Changeset 1881

Timestamp:

Mar 8, 2007, 11:14:14 PM (17 years ago)

Author:

rub

Message:

Add tabsheet on administration pages.

Step 3: Tabsheet for configuration & history

Change css tabsheet to do like p0w0 for all themes

Location:

trunk

Files:

• admin.php (modified) (1 diff)
• admin/configuration.php (modified) (2 diffs)
• admin/history.php (modified) (2 diffs)
• admin/include/functions_history.inc.php (added)
• admin/stats.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) (2 diffs)
• template/yoga/admin/configuration.tpl (modified) (4 diffs)
• template/yoga/admin/default-layout.css (modified) (2 diffs)
• template/yoga/admin/history.tpl (modified) (1 diff)
• template/yoga/admin/stats.tpl (modified) (1 diff)
• template/yoga/theme/p0w0/theme.css (modified) (1 diff)

trunk/admin.php

@@ -82 +82 @@
     'U_SITE_MANAGER'=> $link_start.'site_manager',
     'U_HISTORY_STAT'=> $link_start.'stats',
-    'U_HISTORY_SEARCH'=> $link_start.'history',
     'U_FAQ'=> $link_start.'help',
     'U_SITES'=> $link_start.'remote_site',

trunk/admin/configuration.php

@@ -32 +32 @@
 
 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+include_once(PHPWG_ROOT_PATH.'admin/include/functions_tabsheet.inc.php');
 
 // +-----------------------------------------------------------------------+
@@ -160 +161 @@
 
 //----------------------------------------------------- template initialization
-$template->set_filenames( array('config'=>'admin/configuration.tpl') );
+$template->set_filename('config', 'admin/configuration.tpl');
+
+// TabSheet initialization
+$page['tabsheet'] = array
+(
+  'general' => array
+   (
+    'caption' => l10n('conf_general_title'),
+    'url' => $conf_link.'general'
+   ),
+  'comments' => array
+   (
+    'caption' => l10n('conf_comments_title'),
+    'url' => $conf_link.'comments'
+   ),
+  'default' => array
+   (
+    'caption' => l10n('conf_default'),
+    'url' => $conf_link.'default'
+   )
+);
+
+$page['tabsheet'][$page['section']]['selected'] = true;
+
+// Assign tabsheet to template
+template_assign_tabsheet();
 
 $action = PHPWG_ROOT_PATH.'admin.php?page=configuration';

trunk/admin/history.php

@@ -49 +49 @@
 
 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+include_once(PHPWG_ROOT_PATH.'admin/include/functions_history.inc.php');
 
 if (isset($_GET['start']) and is_numeric($_GET['start']))
@@ -129 +130 @@
 // +-----------------------------------------------------------------------+
 
-$template->set_filenames(array('history'=>'admin/history.tpl'));
+$template->set_filename('history', 'admin/history.tpl');
+
+// TabSheet initialization
+history_tabsheet();
 
 $base_url = PHPWG_ROOT_PATH.'admin.php?page=history';

trunk/admin/stats.php

@@ -32 +32 @@
 
 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+include_once(PHPWG_ROOT_PATH.'admin/include/functions_history.inc.php');
 
 // +-----------------------------------------------------------------------+
@@ -384 +385 @@
 }
 
