From 322d34507796654caf9e691f5a972b63be5434f2 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Mon, 3 May 2010 20:13:03 +0000
Subject: bug 1641 fixed: Admin>Categories>Synchronize moved to
 Admin>Tools>Synchronize (the same for the Site Manager). The big "Quick
 Synchro" button is kept on administration homepage. A link to the Synchronize
 screen was added into Admin>Photos>Add>FTP+Synchro screen.

git-svn-id: http://piwigo.org/svn/trunk@6056 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/include/functions.php                      | 4 ++--
 admin/themes/default/template/admin.tpl          | 4 ++--
 admin/themes/default/template/photos_add_ftp.tpl | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/admin/include/functions.php b/admin/include/functions.php
index d0ea59822..d6a1d5fee 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -1913,8 +1913,6 @@ function get_active_menu($menu_page)
     case 'picture_modify':
       return 0;
 
-    case 'site_manager':
-    case 'site_update':
     case 'cat_list':
     case 'cat_modify':
     case 'cat_move':
@@ -1936,6 +1934,8 @@ function get_active_menu($menu_page)
     case 'plugin':
       return 3;
 
+    case 'site_manager':
+    case 'site_update':
     case 'stats':
     case 'history':
     case 'maintenance':
diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl
index f66411fe3..5f7413444 100644
--- a/admin/themes/default/template/admin.tpl
+++ b/admin/themes/default/template/admin.tpl
@@ -34,8 +34,6 @@ jQuery().ready(function(){ldelim}
         <li><a href="{$U_CATEGORIES}">{'Manage'|@translate}</a></li>
         <li><a href="{$U_MOVE}">{'Move'|@translate}</a></li>
         <li><a href="{$U_CAT_OPTIONS}">{'Properties'|@translate}</a></li>
-        <li><a href="{$U_SITE_MANAGER}">{'Site manager'|@translate}</a></li>
-        <li><a href="{$U_CAT_UPDATE}">{'Synchronize'|@translate}</a></li>
         <li><a href="{$U_PERMALINKS}">{'Permalinks'|@translate}</a></li>
       </ul>
     </dd>
@@ -70,6 +68,8 @@ jQuery().ready(function(){ldelim}
     <dt class="rdion"><span>{'Tools'|@translate}&nbsp;</span></dt>
     <dd>
       <ul>
+        <li><a href="{$U_CAT_UPDATE}">{'Synchronize'|@translate}</a></li>
+        <li><a href="{$U_SITE_MANAGER}">{'Site manager'|@translate}</a></li>
         <li><a href="{$U_HISTORY_STAT}">{'History'|@translate}</a></li>
         <li><a href="{$U_THUMBNAILS}">{'Thumbnails'|@translate}</a></li>
         <li><a href="{$U_MAINTENANCE}">{'Maintenance'|@translate}</a></li>
diff --git a/admin/themes/default/template/photos_add_ftp.tpl b/admin/themes/default/template/photos_add_ftp.tpl
index 81ce87629..52b2cd4d4 100644
--- a/admin/themes/default/template/photos_add_ftp.tpl
+++ b/admin/themes/default/template/photos_add_ftp.tpl
@@ -2,6 +2,8 @@
   <h2>{'FTP + Synchronization'|@translate}</h2>
 </div>
 
+<a href="{$U_CAT_UPDATE}">{'Administration'|@translate} &raquo; {'Tools'|@translate} &raquo; {'Synchronize'|@translate}</a>
+
 <div id="ftpPage">
 {$FTP_HELP_CONTENT}
 </div>
\ No newline at end of file
-- 
cgit v1.2.3