diff options
author | vdigital <vdigital@piwigo.org> | 2008-10-19 15:47:34 +0000 |
---|---|---|
committer | vdigital <vdigital@piwigo.org> | 2008-10-19 15:47:34 +0000 |
commit | a6be0e500b91696013b1580915c21493ce6c39b1 (patch) | |
tree | 14d7a7b6d3bf5d15e2efa3033ce23e3b5b7d66df /admin/template | |
parent | 3326f742fe2a1745dc1ebdd060d023263af299b9 (diff) |
Merging revisions 2773-2776
- Default template and Piwigo domain ...
- No metadata synchronization icon on a remote picture (Synchro failure)
- Jump to category icon is removed on user forbidden categories (previously check_restrictions was leading administrators to the access denied page).
git-svn-id: http://piwigo.org/svn/trunk@2777 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r-- | admin/template/goto/cat_list.tpl | 2 | ||||
-rw-r--r-- | admin/template/goto/cat_modify.tpl | 2 | ||||
-rw-r--r-- | admin/template/goto/picture_modify.tpl | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/admin/template/goto/cat_list.tpl b/admin/template/goto/cat_list.tpl index 4bf158baf..9f26e1f9c 100644 --- a/admin/template/goto/cat_list.tpl +++ b/admin/template/goto/cat_list.tpl @@ -48,7 +48,9 @@ <li class="categoryLi{if $category.IS_VIRTUAL} virtual_cat{/if}" id="cat_{$category.ID}"> <!-- category {$category.ID} --> <ul class="categoryActions"> + {if cat_admin_access($category.ID)} <li><a href="{$category.U_JUMPTO}" title="{'jump to category'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to category'|@translate}" /></a></li> + {/if} <li><a href="{$category.U_EDIT}" title="{'edit category informations'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_edit.png" class="button" alt="{'edit'|@translate}"/></a></li> {if isset($category.U_MANAGE_ELEMENTS) } <li><a href="{$category.U_MANAGE_ELEMENTS}" title="{'manage category elements'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}" /></a></li> diff --git a/admin/template/goto/cat_modify.tpl b/admin/template/goto/cat_modify.tpl index b9746ffe1..418f87539 100644 --- a/admin/template/goto/cat_modify.tpl +++ b/admin/template/goto/cat_modify.tpl @@ -10,7 +10,9 @@ <h3>{$CATEGORIES_NAV}</h3> <ul class="categoryActions"> + {if cat_admin_access($CAT_ID)} <li><a href="{$U_JUMPTO}" title="{'jump to category'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to category'|@translate}" /></a></li> + {/if} {if isset($U_MANAGE_ELEMENTS) } <li><a href="{$U_MANAGE_ELEMENTS}" title="{'manage category elements'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}" /></a></li> <li><a href="{$U_MANAGE_RANKS}" title="{'manage image ranks'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/ranks.png" class="button" alt="{'ranks'|@translate}" /></a></li> diff --git a/admin/template/goto/picture_modify.tpl b/admin/template/goto/picture_modify.tpl index 038fc5ab6..65bc8f407 100644 --- a/admin/template/goto/picture_modify.tpl +++ b/admin/template/goto/picture_modify.tpl @@ -18,7 +18,9 @@ {if isset($U_JUMPTO) } <li><a href="{$U_JUMPTO}" title="{'jump to image'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to image'|@translate}" /></a></li> {/if} + {if !url_is_remote($path)} <li><a href="{$U_SYNC}" title="{'synchronize metadata'|@translate}" {$TAG_INPUT_ENABLED}><img src="{$themeconf.admin_icon_dir}/sync_metadata.png" class="button" alt="{'synchronize'|@translate}" /></a></li> + {/if} </ul> <form action="{$F_ACTION}" method="post" id="properties"> |