Changeset 1878

Timestamp:

Mar 7, 2007, 11:53:42 PM (17 years ago)

Author:

rub

Message:

Add tabsheet on administration pages.

Step 2: Regroup categories options into sheet Batch management.

On next commit, use of this new method on history and configuration

Location:

trunk

Files:

• admin.php (modified) (3 diffs)
• admin/cat_options.php (modified) (2 diffs)
• admin/include/functions_tabsheet.inc.php (modified) (2 diffs)
• language/en_UK.iso-8859-1/admin.lang.php (modified) (1 diff)
• language/fr_FR.iso-8859-1/admin.lang.php (modified) (1 diff)
• template/yoga/admin.tpl (modified) (1 diff)
• template/yoga/admin/cat_options.tpl (modified) (1 diff)
• template/yoga/theme/p0w0/theme.css (modified) (1 diff)

trunk/admin.php

@@ -70 +70 @@
 $link_start = PHPWG_ROOT_PATH.'admin.php?page=';
 $conf_link = $link_start.'configuration&section=';
-$opt_link = $link_start.'cat_options&section=';
 //----------------------------------------------------- template initialization
 $title = l10n('PhpWebGallery Administration'); // for include/page_header.php
@@ -94 +93 @@
     'U_CATEGORIES'=> $link_start.'cat_list',
     'U_MOVE'=> $link_start.'cat_move',
-    'U_CAT_UPLOAD'=> $opt_link.'upload',
-    'U_CAT_COMMENTS'=> $opt_link.'comments',
-    'U_CAT_VISIBLE'=> $opt_link.'visible',
-    'U_CAT_STATUS'=> $opt_link.'status',
     'U_CAT_OPTIONS'=> $link_start.'cat_options',
     'U_CAT_UPDATE'=> $link_start.'site_update&site=1',
@@ -119 +114 @@
     array(
       'U_WS_CHECKER'=> $link_start.'ws_checker',
-      )
-    );
-}
-if ($conf['allow_random_representative'])
-{
-  $template->assign_block_vars(
-    'representative',
-    array(
-      'URL' => $opt_link.'representative'
       )
     );

trunk/admin/cat_options.php

@@ -32 +32 @@
 
 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+include_once(PHPWG_ROOT_PATH.'admin/include/functions_tabsheet.inc.php');
 
 // +-----------------------------------------------------------------------+
@@ -163 +164 @@
    )
  );
+
+// TabSheet initialization
+$opt_link = $link_start.'cat_options&section=';
+$page['tabsheet'] = array
+(
+  'upload' => array
+   (
+    'caption' => l10n('upload'),
+    'url' => $opt_link.'upload'
+   ),
+  'comments' => array
+   (
+    'caption' => l10n('comments'),
+    'url' => $opt_link.'comments'
+   ),
+  'visible' => array
+   (
+    'caption' => l10n('lock'),
+    'url' => $opt_link.'visible'
+   ),
+  'status' => array
+   (
+    'caption' => l10n('cat_security'),
+    'url' => $opt_link.'status'
+   )
+);
+
+if ($conf['allow_random_representative'])
+{
+  $page['tabsheet']['representative'] =
+    array
+    (
+      'caption' => l10n('Representative'),
+      'url' => $opt_link.'representative'
+    );
+}
+$page['tabsheet'][$page['section']]['selected'] = true;
+
+// Assign tabsheet to template
+template_assign_tabsheet();
 
 // +-----------------------------------------------------------------------+

trunk/admin/include/functions_tabsheet.inc.php

@@ -5 +5 @@
 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | file          : $Id$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
+// | file          : $Id: functions_tabsheet.inc.php 1874 2007-03-06 02:07:15Z rub $
+// | last update   : $Date: 2007-03-06 03:07:15 +0100 (mar., 06 mars 2007) $
+// | last modifier : $Author: rub $
+// | revision      : $Revision: 1874 $
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
@@ -72 +72 @@
 }
 
-//TOTO:Voir pour intégrer U_TABSHEET_TITLE dans les autres tabs 
-//TODO:Selected sans link
-//Remplacer mode par tab_caption
 ?>

trunk/language/en_UK.iso-8859-1/admin.lang.php

@@ -415 +415 @@
 $lang['thumbnail'] = 'thumbnail';
 $lang['title'] = 'title';
-$lang['title_cat_options'] = 'Categories options';
 $lang['title_categories'] = 'Categories management';
 $lang['title_configuration'] = 'PhpWebGallery configuration';

trunk/language/fr_FR.iso-8859-1/admin.lang.php

@@ -415 +415 @@
 $lang['thumbnail'] = 'miniature';
 $lang['title'] = 'titre';
-$lang['title_cat_options'] = 'Options des catégories';
 $lang['title_categories'] = 'Gestion des catégories';
 $lang['title_configuration'] = 'Configuration de PhpWebGallery';

trunk/template/yoga/admin.tpl

@@ -29 +29 @@
         <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>
-        <li><a href="{U_CAT_COMMENTS}">{lang:comments}</a></li>
-        <li><a href="{U_CAT_VISIBLE}">{lang:lock}</a></li>
-        <li><a href="{U_CAT_STATUS}">{lang:cat_security}</a></li>
-        <!-- BEGIN representative -->
-        <li><a href="{representative.URL}">{lang:Representative}</a></li>
-        <!-- END representative -->
+        <li><a href="{U_CAT_OPTIONS}">{lang:Batch management}</a></li>
         <li><a href="{U_PERMALINKS}">{lang:Permalinks}</a></li>
       </ul>

trunk/template/yoga/admin/cat_options.tpl

@@ -4 +4 @@
     <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
   </ul>
-  <h2>{lang:title_cat_options}</h2>
+  <h2>{lang:Batch management} {TABSHEET_TITLE}</h2>
+  {TABSHEET}
 </div>
 

trunk/template/yoga/theme/p0w0/theme.css

@@ -285 +285 @@
   border-radius: 6px 6px 0px 0px;       /* round corners with CSS3 compliant browsers */
   -moz-border-radius: 6px 6px 0px 0px;  /* round corners with CSS3 compliant browsers */
-  padding: 5px 4em 2px 4em;
+  padding: 5px 2em 2px 2em;
 }