aboutsummaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2004-12-27 14:30:49 +0000
committerplegall <plg@piwigo.org>2004-12-27 14:30:49 +0000
commit7ba15740434b476e8aef0253919f19ba37e07dc7 (patch)
tree4bba6d6d3e5490189fdc79dee1a51ba6c2e4cb31 /template
parent4c8d18de5b904eddaa900deca20c7d6f7ac928d1 (diff)
- admin/update : filesystem synchronization process completely
rewritten. How to speed up sync ? by avoiding recursivity ! - admin/update : option to display verbose information details - admin/update : option to simulate only. No database insert, delete or update will be made - bug fixed : in admin/cat_list, if you delete a virtual category, you may create a gap in the rank list. This gap will generate errors when trying to move a category on this gap. Fixed by calling ordering and update_global_rank at category deletion. - admin/cat_list, only one query to insert a new virtual category (no need of a second query to update uppercats and global_rank) - for a given category, even if empty, the representing element must not be the one of a forbidden category for the current user - generation time optionnaly displayed on the bottom of each page becomes more price : number of SQL queries and SQL time added. git-svn-id: http://piwigo.org/svn/trunk@659 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'template')
-rw-r--r--template/default/admin/update.tpl39
-rw-r--r--template/default/footer.tpl2
2 files changed, 32 insertions, 9 deletions
diff --git a/template/default/admin/update.tpl b/template/default/admin/update.tpl
index ce4e31a24..1f5dbee2e 100644
--- a/template/default/admin/update.tpl
+++ b/template/default/admin/update.tpl
@@ -7,6 +7,8 @@
<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>
@@ -17,15 +19,15 @@
</ul>
</li>
<li>
- {L_UPDATE_CATS_SUBSET}
+ {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>
- <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 -->
@@ -36,6 +38,27 @@
<li class="update_summary_new">{update.NB_NEW_ELEMENTS} {L_NB_NEW_ELEMENTS}</li>
<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>
+ <li class="update_summary_err">{update.NB_ERRORS} {L_UPDATE_NB_ERRORS}</li>
</ul>
-{update.CATEGORIES}
+<!-- BEGIN errors -->
+<div class="admin">{L_UPDATE_ERROR_LIST_TITLE}</div>
+<ul style="text-align:left;">
+ <!-- BEGIN error -->
+ <li>[{update.errors.error.ELEMENT}] {update.errors.error.LABEL}</li>
+ <!-- END error -->
+</ul>
+<div class="admin">{L_UPDATE_ERRORS_CAPTION}</div>
+<ul style="text-align:left;">
+ <li><strong>PWG-UPDATE-1</strong> : {L_UPDATE_WRONG_DIRNAME_INFO}</li>
+ <li><strong>PWG-UPDATE-2</strong> : {L_UPDATE_MISSING_TN_INFO} {{PICTURE_EXT_LIST}}</li>
+</ul>
+<!-- END errors -->
+<!-- BEGIN infos -->
+<div class="admin">{L_UPDATE_INFOS_TITLE}</div>
+<ul style="text-align:left;">
+ <!-- BEGIN info -->
+ <li>[{update.infos.info.ELEMENT}] {update.infos.info.LABEL}</li>
+ <!-- END info -->
+</ul>
+<!-- END infos -->
<!-- END update -->
diff --git a/template/default/footer.tpl b/template/default/footer.tpl
index 190f3f2b2..be201d51f 100644
--- a/template/default/footer.tpl
+++ b/template/default/footer.tpl
@@ -1,6 +1,6 @@
<div class="copyright">
<!-- BEGIN debug -->
- {L_GEN_TIME} {TIME} -
+ {L_GEN_TIME} {debug.TIME} ({debug.NB_QUERIES} {L_SQL_QUERIES_IN} {debug.SQL_TIME}) -
<!-- END debug -->
<!-- Please, do not remove this copyright. If you really want to,