Changeset 2328 for trunk

Timestamp:

May 3, 2008, 7:28:15 PM (16 years ago)

Author:

vdigital

Message:

Start of Stripy look on Admin page (Not stable for all browsers)

Location:

trunk

Files:

• admin.php (modified) (1 diff)
• admin/intro.php (modified) (1 diff)
• language/en_UK/admin.lang.php (modified) (3 diffs)
• language/es_ES/admin.lang.php (modified) (3 diffs)
• language/fr_FR/admin.lang.php (modified) (2 diffs)
• language/nl_NL/admin.lang.php (modified) (2 diffs)
• template/yoga/admin/intro.tpl (modified) (1 diff)
• template/yoga/header.tpl (modified) (1 diff)
• template/yoga/theme/admin/images/bottom-left-bg.png (added)
• template/yoga/theme/admin/images/list-hover.png (modified) (previous)
• template/yoga/theme/admin/images/list-image.png (modified) (previous)
• template/yoga/theme/admin/images/menubar-bottom.png (added)
• template/yoga/theme/admin/images/menubar-detail.png (added)
• template/yoga/theme/admin/images/menubar-top.png (added)
• template/yoga/theme/admin/images/onglet_actif.png (added)
• template/yoga/theme/admin/images/onglet_actif_transp.png (added)
• template/yoga/theme/admin/images/onglet_inactif.png (added)
• template/yoga/theme/admin/images/onglet_inactif_transp.png (added)
• template/yoga/theme/admin/images/piwigo_logo_sombre_214x100.png (added)
• template/yoga/theme/admin/theme.css (modified) (12 diffs)
• template/yoga/theme/admin/themeconf.inc.php (modified) (2 diffs)

trunk/admin.php

@@ -136 +136 @@
 }
 
+// Add the PhpWebGallery Official menu
+  $template->assign( 'pwgmenu', pwg_URL() );
+  
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 $template->pparse('admin');

trunk/admin/intro.php

@@ -269 +269 @@
 }
 
-// Add the PhpWebGallery Official menu
-  $template->assign( 'pwgmenu', pwg_URL() );
-
 // +-----------------------------------------------------------------------+
 // |                           sending html code                           |

trunk/language/en_UK/admin.lang.php

@@ -505 +505 @@
 $lang['special_admin_menu'] = 'Specials';
 $lang['Duplicates'] = 'Files with same name in more than one physical category';
-$lang['DEMO'] = 'DEMO';
-$lang['HOME'] = 'HOME';
-$lang['FORUM'] = 'FORUM';
-$lang['BUGS'] = 'BUGS';
-$lang['EXTENSIONS'] = 'EXTENSIONS';
-$lang['WIKI / DOC'] = 'WIKI / DOC';
+
 $lang['Export data'] = 'Export data';
 $lang['Overall'] = 'Overall';
@@ -633 +628 @@
 $lang['plugins_check_chmod'] = 'Please check "plugins" folder and sub-folders permissions (CHMOD).';
 $lang['plugins_server_error'] = 'Can\'t connect to server.';
-// --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
+
 $lang['Purge compiled templates'] = 'Purge compiled templates';
 $lang['Caddie is currently empty'] = 'Caddie is currently empty';
@@ -646 +641 @@
 $lang['ACCESS_5'] = 'No access';
 
+$lang['DEMO'] = 'Demo';
+$lang['HOME'] = 'Piwigo home';
+$lang['FORUM'] = 'Support';
+$lang['BUGS'] = 'Bugs';
+$lang['EXTENSIONS'] = 'Extensions';
+$lang['WIKI / DOC'] = 'Documentation';
 ?>

trunk/language/es_ES/admin.lang.php

@@ -510 +510 @@
 $lang['note_check_more_info_wiki'] = 'el wiki';
 $lang['Duplicates'] = 'Ficheros que llevan el mismo nombre en varias categorías físicas';
