diff options
21 files changed, 130 insertions, 81 deletions
@@ -135,6 +135,9 @@ if (count($page['infos']) != 0) $template->assign('infos', $page['infos']); } +// Add the PhpWebGallery Official menu + $template->assign( 'pwgmenu', pwg_URL() ); + include(PHPWG_ROOT_PATH.'include/page_header.php'); $template->pparse('admin'); diff --git a/admin/intro.php b/admin/intro.php index 1585b0482..d30c30532 100644 --- a/admin/intro.php +++ b/admin/intro.php @@ -268,9 +268,6 @@ if ($nb_comments > 0) ); } -// Add the PhpWebGallery Official menu - $template->assign( 'pwgmenu', pwg_URL() ); - // +-----------------------------------------------------------------------+ // | sending html code | // +-----------------------------------------------------------------------+ diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index d231d2798..06ff359b7 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -504,12 +504,7 @@ $lang['Web Services availability duration in days'] = 'Web Services availability $lang['Web Services under control'] = 'PhpWebGallery Web Services are fully operationals and all requests are under control.'; $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'; $lang['Year'] = 'Year'; @@ -632,7 +627,7 @@ $lang['plugins_archive_error'] = 'Can\'t read or extract archive.'; $lang['plugins_extract_error'] = 'An error occured during extraction (%s).'; $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'; $lang['conf_upload_title'] = 'Upload'; @@ -645,4 +640,10 @@ $lang['ACCESS_3'] = 'Access to administrators'; $lang['ACCESS_4'] = 'Access to webmasters'; $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'; ?> diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php index fadce5427..c09c65d24 100644 --- a/language/es_ES/admin.lang.php +++ b/language/es_ES/admin.lang.php @@ -509,12 +509,7 @@ $lang['note_check_more_info'] = 'Vaya sobre %s or %s para más informaciones.'; $lang['note_check_more_info_forum'] = 'el foro'; $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'; $lang['Year'] = 'Año'; @@ -637,7 +632,7 @@ $lang['plugins_archive_error'] = 'Imposible leer o extraer el archivo.'; $lang['plugins_extract_error'] = 'Un error sobrevino durante la extracción de los ficheros (%s).'; $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'; /* TODO */ $lang['conf_upload_title'] = 'Upload'; @@ -650,4 +645,10 @@ $lang['Purge compiled templates'] = 'Purgar el templates compilado'; /* TODO */ $lang['ACCESS_4'] = 'Access to webmasters'; /* 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'; ?> diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index 76f241bee..78020ceea 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -504,12 +504,7 @@ $lang['Web Services availability duration in days'] = 'Durée d\'ouverture des S $lang['Web Services under control'] = 'Les Services Web de PhpWebGallery sont totalement operationnels et toutes les requêtes sont contrôlées.'; $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'; $lang['Year'] = 'Année'; @@ -632,9 +627,15 @@ $lang['plugins_archive_error'] = 'Impossible de lire ou d\'extraire l\'archive.' $lang['plugins_extract_error'] = 'Une erreur est survenue pendant l\'extraction des fichiers (%s).'; $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'; $lang['User access level to upload'] = 'Niveau d\'accès utilisateur pour télécharger'; diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php index 02bb2c522..695df1dc3 100644 --- a/language/nl_NL/admin.lang.php +++ b/language/nl_NL/admin.lang.php @@ -510,12 +510,7 @@ $lang['note_check_more_info'] = 'Ga naar %s of %s voor meer informatie.'; $lang['note_check_more_info_forum'] = 'het forum'; $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'; $lang['Year'] = 'Jaar'; @@ -640,9 +635,14 @@ $lang['c13y_submit_correction'] = 'Pas geselecteerde correcties toe'; /* TODO */ $lang['plugins_check_chmod'] = 'Please check "plugins" folder and sub-folders permissions (CHMOD).'; /* 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'; /* TODO */ $lang['User access level to upload'] = 'User access level to upload'; diff --git a/template/yoga/admin/intro.tpl b/template/yoga/admin/intro.tpl index eedb94d5b..fbfcb8fb0 100644 --- a/template/yoga/admin/intro.tpl +++ b/template/yoga/admin/intro.tpl @@ -1,16 +1,5 @@ {* $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> <dd> diff --git a/template/yoga/header.tpl b/template/yoga/header.tpl index 926baca75..ca5d8b879 100644 --- a/template/yoga/header.tpl +++ b/template/yoga/header.tpl @@ -67,7 +67,14 @@ {/if} <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"> {foreach from=$header_notes item=elt} diff --git a/template/yoga/theme/admin/images/bottom-left-bg.png b/template/yoga/theme/admin/images/bottom-left-bg.png Binary files differnew file mode 100644 index 000000000..ce611dfed --- /dev/null +++ b/template/yoga/theme/admin/images/bottom-left-bg.png diff --git a/template/yoga/theme/admin/images/list-hover.png b/template/yoga/theme/admin/images/list-hover.png Binary files differindex 6413a788e..73b600269 100644 --- a/template/yoga/theme/admin/images/list-hover.png +++ b/template/yoga/theme/admin/images/list-hover.png diff --git a/template/yoga/theme/admin/images/list-image.png b/template/yoga/theme/admin/images/list-image.png Binary files differindex 62194df57..1acdf67e4 100644 --- a/template/yoga/theme/admin/images/list-image.png +++ b/template/yoga/theme/admin/images/list-image.png diff --git a/template/yoga/theme/admin/images/menubar-bottom.png b/template/yoga/theme/admin/images/menubar-bottom.png Binary files differnew file mode 100644 index 000000000..be74ddca1 --- /dev/null +++ b/template/yoga/theme/admin/images/menubar-bottom.png diff --git a/template/yoga/theme/admin/images/menubar-detail.png b/template/yoga/theme/admin/images/menubar-detail.png Binary files differnew file mode 100644 index 000000000..e2d411e95 --- /dev/null +++ b/template/yoga/theme/admin/images/menubar-detail.png diff --git a/template/yoga/theme/admin/images/menubar-top.png b/template/yoga/theme/admin/images/menubar-top.png Binary files differnew file mode 100644 index 000000000..7a1195c5f --- /dev/null +++ b/template/yoga/theme/admin/images/menubar-top.png diff --git a/template/yoga/theme/admin/images/onglet_actif.png b/template/yoga/theme/admin/images/onglet_actif.png Binary files differnew file mode 100644 index 000000000..476edb31b --- /dev/null +++ b/template/yoga/theme/admin/images/onglet_actif.png diff --git a/template/yoga/theme/admin/images/onglet_actif_transp.png b/template/yoga/theme/admin/images/onglet_actif_transp.png Binary files differnew file mode 100644 index 000000000..fe4b18275 --- /dev/null +++ b/template/yoga/theme/admin/images/onglet_actif_transp.png diff --git a/template/yoga/theme/admin/images/onglet_inactif.png b/template/yoga/theme/admin/images/onglet_inactif.png Binary files differnew file mode 100644 index 000000000..8411ed119 --- /dev/null +++ b/template/yoga/theme/admin/images/onglet_inactif.png diff --git a/template/yoga/theme/admin/images/onglet_inactif_transp.png b/template/yoga/theme/admin/images/onglet_inactif_transp.png Binary files differnew file mode 100644 index 000000000..9ad96c14e --- /dev/null +++ b/template/yoga/theme/admin/images/onglet_inactif_transp.png diff --git a/template/yoga/theme/admin/images/piwigo_logo_sombre_214x100.png b/template/yoga/theme/admin/images/piwigo_logo_sombre_214x100.png Binary files differnew file mode 100644 index 000000000..106f20add --- /dev/null +++ b/template/yoga/theme/admin/images/piwigo_logo_sombre_214x100.png diff --git a/template/yoga/theme/admin/theme.css b/template/yoga/theme/admin/theme.css index b168c9381..dd1fab551 100644 --- a/template/yoga/theme/admin/theme.css +++ b/template/yoga/theme/admin/theme.css @@ -71,7 +71,7 @@ H3, #imageToolBar A:hover, .row1, .tabsheet li { } #theAdminPage h2, #theAdminPage h3 { border-bottom: 1px solid #69c; } #imageHeaderBar, #theAdminPage #the_page { - background-color: #111; + background-color: transparent; } #imageToolBar, .header_notes { background-color: #333; @@ -89,7 +89,7 @@ A:hover { padding: 5px; } #theAdminPage #the_page #content, #theAdminPage #the_page .content { - background-color: #111; + background-color: transparent; border-width: 0px; padding: 5px; } @@ -137,18 +137,18 @@ H2, #menubar DT, .throw, TD H3, #theAdminPage H3 { border: none; } #thePicturePage #the_page { - background-color: #111; + background-color: transparent; } #thePicturePage #imageHeaderBar { background-image: url(images/tableh2_bg.png); background-repeat: repeat-x; } #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; } @@ -302,7 +302,7 @@ a.PWG:hover .G { color : #f92; } } .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, h2.showtitle, #theImage p.showlegend { display: none } @@ -329,18 +329,18 @@ body#theAdminPage #menubar { body#theAdminPage #content, #theAdminPage #the_page .content { /*default-layout.cs... (line 1)*/ 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); } #theAdminPage #menubar ul:hover { list-style-image:url(images/list-hover.png); } a, input.rateButton, legend { color:#777; } #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) */ font-size:220%; line-height:4em; margin:auto 2em auto auto; text-align:right; @@ -373,29 +373,25 @@ width:9em !important; -moz-border-radius-bottomright:0px; 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 { background:transparent none no-repeat scroll left top; height: 22px; overflow: hidden; margin: 0px; } .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%; line-height:1.1em; 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)*/ float:left; @@ -405,17 +401,17 @@ text-align:center; width:126px !important; } .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: ""; } #theHeader h1 { /*theme.css (line 345) */ color:#202127; } @@ -429,18 +425,28 @@ font-weight:bold; margin-right:30px; padding-left:2em; } background: transparent none; margin-right:30px; font-weight: lighter;} #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%; }
\ No newline at end of file +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; }
\ No newline at end of file diff --git a/template/yoga/theme/admin/themeconf.inc.php b/template/yoga/theme/admin/themeconf.inc.php index aed3fb102..1a2b51dc4 100644 --- a/template/yoga/theme/admin/themeconf.inc.php +++ b/template/yoga/theme/admin/themeconf.inc.php @@ -1,4 +1,47 @@ <?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', 'theme' => 'admin', @@ -17,7 +60,8 @@ $themeconf = array( jQuery().ready(function(){ jQuery(\'#menubar\').accordion({ header: "dt.rdion", - event: "mouseover" + event: "mouseover", + active: '. selected_admin_menu() . ' }); }); </script>' |
