diff options
author | mistic100 <mistic@piwigo.org> | 2011-10-17 19:01:14 +0000 |
---|---|---|
committer | mistic100 <mistic@piwigo.org> | 2011-10-17 19:01:14 +0000 |
commit | b9bdbb8b5c75cc230bd4974c81ca429df8eb4271 (patch) | |
tree | b4d486dbc45d1b82c3d563a34857a0fdf2fcbb9d | |
parent | 68d79989cbb989cea8747e46d8a71d6fc7f6f9dd (diff) |
Merged r12474 from trunk: feature:2471 [Batch Manager] "zoom" and "edit" links over each thumbnail
git-svn-id: http://piwigo.org/svn/branches/2.3@12475 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r-- | admin/batch_manager_global.php | 6 | ||||
-rw-r--r-- | admin/themes/default/template/batch_manager_global.tpl | 30 | ||||
-rw-r--r-- | admin/themes/default/theme.css | 9 |
3 files changed, 29 insertions, 16 deletions
diff --git a/admin/batch_manager_global.php b/admin/batch_manager_global.php index 8b42165f7..83976df8f 100644 --- a/admin/batch_manager_global.php +++ b/admin/batch_manager_global.php @@ -768,7 +768,11 @@ SELECT id,path,tn_ext,file,filesize,level,name 'TN_SRC' => $src, 'FILE' => $row['file'], 'TITLE' => $title, - 'LEVEL' => $row['level'] + 'LEVEL' => $row['level'], + 'FILE_SRC' => $row['path'], + 'U_EDIT' => + PHPWG_ROOT_PATH.'admin.php?page=picture_modify'. + '&image_id='.$row['id'], ) ); } diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl index 41173eddc..83e9d6935 100644 --- a/admin/themes/default/template/batch_manager_global.tpl +++ b/admin/themes/default/template/batch_manager_global.tpl @@ -1,5 +1,6 @@ {include file='include/tag_selection.inc.tpl'} {include file='include/datepicker.inc.tpl'} +{include file='include/colorbox.inc.tpl'} {footer_script}{literal} pwg_initialization_datepicker("#date_creation_day", "#date_creation_month", "#date_creation_year", "#date_creation_linked_date", "#date_creation_action_set"); @@ -11,6 +12,8 @@ {footer_script require='jquery.tokeninput'} jQuery(document).ready(function() {ldelim} + jQuery("a.preview-box").colorbox(); + 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}]; jQuery("#tags").tokenInput( tag_src, @@ -548,22 +551,25 @@ jQuery(window).load(function() { {assign var='isSelected' value=false} {/if} - <li><span class="wrap1"> + <li> + <span class="wrap1"> <label> <span class="wrap2{if $isSelected} thumbSelected{/if}"> - {if $thumbnail.LEVEL > 0} - <em class="levelIndicatorB">{$pwg->l10n($pwg->sprintf('Level %d',$thumbnail.LEVEL))}</em> - <em class="levelIndicatorF" title="{'Who can see these photos?'|@translate} : ">{$pwg->l10n($pwg->sprintf('Level %d',$thumbnail.LEVEL))}</em> - {/if} - <span> - <img src="{$thumbnail.TN_SRC}" - alt="{$thumbnail.FILE}" - title="{$thumbnail.TITLE|@escape:'html'}" - class="thumbnail"> - </span></span> + <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> + {if $thumbnail.LEVEL > 0} + <em class="levelIndicatorB">{$pwg->l10n($pwg->sprintf('Level %d',$thumbnail.LEVEL))}</em> + <em class="levelIndicatorF" title="{'Who can see these photos?'|@translate} : ">{$pwg->l10n($pwg->sprintf('Level %d',$thumbnail.LEVEL))}</em> + {/if} + <span> + <img src="{$thumbnail.TN_SRC}" + alt="{$thumbnail.FILE}" + title="{$thumbnail.TITLE|@escape:'html'}" + class="thumbnail"> + </span> + </span> <input type="checkbox" name="selection[]" value="{$thumbnail.ID}" {if $isSelected}checked="checked"{/if}> </label> - </span> + </span> </li> {/foreach} </ul> diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index 433d62ffb..cf2a2580b 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -1025,17 +1025,20 @@ LEGEND { #batchManagerGlobal ul.thumbnails span.wrap1 {margin:5px} #batchManagerGlobal ul.thumbnails span.wrap2 {border:0} #batchManagerGlobal ul.thumbnails span.wrap2:hover {background-color:#7CBA0F;} +#batchManagerGlobal ul.thumbnails div.actions {display:none;position:absolute;top:0;right:5px;} +#batchManagerGlobal ul.thumbnails div.actions a {color:#222;} +#batchManagerGlobal ul.thumbnails span.wrap1:hover div.actions {display:block;} #batchManagerGlobal #selectedMessage {padding:5px; -moz-border-radius:5px;-webkit-border-radius:5px;} -#batchManagerGlobal #selectSet a {border-bottom:1px dotted} +#batchManagerGlobal #selectSet a {border-bottom:1px dotted;} #batchManagerGlobal #applyOnDetails {font-style:italic;} #batchManagerGlobal .actionButtons {text-align:left;} #batchManagerGlobal #filterList {padding-left:5px;} #batchManagerGlobal #filterList li {margin-bottom:5px; list-style-type:none;} -#batchManagerGlobal a.removeFilter {background: url(icon/remove_filter.png) no-repeat top left;width:7px;height:7px;display:inline-block} +#batchManagerGlobal a.removeFilter {background: url(icon/remove_filter.png) no-repeat top left;width:7px;height:7px;display:inline-block;} #batchManagerGlobal a.removeFilter:hover {background: url(icon/remove_filter_hover.png); border:none;} #batchManagerGlobal .removeFilter span {display:none} #batchManagerGlobal #applyFilterBlock {margin-top:20px;} -#batchManagerGlobal .useFilterCheckbox {display:none} +#batchManagerGlobal .useFilterCheckbox {display:none;} /* TokenInput (with Facebook style) */ |