-$lang['DEMO'] = 'DEMO';
-$lang['HOME'] = 'ACOGIDA PWG';
-$lang['FORUM'] = 'FORO';
-$lang['BUGS'] = 'BUGS';
-$lang['EXTENSIONS'] = 'EXTENSIONES';
-$lang['WIKI / DOC'] = 'WIKI / DOC';
+
 $lang['Export data'] = 'Exportar los datos';
 $lang['Overall'] = 'Vista global';
@@ -638 +633 @@
 $lang['plugins_check_chmod'] = 'Verifique los autorizaciones del expediente " plugins " y de sus subexpedientes (CHMOD).';
 $lang['plugins_server_error'] = 'Imposible conectarse al servidor.';
-// --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
+/* TODO */
 $lang['Purge compiled templates'] = 'Purgar el templates compilado';
 /* TODO */ $lang['Caddie is currently empty'] = 'Caddie is currently empty';
@@ -651 +646 @@
 /* TODO */ $lang['ACCESS_5'] = 'No access';
 
+$lang['DEMO'] = 'Demo';
+$lang['HOME'] = 'Acogida Piwigo';
+$lang['FORUM'] = 'Ayuda';
+$lang['BUGS'] = 'Bugs';
+$lang['EXTENSIONS'] = 'Extensiones';
+$lang['WIKI / DOC'] = 'Documentación';
 ?>

trunk/language/fr_FR/admin.lang.php

@@ -505 +505 @@
 $lang['special_admin_menu'] = 'Spéciales';
 $lang['Duplicates'] = 'Fichiers portant le même nom dans plusieurs catégories physiques';
-$lang['DEMO'] = 'DÉMO';
-$lang['HOME'] = 'ACCUEIL PWG';
-$lang['FORUM'] = 'FORUM';
-$lang['BUGS'] = 'BOGUES';
-$lang['EXTENSIONS'] = 'EXTENSIONS';
-$lang['WIKI / DOC'] = 'WIKI / DOC';
+
 $lang['Export data'] = 'Exporter les données';
 $lang['Overall'] = 'Vue globale';
@@ -633 +628 @@
 $lang['plugins_check_chmod'] = 'Vérifiez les permissions du dossier "plugins" et de ses sous-dossiers (CHMOD).';
 $lang['plugins_server_error'] = 'Impossible de se connecter au serveur.';
-// --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
+
 $lang['Purge compiled templates'] = 'Purger les templates compilés';
 $lang['Caddie is currently empty'] = 'Le panier est actuellement vide.';
+$lang['DEMO'] = 'Démo';
+$lang['HOME'] = 'Accueil Piwigo';
+$lang['FORUM'] = 'Support';
+$lang['BUGS'] = 'Bogues';
+$lang['EXTENSIONS'] = 'Extensions';
+$lang['WIKI / DOC'] = 'Documentation';
 $lang['conf_upload_title'] = 'Téléchargement';
 $lang['Show upload link every time'] = 'Afficher le lien d\'ajout d\'image tout le temps';

trunk/language/nl_NL/admin.lang.php

@@ -511 +511 @@
 $lang['note_check_more_info_wiki'] = 'de wiki';
 $lang['Duplicates'] = 'Bestanden met de zelfde naam in meer dan één physieke categorie';
-$lang['DEMO'] = 'DEMO';
-$lang['HOME'] = 'HOME';
-$lang['FORUM'] = 'FORUM';
-$lang['BUGS'] = 'FOUTEN';
-$lang['EXTENSIONS'] = 'EXTENSIES';
-$lang['WIKI / DOC'] = 'WIKI / DOC';
+
 $lang['Export data'] = 'Exporteer data';
 $lang['Overall'] = 'Totaal';
@@ -641 +636 @@
 /* TODO */ $lang['plugins_server_error'] = 'Can\'t connect to server.';
 
