Changeset 24900

Timestamp:

11/21/08 14:56:17 (7 weeks ago)

Author:

rgasch

Message:

addded allValue and allText support to country selector

Files:

• branches/zikula-1.0/includes/pnobjlib/HtmlUtil.class.php (modified) (3 diffs)
• branches/zikula-1.0/system/pnRender/plugins/function.selector_countries.php (modified) (2 diffs)
• development/main/includes/HtmlUtil.class.php (modified) (3 diffs)
• development/main/system/pnRender/plugins/function.selector_countries.php (modified) (2 diffs)
• development/zikula-1/includes/HtmlUtil.class.php (modified) (3 diffs)
• development/zikula-1/system/pnRender/plugins/function.selector_countries.php (modified) (2 diffs)

branches/zikula-1.0/includes/pnobjlib/HtmlUtil.class.php

@@ -933 +933 @@
      * @param defaultValue   The default value to select (default='') (optional)
      * @param defaultText    The text for the default value (default='') (optional)
+     * @param allValue       The value to assign for the "All" choice (optional) (default=0)
+     * @param allText        The text to display for the "All" choice (optional) (default='')
      * @param submit         Whether or not to auto-submit the selector
      * @param disabled       Whether or not to disable selector (optional) (default=false)
@@ -939 +941 @@
      * @return The generated HTML for the selector
      */
-    function getSelector_Countries ($name='countries', $selectedValue='', $defaultValue=0, $defaultText='', 
-                                    $submit=false, $disabled=false, $multipleSize=1)
+    function getSelector_Countries ($name='countries', $selectedValue='', $defaultValue=0, $defaultText='',  
+                                    $allValue=0, $allText='', $submit=false, $disabled=false, $multipleSize=1)
     {
         $countries = countrylist();
@@ -956 +958 @@
             $sel = ((string)$defaultValue==(string)$selectedValue ? 'selected="selected"' : '');
             $html .= "<option value=\"$defaultValue\" $sel>$defaultText</option>";
+        }
+
+        if ($allText) {
+            $sel = ((string)$allValue==(string)$selectedValue ? 'selected="selected"' : '');
+            $html .= "<option value=\"$allValue\" $sel>$allText</option>";
         }
 

branches/zikula-1.0/system/pnRender/plugins/function.selector_countries.php

@@ -37 +37 @@
 function smarty_function_selector_countries($params, &$smarty) 
 {
+    $allValue         = isset($params['allValue'])         ? $params['allValue']         : 0;
+    $allText          = isset($params['allText'])          ? $params['allText']          : '';
     $defaultValue     = isset($params['defaultValue'])     ? $params['defaultValue']     : 0;
     $defaultText      = isset($params['defaultText'])      ? $params['defaultText']      : '';
@@ -46 +48 @@
 
     Loader::loadClass('HtmlUtil');
-    return HtmlUtil::getSelector_Countries ($name, $selectedValue, $defaultValue, $defaultText, $submit, $disabled, $multipleSize);
+    return HtmlUtil::getSelector_Countries ($name, $selectedValue, $defaultValue, $defaultText, $allValue, $allText, $submit, $disabled, $multipleSize);
 }

development/main/includes/HtmlUtil.class.php

@@ -938 +938 @@
      * @param defaultValue   The default value to select (default='') (optional)
      * @param defaultText    The text for the default value (default='') (optional)
+     * @param allValue       The value to assign for the "All" choice (optional) (default=0)
+     * @param allText        The text to display for the "All" choice (optional) (default='')
      * @param submit         Whether or not to auto-submit the selector
      * @param disabled       Whether or not to disable selector (optional) (default=false)
@@ -945 +947 @@
      */
     static function getSelector_Countries($name = 'countries', $selectedValue = '', $defaultValue = 0, $defaultText = '', 
-                                    $submit = false, $disabled = false, $multipleSize = 1)
+                                          $allValue=0, $allText='', $submit=false, $disabled=false, $multipleSize=1)
     {
         $countries = countrylist();
@@ -961 +963 @@
             $sel = ((string)$defaultValue == (string)$selectedValue ? 'selected="selected"' : '');
             $html .= "<option value=\"$defaultValue\" $sel>$defaultText</option>";
+        }
+
+        if ($allText) {
+            $sel = ((string)$allValue==(string)$selectedValue ? 'selected="selected"' : '');
+            $html .= "<option value=\"$allValue\" $sel>$allText</option>";
         }
 

development/main/system/pnRender/plugins/function.selector_countries.php

@@ -37 +37 @@
 function smarty_function_selector_countries($params, &$smarty) 
 {
+    $allValue         = isset($params['allValue'])         ? $params['allValue']         : 0;
+    $allText          = isset($params['allText'])          ? $params['allText']          : '';
     $defaultValue     = isset($params['defaultValue'])     ? $params['defaultValue']     : 0;
     $defaultText      = isset($params['defaultText'])      ? $params['defaultText']      : '';
@@ -46 +48 @@
 
     Loader::loadClass('HtmlUtil');
-    return HtmlUtil::getSelector_Countries ($name, $selectedValue, $defaultValue, $defaultText, $submit, $disabled, $multipleSize);
+    return HtmlUtil::getSelector_Countries ($name, $selectedValue, $defaultValue, $defaultText, $allValue, $allText, $submit, $disabled, $multipleSize);
 }

development/zikula-1/includes/HtmlUtil.class.php

@@ -933 +933 @@
      * @param defaultValue   The default value to select (default='') (optional)
      * @param defaultText    The text for the default value (default='') (optional)
+     * @param allValue       The value to assign for the "All" choice (optional) (default=0)
+     * @param allText        The text to display for the "All" choice (optional) (default='')
      * @param submit         Whether or not to auto-submit the selector
      * @param disabled       Whether or not to disable selector (optional) (default=false)
@@ -940 +942 @@
      */
     function getSelector_Countries ($name='countries', $selectedValue='', $defaultValue=0, $defaultText='', 
-                                    $submit=false, $disabled=false, $multipleSize=1)
+                                    $allValue=0, $allText='', $submit=false, $disabled=false, $multipleSize=1)
     {
         $countries = countrylist();
@@ -956 +958 @@
             $sel = ((string)$defaultValue==(string)$selectedValue ? 'selected="selected"' : '');
             $html .= "<option value=\"$defaultValue\" $sel>$defaultText</option>";
+        }
+
+        if ($allText) {
+            $sel = ((string)$allValue==(string)$selectedValue ? 'selected="selected"' : '');
+            $html .= "<option value=\"$allValue\" $sel>$allText</option>";
         }
 

development/zikula-1/system/pnRender/plugins/function.selector_countries.php

@@ -37 +37 @@
 function smarty_function_selector_countries($params, &$smarty) 
 {
+    $allValue         = isset($params['allValue'])         ? $params['allValue']         : 0;
+    $allText          = isset($params['allText'])          ? $params['allText']          : '';
     $defaultValue     = isset($params['defaultValue'])     ? $params['defaultValue']     : 0;
     $defaultText      = isset($params['defaultText'])      ? $params['defaultText']      : '';
@@ -46 +48 @@
 
     Loader::loadClass('HtmlUtil');
-    return HtmlUtil::getSelector_Countries ($name, $selectedValue, $defaultValue, $defaultText, $submit, $disabled, $multipleSize);
+    return HtmlUtil::getSelector_Countries ($name, $selectedValue, $defaultValue, $defaultText, $allValue, $allText, $submit, $disabled, $multipleSize);
 }