Changes in [510:35391bb5998a:511:50d43f4dea8e]

Files:

• admin/help.php (added)
• admin/images/menu/help-b.png (added)
• admin/images/menu/help.png (added)
• admin/style/default.css (modified) (5 diffs)
• inc/admin/lib.dc.page.php (modified) (2 diffs)
• inc/admin/prepend.php (modified) (1 diff)
• locales/en/help/main.html (added)
• locales/en/resources.php (modified) (1 diff)
• locales/fr/help/core_main.html (added)
• locales/fr/main.po (modified) (1 diff)

admin/style/default.css

@@ -52 +52 @@
      font-size: 1.2em;
 }
+
 p, div.p {
      margin: 0 0 1em 0;
 }
+
 hr {
      height: 1px;
@@ -61 +63 @@
      border-style: solid;
 }
+
 pre, code {
      font: 100% "Andale Mono","Courier New",monospace;
@@ -93 +96 @@
      background:transparent;
      }
-#prelude a {
+#prelude li a {
      color:#fff;
      }
@@ -279 +282 @@
      margin-bottom: 1em;
 }
+
 #main-menu h3 {
      margin: 0 0 0.5em;
@@ -810 +814 @@
      -webkit-border-bottom-left-radius: 1em;
      color: #444;
+}
+.helplink {
+     margin-left: 0.5em;
+     float: left;
+     display: block;
 }
 .help-box {

inc/admin/lib.dc.page.php

@@ -182 +182 @@
           '</div>'."\n".      // End of #main-menu
           '<div id="footer"><p>'.
+          '<a class="helplink'.(preg_match('/help.php(\?.*)?$/',$_SERVER['REQUEST_URI']) ? ' active' : '').'" href="help.php">'.__('Global help').'</a>'.
           sprintf(__('Thank you for using %s.'),'<a href="http://dotclear.org/">Dotclear '.DC_VERSION.'</a>').
           ' <span class="credit"> (Icons by <a href="http://dryicons.com/">Dryicons</a>)</span>'.
@@ -348 +349 @@
           '<div id="help"><hr /><div class="help-content clear"><h2>'.__('Help').'</h2>'.
           $content.
+          '</div>'.
+          '<div id="helplink"><hr />'.
+          '<p>'.
+          sprintf(__('See also %s'),sprintf('<a href="help.php">%s</a>',__('the global help'))).
+          '</p>'.
           '</div></div>';
      }

inc/admin/prepend.php

@@ -239 +239 @@
           'images/menu/langs.png','images/menu/langs-b.png',
           null,null,null));
+
+     $_fav['help'] = new ArrayObject(array('help','Global help','help.php',
+          'images/menu/help.png','images/menu/help-b.png',
+          '*',null,null));
      
      # Menus creation

locales/en/resources.php

@@ -23 +23 @@
 
 $__resources['help'] = array(
+     'core_main' => dirname(__FILE__).'/help/main.html',
      'core_blog_pref' => dirname(__FILE__).'/help/blog_pref.html',
      'core_categories' => dirname(__FILE__).'/help/categories.html',

locales/fr/main.po

@@ -795 +795 @@
 msgstr "Nouveau billet"
 
+msgid "Global help"
+msgstr "Aide générale"
+
+msgid "See also %s"
+msgstr "Voir également %s"
+
+msgid "the global help"
+msgstr "l'aide générale"
+
 msgid "My dashboard"
 msgstr "Mon tableau de bord"