Changeset 10650


Ignore:
Timestamp:
Apr 27, 2011, 11:59:46 PM (9 years ago)
Author:
mistic100
Message:

feature:2269 merge r10648&r10649 from trunk

Location:
branches/2.2
Files:
3 edited
6 copied

Legend:

Unmodified
Added
Removed
  • branches/2.2/admin/batch_manager_unit.php

    r9016 r10650  
    264264        'ID' => $row['id'],
    265265        'TN_SRC' => $src,
     266        'FILE_SRC' => $row['path'],
    266267        'LEGEND' => !empty($row['name']) ?
    267268            $row['name'] : get_name_from_file($row['file']),
  • branches/2.2/admin/themes/default/template/batch_manager_unit.tpl

    r10421 r10650  
    1 
    21{include file='include/autosize.inc.tpl'}
    32{include file='include/datepicker.inc.tpl'}
     3{include file='include/colorbox.inc.tpl'}
    44
    55{combine_script id='jquery.fcbkcomplete' load='async' require='jquery' path='themes/default/js/plugins/jquery.fcbkcomplete.js'}
     
    2626                newel: true
    2727        });
     28 
     29  $("a.preview-box").colorbox();
    2830});
    2931{/literal}{/footer_script}
     
    5153  <legend>{$element.LEGEND}</legend>
    5254
    53   <a href="{$element.U_EDIT}"><img src="{$element.TN_SRC}" alt="" title="{'Edit photo information'|@translate}"></a>
     55  <span class="thumb">
     56    <a href="{$element.FILE_SRC}" class="preview-box" title="{$element.LEGEND}"><img src="{$element.TN_SRC}" alt=""></a>
     57    <br/>
     58    <a href="{$element.U_EDIT}">{'Informations'|@translate}</a>
     59  </span>
    5460
    5561  <table>
  • branches/2.2/admin/themes/default/theme.css

    r10131 r10650  
    216216FORM#catModify TABLE { width: auto; }
    217217
    218 FIELDSET.elementEdit A {
     218FIELDSET.elementEdit .thumb {
    219219        display: block;
    220220        float: right;
     221        text-align: center;
    221222}
    222223
  • branches/2.2/themes/default/template/include/colorbox.inc.tpl

    r10648 r10650  
    1 {combine_script id='jquery.colorbox' load='async' require='jquery' path='themes/default/js/plugins/jquery.colorbox.min.js'}
     1{combine_script id='jquery.colorbox' require='jquery' path='themes/default/js/plugins/jquery.colorbox.min.js'}
    22{combine_css path="themes/default/js/plugins/jquery.colorbox.css"}
Note: See TracChangeset for help on using the changeset viewer.