aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2011-05-25 09:18:32 +0000
committerplegall <plg@piwigo.org>2011-05-25 09:18:32 +0000
commitef19a77f6e4c3749d7d8cb819d7323339bf4bf37 (patch)
treeed3e2ce85db29a12b691b40d1abeaede2a978c26
parentc9b7beb12f38890631ab12c8086b1bff28eed4a4 (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 '')
-rw-r--r--admin/cat_list.php7
-rw-r--r--admin/cat_modify.php9
-rw-r--r--admin/site_update.php10
-rw-r--r--admin/themes/clear/icon/synchronize.pngbin0 -> 1758 bytes
-rw-r--r--admin/themes/default/icon/synchronize.pngbin0 -> 782 bytes
-rw-r--r--admin/themes/default/template/cat_list.tpl3
-rw-r--r--admin/themes/default/template/cat_modify.tpl3
7 files changed, 31 insertions, 1 deletions
diff --git a/admin/cat_list.php b/admin/cat_list.php
index ae957792d..050b7c06a 100644
--- a/admin/cat_list.php
+++ b/admin/cat_list.php
@@ -307,6 +307,13 @@ foreach ($categories as $category)
$tpl_cat['U_DELETE'] = $self_url.'&amp;delete='.$category['id'];
$tpl_cat['U_DELETE'].= '&amp;pwg_token='.get_pwg_token();
}
+ else
+ {
+ if ($conf['enable_synchronization'])
+ {
+ $tpl_cat['U_SYNC'] = $base_url.'site_update&amp;site=1&amp;cat_id='.$category['id'];
+ }
+ }
if ( array_key_exists($category['id'], $categories_with_images) )
{
diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index 8f99a9155..3c944ce7b 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -270,6 +270,15 @@ else
$category['cat_full_dir'] )
)
);
+
+ if ($conf['enable_synchronization'])
+ {
+ $template->assign(
+ 'U_SYNC',
+ $base_url.'site_update&amp;site=1&amp;cat_id='.$category['id']
+ );
+ }
+
}
// representant management
diff --git a/admin/site_update.php b/admin/site_update.php
index 6b5ae775b..5b90729b8 100644
--- a/admin/site_update.php
+++ b/admin/site_update.php
@@ -809,8 +809,16 @@ else
'meta_all' => false,
'meta_empty_overrides' => false,
);
-
+
$cat_selected = array();
+
+ if (isset($_GET['cat_id']))
+ {
+ check_input_parameter('cat_id', $_GET, false, PATTERN_ID);
+
+ $cat_selected = array($_GET['cat_id']);
+ $tpl_introduction['sync'] = 'files';
+ }
}
$tpl_introduction['privacy_level_options'] = get_privacy_level_options();
diff --git a/admin/themes/clear/icon/synchronize.png b/admin/themes/clear/icon/synchronize.png
new file mode 100644
index 000000000..72a8c0ec5
--- /dev/null
+++ b/admin/themes/clear/icon/synchronize.png
Binary files differ
diff --git a/admin/themes/default/icon/synchronize.png b/admin/themes/default/icon/synchronize.png
new file mode 100644
index 000000000..767bb3b6d
--- /dev/null
+++ b/admin/themes/default/icon/synchronize.png
Binary files differ
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}