Changeset 117:dbe66b29e1cd for plugins

Timestamp:

05/02/11 21:38:54 (14 years ago)

Author:

Franck <carnet.franck.paul@…>

Branch:

userprefs

Message:

Mise en place attribut for des label et attribut id des champs de configuration des widgets

Location:

plugins/widgets

Files:

• class.widgets.php (modified) (3 diffs)
• index.php (modified) (6 diffs)

plugins/widgets/class.widgets.php

@@ -220 +220 @@
      }
      
-     public function formSettings($pr='')
+     public function formSettings($pr='',&$i=0)
      {
           $res = '';
           foreach ($this->settings as $id => $s)
           {
+               $wfid = "wf-".$i;
                $iname = $pr ? $pr.'['.$id.']' : $id;
                switch ($s['type'])
@@ -230 +231 @@
                     case 'text':
                          $res .=
-                         '<p><label>'.$s['title'].' '.
-                         form::field(array($iname),20,255,html::escapeHTML($s['value']),'maximal').
+                         '<p><label for="'.$wfid.'">'.$s['title'].' '.
+                         form::field(array($iname,$wfid),20,255,html::escapeHTML($s['value']),'maximal').
                          '</label></p>';
                          break;
                     case 'textarea':
                          $res .=
-                         '<p><label>'.$s['title'].' '.
-                         form::textarea(array($iname),30,5,html::escapeHTML($s['value']),'maximal').
+                         '<p><label for="'.$wfid.'">'.$s['title'].' '.
+                         form::textarea(array($iname,$wfid),30,5,html::escapeHTML($s['value']),'maximal').
                          '</label></p>';
                          break;
@@ -243 +244 @@
                          $res .=
                          '<p>'.form::hidden(array($iname),'0').
-                         '<label class="classic">'.
-                         form::checkbox(array($iname),'1',$s['value']).' '.$s['title'].
+                         '<label class="classic" for="'.$wfid.'">'.
+                         form::checkbox(array($iname,$wfid),'1',$s['value']).' '.$s['title'].
                          '</label></p>';
                          break;
                     case 'combo':
                          $res .=
-                         '<p><label>'.$s['title'].' '.
-                         form::combo(array($iname),$s['options'],$s['value']).
-                         '</label></p>';
-                         break;
-               }
+                         '<p><label for="'.$wfid.'">'.$s['title'].' '.
+                         form::combo(array($iname,$wfid),$s['options'],$s['value']).
+                         '</label></p>';
+                         break;
+               }
+               $i++;
           }
           

plugins/widgets/index.php

@@ -165 +165 @@
 '<div id="widgets">';
 
+$j = 0;
 foreach ($__widgets->elements(true) as $w) {
      echo
@@ -172 +173 @@
      '<p class="js-remove"><label class="classic">'.__('Append to:').' '.
      form::combo(array('addw['.$w->id().']'),$append_combo).'</label></p>'.
-     '<div class="widgetSettings">'.$w->formSettings('w[void][0]').'</div>'.
+     '<div class="widgetSettings">'.$w->formSettings('w[void][0]',$j).'</div>'.
      '</div>';
+     $j++;
 }
 
@@ -187 +189 @@
 echo
 '<div id="sidebarNav" class="widgets">'.
-sidebarWidgets('dndnav',__('Navigation sidebar'),$widgets_nav,'nav',$__default_widgets['nav']).
+sidebarWidgets('dndnav',__('Navigation sidebar'),$widgets_nav,'nav',$__default_widgets['nav'],$j).
 '</div>';
 
@@ -193 +195 @@
 echo
 '<div id="sidebarExtra" class="widgets">'.
-sidebarWidgets('dndextra',__('Extra sidebar'),$widgets_extra,'extra',$__default_widgets['extra']).
+sidebarWidgets('dndextra',__('Extra sidebar'),$widgets_extra,'extra',$__default_widgets['extra'],$j).
 '</div>';
 
@@ -262 +264 @@
 dcPage::helpBlock($widget_elements);
 
-function sidebarWidgets($id,$title,$widgets,$pr,$default_widgets)
+function sidebarWidgets($id,$title,$widgets,$pr,$default_widgets,&$j)
 {
      $res = '<fieldset><legend>'.$title.'</legend><div id="'.$id.'">';
@@ -287 +289 @@
           form::checkbox(array($iname.'[_rem]'),'1',0).' '.__('Remove widget').
           '</label></p>'.
-          '<div class="widgetSettings">'.$w->formSettings($iname).'</div>'.
+          '<div class="widgetSettings">'.$w->formSettings($iname,&$j).'</div>'.
           '</div>';
           
           $i++;
+          $j++;
      }