From 4ae6d689578448a33024703c61bb17b5709fa0e5 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 3 Feb 2011 12:57:39 +0000
Subject: changed input/pulldown to input/dropdown

git-svn-id: http://code.elgg.org/elgg/trunk@8006 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/input/access.php   |  2 +-
 views/default/input/dropdown.php | 58 ++++++++++++++++++++++++++++++++++++++++
 views/default/input/pulldown.php | 54 +++----------------------------------
 3 files changed, 62 insertions(+), 52 deletions(-)
 create mode 100644 views/default/input/dropdown.php

(limited to 'views/default/input')

diff --git a/views/default/input/access.php b/views/default/input/access.php
index 56123d49a..da7853b8b 100644
--- a/views/default/input/access.php
+++ b/views/default/input/access.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Elgg access level input
- * Displays a pulldown input field
+ * Displays a dropdown input field
  *
  * @package Elgg
  * @subpackage Core
diff --git a/views/default/input/dropdown.php b/views/default/input/dropdown.php
new file mode 100644
index 000000000..b4d38fb00
--- /dev/null
+++ b/views/default/input/dropdown.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Elgg dropdown input
+ * Displays a dropdown (select) input field
+ *
+ * NB: Default values of FALSE or NULL will match '' (empty string) and not 0.
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['value']          The current value, if any
+ * @uses $vars['js']             Any Javascript to enter into the select tag
+ * @uses $vars['internalname']   The name of the select field
+ * @uses $vars['options']        An array of strings representing the options for the dropdown field
+ * @uses $vars['options_values'] An associative array of "value" => "option"
+ *                               where "value" is an internal name and "option" is
+ * 								 the value displayed on the button. Replaces
+ *                               $vars['options'] when defined.
+ */
+
+$class = $vars['class'];
+if (!$class) {
+	$class = "elgg-input-dropdown";
+}
+
+if (!isset($vars['value'])) {
+	$vars['value'] = elgg_get_sticky_value($vars['internalname']);
+}
+
+?>
+<select name="<?php echo $vars['internalname']; ?>" <?php if (isset($vars['internalid'])) echo "id=\"{$vars['internalid']}\""; ?> <?php echo $vars['js']; ?> <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>">
+<?php
+
+if ($vars['options_values']) {
+	foreach($vars['options_values'] as $value => $option) {
+
+		$encoded_value = htmlentities($value, ENT_QUOTES, 'UTF-8');
+		$encoded_option = htmlentities($option, ENT_QUOTES, 'UTF-8');
+
+		if ((string)$value == (string)$vars['value']) {
+			echo "<option value=\"$encoded_value\" selected=\"selected\">$encoded_option</option>";
+		} else {
+			echo "<option value=\"$encoded_value\">$encoded_option</option>";
+		}
+	}
+} else {
+	foreach($vars['options'] as $option) {
+		$encoded_option = htmlentities($option, ENT_QUOTES, 'UTF-8');
+
+		if ((string)$option == (string)$vars['value']) {
+			echo "<option selected=\"selected\">$encoded_option</option>";
+		} else {
+			echo "<option>$encoded_option</option>";
+		}
+	}
+}
+?>
+</select>
diff --git a/views/default/input/pulldown.php b/views/default/input/pulldown.php
index 25e3e3c37..994de5297 100644
--- a/views/default/input/pulldown.php
+++ b/views/default/input/pulldown.php
@@ -1,56 +1,8 @@
 <?php
 /**
- * Elgg pulldown input
- * Displays a pulldown input field
+ * Deprecated pulldown input view - use 'input/dropdown' instead.
  *
- * NB: Default values of FALSE or NULL will match '' (empty string) and not 0.
- *
- * @package Elgg
- * @subpackage Core
- *
- * @uses $vars['value'] The current value, if any
- * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
- * @uses $vars['options'] An array of strings representing the options for the pulldown field
- * @uses $vars['options_values'] An associative array of "value" => "option" where "value" is an internal name and "option" is
- * 								 the value displayed on the button. Replaces $vars['options'] when defined.
+ * @deprecated 1.8
  */
 
-$class = $vars['class'];
-if (!$class) {
-	$class = "elgg-input-dropdown";
-}
-
-if (!isset($vars['value'])) {
-	$vars['value'] = elgg_get_sticky_value($vars['internalname']);
-}
-
-?>
-<select name="<?php echo $vars['internalname']; ?>" <?php if (isset($vars['internalid'])) echo "id=\"{$vars['internalid']}\""; ?> <?php echo $vars['js']; ?> <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>">
-<?php
-
-if ($vars['options_values']) {
-	foreach($vars['options_values'] as $value => $option) {
-
-		$encoded_value = htmlentities($value, ENT_QUOTES, 'UTF-8');
-		$encoded_option = htmlentities($option, ENT_QUOTES, 'UTF-8');
-
-		if ((string)$value == (string)$vars['value']) {
-			echo "<option value=\"$encoded_value\" selected=\"selected\">$encoded_option</option>";
-		} else {
-			echo "<option value=\"$encoded_value\">$encoded_option</option>";
-		}
-	}
-} else {
-	foreach($vars['options'] as $option) {
-		$encoded_option = htmlentities($option, ENT_QUOTES, 'UTF-8');
-
-		if ((string)$option == (string)$vars['value']) {
-			echo "<option selected=\"selected\">$encoded_option</option>";
-		} else {
-			echo "<option>$encoded_option</option>";
-		}
-	}
-}
-?>
-</select>
\ No newline at end of file
+echo elgg_view('input/dropdown', $vars);
-- 
cgit v1.2.3