diff options
-rw-r--r-- | admin/include/functions.php | 2 | ||||
-rw-r--r-- | admin/template/yoga/admin.tpl | 2 | ||||
-rw-r--r-- | admin/template/yoga/theme/admin/theme.css | 11 | ||||
-rw-r--r-- | language/en_UK/help.html | 3 | ||||
-rw-r--r-- | language/es_ES/help.html | 2 | ||||
-rw-r--r-- | language/fr_FR/help.html | 2 | ||||
-rw-r--r-- | language/it_IT/help.html | 2 | ||||
-rw-r--r-- | language/nl_NL/help.html | 3 |
8 files changed, 21 insertions, 6 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php index e700d662e..a3381f09a 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -1807,7 +1807,7 @@ function pwg_URL() if ( isset($lang_info['code']) and in_array($lang_info['code'], array('fr','en')) ) { /* current wiki languages are French or English */ - $urls['WIKI'] .= 'doku.php?id='.$lang_info['code'].':start'; + $urls['WIKI'] .= 'doku.php?id='.$lang_info['code'].':'.$lang_info['code']; $urls['HOME'] .= '?lang='.$lang_info['code']; } return $urls; diff --git a/admin/template/yoga/admin.tpl b/admin/template/yoga/admin.tpl index 4914477d0..e1d30f36e 100644 --- a/admin/template/yoga/admin.tpl +++ b/admin/template/yoga/admin.tpl @@ -75,7 +75,7 @@ {/if} <li> {'Plugins'|@translate} - <ul> + <ul {* TODO conditional class="scroll" *}> {foreach from=$plugin_menu_items item=menu_item} <li><a href="{$menu_item.URL}">{$menu_item.NAME}</a></li> {/foreach} diff --git a/admin/template/yoga/theme/admin/theme.css b/admin/template/yoga/theme/admin/theme.css index af58e8be8..e181ea89c 100644 --- a/admin/template/yoga/theme/admin/theme.css +++ b/admin/template/yoga/theme/admin/theme.css @@ -43,7 +43,8 @@ letter-spacing:0.1em; margin-right:30px; text-align:right; color: #777; text-transform:none; font-weight:bold; padding-left:20px; } .content dl, dd { margin:5px; } .content div.titrePage { height:55px; } - +.content ol li { text-align: left; } +.instructions { text-align: left; padding: 20px 20px 0 20px; } .throw, td h3 { background-image: url(images/fillet.png); background-repeat: repeat-x; } .browsePath a { color: #eee; } @@ -103,8 +104,14 @@ background:transparent url(images/active_tab_letters.png) no-repeat scroll left /* menubar is on all admin pages => No specific css file */ #menubar { background:transparent url(images/menuBoxBottom_new.png) no-repeat scroll left bottom; -border:0; display:inline; float:left; left:0; margin: 0 0 0 35px; min-height:477px; height:477px; +border:0; display:inline; float:left; left:0; margin: 0 0 0 35px; min-height:475px; height:475px; /* should be 477 */ padding:0; width:207px; z-index:99; text-align: left; } +#menubar ul.scroll { overflow-y:auto; height: 148px; margin-right:8px; + /* Only IE family supports colored scrollbar */ + scrollbar-face-color: #222; scrollbar-shadow-color: #444; scrollbar-highlight-color: #000; + scrollbar-3dlight-color: #292929; scrollbar-darkshadow-color: #333; scrollbar-track-color: #111; + scrollbar-arrow-color: #ff3333; } +html>body #menubar {min-height:477px; height:477px;} /* IE 7 and modern browsers */ #menubar .selected a { color: #f70; border-color: #f36;} #menubar .selected a:hover { color: #f36; border-bottom: 1px solid #f36;} #menubar dd { diff --git a/language/en_UK/help.html b/language/en_UK/help.html index 1ca5c5ca9..b585cb741 100644 --- a/language/en_UK/help.html +++ b/language/en_UK/help.html @@ -1,3 +1,4 @@ +<div class="instructions"> <h2>Help</h2> <h3>Quick start</h3> @@ -256,4 +257,4 @@ filesystem with database.</p> documentation</a> for further reading.</li> </ul> - +</div>
\ No newline at end of file diff --git a/language/es_ES/help.html b/language/es_ES/help.html index c23ab51b0..4f9bb53a6 100644 --- a/language/es_ES/help.html +++ b/language/es_ES/help.html @@ -1,3 +1,4 @@ +<div class="instructions"> <h2>Ayudante</h2> <h3>Comienzo rápido</h3> @@ -181,3 +182,4 @@ class="pwgScreen">Administración, Categorías, Propiedades, Añadido de imágen <a href="http://phpwebgallery.net/doc">documentación oficial de Piwigo</a> Para obtener más detalles.</li> </ul> +</div>
\ No newline at end of file diff --git a/language/fr_FR/help.html b/language/fr_FR/help.html index dd16a6cb2..d43c20272 100644 --- a/language/fr_FR/help.html +++ b/language/fr_FR/help.html @@ -1,3 +1,4 @@ +<div class="instructions"> <h2>Aide</h2> <h3>Démarrage rapide</h3> @@ -248,3 +249,4 @@ question si votre recherche est infructueuse. Le Piwigo</a> pour obtenir plus de détails.</li> </ul> +</div>
\ No newline at end of file diff --git a/language/it_IT/help.html b/language/it_IT/help.html index aa270bf3b..0684af9fd 100644 --- a/language/it_IT/help.html +++ b/language/it_IT/help.html @@ -1,3 +1,4 @@ +<div class="instructions">
<h2>Aiuto</h2>
<h3>Presa in mano rapida</h3>
@@ -247,3 +248,4 @@ anche un'ampia <a href="http://phpwebgallery.net/doc">documentazione</a> in cui potrete trovare risposte ai vostri dubbi.</li>
</ul>
+</div>
\ No newline at end of file diff --git a/language/nl_NL/help.html b/language/nl_NL/help.html index 1c29510ed..3bee826d2 100644 --- a/language/nl_NL/help.html +++ b/language/nl_NL/help.html @@ -1,3 +1,4 @@ +<div class="instructions"> <h2>Help</h2> <h3>Snelle start</h3> @@ -224,4 +225,4 @@ die sub-categorieën bevatten.</li> Piwigo. Bekijk de <a href="http://phpwebgallery.net/doc/" target="blank">officiele Piwigo documentatie</a> voor meer informatie.</li> </ul> - +</div>
\ No newline at end of file |