- no debug output in synchronization process (replaced by HTML comments,

  information is still available)

- when showing result of a simulation, also displays the form with values
  given for simulation. Admin can perform another simulation or uncheck the
  simulation option


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

1 files changed, 39 insertions, 36 deletions

diff --git a/template/default/admin/update.tpl b/template/default/admin/update.tpl
index 1f5dbee2e..5b4136ca2 100644
--- a/template/default/admin/update.tpl
+++ b/template/default/admin/update.tpl
@@ -1,36 +1,3 @@
-<!-- BEGIN introduction -->
-<div class="admin">{L_UPDATE_TITLE}</div>
-<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>
-        <li><input type="checkbox" name="display_info" value="1" /> {L_UPDATE_DISPLAY_INFO}</li>
-        <li><input type="checkbox" name="simulate" value="1" checked="checked" /> {L_UPDATE_SIMULATE}</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}<br />
-      <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}
-    </li>
-  </ul>
-  <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>
 <ul style="text-align:left;">
@@ -55,10 +22,46 @@
 <!-- END errors -->
 <!-- BEGIN infos -->
 <div class="admin">{L_UPDATE_INFOS_TITLE}</div>
-<ul style="text-align:left;"> 
-  <!-- BEGIN info --> 
+<ul style="text-align:left;">
+  <!-- BEGIN info -->
   <li>[{update.infos.info.ELEMENT}] {update.infos.info.LABEL}</li>
-  <!-- END info --> 
+  <!-- END info -->
 </ul>
 <!-- END infos -->
 <!-- END update -->
+<!-- BEGIN introduction -->
+<div class="admin">{L_UPDATE_TITLE}</div>
+<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" {SYNC_DIRS_CHECKED} /> {L_UPDATE_SYNC_DIRS}</li>
+        <li><input type="radio" name="sync" value="files" {SYNC_ALL_CHECKED} /> {L_UPDATE_SYNC_ALL}</li>
+        <li><input type="checkbox" name="display_info" value="1" {DISPLAY_INFO_CHECKED} /> {L_UPDATE_DISPLAY_INFO}</li>
+        <li><input type="checkbox" name="simulate" value="1" checked="checked" /> {L_UPDATE_SIMULATE}</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}<br />
+      <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" {SUBCATS_INCLUDED_CHECKED} /> {L_SEARCH_SUBCATS_INCLUDED}
+    </li>
+  </ul>
+  <p style="text-align:center;">
+    <input type="submit" value="{L_SUBMIT}" name="submit" class="bouton" />
+    <input type="reset"  value="{L_RESET}"  name="reset"  class="bouton" />
+  </p>
+</form>
+<!-- END introduction -->