Changeset 12475 for branches


Ignore:
Timestamp:
Oct 17, 2011, 9:01:14 PM (13 years ago)
Author:
mistic100
Message:

Merged r12474 from trunk: feature:2471 [Batch Manager] "zoom" and "edit" links over each thumbnail

Location:
branches/2.3/admin
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.3/admin/batch_manager_global.php

    r12295 r12475  
    769769        'FILE' => $row['file'],
    770770        'TITLE' => $title,
    771         'LEVEL' => $row['level']
     771        'LEVEL' => $row['level'],
     772        'FILE_SRC' => $row['path'],
     773        'U_EDIT' =>
     774            PHPWG_ROOT_PATH.'admin.php?page=picture_modify'.
     775            '&image_id='.$row['id'],
    772776        )
    773777      );
  • branches/2.3/admin/themes/default/template/batch_manager_global.tpl

    r12422 r12475  
    11{include file='include/tag_selection.inc.tpl'}
    22{include file='include/datepicker.inc.tpl'}
     3{include file='include/colorbox.inc.tpl'}
    34
    45{footer_script}{literal}
     
    1213{footer_script require='jquery.tokeninput'}
    1314jQuery(document).ready(function() {ldelim}
     15  jQuery("a.preview-box").colorbox();
     16 
    1417        var tag_src = [{foreach from=$tags item=tag name=tags}{ldelim}name:"{$tag.name|@escape:'javascript'}",id:"{$tag.id}"{rdelim}{if !$smarty.foreach.tags.last},{/if}{/foreach}];
    1518  jQuery("#tags").tokenInput(
     
    549552        {/if}
    550553
    551       <li><span class="wrap1">
     554      <li>
     555        <span class="wrap1">
    552556          <label>
    553557            <span class="wrap2{if $isSelected} thumbSelected{/if}">
    554         {if $thumbnail.LEVEL > 0}
    555         <em class="levelIndicatorB">{$pwg->l10n($pwg->sprintf('Level %d',$thumbnail.LEVEL))}</em>
    556         <em class="levelIndicatorF" title="{'Who can see these photos?'|@translate} : ">{$pwg->l10n($pwg->sprintf('Level %d',$thumbnail.LEVEL))}</em>
    557         {/if}
    558             <span>
    559               <img src="{$thumbnail.TN_SRC}"
    560                  alt="{$thumbnail.FILE}"
    561                  title="{$thumbnail.TITLE|@escape:'html'}"
    562                  class="thumbnail">
    563             </span></span>
     558            <div class="actions"><a href="{$thumbnail.FILE_SRC}" class="preview-box">{'Zoom'|@translate}</a> | <a href="{$thumbnail.U_EDIT}" target="_blank">{'Edit'|@translate}</a></div>
     559              {if $thumbnail.LEVEL > 0}
     560              <em class="levelIndicatorB">{$pwg->l10n($pwg->sprintf('Level %d',$thumbnail.LEVEL))}</em>
     561              <em class="levelIndicatorF" title="{'Who can see these photos?'|@translate} : ">{$pwg->l10n($pwg->sprintf('Level %d',$thumbnail.LEVEL))}</em>
     562              {/if}
     563              <span>
     564                <img src="{$thumbnail.TN_SRC}"
     565                   alt="{$thumbnail.FILE}"
     566                   title="{$thumbnail.TITLE|@escape:'html'}"
     567                   class="thumbnail">
     568              </span>
     569            </span>
    564570            <input type="checkbox" name="selection[]" value="{$thumbnail.ID}" {if $isSelected}checked="checked"{/if}>
    565571          </label>
    566           </span>
     572        </span>
    567573      </li>
    568574      {/foreach}
  • branches/2.3/admin/themes/default/theme.css

    r12032 r12475  
    10261026#batchManagerGlobal ul.thumbnails span.wrap2 {border:0}
    10271027#batchManagerGlobal ul.thumbnails span.wrap2:hover {background-color:#7CBA0F;}
     1028#batchManagerGlobal ul.thumbnails div.actions {display:none;position:absolute;top:0;right:5px;}
     1029#batchManagerGlobal ul.thumbnails div.actions a {color:#222;}
     1030#batchManagerGlobal ul.thumbnails span.wrap1:hover div.actions {display:block;}
    10281031#batchManagerGlobal #selectedMessage {padding:5px; -moz-border-radius:5px;-webkit-border-radius:5px;}
    1029 #batchManagerGlobal #selectSet a {border-bottom:1px dotted}
     1032#batchManagerGlobal #selectSet a {border-bottom:1px dotted;}
    10301033#batchManagerGlobal #applyOnDetails {font-style:italic;}
    10311034#batchManagerGlobal .actionButtons {text-align:left;}
    10321035#batchManagerGlobal #filterList {padding-left:5px;}
    10331036#batchManagerGlobal #filterList li {margin-bottom:5px; list-style-type:none;}
    1034 #batchManagerGlobal a.removeFilter {background: url(icon/remove_filter.png) no-repeat top left;width:7px;height:7px;display:inline-block}
     1037#batchManagerGlobal a.removeFilter {background: url(icon/remove_filter.png) no-repeat top left;width:7px;height:7px;display:inline-block;}
    10351038#batchManagerGlobal a.removeFilter:hover {background: url(icon/remove_filter_hover.png); border:none;}
    10361039#batchManagerGlobal .removeFilter span {display:none}
    10371040#batchManagerGlobal #applyFilterBlock {margin-top:20px;}
    1038 #batchManagerGlobal .useFilterCheckbox {display:none}
     1041#batchManagerGlobal .useFilterCheckbox {display:none;}
    10391042
    10401043
Note: See TracChangeset for help on using the changeset viewer.