From d46162271a5ca3c3af690173d0abfcd1ab9f69a1 Mon Sep 17 00:00:00 2001 From: brettp Date: Fri, 16 Oct 2009 21:05:54 +0000 Subject: Standardized views/failsafe/* git-svn-id: http://code.elgg.org/elgg/trunk@3558 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/failsafe/input/access.php | 90 ++++++++++++++++++------------------- views/failsafe/input/button.php | 82 +++++++++++++++++++-------------- views/failsafe/input/checkboxes.php | 89 ++++++++++++++++++------------------ views/failsafe/input/form.php | 62 +++++++++++++++---------- views/failsafe/input/hidden.php | 32 ++++++------- views/failsafe/input/longtext.php | 39 ++++++++-------- views/failsafe/input/pulldown.php | 83 ++++++++++++++++------------------ views/failsafe/input/reset.php | 47 +++++++++---------- views/failsafe/input/submit.php | 47 +++++++++---------- views/failsafe/input/text.php | 41 +++++++++-------- 10 files changed, 316 insertions(+), 296 deletions(-) (limited to 'views/failsafe/input') diff --git a/views/failsafe/input/access.php b/views/failsafe/input/access.php index 74fc56ddf..c0dabccaf 100644 --- a/views/failsafe/input/access.php +++ b/views/failsafe/input/access.php @@ -1,51 +1,49 @@ 0) { + + ?> + + class=""> - $option) { - if ($key != $vars['value']) { - echo ""; - } else { - echo ""; - } - } - -?> - - - + - } + \ No newline at end of file +} \ No newline at end of file diff --git a/views/failsafe/input/button.php b/views/failsafe/input/button.php index 0f6fdf6a5..2c36841df 100644 --- a/views/failsafe/input/button.php +++ b/views/failsafe/input/button.php @@ -1,39 +1,53 @@ wwwroot)===false) $src = ""; // blank src if trying to access an offsite image. +$class = $vars['class']; +if (!$class) { + $class = "submit_button"; +} + +if (isset($vars['type'])) { + $type = strtolower($vars['type']); +} else { + $type = 'submit'; +} + +switch ($type) { + case 'button' : + $type='button'; + break; + case 'reset' : + $type='reset'; + break; + case 'submit': + default: + $type = 'submit'; +} + +$value = htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); +$name = $vars['internalname']; +$src = $vars['src']; +// blank src if trying to access an offsite image. +if (strpos($src,$CONFIG->wwwroot)===false) { + $src = ""; +} ?> value="" src="" class="" /> \ No newline at end of file diff --git a/views/failsafe/input/checkboxes.php b/views/failsafe/input/checkboxes.php index 0e394af55..0cc32958f 100644 --- a/views/failsafe/input/checkboxes.php +++ b/views/failsafe/input/checkboxes.php @@ -1,49 +1,48 @@ $option) { + //if (!in_array($option,$vars['value'])) { + if (is_array($vars['value'])) { + if (!in_array($option,$vars['value'])) { + $selected = ""; + } else { + $selected = "checked = \"checked\""; + } + } else { + if ($option != $vars['value']) { + $selected = ""; + } else { + $selected = "checked = \"checked\""; + } + } + $labelint = (int) $label; + if ("{$label}" == "{$labelint}") { + $label = $option; + } - * @link http://elgg.org/ - * - * @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 checkbox field - * - */ - - $class = $vars['class']; - if (!$class) $class = "input-checkboxes"; - - foreach($vars['options'] as $label => $option) { - //if (!in_array($option,$vars['value'])) { - if (is_array($vars['value'])) { - if (!in_array($option,$vars['value'])) { - $selected = ""; - } else { - $selected = "checked = \"checked\""; - } - } else { - if ($option != $vars['value']) { - $selected = ""; - } else { - $selected = "checked = \"checked\""; - } - } - $labelint = (int) $label; - if ("{$label}" == "{$labelint}") { - $label = $option; - } - - $disabled = ""; - if ($vars['disabled']) $disabled = ' disabled="yes" '; - echo "
"; - } - -?> \ No newline at end of file + $disabled = ""; + if ($vars['disabled']) { + $disabled = ' disabled="yes" '; + } + echo "
"; +} \ No newline at end of file diff --git a/views/failsafe/input/form.php b/views/failsafe/input/form.php index 99b6f9965..10fe89dcf 100644 --- a/views/failsafe/input/form.php +++ b/views/failsafe/input/form.php @@ -1,27 +1,43 @@
id="" name="" action="" method="" > diff --git a/views/failsafe/input/hidden.php b/views/failsafe/input/hidden.php index 58b86c25e..dd5c8bb98 100644 --- a/views/failsafe/input/hidden.php +++ b/views/failsafe/input/hidden.php @@ -1,18 +1,18 @@ - name="" value="" /> \ No newline at end of file + name="" value="" /> \ No newline at end of file diff --git a/views/failsafe/input/longtext.php b/views/failsafe/input/longtext.php index c1f38fe69..9c89583de 100644 --- a/views/failsafe/input/longtext.php +++ b/views/failsafe/input/longtext.php @@ -1,25 +1,24 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/views/failsafe/input/pulldown.php b/views/failsafe/input/pulldown.php index 1adbad099..6ad12eec4 100644 --- a/views/failsafe/input/pulldown.php +++ b/views/failsafe/input/pulldown.php @@ -1,52 +1,45 @@ "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 = "input-pulldown"; - +/** + * Elgg pulldown input + * Displays a pulldown input field + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + * + * @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. + */ + + +$class = $vars['class']; +if (!$class) { + $class = "input-pulldown"; +} ?> - - \ No newline at end of file diff --git a/views/failsafe/input/reset.php b/views/failsafe/input/reset.php index 96fc57a4f..bb8d278c3 100644 --- a/views/failsafe/input/reset.php +++ b/views/failsafe/input/reset.php @@ -1,25 +1,26 @@ \ No newline at end of file +$vars['type'] = 'reset'; +$class = $vars['class']; +if (!$class) { + $class = "submit_button"; +} +$vars['class'] = $class; + +echo elgg_view('input/button', $vars); \ No newline at end of file diff --git a/views/failsafe/input/submit.php b/views/failsafe/input/submit.php index 79d6522b9..cfa7989d0 100644 --- a/views/failsafe/input/submit.php +++ b/views/failsafe/input/submit.php @@ -1,25 +1,26 @@ \ No newline at end of file +$vars['type'] = 'submit'; +$class = $vars['class']; +if (!$class) { + $class = "submit_button"; +} +$vars['class'] = $class; + +echo elgg_view('input/button', $vars); \ No newline at end of file diff --git a/views/failsafe/input/text.php b/views/failsafe/input/text.php index 4c37e5219..f94ee0135 100644 --- a/views/failsafe/input/text.php +++ b/views/failsafe/input/text.php @@ -1,27 +1,26 @@ - - name="" value="" class=""/> \ No newline at end of file + name="" value="" class=""/> \ No newline at end of file -- cgit v1.2.3