Changeset 8898

Show
Ignore:
Timestamp:
01/25/11 21:23:33 (2 years ago)
Author:
rvelices
Message:

scripts.js was not loaded on picture page with high images
admin maintenance leave a space between grouped 'non-destructive' actions and 'destructive' actions

Location:
trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/admin/themes/default/template/maintenance.tpl

    r8762 r8898  
    1010 
    1111<ul> 
    12   <li><a href="{$U_MAINT_CATEGORIES}">{'Update albums informations'|@translate}</a></li> 
    13   <li><a href="{$U_MAINT_IMAGES}">{'Update photos information'|@translate}</a></li> 
    14   <li><a href="{$U_MAINT_ORPHAN_TAGS}">{'Delete orphan tags'|@translate}</a></li> 
    15   <li><a href="{$U_MAINT_DATABASE}">{'Repair and optimize database'|@translate}</a></li> 
    16   <li><a href="{$U_MAINT_HISTORY_DETAIL}" onclick="return confirm('{'Purge history detail'|@translate}');">{'Purge history detail'|@translate}</a></li> 
    17   <li><a href="{$U_MAINT_HISTORY_SUMMARY}" onclick="return confirm('{'Purge history summary'|@translate}');">{'Purge history summary'|@translate}</a></li> 
    18   <li><a href="{$U_MAINT_SESSIONS}">{'Purge sessions'|@translate}</a></li> 
    19   <li><a href="{$U_MAINT_FEEDS}">{'Purge never used notification feeds'|@translate}</a></li> 
    20   <li><a href="{$U_MAINT_SEARCH}"onclick="return confirm('{'Purge search history'|@translate}');">{'Purge search history'|@translate}</a></li> 
    21   <li><a href="{$U_MAINT_COMPILED_TEMPLATES}">{'Purge compiled templates'|@translate}</a></li> 
    22   <li><a href="{$U_MAINT_C13Y}">{'Reinitialize check integrity'|@translate}</a></li> 
     12        <li><a href="{$U_MAINT_CATEGORIES}">{'Update albums informations'|@translate}</a></li> 
     13        <li><a href="{$U_MAINT_IMAGES}">{'Update photos information'|@translate}</a></li> 
     14        <li><a href="{$U_MAINT_DATABASE}">{'Repair and optimize database'|@translate}</a></li> 
    2315</ul> 
     16 
     17<ul> 
     18        <li><a href="{$U_MAINT_ORPHAN_TAGS}">{'Delete orphan tags'|@translate}</a></li> 
     19        <li><a href="{$U_MAINT_HISTORY_DETAIL}" onclick="return confirm('{'Purge history detail'|@translate}');">{'Purge history detail'|@translate}</a></li> 
     20        <li><a href="{$U_MAINT_HISTORY_SUMMARY}" onclick="return confirm('{'Purge history summary'|@translate}');">{'Purge history summary'|@translate}</a></li> 
     21        <li><a href="{$U_MAINT_SESSIONS}">{'Purge sessions'|@translate}</a></li> 
     22        <li><a href="{$U_MAINT_FEEDS}">{'Purge never used notification feeds'|@translate}</a></li> 
     23        <li><a href="{$U_MAINT_SEARCH}"onclick="return confirm('{'Purge search history'|@translate}');">{'Purge search history'|@translate}</a></li> 
     24        <li><a href="{$U_MAINT_COMPILED_TEMPLATES}">{'Purge compiled templates'|@translate}</a></li> 
     25        <li><a href="{$U_MAINT_C13Y}">{'Reinitialize check integrity'|@translate}</a></li> 
     26</ul> 

  • trunk/themes/default/template/picture_content.tpl

    r8711 r8898  
    1 {if isset($high) } 
     1{if isset($high)} 
     2{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'} 
    23<a href="javascript:phpWGOpenWindow('{$high.U_HIGH}','{$high.UUID}','scrollbars=yes,toolbar=no,status=no,resizable=yes')"> 
    34{/if} 
    4   <img src="{$SRC_IMG}" style="width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px;" alt="{$ALT_IMG}"  
     5        <img src="{$SRC_IMG}" style="width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px;" alt="{$ALT_IMG}"  
    56        {if isset($COMMENT_IMG)} 
    67                title="{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}" {else} title="{$current.TITLE|@replace:'"':' '} - {$ALT_IMG}" 
    … …  
    89{if isset($high) } 
    910</a> 
    10   <p>{'Click on the photo to see it in high definition'|@translate}</p> 
     11        <p>{'Click on the photo to see it in high definition'|@translate}</p> 
    1112{/if}