Changeset 1308


Ignore:
Timestamp:
May 15, 2006, 10:53:08 PM (18 years ago)
Author:
plg
Message:

merge -r1306:1307 from branch 1.6 into trunk

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin/element_set_global.php

    r1121 r1308  
    206206    'L_SUBMIT'=>$lang['submit'],
    207207
    208     'U_COLS'=>$base_url.get_query_string_diff(array('cols')),
    209208    'U_DISPLAY'=>$base_url.get_query_string_diff(array('display')),
    210209
    … …  
    340339// +-----------------------------------------------------------------------+
    341340
    342 $page['cols'] = !empty($_GET['cols']) ? intval($_GET['cols']) : 5;
    343 
    344341// how many items to display on this page
    345342if (!empty($_GET['display']))
    … …  
    383380  {
    384381    $template->assign_block_vars('thumbnails', array());
    385     // first line
    386     $template->assign_block_vars('thumbnails.line', array());
    387     // current row displayed
    388     $row_number = 0;
    389382  }
    390383
    … …  
    394387
    395388    $template->assign_block_vars(
    396       'thumbnails.line.thumbnail',
     389      'thumbnails.thumbnail',
    397390      array(
    398391        'ID' => $row['id'],
    … …  
    402395        )
    403396      );
    404 
    405     // create a new line ?
    406     if (++$row_number == $page['cols'])
    407     {
    408     $template->assign_block_vars('thumbnails.line', array());
    409     $row_number = 0;
    410     }
    411397  }
    412398}

  • trunk/template/yoga/admin/element_set_global.tpl

    r1281 r1308  
    99</p>
    1010
    11 <form action="{F_ACTION}" method="post">
    12 
    13 <fieldset>
    14 
    15   <legend>{lang:Caddie management}</legend>
    16 
    17   <ul style="list-style-type:none;">
    18 
    19     <!-- BEGIN in_caddie -->
    20     <li><label><input type="radio" name="caddie_action" value="empty_all" /> {lang:Empty caddie}</label></li>
    21     <li><label><input type="radio" name="caddie_action" value="empty_selected" /> {lang:Take selected elements out of caddie}</label></li>
    22     <!-- END in_caddie -->
    23 
    24     <!-- BEGIN not_in_caddie -->
    25     <li><input type="radio" name="caddie_action" value="add_selected" /> {lang:Add selected elements to caddie}</li>
    26     <!-- END not_in_caddie -->
    27  
    28   </ul>
    29 
    30   <p style="text-align:center;"><input type="submit" value="{L_SUBMIT}" name="submit_caddie" {TAG_INPUT_ENABLED}/></p>
    31 
    32 </fieldset>
    33 
    34 </form>
    35  
    36 <form action="{F_ACTION}" method="post">
    37 
    3811<fieldset>
    3912
    4013  <legend>{lang:Display options}</legend>
    41 <!--
    42   <p>{lang:elements per line}:
    43       <a href="{U_COLS}&amp;cols=4">4</a>
    44     | <a href="{U_COLS}&amp;cols=5">5</a>
    45     | <a href="{U_COLS}&amp;cols=6">6</a>
    46     | <a href="{U_COLS}&amp;cols=7">7</a>
    47     | <a href="{U_COLS}&amp;cols=8">8</a>
    48     | <a href="{U_COLS}&amp;cols=9">9</a>
    49     | <a href="{U_COLS}&amp;cols=10">10</a>
    50   </p>
    51 -->
     14
    5215  <p>{lang:elements per page}:
    5316      <a href="{U_DISPLAY}&amp;display=20">20</a>
    … …  
    5619    | <a href="{U_DISPLAY}&amp;display=all">{lang:all}</a>
    5720  </p>
     21
     22</fieldset>
     23
     24<form action="{F_ACTION}" method="post">
     25
     26<fieldset>
     27
     28  <legend>{lang:Elements}</legend>
     29<!--
     30  <div class="navigationBar">{NAV_BAR}</div>
     31-->
     32  <!-- BEGIN thumbnails -->
     33  <ul class="thumbnails">
     34    <!-- BEGIN thumbnail -->
     35    <li><span class="wrap1"><span class="wrap2">
     36        <label>
     37        <img src="{thumbnails.thumbnail.SRC}"
     38             alt="{thumbnails.thumbnail.ALT}"
     39             title="{thumbnails.thumbnail.TITLE}"
     40             class="thumbLink" />
     41        <input type="checkbox" name="selection[]" value="{thumbnails.thumbnail.ID}" />
     42        </label>
     43    </li>
     44    <!-- END thumbnail -->
     45  </ul>
     46  <!-- END thumbnails -->
    5847
    5948</fieldset>
    … …  
    157146<fieldset>
    158147
    159   <legend>{lang:Elements}</legend>
     148  <legend>{lang:Caddie management}</legend>
    160149
    161   <div class="navigationBar">{NAV_BAR}</div>
     150  <ul style="list-style-type:none;">
     151    <!-- BEGIN in_caddie -->
     152    <li><label><input type="radio" name="caddie_action" value="empty_all" /> {lang:Empty caddie}</label></li>
     153    <li><label><input type="radio" name="caddie_action" value="empty_selected" /> {lang:Take selected elements out of caddie}</label></li>
     154    <!-- END in_caddie -->
    162155
    163   <!-- BEGIN thumbnails -->
    164   <ul class="thumbnails">
    165     <!-- BEGIN line -->
    166       <!-- BEGIN thumbnail -->
    167       <li><span class="wrap1"><span class="wrap2">
    168         <label>
    169         <img src="{thumbnails.line.thumbnail.SRC}"
    170              alt="{thumbnails.line.thumbnail.ALT}"
    171              title="{thumbnails.line.thumbnail.TITLE}"
    172              class="thumbnail" />
    173         <input type="checkbox" name="selection[]" value="{thumbnails.line.thumbnail.ID}" />
    174         </label>
    175       </span></span></li>
    176       <!-- END thumbnail -->
    177     <!-- END line -->
     156    <!-- BEGIN not_in_caddie -->
     157    <li><label><input type="radio" name="caddie_action" value="add_selected" /> {lang:Add selected elements to caddie}</label></li>
     158    <!-- END not_in_caddie -->
     159 
    178160  </ul>
    179   <!-- END thumbnails -->
     161
     162  <p><input type="submit" value="{L_SUBMIT}" name="submit_caddie" {TAG_INPUT_ENABLED}/></p>
    180163
    181164</fieldset>
Note: See TracChangeset for help on using the changeset viewer.