-// --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
 /* TODO */ $lang['Purge compiled templates'] = 'Purge compiled templates';
 /* TODO */ $lang['Caddie is currently empty'] = 'Caddie is currently empty';
+/* TODO */ $lang['DEMO'] = 'Demo';
+/* TODO */ $lang['HOME'] = 'Piwigo Home';
+/* TODO */ $lang['FORUM'] = 'Bijstand';
+/* TODO */ $lang['BUGS'] = 'Fouten';
+/* TODO */ $lang['EXTENSIONS'] = 'Extensies';
+/* TODO */ $lang['WIKI / DOC'] = 'Documentatie';
 /* TODO */ $lang['conf_upload_title'] = 'Upload';
 /* TODO */ $lang['Show upload link every time'] = 'Show upload link every time';

trunk/template/yoga/admin/intro.tpl

@@ -1 +1 @@
 {* $Id$ *}
 <h2>{'title_default'|@translate}</h2>
-{if isset($pwgmenu)}
-<ul class="pwgmenu">
-  <!-- Keep Doctype XHTML Strict acceptable even in Admin -->
-  <!-- New window is open if Js available (Webmasters accept it usually) --> 
-  <li><a href="{$pwgmenu.HOME}" onclick="window.open(this.href, ''); return false;">{'HOME'|@translate}</a></li>
-  <li><a href="{$pwgmenu.WIKI}" onclick="window.open(this.href, ''); return false;">{'WIKI / DOC'|@translate}</a></li>
-  <li><a href="{$pwgmenu.FORUM}" onclick="window.open(this.href, ''); return false;">{'FORUM'|@translate}</a></li>
-  <li><a href="{$pwgmenu.BUGS}" onclick="window.open(this.href, ''); return false;">{'BUGS'|@translate}</a></li>
-  <li><a href="{$pwgmenu.EXTENSIONS}" onclick="window.open(this.href, ''); return false;">{'EXTENSIONS'|@translate}</a></li>
-</ul>   
-{/if}
 <dl>
   <dt>{'PhpWebGallery version'|@translate}</dt>

trunk/template/yoga/header.tpl

@@ -68 +68 @@
 
 <div id="theHeader">{$PAGE_BANNER}</div>
-
+{if isset($pwgmenu)}
+<ul class="pwgmenu">
+  <li><a href="{$pwgmenu.HOME}" onclick="window.open(this.href, ''); return false;"><span class="bg">{'HOME'|@translate}<span></a></li>
+  <li><a href="{$pwgmenu.WIKI}" onclick="window.open(this.href, ''); return false;"><span class="bg">{'WIKI / DOC'|@translate}<span></a></li>
+  <li><a href="{$pwgmenu.FORUM}" onclick="window.open(this.href, ''); return false;"><span class="bg">{'FORUM'|@translate}<span></a></li>
+  <li><a href="{$pwgmenu.EXTENSIONS}" onclick="window.open(this.href, ''); return false;"><span class="bg">{'EXTENSIONS'|@translate}<span></a></li>
+</ul>   
+{/if}
 {if not empty($header_notes)}
 <div class="header_notes">

trunk/template/yoga/theme/admin/theme.css

@@ -72 +72 @@
 #theAdminPage h2, #theAdminPage h3 { border-bottom: 1px solid #69c; }
 #imageHeaderBar, #theAdminPage #the_page {
-  background-color: #111;
+  background-color: transparent;
 }
 #imageToolBar, .header_notes {
@@ -90 +90 @@
 }
 #theAdminPage #the_page #content, #theAdminPage #the_page .content {
-  background-color: #111;
+  background-color: transparent;
   border-width: 0px;
   padding: 5px;
@@ -138 +138 @@
 }
 #thePicturePage #the_page {
-  background-color: #111;
+  background-color: transparent;
 }
 #thePicturePage #imageHeaderBar {
@@ -145 +145 @@
 }
 #thePicturePage #imageToolBar {
