Changeset 12476


Ignore:
Timestamp:
Oct 17, 2011, 9:05:29 PM (12 years ago)
Author:
mistic100
Message:

revert r12475, targeted version is 2.4

Location:
branches/2.3/admin
Files:
3 edited

Legend:

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

    r12475 r12476  
    769769        'FILE' => $row['file'],
    770770        'TITLE' => $title,
    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'],
     771        'LEVEL' => $row['level']
    776772        )
    777773      );
  • branches/2.3/admin/themes/default/template/batch_manager_global.tpl

    r12475 r12476  
    11{include file='include/tag_selection.inc.tpl'}
    22{include file='include/datepicker.inc.tpl'}
    3 {include file='include/colorbox.inc.tpl'}
    43
    54{footer_script}{literal}
     
    1312{footer_script require='jquery.tokeninput'}
    1413jQuery(document).ready(function() {ldelim}
    15   jQuery("a.preview-box").colorbox();
    16  
    1714        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}];
    1815  jQuery("#tags").tokenInput(
     
    552549        {/if}
    553550
    554       <li>
    555         <span class="wrap1">
     551      <li><span class="wrap1">
    556552          <label>
    557553            <span class="wrap2{if $isSelected} thumbSelected{/if}">
    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>
     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>
    570564            <input type="checkbox" name="selection[]" value="{$thumbnail.ID}" {if $isSelected}checked="checked"{/if}>
    571565          </label>
    572         </span>
     566          </span>
    573567      </li>
    574568      {/foreach}
  • branches/2.3/admin/themes/default/theme.css

    r12475 r12476  
    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;}
    10311028#batchManagerGlobal #selectedMessage {padding:5px; -moz-border-radius:5px;-webkit-border-radius:5px;}
    1032 #batchManagerGlobal #selectSet a {border-bottom:1px dotted;}
     1029#batchManagerGlobal #selectSet a {border-bottom:1px dotted}
    10331030#batchManagerGlobal #applyOnDetails {font-style:italic;}
    10341031#batchManagerGlobal .actionButtons {text-align:left;}
    10351032#batchManagerGlobal #filterList {padding-left:5px;}
    10361033#batchManagerGlobal #filterList li {margin-bottom:5px; list-style-type:none;}
    1037 #batchManagerGlobal a.removeFilter {background: url(icon/remove_filter.png) no-repeat top left;width:7px;height:7px;display:inline-block;}
     1034#batchManagerGlobal a.removeFilter {background: url(icon/remove_filter.png) no-repeat top left;width:7px;height:7px;display:inline-block}
    10381035#batchManagerGlobal a.removeFilter:hover {background: url(icon/remove_filter_hover.png); border:none;}
    10391036#batchManagerGlobal .removeFilter span {display:none}
    10401037#batchManagerGlobal #applyFilterBlock {margin-top:20px;}
    1041 #batchManagerGlobal .useFilterCheckbox {display:none;}
     1038#batchManagerGlobal .useFilterCheckbox {display:none}
    10421039
    10431040
Note: See TracChangeset for help on using the changeset viewer.