Changeset 16828


Ignore:
Timestamp:
07/18/12 18:23:51 (7 years ago)
Author:
flop25
Message:

merge r16827 from trunk to 2.4 branch
bug:2698
2 id identical
fieldset instead of a span
moving up the field for autoorder
hiding the link to set a autoorder if there is no album (clicking on it didn't do anything)merge r16825

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.4/admin/themes/default/template/cat_list.tpl

    r16826 r16828  
    6161 
    6262 
    63 <form id="CreateAlbum" action="{$F_ACTION}" method="post"> 
     63<form id="formCreateAlbum" action="{$F_ACTION}" method="post"> 
     64  <p class="showCreateAlbum"> 
    6465  <fieldset id="createAlbum" style="display:none;"> 
    65     <p class="showCreateAlbum"> 
    6666      <legend>{'create a new album'|@translate}</legend> 
    6767      <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}"> 
     
    6969        <br><input type="text" name="virtual_name"> 
    7070      </p> 
    71       <p class="actionButtons"> 
     71      <span class="actionButtons"> 
    7272        <input class="submit" type="submit" value="{'Create'|@translate}" name="submitAdd"> 
    7373        <a href="#" id="addAlbumClose">{'Cancel'|@translate}</a> 
    74       </p> 
    75     </p> 
     74      </span> 
    7675  </fieldset> 
     76  </p> 
    7777</form> 
    7878<form id="categoryOrdering" action="{$F_ACTION}" method="post"> 
    7979<input type="hidden" name="pwg_token" value="{$PWG_TOKEN}"> 
    80 <p> 
    81   <span id="notManualOrder"> 
    82     <a href="#" id="addAlbumOpen">{'create a new album'|@translate}</a> 
    83     | <a href="#" id="autoOrderOpen">{'apply automatic sort order'|@translate}</a> 
    84   </span> 
    85   <span id="manualOrder" style="display:none;"> 
    86     <input class="submit" name="submitManualOrder" type="submit" value="{'Save manual order'|@translate}"> 
    87     {'... or '|@translate} <a href="#" id="cancelManualOrder">{'cancel manual order'|@translate}</a> 
    88   </span> 
    89 </p> 
    9080{if count($categories) } 
    91  
    92   <span id="autoOrder" style="display:none;"> 
     81  <fieldset id="autoOrder" style="display:none;"> 
    9382    <legend>{'Automatic sort order'|@translate}</legend> 
    9483    <p><strong>{'Sort order'|@translate}</strong> 
     
    10594      <a href="#" id="autoOrderClose">{'Cancel'|@translate}</a> 
    10695    </p> 
     96  </fieldset> 
     97{/if} 
     98<p> 
     99  <span id="notManualOrder"> 
     100    <a href="#" id="addAlbumOpen">{'create a new album'|@translate}</a> 
     101    {if count($categories) }| <a href="#" id="autoOrderOpen">{'apply automatic sort order'|@translate}</a>{/if} 
    107102  </span> 
     103  <span id="manualOrder" style="display:none;"> 
     104    <input class="submit" name="submitManualOrder" type="submit" value="{'Save manual order'|@translate}"> 
     105    {'... or '|@translate} <a href="#" id="cancelManualOrder">{'cancel manual order'|@translate}</a> 
     106  </span> 
     107</p> 
     108{if count($categories) } 
    108109   
    109110  <ul class="categoryUl"> 
     
    125126 
    126127      <p class="albumActions"> 
    127               <a href="{$category.U_EDIT}">{'Edit'|@translate}</a> 
    128               {if isset($category.U_MANAGE_ELEMENTS) } 
    129               | <a href="{$category.U_MANAGE_ELEMENTS}">{'manage album photos'|@translate}</a> 
    130               {/if} 
    131               | <a href="{$category.U_CHILDREN}">{'manage sub-albums'|@translate}</a> 
    132               {if isset($category.U_SYNC) } 
    133               | <a href="{$category.U_SYNC}">{'Synchronize'|@translate}</a> 
    134               {/if} 
    135               {if isset($category.U_DELETE) } 
    136               | <a href="{$category.U_DELETE}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');">{'delete album'|@translate}</a> 
     128        <a href="{$category.U_EDIT}">{'Edit'|@translate}</a> 
     129        {if isset($category.U_MANAGE_ELEMENTS) } 
     130        | <a href="{$category.U_MANAGE_ELEMENTS}">{'manage album photos'|@translate}</a> 
     131        {/if} 
     132        | <a href="{$category.U_CHILDREN}">{'manage sub-albums'|@translate}</a> 
     133        {if isset($category.U_SYNC) } 
     134        | <a href="{$category.U_SYNC}">{'Synchronize'|@translate}</a> 
     135        {/if} 
     136        {if isset($category.U_DELETE) } 
     137        | <a href="{$category.U_DELETE}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');">{'delete album'|@translate}</a> 
    137138      {/if} 
    138139      {if cat_admin_access($category.ID)} 
Note: See TracChangeset for help on using the changeset viewer.