- user list : links to profile page and permissions page are represented by

  icons (more compact)

- user list : ability to associate to a group or to dissociate from a group
  a list of selected users

- user list : ability to set user properties in "batch" mode (a selection of
  users at once)

- user list : alternate background color for each line

- (not in ChangeLog) temporary commented code to update current user
  language if $_POST['language'] is set (see include/user.inc.php for
  details)


git-svn-id: http://piwigo.org/svn/trunk@787 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 174 insertions, 5 deletions

diff --git a/template/default/admin/user_list.tpl b/template/default/admin/user_list.tpl
index 215564879..1b25a251e 100644
--- a/template/default/admin/user_list.tpl
+++ b/template/default/admin/user_list.tpl
@@ -52,8 +52,11 @@
 
 </form>
 
-<table style="width:100%;" >
+<form method="post" name="preferences" action="{F_PREF_ACTION}">
+
+<table class="table2" style="width:100%;" >
   <tr class="throw">
+    <th style="width:1%;"></th>
     <th style="width:20%;">{L_USERNAME}</th>
     <th style="width:20%;">{L_STATUS}</th>
     <th style="width:30%;">{L_EMAIL}</th>
@@ -61,13 +64,175 @@
     <th style="width:1%;">{L_ACTIONS}</th>
   </tr>
   <!-- BEGIN user -->
-  <tr>
-    <td><a href="{user.U_MOD}">{user.USERNAME}</a></td>
+  <tr class="{user.CLASS}">
+    <td><input type="checkbox" name="selection[]" value="{user.ID}" {user.CHECKED} id="selection-{user.ID}" /></td>
+    <td><label for="selection-{user.ID}">{user.USERNAME}</label></td>
     <td>{user.STATUS}</td>
     <td>{user.EMAIL}</td>
     <td>{user.GROUPS}</td>
-    <td>[<a href="{user.U_PERM}">{L_PERMISSIONS}</a>]</td>
+    <td style="text-align:center;">
+      <a href="{user.U_MOD}"><img src="./template/default/theme/profile.png" style="border:none" alt="profile" title="profile" /></a>
+      <a href="{user.U_PERM}"><img src="./template/default/theme/permissions.png" style="border:none" alt="{L_PERMISSIONS}" title="{L_PERMISSIONS}" /></a>
+    </td>
   </tr>
   <!-- END user -->
 </table>
 <div class="navigationBar">{NAVBAR}</div>
