diff options
| author | plegall <plg@piwigo.org> | 2011-05-25 09:18:32 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2011-05-25 09:18:32 +0000 |
| commit | ef19a77f6e4c3749d7d8cb819d7323339bf4bf37 (patch) | |
| tree | ed3e2ce85db29a12b691b40d1abeaede2a978c26 /admin/themes | |
| parent | c9b7beb12f38890631ab12c8086b1bff28eed4a4 (diff) | |
merge r11040 from branch 2.2 to trunk
bug 1786 fixed: ability to prefilter the synchronize screen with a specific
album by clicking on the new "Synchronize" icon on album admin page or album
admin list.
This is not the solution proposed by Gotcha (ie a treeview to select the album
on the synchronize screen) but it solves the same problem.
git-svn-id: http://piwigo.org/svn/trunk@11041 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/themes')
| -rw-r--r-- | admin/themes/clear/icon/synchronize.png | bin | 0 -> 1758 bytes | |||
| -rw-r--r-- | admin/themes/default/icon/synchronize.png | bin | 0 -> 782 bytes | |||
| -rw-r--r-- | admin/themes/default/template/cat_list.tpl | 3 | ||||
| -rw-r--r-- | admin/themes/default/template/cat_modify.tpl | 3 |
4 files changed, 6 insertions, 0 deletions
diff --git a/admin/themes/clear/icon/synchronize.png b/admin/themes/clear/icon/synchronize.png Binary files differnew file mode 100644 index 000000000..72a8c0ec5 --- /dev/null +++ b/admin/themes/clear/icon/synchronize.png diff --git a/admin/themes/default/icon/synchronize.png b/admin/themes/default/icon/synchronize.png Binary files differnew file mode 100644 index 000000000..767bb3b6d --- /dev/null +++ b/admin/themes/default/icon/synchronize.png diff --git a/admin/themes/default/template/cat_list.tpl b/admin/themes/default/template/cat_list.tpl index 1917bb3fa..2a535c13a 100644 --- a/admin/themes/default/template/cat_list.tpl +++ b/admin/themes/default/template/cat_list.tpl @@ -74,6 +74,9 @@ jQuery(document).ready(function(){ldelim} {if isset($category.U_MANAGE_PERMISSIONS) } <li><a href="{$category.U_MANAGE_PERMISSIONS}" title="{'edit album permissions'|@translate}" ><img src="{$themeconf.admin_icon_dir}/category_permissions.png" class="button" alt="{'Permissions'|@translate}"></a></li> {/if} + {if isset($category.U_SYNC) } + <li><a href="{$category.U_SYNC}" title="{'Synchronize'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/synchronize.png" class="button" alt="{'Synchronize'|@translate}"></a></li> + {/if} {if isset($category.U_DELETE) } <li><a href="{$category.U_DELETE}" title="{'delete album'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"><img src="{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'delete album'|@translate}"></a></li> {/if} diff --git a/admin/themes/default/template/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl index 8c51785e2..0e03aeacd 100644 --- a/admin/themes/default/template/cat_modify.tpl +++ b/admin/themes/default/template/cat_modify.tpl @@ -20,6 +20,9 @@ {if isset($U_MANAGE_PERMISSIONS) } <li><a href="{$U_MANAGE_PERMISSIONS}" title="{'edit album permissions'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_permissions.png" class="button" alt="{'Permissions'|@translate}"></a></li> {/if} + {if isset($U_SYNC) } + <li><a href="{$U_SYNC}" title="{'Synchronize'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/synchronize.png" class="button" alt="{'Synchronize'|@translate}"></a></li> + {/if} {if isset($U_DELETE) } <li><a href="{$U_DELETE}" title="{'delete album'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'delete album'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"></a></li> {/if} |