-  background-color: #111;
+  background-color: transparent;
   border-bottom: 2px solid #69c;
 }
 #thePicturePage #theImage {
-  background-color: #111;
+  background-color: transparent;
   margin: 0px;
   padding: 3px 0px 15px 0px;
@@ -303 +303 @@
 .statBar { background-color: #e60; }
 #imageToolBar .randomButtons a:hover,
-#imageToolBar .navButtons a:hover { background-color: #111; }
+#imageToolBar .navButtons a:hover { background-color: transparent; }
 #menubar .menuInfoCat,
 #menubar .menuInfoCatByChild,
@@ -330 +330 @@
 list-style-type:none; padding: 0pt;
  /*default-layout.cs... (line 23) */
-margin: 0pt 0pt 0pt 13.5em; background: transparent url(images/content-bg.png) 
+margin: 0pt 0pt 0pt 200px; background: transparent url(images/content-bg.png) 
   repeat-y scroll right top;}
 #theAdminPage #menubar ul { list-style-image:url(images/list-image.png); }
@@ -337 +337 @@
 #menubar a { border-bottom:0; text-decoration:none; font-style: italic;}
 body#theAdminPage #theHeader { 
-  background:#111 url(images/logo23.jpg) no-repeat top left; height:105px; 
+  background:transparent url(images/piwigo_logo_sombre_214x100.png) no-repeat 230px top; height:105px; 
 }
 body#theAdminPage #post-header { 
-  background: transparent url(images/tableh1_bg.png) repeat-x top left;
-  width: 100%; height: 4px;
+  background-color: transparent;
+  width: 60%; height: 4px; margin-left:40%;
 }
 #theHeader h1 { /*default-layout.cs... (line 204) */
@@ -374 +374 @@
 border-bottom:0;
 border-right:0;
-border-top:1px solid #222;
-background: transparent url(images/pre-menubar-bg.png) no-repeat scroll left top;
+border-top:0px solid #222;
+background-color: transparent;
 }
 #theAdminPage #menubar dt.pre-menubar {
@@ -382 +382 @@
 }
 .pwgmenu { /*theme.css (line 335)*/
-background:transparent;
-display:table;
+background:transparent url(images/header_bottom.png) repeat-x scroll left 25px;
+float:right;
 font-family:verdana,arial,helvetica,sans-serif;
 font-size:70%;
@@ -389 +389 @@
 list-style-image:none;
 list-style-type:none;
-margin:1px 8px 1px 00;
-padding:3px;
-position:relative;
-right:-406px;
-text-decoration:none;
-top:-93px;
-white-space:nowrap;
-width:636px;
+margin:1px 8px 1px 0pt;
+padding:3px 3px 3px 101px;
+text-decoration:none; top:-35px;
+width:587px;
 }
 .pwgmenu li { /*default-layout.cs... (line 151)*/
@@ -406 +402 @@
 }
 .pwgmenu a { /*theme.css (line 344)*/
-background:#FF3366 url(images/select_bt.png) repeat scroll left top;
+background:transparent url(images/onglet_inactif_transp.png) no-repeat scroll left 3px;
 border:0pt none;
-color:#CCCCCC;
+color:#FF3333;
 display:block;
-font-size:140%;
-height:15px;
-padding:15px 0pt 0pt;
-text-align:center;
-text-decoration:none;
-width:126px !important;
-}
+font-size:40%; height:33px;
+padding:3px 0pt 5px 10pt; text-align:left;
+text-decoration:none; width:126px !important;
+}
+.pwgmenu a:hover { /*theme.css (line 344)*/
+background:transparent url(images/onglet_actif_transp.png) no-repeat scroll left 2px;
+color: #ff7700; }
 #content h2:before, #content h2:after, 
 #menubar DT:before, #menubar DT:after { content: ""; }
@@ -430 +426 @@
 #theAdminPage h2 { /* theme.css (line 72) */ border-bottom:0px; }
 body#theAdminPage { /*theme.css (line 324) */
-background:#111111 url(images/menubar-bg.png) repeat-y scroll left top;}
+background:#111111 url(images/top-left-bg.png) no-repeat scroll left top;}
 #theAdminPage #the_page { /*theme.css (line 73)*/
-background:transparent url(images/content-bg.png) repeat-y scroll right top; }
+background:transparent url(images/bottom-left-bg.png) no-repeat fixed left bottom; }
 #the_page { /*theme.css (line 348)*/ padding-bottom:30px;}
 #content, .content {background-color:transparent;}
 body#theAdminPage #menubar {  /* theme.css (line 324) */
