feature 2561: redesign on album administration screen.

* only one form on the screen and several tabs

* simpler URL pattern : page=album-123-properties / page=album-123-sort_order
  / page=album-123-permissions

* action to associate all photos of an album to another (new) virtual album
  was removed. This can be easily done with the new Batch Manager

* notification by email on an album still has to be moved on a new dedicated tab

* action icons (jump to album, manage photos, manage sub-albums, delete album...)
  replaced by plain text links


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

4 files changed, 80 insertions, 177 deletions

diff --git a/admin/themes/default/template/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl
index 91b580998..2b5f15fdc 100644
--- a/admin/themes/default/template/cat_modify.tpl
+++ b/admin/themes/default/template/cat_modify.tpl
@@ -1,209 +1,108 @@
-
-{include file='include/autosize.inc.tpl'}
-{include file='include/resize.inc.tpl'}
-
 <div class="titrePage">
-  <h2>{'Edit album'|@translate}</h2>
+  <h2><span style="letter-spacing:0">{$CATEGORIES_NAV}</span> &#8250; {'Edit album'|@translate} {$TABSHEET_TITLE}</h2>
 </div>
 
-<h3>{$CATEGORIES_NAV}</h3>
-
-<ul class="categoryActions">
-  {if cat_admin_access($CAT_ID)}
-  <li><a href="{$U_JUMPTO}" title="{'jump to album'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" alt="{'jump to album'|@translate}"></a></li>
-  {/if}
-  {if isset($U_MANAGE_ELEMENTS) }
-  <li><a href="{$U_MANAGE_ELEMENTS}" title="{'manage album photos'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_elements.png" alt="{'Photos'|@translate}"></a></li>
-  {/if}
-  <li><a href="{$U_MANAGE_RANKS}" title="{'Manage photo ranks'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/ranks.png" alt="{'ranks'|@translate}"></a></li>
-  <li><a href="{$U_CHILDREN}" title="{'manage sub-albums'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_children.png" alt="{'sub-albums'|@translate}"></a></li>
-  {if isset($U_MANAGE_PERMISSIONS) }
-  <li><a href="{$U_MANAGE_PERMISSIONS}" title="{'Edit album permissions'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_permissions.png" alt="{'Permissions'|@translate}"></a></li>
-  {/if}
-  {if isset($U_SYNC) }
-  <li><a href="{$U_SYNC}" title="{'Synchronize'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/synchronize.png" alt="{'Synchronize'|@translate}"></a></li>
-  {/if}
-  {if isset($U_DELETE) }
-  <li><a href="{$U_DELETE}" title="{'delete album'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_delete.png" alt="{'delete album'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"></a></li>
-  {/if}
-</ul>
-
 <form action="{$F_ACTION}" method="POST" id="catModify">
 
 <fieldset>
   <legend>{'Informations'|@translate}</legend>
-  <table>
 
-    {if isset($CAT_FULL_DIR) }
-    <tr>
-      <td><strong>{'Directory'|@translate}</strong></td>
-      <td class="row1">{$CAT_FULL_DIR}</td>
-    </tr>
-    {/if}
-    
+  <table style="width:100%">
     <tr>
-      <td><strong>{'Name'|@translate}</strong></td>
-      <td>
-        <input type="text" class="large" name="name" value="{$CAT_NAME}" maxlength="60">
-      </td>
-    </tr>
-    <tr>
-      <td><strong>{'Description'|@translate}</strong></td>
-      <td>
-        <textarea cols="50" rows="5" name="comment" id="comment" class="description">{$CAT_COMMENT}</textarea>
-      </td>
-    </tr>
-  </table>
-</fieldset>
-
-{if isset($move_cat_options) }
-<fieldset id="move">
-  <legend>{'Move'|@translate}</legend>
-  {'Parent album'|@translate}
-  <select class="categoryDropDown" name="parent">
-    <option value="0">------------</option>
-    {html_options options=$move_cat_options selected=$move_cat_options_selected }
-  </select>
-</fieldset>
-{/if}
-
-<fieldset id="options">
-  <legend>{'Options'|@translate}</legend>
-  <table>
-    <tr>
-      <td><strong>{'Access type'|@translate}</strong>
-      <td>
-        {html_radios name='status' values=$status_values output=$status_values|translate selected=$CAT_STATUS}
-      </td>
-    </tr>
-    <tr>
-      <td><strong>{'Lock'|@translate}</strong>
-      <td>
-        {html_radios name='visible' values='true,false'|@explode output='No,Yes'|@explode|translate selected=$CAT_VISIBLE}
-      </td>
-    </tr>
-  {if isset($CAT_COMMENTABLE)}
-    <tr>
-      <td><strong>{'Comments'|@translate}</strong>
-      <td>
-        {html_radios name='commentable' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_COMMENTABLE}
-      </td>
-    </tr>
-  {/if}
-  </table>
-</fieldset>
-
-<p style="text-align:center;">
-  <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit">
-  <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset">
-</p>
-
+      <td style="width:1%;padding-right:10px;text-align:center;">
 {if isset($representant) }
