- synchronization interface redesigned : a form lets user choose option of

  dirs/files/metadata sync on all categories or a defined one (including
  subcategories)

- database sync is only available through update.php


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

4 files changed, 36 insertions, 49 deletions

diff --git a/template/default/admin.tpl b/template/default/admin.tpl
index de6c175a1..3504b16ab 100644
--- a/template/default/admin.tpl
+++ b/template/default/admin.tpl
@@ -19,7 +19,8 @@
   <li><a class="adminMenu" href="{U_SITES}">{L_SITES}</a></li>
   <li><a class="adminMenu" href="{U_PHPINFO}">{L_PHPINFO}</a></li>
   <li><a class="adminMenu" href="{U_HISTORY}">{L_HISTORY}</a></li>
-  </ul>
+  <li><a class="adminMenu" href="{U_CAT_UPDATE}">{L_UPDATE}</a></li>
+</ul>
 </div>
 <div class="titreMenu">{L_CONFIGURATION}</div>
 <div class="menu">
@@ -37,7 +38,6 @@
 <ul class="menu">
   <li><a class="adminMenu" href="{U_CATEGORIES}">{L_MANAGE}</a></li>
   <li><a class="adminMenu" href="{U_UPLOAD}">{L_UPLOAD}</a></li>
-  <li><a class="adminMenu" href="{U_CAT_UPDATE}">{L_UPDATE}</a></li>
 </ul>
 </div>
 <div class="titreMenu">{L_IMAGES}</div>
@@ -46,8 +46,7 @@
   <li><a class="adminMenu" href="{U_WAITING}">{L_WAITING}</a></li>
   <li><a class="adminMenu" href="{U_THUMBNAILS}">{L_THUMBNAILS}</a></li>
   <li><a class="adminMenu" href="{U_COMMENTS}">{L_COMMENTS}</a></li>
-  <li><a class="adminMenu" href="{U_IMG_UPDATE}">{L_UPDATE}</a></li>
-  </ul>
+</ul>
 </div>
 <div class="titreMenu">{L_IDENTIFY}</div>
 <div class="menu">
diff --git a/template/default/admin/cat_list.tpl b/template/default/admin/cat_list.tpl
index d78eb6eb1..b33771222 100644
--- a/template/default/admin/cat_list.tpl
+++ b/template/default/admin/cat_list.tpl
@@ -19,7 +19,7 @@
 <!-- BEGIN category -->
 <tr>
   <td style="width:1px;padding:5px;"><img src="{category.CATEGORY_IMG_SRC}" alt="{category.CATEGORY_IMG_ALT}" title="{category.CATEGORY_IMG_TITLE}" /></td>
-  <td style="width:40%;text-align:left;"><a class="titreImg" href="{category.U_CATEGORY}">{category.CATEGORY_NAME}</a>
+  <td style="width:60%;text-align:left;"><a class="titreImg" href="{category.U_CATEGORY}">{category.CATEGORY_NAME}</a>
     <br />
 	<!-- BEGIN storage -->
     {L_STORAGE} : {category.CATEGORY_DIR} - 
@@ -42,22 +42,6 @@
     <!-- END no_image_info -->
   </td>
   <td class="row1" style="width:10%;white-space:nowrap;text-align:center;">
-    <!-- BEGIN update -->
-    <a href="{category.U_CAT_UPDATE}">{L_UPDATE}</a>
-    <!-- END update -->
-    <!-- BEGIN no_update -->
-    <span style="color:darkgray;">{L_UPDATE}</span>
-    <!-- END no_update -->
-  </td>
-  <td class="row1" style="width:10%;white-space:nowrap;text-align:center;">
-    <!-- BEGIN metadata -->
-    <a href="{category.U_CAT_METADATA}">{L_UPDATE_METADATA}</a>
-    <!-- END metadata -->
-    <!-- BEGIN no_metadata -->
-    <span style="color:darkgray;">{L_UPDATE_METADATA}</span>
-    <!-- END no_metadata -->
-  </td>
-  <td class="row1" style="width:10%;white-space:nowrap;text-align:center;">
     <!-- BEGIN virtual -->
     <a href="{category.U_CAT_DELETE}">{L_DELETE}</a>
     <!-- END virtual -->
diff --git a/template/default/admin/infos_images.tpl b/template/default/admin/infos_images.tpl
index 8609c514c..0d6ac2e21 100644
--- a/template/default/admin/infos_images.tpl
+++ b/template/default/admin/infos_images.tpl
@@ -7,6 +7,7 @@
 </ul>
 </div>
 <!-- END errors -->
