- modification : major simplification of admin.php. Titles are managed by

  included page, localized items are managed directly in the template.

- new : sub template admin/double_select is included in templates
  admin/cat_options, admin/user_perm and admin/group_perm. I haven't been
  able to use it in admin/picture_modify because it seems impossible to have
  two instance of the same sub-template without interfering.

- modification : bug 99, in profile manager, no auto submit when changing
  language (useless and generate accessibility problem).

- improvement : HTML semantically correct for administration menu, simpler
  syntax, less tags, correct tags (dl/dt/dd instead of div/div).

- modification : number of waiting elements and unvalidated comments are
  displayed in admin/intro instead of administration menu (with a link to
  the dedicated pages).

- deletion : no link to profile from admin/user_list anymore (no need).


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

1 files changed, 60 insertions, 70 deletions

diff --git a/template/default/admin/picture_modify.tpl b/template/default/admin/picture_modify.tpl
index 5cd889e83..f16dce412 100644
--- a/template/default/admin/picture_modify.tpl
+++ b/template/default/admin/picture_modify.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_picmod}</h1>
+
 <div class="admin">{TITLE_IMG}</div>
 <form action="{F_ACTION}" method="POST">
   <table style="width:100%;">
@@ -60,76 +62,64 @@
   </table>
 </form>
 
-<form name="form1" method="post" action="{F_ACTION}" style="text-align:center;width:800px;">
-
-  <div style="clear:both;"></div>
-
-  <div style="height:auto;">
-
-    <div style="float:left;padding:10px;width:300px;">
-      <span class="titreMenu">{L_CAT_ASSOCIATED}</span><br />
-      <select style="height:auto;width:280px" name="cat_associated[]" multiple="multiple" size="10">
-        <!-- BEGIN associated_option -->
-        <option class="{associated_option.CLASS}" {associated_option.SELECTED} value="{associated_option.VALUE}">{associated_option.OPTION}</option>
-        <!-- END associated_option -->
-      </select>
-    </div>
-
-    <div style="float:left;padding-top:80px;padding-bottom:80px;text-align:center;width:160px;" >
-      <input type="submit" value="&laquo;" name="associate" style="font-size:15px;" class="bouton" /><br/>
-      <input type="submit" value="&raquo;" name="dissociate" style="font-size:15px;" class="bouton" />
-    </div>
-
-    <div style="float:right;padding:10px;width:300px;">
-      <span class="titreMenu">{L_CAT_DISSOCIATED}</span><br />
-      <select style="width:280px" name="cat_dissociated[]" multiple="multiple" size="10">
-        <!-- BEGIN dissociated_option -->
-        <option class="{dissociated_option.CLASS}" {dissociated_option.SELECTED} value="{dissociated_option.VALUE}">{dissociated_option.OPTION}</option>
-        <!-- END dissociated_option -->
-      </select>
-    </div>
-
-  </div>
-
-  <div style="clear:both;"></div>
-
-  <input type="reset" name="reset" value="{L_RESET}" class="bouton" />
-
+<form name="form1" method="post" action="{F_ACTION}">
+  <fieldset>
+    <legend>{lang:Association to categories}</legend>
+
+    <table class="doubleSelect">
+      <tr>
+        <td>
+          <h3>{L_CAT_ASSOCIATED}</h3>
+          <select class="categoryList" name="cat_associated[]" multiple="multiple" size="30">
+            <!-- BEGIN associated_option -->
+            <option {associated_option.SELECTED} value="{associated_option.VALUE}">{associated_option.OPTION}</option>
+            <!-- END associated_option -->
+          </select>
+          <p><input type="submit" value="&raquo;" name="dissociate" style="font-size:15px;"/></p>
+        </td>
+
+        <td>
+          <h3>{L_CAT_DISSOCIATED}</h3>
+          <select class="categoryList" name="cat_dissociated[]" multiple="multiple" size="30">
+            <!-- BEGIN dissociated_option -->
+            <option {dissociated_option.SELECTED} value="{dissociated_option.VALUE}">{dissociated_option.OPTION}</option>
+            <!-- END dissociated_option -->
+          </select>
+          <p><input type="submit" value="&laquo;" name="associate" style="font-size:15px;" /></p>
+        </td>
+      </tr>
+    </table>
+
+  </fieldset>
 </form>
 
-<form name="form2" method="post" action="{F_ACTION}" style="text-align:center;width:800px;">
-
-  <div style="clear:both;"></div>
-
-  <div style="height:auto;">
-
-    <div style="float:left;padding:10px;width:300px;">
-      <span class="titreMenu">{L_REPRESENTS}</span><br />
-      <select style="height:auto;width:280px" name="cat_elected[]" multiple="multiple" size="10">
-        <!-- BEGIN elected_option -->
-        <option class="{elected_option.CLASS}" {elected_option.SELECTED} value="{elected_option.VALUE}">{elected_option.OPTION}</option>
-        <!-- END elected_option -->
-      </select>
-    </div>
-
-    <div style="float:left;padding-top:80px;padding-bottom:80px;text-align:center;width:160px;" >
-      <input type="submit" value="&laquo;" name="elect" style="font-size:15px;" class="bouton" /><br/>
-      <input type="submit" value="&raquo;" name="dismiss" style="font-size:15px;" class="bouton" />
-    </div>
-
-    <div style="float:right;padding:10px;width:300px;">
-      <span class="titreMenu">{L_DOESNT_REPRESENT}</span><br />
-      <select style="width:280px" name="cat_dismissed[]" multiple="multiple" size="10">
-        <!-- BEGIN dismissed_option -->
-        <option class="{dismissed_option.CLASS}" {dismissed_option.SELECTED} value="{dismissed_option.VALUE}">{dismissed_option.OPTION}</option>
-        <!-- END dismissed_option -->
-      </select>
-    </div>
-
-  </div>
-
-  <div style="clear:both;"></div>
-
-  <input type="reset" name="reset" value="{L_RESET}" class="bouton" />
-
+<form name="form2" method="post" action="{F_ACTION}">
+  <fieldset>
+    <legend>{lang:Representation of categories}</legend>
+
+    <table class="doubleSelect">
+      <tr>
+        <td>
+          <h3>{L_REPRESENTS}</h3>
+          <select class="categoryList" name="cat_elected[]" multiple="multiple" size="30">
+            <!-- BEGIN elected_option -->
+            <option {elected_option.SELECTED} value="{elected_option.VALUE}">{elected_option.OPTION}</option>
+            <!-- END elected_option -->
+          </select>
+          <p><input type="submit" value="&raquo;" name="dismiss" style="font-size:15px;"/></p>
+        </td>
+
+        <td>
+          <h3>{L_DOESNT_REPRESENT}</h3>
+          <select class="categoryList" name="cat_dismissed[]" multiple="multiple" size="30">
+            <!-- BEGIN dismissed_option -->
+            <option {dismissed_option.SELECTED} value="{dismissed_option.VALUE}">{dismissed_option.OPTION}</option>
+            <!-- END dismissed_option -->
+          </select>
+          <p><input type="submit" value="&laquo;" name="elect" style="font-size:15px;" /></p>
+        </td>
+      </tr>
+    </table>
+
+  </fieldset>
 </form>