Changeset 115:51e55538db9f for admin/preferences.php

Timestamp:

05/02/11 19:50:44 (14 years ago)

Author:

Franck <carnet.franck.paul@…>

Branch:

userprefs

Parents:

113:b17c0c598f26 (diff), 114:56287c01e99f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge

Files:

• admin/preferences.php (modified) (5 diffs)
• admin/preferences.php (modified) (1 diff)

admin/preferences.php

@@ -387 +387 @@
 
 echo
-'<form action="preferences.php" method="post" id="user-options">'.
+'<form action="preferences.php" method="post" id="opts-forms">'.
 '<fieldset><legend>'.__('My options').'</legend>'.
 
@@ -453 +453 @@
                     '<img src="'.$fav['large-icon'].'" alt="" /> '.
                     form::field(array('order['.$k.']'),2,3,$count,'position','',false,'title="'.sprintf(__('position of %s'),$fav['title']).'"').
-                    form::hidden('dynorder[]',$k).
+                    form::hidden(array('dynorder[]','dynorder-'.$k.''),$k).
                     '<label for="fuk-'.$k.'">'.form::checkbox(array('remove[]','fuk-'.$k),$k).$fav['title'].'</label>'.
                     '</li>';
@@ -466 +466 @@
      $core->formNonce().
      '<input type="submit" name="saveorder" value="'.__('Save order').'" /> '.
-     
-     '<input type="submit" class="delete" name="removeaction"'.
+
+     '<input type="submit" class="delete" name="removeaction" '.
      'value="'.__('Delete selected favorites').'" '.
      'onclick="return window.confirm(\''.html::escapeJS(
@@ -473 +473 @@
 
      ($core->auth->isSuperAdmin() ? 
-     '<hr />'.
-     '<p>'.__('If you are a super administrator, you may define this set of favorites to be used by default on all blogs of this installation:').'</p>'.
-     '<p><input class="reset" type="submit" name="replace" value="'.__('Define as default favorites').'" />' : '').'</p>'.
+          '<hr />'.
+          '<p>'.__('If you are a super administrator, you may define this set of favorites to be used by default on all blogs of this installation:').'</p>'.
+          '<p><input class="reset" type="submit" name="replace" value="'.__('Define as default favorites').'" />' : 
+          '').
+          '</p>'.
      '</div>';
 } else {
@@ -528 +530 @@
 '<p>'.
 $core->formNonce().
-'<input type="submit" name="appendaction" value="'.__('Add to my favorites').'" /></p>'.
-'</fieldset>';
+'<input type="submit" name="appendaction" value="'.__('Add to my favorites').'" /></p>';
+echo '</fieldset>';
 echo '</div>';
 echo '</div>'; # Two-cols

admin/preferences.php

@@ -460 +460 @@
 }
 if ($count > 0) echo '</ul>';
-
 if ($count > 0) {
      echo