+
+<!-- form to set properties for many users at once -->
+<div class="admin">Preferences</div>
+
+<table>
+
+  <tr>
+    <td>associate to groupe</td>
+    <td>
+      <select name="associate" size="1">
+        <!-- BEGIN associate_option -->
+        <option {associate_option.SELECTED} value="{associate_option.VALUE}">{associate_option.CONTENT}</option>
+        <!-- END associate_option -->
+      </select>
+    </td>
+  </tr>
+
+  <tr>
+    <td>dissociate from groupe</td>
+    <td>
+      <select name="dissociate" size="1">
+        <!-- BEGIN dissociate_option -->
+        <option {dissociate_option.SELECTED} value="{dissociate_option.VALUE}">{dissociate_option.CONTENT}</option>
+        <!-- END dissociate_option -->
+      </select>
+    </td>
+  </tr>
+
+  <tr>
+    <td>{L_NB_IMAGE_LINE}</td>
+    <td>
+      <input type="radio" name="nb_image_line_action" value="leave" checked="checked" /> leave unchanged
+      <input type="radio" name="nb_image_line_action" value="set" id="nb_image_line_action_set" /> set to
+      <input onmousedown="document.getElementById('nb_image_line_action_set').checked = true;"
+             size="3" maxlength="2" type="text" name="nb_image_line" value="{NB_IMAGE_LINE}" />
+    </td>
+  </tr>
+
+  <tr>
+    <td>{L_NB_LINE_PAGE}</td>
+    <td>
+      <input type="radio" name="nb_line_page_action" value="leave" checked="checked" /> leave unchanged
+      <input type="radio" name="nb_line_page_action" value="set" id="nb_line_page_action_set" /> set to
+      <input onmousedown="document.getElementById('nb_line_page_action_set').checked = true;"
+             size="3" maxlength="2" type="text" name="nb_line_page" value="{NB_LINE_PAGE}" />
+    <td>
+  </tr>
+
+  <tr>
+    <td>{L_TEMPLATE}</td>
+    <td>
+      <input type="radio" name="template_action" value="leave" checked="checked" /> leave unchanged
+      <input type="radio" name="template_action" value="set" id="template_action_set" /> set to
+      <select onmousedown="document.getElementById('template_action_set').checked = true;" name="template" size="1">
+        <!-- BEGIN template_option -->
+        <option {template_option.SELECTED} value="{template_option.VALUE}">{template_option.CONTENT}</option>
+        <!-- END template_option -->
+      </select>
+    </td>
+  </tr>
+
+  <tr>
+    <td>{L_LANGUAGE}</td>
+    <td>
+      <input type="radio" name="language_action" value="leave" checked="checked" /> leave unchanged
+      <input type="radio" name="language_action" value="set" id="language_action_set" /> set to
+      <select onmousedown="document.getElementById('language_action_set').checked = true;" name="language" size="1">
+        <!-- BEGIN language_option -->
+        <option {language_option.SELECTED} value="{language_option.VALUE}">{language_option.CONTENT}</option>
+        <!-- END language_option -->
+      </select>
+    </td>
+  </tr>
+
+  <tr>
+    <td>{L_RECENT_PERIOD}</td>
+    <td>
+      <input type="radio" name="recent_period_action" value="leave" checked="checked" /> leave unchanged
+      <input type="radio" name="recent_period_action" value="set" id="recent_period_action_set" /> set to
+      <input onmousedown="document.getElementById('recent_period_action_set').checked = true;"
+             type="text" size="3" maxlength="2" name="recent_period" value="{RECENT_PERIOD}" />
+    </td>
+  </tr>
+
+  <tr>
+    <td>{L_EXPAND}</td>
+    <td>
+      <input type="radio" name="expand_action" value="leave" checked="checked" /> leave unchanged
+      <input type="radio" name="expand_action" value="set" id="expand_action_set" /> set to
+      <input onmousedown="document.getElementById('expand_action_set').checked = true;" 
+             type="radio" class="radio" name="expand" value="true"  {EXPAND_YES} />{L_YES}
+      <input onmousedown="document.getElementById('expand_action_set').checked = true;"
+             type="radio" class="radio" name="expand" value="false" {EXPAND_NO}  />{L_NO}
+    </td>
+  </tr>
+
+  <tr>
+    <td>{L_SHOW_NB_COMMENTS}</td>
+    <td>
+      <input type="radio" name="show_nb_comments_action" value="leave" checked="checked" /> leave unchanged
+      <input type="radio" name="show_nb_comments_action" value="set" id="show_nb_comments_action_set" /> set to
+      <input onmousedown="document.getElementById('show_nb_comments_action_set').checked = true;"
+             type="radio" class="radio" name="show_nb_comments" value="true" {SHOW_NB_COMMENTS_YES} />{L_YES}
+      <input onmousedown="document.getElementById('show_nb_comments_action_set').checked = true;"
+             type="radio" class="radio" name="show_nb_comments" value="false" {SHOW_NB_COMMENTS_NO} />{L_NO}
+    </td>
+  </tr>
+
+  <tr>
+    <td>{L_MAXWIDTH}</td>
+    <td>
+      <input type="radio" name="maxwidth_action" value="leave" checked="checked" /> leave unchanged
+      <input type="radio" name="maxwidth_action" value="unset" /> unset
+      <input type="radio" name="maxwidth_action" value="set" id="maxwidth_action_set" /> set to 
+      <input onmousedown="document.getElementById('maxwidth_action_set').checked = true;"
+             type="text" size="4" maxlength="4" name="maxwidth" value="{MAXWIDTH}" />
+    </td>
+  </tr>
+
+
+  <tr>
+    <td>{L_MAXHEIGHT}</td>
+    <td>
+      <input type="radio" name="maxheight_action" value="leave" checked="checked" /> leave unchanged
+      <input type="radio" name="maxheight_action" value="unset" /> unset
+      <input type="radio" name="maxheight_action" value="set" id="maxheight_action_set" /> set to 
+      <input onmousedown="document.getElementById('maxheight_action_set').checked = true;"
+             type="text" size="4" maxlength="4" name="maxheight" value="{maxheight}" />
+    </td>
+  </tr>
+
+  <tr>
+    <td>{L_STATUS}</td>
+    <td>
+      <input type="radio" name="status_action" value="leave" checked="checked" /> leave unchanged
+      <input type="radio" name="status_action" value="set" id="status_action_set" /> set to
+      <select onmousedown="document.getElementById('status_action_set').checked = true;" name="status" size="1">
+        <!-- BEGIN pref_status_option -->
+        <option {pref_status_option.SELECTED} value="{pref_status_option.VALUE}">{pref_status_option.CONTENT}</option>
+        <!-- END pref_status_option -->
+      </select>
+    </td>
+  </tr>
+
+</table>
+
+<p style="text-align:center;">
+  target  
+  <input type="radio" name="target" value="all" /> all
+  <input type="radio" name="target" value="selection" checked="checked" /> selection
+</p>
+
+<p style="text-align:center;">
+  <input type="submit" value="{L_SUBMIT}" name="pref_submit" class="bouton" />
+  <input type="reset" value="{L_RESET}" name="pref_reset" class="bouton" />
+</p>
+
+</form>
diff --git a/template/default/default.css b/template/default/default.css
index 8337b8dbc..35f54769c 100644
--- a/template/default/default.css
+++ b/template/default/default.css
@@ -376,4 +376,8 @@ div.remoteLocal {
 }
 
 /* for debugging purpose */
-pre { text-align:left; }
\ No newline at end of file
+pre { text-align:left; }
+
+label:hover {
+  cursor: pointer;
+}
diff --git a/template/default/theme/permissions.png b/template/default/theme/permissions.png
new file mode 100644
index 000000000..5758896de
--- /dev/null
+++ b/template/default/theme/permissions.png
diff --git a/template/default/theme/profile.png b/template/default/theme/profile.png
new file mode 100644
index 000000000..d04cb347b
--- /dev/null
+++ b/template/default/theme/profile.png