-<fieldset id="representant">
-  <legend>{'Representant'|@translate}</legend>
-  <table>
-    <tr>
-      <td align="center">
-        {if isset($representant.picture) }
-        <a href="{$representant.picture.URL}"><img src="{$representant.picture.SRC}" alt=""></a>
-        {else}
+  {if isset($representant.picture) }
+        <a href="{$representant.picture.URL}"><img src="{$representant.picture.SRC}" alt="" style="border:2px solid #ddd"></a>
+  {else}
         <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_representant_random.png" alt="{'Random photo'|@translate}">
-        {/if}
-      </td>
-      <td>
-        {if $representant.ALLOW_SET_RANDOM }
-        <p><input class="submit" type="submit" name="set_random_representant" value="{'Find a new representant by random'|@translate}"></p>
-        {/if}
+  {/if}
 
-        {if isset($representant.ALLOW_DELETE) }
+  {if $representant.ALLOW_SET_RANDOM }
+        <p style="text-align:center;"><input class="submit" type="submit" name="set_random_representant" value="Refresh" title="{'Find a new representant by random'|@translate}"></p>
+  {/if}
+
+  {if isset($representant.ALLOW_DELETE) }
         <p><input class="submit" type="submit" name="delete_representant" value="{'Delete Representant'|@translate}"></p>
-        {/if}
+  {/if}
+{/if}
       </td>
-    </tr>
-  </table>
-</fieldset>
+
+      <td style="vertical-align:top;border-left:2px solid #ddd;padding-left:10px;">
+<p>{$INTRO}</p>
+<ul style="padding-left:15px;">
+{if cat_admin_access($CAT_ID)}
+  <li><a href="{$U_JUMPTO}">{'jump to album'|@translate} →</a></li>
 {/if}
 
-</form>
+{if isset($U_MANAGE_ELEMENTS) }
+  <li><a href="{$U_MANAGE_ELEMENTS}">{'manage album photos'|@translate}</a></li>
+{/if}
 
-<form action="{$F_ACTION}" method="POST" id="links">
+  <li><a href="{$U_CHILDREN}">{'manage sub-albums'|@translate}</a></li>
 
-<fieldset id="linkAllNew">
-  <legend>{'Link all album photos to a new album'|@translate}</legend>
+{if isset($U_SYNC) }
+  <li><a href="{$U_SYNC}">{'Synchronize'|@translate}</a> ({'Directory'|@translate} = {$CAT_FULL_DIR})</li>
+{/if}
 
-  <table>
-    <tr>
-      <td>{'Virtual album name'|@translate}</td>
-      <td><input type="text" class="large" name="virtual_name"></td>
-    </tr>
+{if isset($U_DELETE) }
+  <li><a href="{$U_DELETE}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');">{'delete album'|@translate}</a></li>
+{/if}
 
-    <tr>
-      <td>{'Parent album'|@translate}</td>
-      <td>
-        <select class="categoryDropDown" name="parent">
-          <option value="0">------------</option>
-          {html_options options=$create_new_parent_options }
-        </select>
+</ul>
       </td>
     </tr>
   </table>
 
-  <p>
-    <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitAdd">
-    <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset">
-  </p>
-
 </fieldset>
 
-<fieldset id="linkAllExist">
-  <legend>{'Link all album photos to some existing albums'|@translate}</legend>
-
-  <table>
-    <tr>
-      <td>{'Albums'|@translate}</td>
-      <td>
-        <select class="categoryList" name="destinations[]" multiple="multiple" size="5">
-          {html_options options=$category_destination_options }
-        </select>
-      </td>
-    </tr>
-  </table>
-
+<fieldset>
+  <legend>{'Properties'|@translate}</legend>
   <p>
-    <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitDestinations">
-    <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset">
+    <strong>{'Name'|@translate}</strong>
+    <br>
+    <input type="text" class="large" name="name" value="{$CAT_NAME}" maxlength="60">
   </p>
 
-</fieldset>
+  <p>
+    <strong>{'Description'|@translate}</strong>
+    <br>
+    <textarea cols="50" rows="5" name="comment" id="comment" class="description">{$CAT_COMMENT}</textarea>
+  </p>
 
