diff options
| author | plegall <plg@piwigo.org> | 2014-01-02 11:51:58 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2014-01-02 11:51:58 +0000 |
| commit | 5fb0ce9063564955bd7e46033528ad678cc30321 (patch) | |
| tree | d1c4ac761932ac9181bd9646dc5881422c6c18d8 /admin/themes | |
| parent | dd73213674aefd202200c4f144e12b9dafdfb744 (diff) | |
bug 3015 fixed: remove "manage album photos" from cat_list to avoid
misunderstanding with "photos sort order".
Add infos on album manager: number of photos and sub-albums
git-svn-id: http://piwigo.org/svn/trunk@26399 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | admin/themes/default/template/cat_list.tpl | 4 | ||||
| -rw-r--r-- | admin/themes/default/theme.css | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/admin/themes/default/template/cat_list.tpl b/admin/themes/default/template/cat_list.tpl index 8b173034c..5fe54b9eb 100644 --- a/admin/themes/default/template/cat_list.tpl +++ b/admin/themes/default/template/cat_list.tpl @@ -116,15 +116,13 @@ jQuery(document).ready(function(){ <p class="albumTitle"> <img src="{$themeconf.admin_icon_dir}/cat_move.png" class="drag_button" style="display:none;" alt="{'Drag to re-order'|@translate}" title="{'Drag to re-order'|@translate}"> <strong><a href="{$category.U_CHILDREN}" title="{'manage sub-albums'|@translate}">{$category.NAME}</a></strong> + <span class="albumInfos"><span class="userSeparator">·</span> {$category.NB_PHOTOS|translate_dec:'%d photo':'%d photos'} <span class="userSeparator">·</span> {$category.NB_SUB_PHOTOS|translate_dec:'%d photo':'%d photos'} {$category.NB_SUB_ALBUMS|translate_dec:'in %d sub-album':'in %d sub-albums'}</span> </p> <input type="hidden" name="catOrd[{$category.ID}]" value="{$category.RANK}"> <p class="albumActions"> <a href="{$category.U_EDIT}"><span class="icon-pencil"></span>{'Edit'|@translate}</a> - {if isset($category.U_MANAGE_ELEMENTS) } - | <a href="{$category.U_MANAGE_ELEMENTS}"><span class="icon-picture"></span>{'manage album photos'|@translate}</a> - {/if} | <a href="{$category.U_CHILDREN}"><span class="icon-sitemap"></span>{'manage sub-albums'|@translate}</a> {if isset($category.U_SYNC) } | <a href="{$category.U_SYNC}"><span class="icon-exchange"></span>{'Synchronize'|@translate}</a> diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index 7a9322deb..654685563 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -1064,8 +1064,8 @@ p#uploadModeInfos {text-align:left;margin-top:1em;font-size:90%;color:#999;} .commentFilter .navigationBar {float:right; margin:0;} FORM#categoryOrdering p.albumTitle {margin:0;} -FORM#categoryOrdering p.albumActions {visibility:hidden; margin:0} -FORM#categoryOrdering .categoryLi:hover p.albumActions {visibility:visible;} +FORM#categoryOrdering p.albumActions, FORM#categoryOrdering span.albumInfos {visibility:hidden; margin:0} +FORM#categoryOrdering .categoryLi:hover p.albumActions, FORM#categoryOrdering .categoryLi:hover span.albumInfos {visibility:visible;} .showCreateAlbum {text-align:left; margin:0 1em 1em 1em;line-height:22px;} #autoOrder p, #createAlbum p {text-align:left; margin:0 0 1em 0;} |