Changeset 11040

Timestamp:

May 25, 2011, 11:01:55 AM (14 years ago)

Author:

plg

Message:

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.

Location:

branches/2.2/admin

Files:

• cat_list.php (modified) (1 diff)
• cat_modify.php (modified) (1 diff)
• site_update.php (modified) (1 diff)
• themes/clear/icon/synchronize.png (added)
• themes/default/icon/synchronize.png (added)
• themes/default/template/cat_list.tpl (modified) (1 diff)
• themes/default/template/cat_modify.tpl (modified) (1 diff)

branches/2.2/admin/cat_list.php

@@ -308 +308 @@
     $tpl_cat['U_DELETE'].= '&pwg_token='.get_pwg_token();
   }
+  else
+  {
+    if ($conf['enable_synchronization'])
+    {
+      $tpl_cat['U_SYNC'] = $base_url.'site_update&site=1&cat_id='.$category['id'];
+    }
+  }
 
   if ( array_key_exists($category['id'], $categories_with_images) )

branches/2.2/admin/cat_modify.php

@@ -271 +271 @@
       )
     );
+
+  if ($conf['enable_synchronization'])
+  {
+    $template->assign(
+      'U_SYNC',
+      $base_url.'site_update&site=1&cat_id='.$category['id']
+      );
+  }
+
 }
 

branches/2.2/admin/site_update.php

@@ -810 +810 @@
       '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';
+  }
 }
 

branches/2.2/admin/themes/default/template/cat_list.tpl

@@ -75 +75 @@
         <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>

branches/2.2/admin/themes/default/template/cat_modify.tpl

@@ -20 +20 @@
   {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) }