Ignore:
Timestamp:
May 26, 2010, 2:20:07 AM (14 years ago)
Author:
plg
Message:

merge r6361 from branch 2.1 to trunk

feature 1697: ability to deactivate the synchronization method to add photos.

Location:
trunk/admin/themes/default/template
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r6363 r6365  
    2020      <ul>
    2121        <li><a href="{$U_ADD_PHOTOS}">{'Add'|@translate}</a></li>
     22{if $ENABLE_SYNCHRONIZATION}
    2223        <li><a href="{$U_WAITING}">{'Waiting'|@translate}</a></li>
     24{/if}
    2325        <li><a href="{$U_RATING}">{'Rating'|@translate}</a></li>
    2426        <li><a href="{$U_TAGS}">{'Tags'|@translate}</a></li>
    … …  
    6971    <dd>
    7072      <ul>
     73{if $ENABLE_SYNCHRONIZATION}
    7174        <li><a href="{$U_CAT_UPDATE}">{'Synchronize'|@translate}</a></li>
    7275        <li><a href="{$U_SITE_MANAGER}">{'Site manager'|@translate}</a></li>
     76{/if}
    7377        <li><a href="{$U_HISTORY_STAT}">{'History'|@translate}</a></li>
     78{if $ENABLE_SYNCHRONIZATION}
    7479        <li><a href="{$U_THUMBNAILS}">{'Thumbnails'|@translate}</a></li>
     80{/if}
    7581        <li><a href="{$U_MAINTENANCE}">{'Maintenance'|@translate}</a></li>
    7682        <li><a href="{$U_PENDING_COMMENTS}">{'Pending Comments'|@translate}</a></li>

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

    r6363 r6365  
    8686  <fieldset>
    8787    <legend>{'Deletions'|@translate}</legend>
     88{if $ENABLE_SYNCHRONIZATION}
    8889    <p style="font-style:italic">{'Note: photo deletion does not apply to photos added by synchronization. For photos added by synchronization, remove them from the filesystem and then perform another synchronization.'|@translate}</p>
     90{/if}
    8991    <p>
    9092      {'target'|@translate}

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

    r6363 r6365  
    6262{/literal}
    6363
     64{if not $ENABLE_SYNCHRONIZATION}
     65{literal}
     66<script type='text/javascript'>
     67  $(document).ready(function() {
     68    $("#helpSynchro").hide();
     69  });
     70</script>
     71{/literal}
     72{/if}
     73
    6474</body>
    6575</html>

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

    r6363 r6365  
    6060</dl>
    6161
    62 
     62{if $ENABLE_SYNCHRONIZATION}
    6363<form name="QuickSynchro" action="{$U_CAT_UPDATE}" method="post" id="QuickSynchro" style="display: block; text-align:right;">
    6464<div>
    … …  
    7676</div>
    7777</form>
     78{/if}
Note: See TracChangeset for help on using the changeset viewer.