aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2011-01-25 20:23:33 +0000
committerrvelices <rv-github@modusoptimus.com>2011-01-25 20:23:33 +0000
commit73d3ce19e79b1113d29e8f909bc011732a6f3721 (patch)
treefe3e074c96407eb30d9f72e75fa894559f620c22
parent9c21be642f7d300aeb2f427b84edaf18dbd2474f (diff)
scripts.js was not loaded on picture page with high images
admin maintenance leave a space between grouped 'non-destructive' actions and 'destructive' actions git-svn-id: http://piwigo.org/svn/trunk@8898 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/themes/default/template/maintenance.tpl25
-rw-r--r--themes/default/template/picture_content.tpl7
2 files changed, 18 insertions, 14 deletions
diff --git a/admin/themes/default/template/maintenance.tpl b/admin/themes/default/template/maintenance.tpl
index dcde866bb..9b2c75859 100644
--- a/admin/themes/default/template/maintenance.tpl
+++ b/admin/themes/default/template/maintenance.tpl
@@ -9,15 +9,18 @@
</ul>
<ul>
- <li><a href="{$U_MAINT_CATEGORIES}">{'Update albums informations'|@translate}</a></li>
- <li><a href="{$U_MAINT_IMAGES}">{'Update photos information'|@translate}</a></li>
- <li><a href="{$U_MAINT_ORPHAN_TAGS}">{'Delete orphan tags'|@translate}</a></li>
- <li><a href="{$U_MAINT_DATABASE}">{'Repair and optimize database'|@translate}</a></li>
- <li><a href="{$U_MAINT_HISTORY_DETAIL}" onclick="return confirm('{'Purge history detail'|@translate}');">{'Purge history detail'|@translate}</a></li>
- <li><a href="{$U_MAINT_HISTORY_SUMMARY}" onclick="return confirm('{'Purge history summary'|@translate}');">{'Purge history summary'|@translate}</a></li>
- <li><a href="{$U_MAINT_SESSIONS}">{'Purge sessions'|@translate}</a></li>
- <li><a href="{$U_MAINT_FEEDS}">{'Purge never used notification feeds'|@translate}</a></li>
- <li><a href="{$U_MAINT_SEARCH}"onclick="return confirm('{'Purge search history'|@translate}');">{'Purge search history'|@translate}</a></li>
- <li><a href="{$U_MAINT_COMPILED_TEMPLATES}">{'Purge compiled templates'|@translate}</a></li>
- <li><a href="{$U_MAINT_C13Y}">{'Reinitialize check integrity'|@translate}</a></li>
+ <li><a href="{$U_MAINT_CATEGORIES}">{'Update albums informations'|@translate}</a></li>
+ <li><a href="{$U_MAINT_IMAGES}">{'Update photos information'|@translate}</a></li>
+ <li><a href="{$U_MAINT_DATABASE}">{'Repair and optimize database'|@translate}</a></li>
+</ul>
+
+<ul>
+ <li><a href="{$U_MAINT_ORPHAN_TAGS}">{'Delete orphan tags'|@translate}</a></li>
+ <li><a href="{$U_MAINT_HISTORY_DETAIL}" onclick="return confirm('{'Purge history detail'|@translate}');">{'Purge history detail'|@translate}</a></li>
+ <li><a href="{$U_MAINT_HISTORY_SUMMARY}" onclick="return confirm('{'Purge history summary'|@translate}');">{'Purge history summary'|@translate}</a></li>
+ <li><a href="{$U_MAINT_SESSIONS}">{'Purge sessions'|@translate}</a></li>
+ <li><a href="{$U_MAINT_FEEDS}">{'Purge never used notification feeds'|@translate}</a></li>
+ <li><a href="{$U_MAINT_SEARCH}"onclick="return confirm('{'Purge search history'|@translate}');">{'Purge search history'|@translate}</a></li>
+ <li><a href="{$U_MAINT_COMPILED_TEMPLATES}">{'Purge compiled templates'|@translate}</a></li>
+ <li><a href="{$U_MAINT_C13Y}">{'Reinitialize check integrity'|@translate}</a></li>
</ul>
diff --git a/themes/default/template/picture_content.tpl b/themes/default/template/picture_content.tpl
index d65a9597a..c4c6da3bf 100644
--- a/themes/default/template/picture_content.tpl
+++ b/themes/default/template/picture_content.tpl
@@ -1,11 +1,12 @@
-{if isset($high) }
+{if isset($high)}
+{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
<a href="javascript:phpWGOpenWindow('{$high.U_HIGH}','{$high.UUID}','scrollbars=yes,toolbar=no,status=no,resizable=yes')">
{/if}
- <img src="{$SRC_IMG}" style="width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px;" alt="{$ALT_IMG}"
+ <img src="{$SRC_IMG}" style="width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px;" alt="{$ALT_IMG}"
{if isset($COMMENT_IMG)}
title="{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}" {else} title="{$current.TITLE|@replace:'"':' '} - {$ALT_IMG}"
{/if}>
{if isset($high) }
</a>
- <p>{'Click on the photo to see it in high definition'|@translate}</p>
+ <p>{'Click on the photo to see it in high definition'|@translate}</p>
{/if}