-{if isset($group_mail_options)}
-<fieldset id="emailCatInfo">
-  <legend>{'Send an information email to group members'|@translate}</legend>
+{if isset($move_cat_options) }
+  <p>
+    <strong>{'Parent album'|@translate}</strong>
+    <br>
+    <select class="categoryDropDown" name="parent">
+      <option value="0">------------</option>
+      {html_options options=$move_cat_options selected=$move_cat_options_selected }
+    </select>
+  </p>
+{/if}
 
-  <table>
-    <tr>
-      <td><strong>{'Group'|@translate}</strong></td>
-      <td>
-        <select name="group">
-          {html_options options=$group_mail_options}
-        </select>
-      </td>
-    </tr>
-    <tr>
-      <td><strong>{'Mail content'|@translate}</strong></td>
-      <td>
-        <textarea cols="50" rows="5" name="mail_content" id="mail_content" class="description">{$MAIL_CONTENT}</textarea>
-      </td>
-    </tr>
+  <p>
+    <strong>{'Access type'|@translate}</strong>
+    <br>
+    {html_radios name='status' values=$status_values output=$status_values|translate selected=$CAT_STATUS}
+  </p>
 
-  </table>
+  <p>
+    <strong>{'Lock'|@translate}</strong>
+    <br>
+    {html_radios name='visible' values='true,false'|@explode output='No,Yes'|@explode|translate selected=$CAT_VISIBLE}
+  </p>
 
+  {if isset($CAT_COMMENTABLE)}
   <p>
-    <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitEmail">
-    <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset">
+    <strong>{'Comments'|@translate}</strong>
+    <br>
+    {html_radios name='commentable' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_COMMENTABLE}
   </p>
+  {/if}
 
+  <p style="margin:0">
+    <input class="submit" type="submit" value="{'Save Settings'|@translate}" name="submit">
+  </p>
 </fieldset>
-{/if}
 
 </form>
diff --git a/admin/themes/default/template/cat_perm.tpl b/admin/themes/default/template/cat_perm.tpl
index 4e1a202a0..c44d918ae 100644
--- a/admin/themes/default/template/cat_perm.tpl
+++ b/admin/themes/default/template/cat_perm.tpl
@@ -1,9 +1,7 @@
 <div class="titrePage">
-  <h2>{'Edit album permissions'|@translate}</h2>
+  <h2><span style="letter-spacing:0">{$CATEGORIES_NAV}</span> &#8250; {'Edit album'|@translate} {$TABSHEET_TITLE}</h2>
 </div>
 
-<h3>{$CATEGORIES_NAV}</h3>
-
 <form action="{$F_ACTION}" method="post" id="categoryPermissions">
 
   <h4>{'Groups'|@translate}</h4>
diff --git a/admin/themes/default/template/element_set_ranks.tpl b/admin/themes/default/template/element_set_ranks.tpl
index 3352a6355..ca677b4d6 100644
--- a/admin/themes/default/template/element_set_ranks.tpl
+++ b/admin/themes/default/template/element_set_ranks.tpl
@@ -37,9 +37,9 @@ jQuery('.clipwrapper').tipTip({
 }); 
 {/literal}{/footer_script}
 
-<h2>{'Manage photo ranks'|@translate}</h2>
-
-<h3>{$CATEGORIES_NAV}</h3>
+<div class="titrePage">
+  <h2><span style="letter-spacing:0">{$CATEGORIES_NAV}</span> &#8250; {'Edit album'|@translate} {$TABSHEET_TITLE}</h2>
+</div>
 
 <form action="{$F_ACTION}" method="post">
 {if !empty($thumbnails)}
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index 5f732ca9b..c1d34dcd1 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -219,6 +219,12 @@ LI.menuLi {
 
 FORM#catModify TABLE { width: auto; }
 
+#catModify p {
+  line-height: 20px;
+  margin: 0 0 1.5em;
+  text-align: left;
+}
+
 FIELDSET.elementEdit .thumb {
 	display: block;
 	float: right;
@@ -787,7 +793,7 @@ UL.thumbnails SPAN.wrap2 {
 #themesContent H3 {font-size:16px; text-align:left; border-bottom:1px solid #444; letter-spacing:1px; margin:5px;}
 .themeBoxes {min-height:0;text-align:left;}
 
-h2 { letter-spacing:2px; font-weight:bold;}
+h2 { letter-spacing:1px; font-weight:bold;}
 h2:lang(en) { text-transform:capitalize; }
 
 #pluginsMenuSeparator {width:80%; margin:5px auto;}