-background:transparent none repeat-y scroll right top; border-bottom:0px; }
+background:transparent none repeat-y scroll right top; border-bottom:0px; margin-top:150px;}
 #theAdminPage #the_page #content, #theAdminPage #the_page .content { /*theme.css (line 91)*/
-background-color:#111111; border-width:0px; padding:5px 35px 5px 5px; }
+background-color:transparent; border-width:0px; padding:5px 35px 5px 5px; }
 body#theAdminPage #menubar dl.selected dd { padding-bottom: 145px; }
 .header_notes {/*default-colors.cs... (line 91)*/
 background-image:url(icon/note.png); background-position:left top;
-background-repeat:no-repeat; border:1px solid #AAAAAA;
-font-weight:bold; margin:14px; padding:5px 0px 0px;
-position:absolute; right:31px; text-align:center; top:96px;  width:50%; }
+background-repeat:no-repeat; border:1px solid #AAAAAA; font-weight:bold;
+margin:14px; padding:5px 0px 0px; position:absolute; right:31px;
+text-align:center; top:96px; width:502px; }
+#theAdminPage #menubar dl.selected {/*theme.css (line 372)*/
+background:transparent url(images/menubar-top.png) no-repeat scroll left top;
+}
+#theAdminPage #menubar dl {/*theme.css (line 372)*/
+background:transparent url(images/menubar-top.png) no-repeat scroll left top; width: 198px;
+}
+#theAdminPage #menubar dt { background: none; left:10px; position:relative; text-align:left; top:-10px;}
+#theAdminPage #menubar dd { background: transparent url(images/menubar-detail.png) repeat-y top left; 
+margin: 0px 0px 0px 4px; padding: 0px;}
+span.bg { background-color: #111111; padding-right: 3px; }

trunk/template/yoga/theme/admin/themeconf.inc.php

@@ -1 +1 @@
 <?php
+/**
+ * Accordion menus need to be stable
+ */
+function selected_admin_menu()
+{
+  if (isset($_GET['page']))
+  {
+    switch ($_GET['page']) {
+      case 'configuration':
+        return 1;
+      case 'site_manager':
+      case 'site_update':
+      case 'cat_list':
+      case 'cat_modify':
+      case 'element_set':
+      case 'cat_perm':
+      case 'picture_modify':
+        if (isset($_GET['cat']) and $_GET['cat']='caddie') {
+          return 3;
+        }
+        return 2;
+      case 'comments':
+      case 'thumbnail':
+      case 'rating':
+      case 'tags':
+        return 3;
+      case 'user_list':
+      case 'group_list':
+      case 'notification_by_mail':
+        return 4;
+      case 'stats':
+      case 'history':
+      case 'maintenance':
+      case 'advanced_feature':
+      case 'wd_checker':
+      case 'plugins_list':
+      case 'plugin':
+        return 5;
+    } 
+  }
+  return 0;
+}
+
 $themeconf = array(
   'template' => 'yoga',
@@ -18 +61 @@
     jQuery(\'#menubar\').accordion({
       header: "dt.rdion",
-      event: "mouseover"
+      event: "mouseover",
+      active: '. selected_admin_menu() . '
     });
   });