[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-cvs
Subject:    [SM-CVS] SF.net SVN: squirrelmail:[13755] trunk/squirrelmail
From:       kink () users ! sourceforge ! net
Date:       2009-05-24 10:00:10
Message-ID: E1M8AV0-0001Nu-Lb () 74yxhf1 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 13755
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13755&view=rev
Author:   kink
Date:     2009-05-24 10:00:10 +0000 (Sun, 24 May 2009)

Log Message:
-----------
add more labling for options pages

Modified Paths:
--------------
    trunk/squirrelmail/functions/forms.php
    trunk/squirrelmail/templates/default/options.tpl

Modified: trunk/squirrelmail/functions/forms.php
===================================================================
--- trunk/squirrelmail/functions/forms.php	2009-05-24 09:59:41 UTC (rev 13754)
+++ trunk/squirrelmail/functions/forms.php	2009-05-24 10:00:10 UTC (rev 13755)
@@ -190,6 +190,7 @@
              . htmlspecialchars($v);
     }
 
+    if (! isset($aAttribs['id'])) $aAttribs['id'] = $sName;
 
     // make sure $default is an array, since multiple select lists
     // need the chance to have more than one default... 
@@ -292,6 +293,10 @@
 
     // add default css
     else if (!isset($aAttribs['class'])) $aAttribs['class'] = 'sqmtextarea';
+    
+    if ( empty( $aAttribs['id'] ) ) {
+        $aAttribs['id'] = strtr($sName,'[]','__');
+    }
 
     global $oTemplate;
 

Modified: trunk/squirrelmail/templates/default/options.tpl
===================================================================
--- trunk/squirrelmail/templates/default/options.tpl	2009-05-24 09:59:41 UTC (rev \
                13754)
+++ trunk/squirrelmail/templates/default/options.tpl	2009-05-24 10:00:10 UTC (rev \
13755) @@ -61,15 +61,11 @@
             echo   "<tr>\n" .
                    " <td class=\"optionName\"" . ($opt->caption_wrap ? '' : ' \
style="white-space:nowrap"') . ">\n  ";  
-            if ($opt->type == SMOPT_TYPE_BOOLEAN_CHECKBOX
-             || $opt->type == SMOPT_TYPE_BOOLEAN) {
-                echo '<label for="new_' . $opt->name . '">'
-                   . $opt->caption . '</label>';
-            } else if ($opt->type == SMOPT_TYPE_TEXTAREA && \
                !empty($opt->trailing_text)) {
-                echo $opt->caption . '<br /><small>' . $opt->trailing_text . \
                '</small>';
-            } else {
-                echo $opt->caption;
+            echo '<label for="new_' . $opt->name . '">' . $opt->caption;
+            if ($opt->type == SMOPT_TYPE_TEXTAREA && !empty($opt->trailing_text)) {
+                echo '<br /><small>' . $opt->trailing_text . '</small>';
             }
+            echo '</label>';
 
             echo   "\n </td>\n" .
                    " <td class=\"optionValue\">\n" .


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, & 
iPhoneDevCamp asthey present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://www.creativitycat.com 
-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs@lists.sourceforge.net
List info (subscribe/unsubscribe/change options): \
                https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn


[prev in list] [next in list] [prev in thread] [next in thread]