+
 <form action="{F_ACTION}" method="POST">
 <div class="admin">{L_INFOS_TITLE} &quot;{CATEGORY}&quot;</div>
   <table width="100%">
@@ -76,7 +77,7 @@
     </tr>
     <!-- END picture -->
     <tr>
-      <td colspan="6">
+      <td colspan="7">
         <img src="./template/default/admin/images/arrow_select.gif" alt="&lt;" />
         {L_INFOS_ASSOCIATE}
         <!-- BEGIN associate_LOV -->
@@ -89,9 +90,9 @@
       </td>
     </tr>
     <tr>
-      <td colspan="6" style="text-align:center;">
+      <td colspan="7" style="text-align:center;">
         <input type="submit" value="{L_SUBMIT}" name="submit" class="bouton" />
       </td>
     </tr>
   </table>
-</form>
\ No newline at end of file
+</form>
diff --git a/template/default/admin/update.tpl b/template/default/admin/update.tpl
index 0a09dd23b..ce4e31a24 100644
--- a/template/default/admin/update.tpl
+++ b/template/default/admin/update.tpl
@@ -1,9 +1,33 @@
 <!-- BEGIN introduction -->
 <div class="admin">{L_UPDATE_TITLE}</div>
-<ul class="menu">
-  <li><a href="{U_CAT_UPDATE}">{L_CAT_UPDATE}</a></li>
-  <li><a href="{U_ALL_UPDATE}">{L_ALL_UPDATE}</a></li>
-</ul>
+<form action="{F_ACTION}" method="post">
+  <ul class="menu">
+    <li>
+      {L_UPDATE_SYNC_FILES}
+      <ul class="menu">
+        <li><input type="radio" name="sync" value="dirs" checked="checked" /> {L_UPDATE_SYNC_DIRS}</li>
+        <li><input type="radio" name="sync" value="files" /> {L_UPDATE_SYNC_ALL}</li>
+      </ul>
+    </li>
+    <li>
+      {L_UPDATE_SYNC_METADATA}
+      <ul class="menu">
+        <li><input type="radio" name="sync" value="metadata_new" /> {L_UPDATE_SYNC_METADATA_NEW}</li>
+        <li><input type="radio" name="sync" value="metadata_all" /> {L_UPDATE_SYNC_METADATA_ALL}</li>
+      </ul>
+    </li>
+    <li>
+      {L_UPDATE_CATS_SUBSET}
+    </li>
+  </ul>
+  <select style="width:500px" name="cat" size="10">
+    <!-- BEGIN category_option -->
+    <option {introduction.category_option.SELECTED} value="{introduction.category_option.VALUE}">{introduction.category_option.OPTION}</option>
+    <!-- END category_option -->
+  </select>
+  <input type="checkbox" name="subcats-included" value="1" checked="checked" /> {L_SEARCH_SUBCATS_INCLUDED}
+  <p style="text-align:center;"><input type="submit" value="{L_SUBMIT}" name="submit" class="bouton" /></p>
+</form>
 <!-- END introduction -->
 <!-- BEGIN update -->
 <div class="admin">{L_RESULT_UPDATE}</div>
@@ -13,26 +37,5 @@
   <li class="update_summary_del">{update.NB_DEL_CATEGORIES} {L_NB_DEL_CATEGORIES}</li>
   <li class="update_summary_del">{update.NB_DEL_ELEMENTS} {L_NB_DEL_ELEMENTS}</li>
 </ul>
-<!-- BEGIN sync_metadata -->
-<br />[ <a href="{update.sync_metadata.U_URL}">{L_UPDATE_SYNC_METADATA_QUESTION}</a> ]
-<!-- END sync_metadata -->
 {update.CATEGORIES}
 <!-- END update -->
-<!-- BEGIN remote_update -->
-  <table>
-  <tr>
-    <th>{#remote_site}</th>
-  </tr>
-  <tr>
-    <td>
-      <div class="retrait">
-        <span style="font-weight:bold;color:navy;">{#url}</span><br /><br />
-        <!-- update.php generates itself HTML code for categories  -->
-        {#categories}
-        <br /><span style="color:blue;">{#count_new} {#update_research_conclusion}</span>
-        <br /><span style="color:red;">{#count_deleted} {#update_deletion_conclusion}</span>
-      </div>
-    </td>
-  </tr>
-  </table>
-  <!-- END remote_update -->