-$template->set_filenames(array('stats'=>'admin/stats.tpl'));
+$template->set_filename('stats', 'admin/stats.tpl');
+
+// TabSheet initialization
+history_tabsheet();
 
 $template->assign_vars(

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

@@ -223 +223 @@
 $lang['category'] = 'category';
 $lang['conf_access'] = 'Access type';
-$lang['conf_comments_title'] = 'Users comments';
+$lang['conf_comments_title'] = 'Comments';
 $lang['conf_confirmation'] = 'Information data registered in database';
 $lang['conf_default'] = 'Default display';
 $lang['conf_default_title'] = 'Default display';
 $lang['conf_gallery_url_error'] = 'The gallery URL is not valid.';
-$lang['conf_general_title'] = 'Main configuration';
+$lang['conf_general_title'] = 'Main';
 $lang['conf_nb_comment_page_error'] = 'The number of comments a page must be between 5 and 50 included.';
 $lang['config'] = 'Configuration';

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

@@ -223 +223 @@
 $lang['category'] = 'catégorie';
 $lang['conf_access'] = 'Type d\'accès';
-$lang['conf_comments_title'] = 'Commentaires d\'utilisateurs';
+$lang['conf_comments_title'] = 'Commentaires';
 $lang['conf_confirmation'] = 'Informations enregistrées dans la base de données';
 $lang['conf_default'] = 'Affichage par défaut';
 $lang['conf_default_title'] = 'Affichage par défaut';
 $lang['conf_gallery_url_error'] = 'L\'adresse de la galerie n\'est pas valide.';
-$lang['conf_general_title'] = 'Configuration principale';
+$lang['conf_general_title'] = 'Principale';
 $lang['conf_nb_comment_page_error'] = 'Le nombre de commentaires d\'utilisateurs par page doit être compris entre 5 et 50.';
 $lang['config'] = 'Configuration';

trunk/template/yoga/admin.tpl

@@ -16 +16 @@
       <ul>
         <li><a href="{U_CONFIG_GENERAL}">{lang:general}</a></li>
-        <li><a href="{U_CONFIG_COMMENTS}">{lang:comments}</a></li>
         <li><a href="{U_CONFIG_DISPLAY}">{lang:conf_default}</a></li>
       </ul>
@@ -61 +60 @@
     <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_HISTORY_STAT}">{lang:history}</a></li>
         <li><a href="{U_MAINTENANCE}">{lang:Maintenance}</a></li>
         <li><a href="{U_ADVANCED_FEATURE}">{lang:Advanced_features}</a></li>

trunk/template/yoga/admin/configuration.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_configuration}</h2>
+  <h2>{lang:title_configuration} {TABSHEET_TITLE}</h2>
+  {TABSHEET}
 </div>
 
@@ -11 +12 @@
 <!-- BEGIN general -->
 <fieldset id="generalConf">
-  <legend>{lang:conf_general_title}</legend>
-
   <ul>
     <li>
@@ -92 +91 @@
 <!-- BEGIN comments -->
 <fieldset id="commentsConf">
-  <legend>{lang:conf_comments_title}</legend>
-
   <ul>
     <li>
@@ -136 +133 @@
 <!-- BEGIN default -->
 <fieldset id="commentsConf">
-  <legend>{lang:conf_default_title}</legend>
-
   <ul>
     <li>

trunk/template/yoga/admin/default-layout.css

@@ -161 +161 @@
   text-decoration : none;
   background: transparent;
+  border-bottom: 1px solid #fff;
 }
 
@@ -168 +169 @@
   margin: 0 6px;
   color: white;
-  font-size: 120%;
+  font-size: 110%;
   font-weight: bold;
   padding: 4px 8px;
   border: 1px solid #fff;
+  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 2em 2px 2em;
 }
 

trunk/template/yoga/admin/history.tpl

@@ -11 +11 @@
     </li>
   </ul>
-  <h2>{lang:History}</h2>
+  <h2>{lang:History} {TABSHEET_TITLE}</h2>
+  {TABSHEET}
 </div>
 

trunk/template/yoga/admin/stats.tpl

@@ -1 +1 @@
 <!-- $Id$ -->
-<h2>{lang:title_history}</h2>
+<div class="titrePage">
+  <ul class="categoryActions">
+    <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:History} {TABSHEET_TITLE}</h2>
+  {TABSHEET}
+</div>
 
 <h3>{L_STAT_TITLE}</h3>

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

@@ -278 +278 @@
 * { outline: none; }
 
-.tabsheet { border-bottom: 1px solid #369; }
+.tabsheet {
+  border-bottom: 1px solid #369;
+}
+
 .tabsheet li {
   background: #369;
   color: white;
   border: 1px solid #fff;
-  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 2em 2px 2em;
 }