From f800d4fb40468fbf255ac78ccd2da82544f8d557 Mon Sep 17 00:00:00 2001
From: vdigital <vdigital@piwigo.org>
Date: Fri, 23 Feb 2007 23:25:34 +0000
Subject: New / Web Services: - ws_checker.php makes its own web service
 request to control availability - config_default.inc.php : comment for cURL
 support needed for checker - ws_function authorize session and getVersion for
 any partner - help review

New Admin Menu: review.

git-svn-id: http://piwigo.org/svn/trunk@1853 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 template/yoga/admin.tpl            | 55 ++++++++++++++++----------------------
 template/yoga/admin/ws_checker.tpl |  3 +++
 2 files changed, 26 insertions(+), 32 deletions(-)

(limited to 'template/yoga')

diff --git a/template/yoga/admin.tpl b/template/yoga/admin.tpl
index 3dca4cbf6..9fc63321b 100644
--- a/template/yoga/admin.tpl
+++ b/template/yoga/admin.tpl
@@ -5,24 +5,8 @@
     <dd>
       <ul>
         <li><a href="{U_RETURN}">{lang:home}</a></li>
-        <li><a href="{U_ADMIN}" title="{L_ADMIN_HINT}">{L_ADMIN}</a></li>
-      </ul>
-    </dd>
-  </dl>
-  <dl>
-    <dt>{lang:general}</dt>
-    <dd>
-      <ul>
         <li><a href="{U_FAQ}">{lang:instructions}</a></li>
-        <li><a href="{U_SITE_MANAGER}">{lang:Site manager}</a></li>
-        <li><a href="{U_CAT_UPDATE}">{lang:update}</a></li>
-        <li>
-          {lang:history}
-          <ul>
-            <li><a href="{U_HISTORY_STAT}">{lang:Statistics}</a></li>
-            <li><a href="{U_HISTORY_SEARCH}">{lang:Search}</a></li>
-          </ul>
-        </li>
+        <li><a href="{U_ADMIN}" title="{L_ADMIN_HINT}">{L_ADMIN}</a></li>
       </ul>
     </dd>
   </dl>
@@ -36,23 +20,12 @@
       </ul>
     </dd>
   </dl>
-  <dl>
-    <dt>{lang:special_admin_menu}</dt>
-    <dd>
-      <ul>
-        <li><a href="{U_MAINTENANCE}">{lang:Maintenance}</a></li>
-        <li><a href="{U_ADVANCED_FEATURE}">{lang:Advanced_features}</a></li>
-        <li><a href="{U_NOTIFICATION_BY_MAIL}">{lang:nbm_item_notification}</a></li>
-        <!-- BEGIN web_services -->
-        <li><a href="{web_services.U_WS_CHECKER}">{lang:web_services}</a></li>
-        <!-- END web_services -->
-      </ul>
-    </dd>
-  </dl>
   <dl>
     <dt>{lang:Categories}</dt>
     <dd>
       <ul>
+        <li><a href="{U_SITE_MANAGER}">{lang:Site manager}</a></li>
+        <li><a href="{U_CAT_UPDATE}">{lang:update}</a><br />&nbsp;</li>
         <li><a href="{U_CATEGORIES}">{lang:manage}</a></li>
         <li><a href="{U_MOVE}">{lang:Move}</a></li>
         <li><a href="{U_CAT_UPLOAD}">{lang:upload}</a></li>
@@ -73,8 +46,8 @@
         <li><a href="{U_THUMBNAILS}">{lang:thumbnails}</a></li>
         <li><a href="{U_COMMENTS}">{lang:comments}</a></li>
         <li><a href="{U_RATING}">{lang:Rating}</a></li>
-        <li><a href="{U_CADDIE}">{lang:Caddie}</a></li>
         <li><a href="{U_TAGS}">{lang:Tags}</a></li>
+        <li><a href="{U_CADDIE}">{lang:Caddie}</a></li>
       </ul>
     </dd>
   </dl>
@@ -84,18 +57,36 @@
       <ul>
         <li><a href="{U_USERS}">{lang:users}</a></li>
         <li><a href="{U_GROUPS}">{lang:groups}</a></li>
+        <li><a href="{U_NOTIFICATION_BY_MAIL}">{lang:nbm_item_notification}</a></li>
       </ul>
     </dd>
   </dl>
   <dl>
-    <dt>{lang:Plugins}</dt>
+    <dt>{lang:special_admin_menu}</dt>
     <dd>
       <ul>
+        <li>
+          {lang:history}
+          <ul>
+            <li><a href="{U_HISTORY_STAT}">{lang:Statistics}</a></li>
+            <li><a href="{U_HISTORY_SEARCH}">{lang:Search}</a></li>
+          </ul>
+        </li>
+        <li><a href="{U_MAINTENANCE}">{lang:Maintenance}</a></li>
+        <li><a href="{U_ADVANCED_FEATURE}">{lang:Advanced_features}</a></li>
+        <!-- BEGIN web_services -->
+        <li><a href="{web_services.U_WS_CHECKER}">{lang:web_services}</a></li>
+        <!-- END web_services -->
+        <li>
+          {lang:Plugins}
+          <ul>
 <!-- BEGIN plugin_menu -->
 <!-- BEGIN menu_item -->
       <li><a href="{plugin_menu.menu_item.URL}">{plugin_menu.menu_item.NAME}</a></li>
 <!-- END menu_item -->
 <!-- END plugin_menu -->
+          </ul>
+        </li>
       </ul>
     </dd>
   </dl>
diff --git a/template/yoga/admin/ws_checker.tpl b/template/yoga/admin/ws_checker.tpl
index d4365155f..db11059b1 100644
--- a/template/yoga/admin/ws_checker.tpl
+++ b/template/yoga/admin/ws_checker.tpl
@@ -223,4 +223,7 @@
 
   </fieldset>
 </form>
+<!-- BEGIN ws_status -->
+    <h3>{acc_list.ws_status.VALUE}</h3>
+<!-- END ws_status -->
 <!-- END acc_list -->
-- 
cgit v1.2.3