3 files changed, 31 insertions, 15 deletions

diff --git a/tpl/page.footer.html b/tpl/page.footer.html
index 448e9f8e..b2a2fcbb 100644
--- a/tpl/page.footer.html
+++ b/tpl/page.footer.html
@@ -1,5 +1,5 @@
 <div id="footer">
-    <b><a href="https://github.com/shaarli/Shaarli">Shaarli</a></b> - The personal, minimalist, super-fast, no-database delicious clone by the <a href="https://github.com/shaarli/Shaarli">Shaarli</a> community.
+    <b><a href="https://github.com/shaarli/Shaarli">Shaarli</a></b> - The personal, minimalist, super-fast, no-database delicious clone by the <a href="https://github.com/shaarli/Shaarli">Shaarli</a> community - <a href="doc/index.html">Help/documentation</a>
 </div>
 {if="$newversion"}
     <div id="newversion"><span id="version_id">&#x25CF;</span> Shaarli {$newversion|htmlspecialchars} is <a href="https://github.com/shaarli/Shaarli/releases">available</a>.</div>
diff --git a/tpl/page.header.html b/tpl/page.header.html
index 17c0c75c..0fd65e40 100644
--- a/tpl/page.header.html
+++ b/tpl/page.header.html
@@ -1,28 +1,43 @@
 
-    <div id="logo" title="Share your links !" onclick="document.location='?';"></div>
-    <div id="linkcount" class="nomobile">Shaare your links...<br>
-        {if="!empty($linkcount)"}{$linkcount} links{/if}</div>
-    <span id="shaarli_title"><a href="{$titleLink}">{$shaarlititle|htmlspecialchars}</a></span>
+<div id="logo" title="Share your links !" onclick="document.location='?';"></div>
+
+<div id="linkcount" class="nomobile">
+    {if="!empty($linkcount)"}{$linkcount} links{/if}
+</div>
+
+<div id="menu">
+  <ul>
+      <li><span id="shaarli_title">
+        <a href="{$titleLink}">{$shaarlititle|htmlspecialchars}</a>
+    </span>
+    </li>
   
 {if="!empty($_GET['source']) && $_GET['source']=='bookmarklet'"}
     {ignore} When called as a popup from bookmarklet, do not display menu. {/ignore}
 {else}
-    <a href="?" class="nomobile">Home</a>
+<li><a href="?" class="nomobile">Home</a></li>
     {if="isLoggedIn()"}
-        <a href="?do=logout">Logout</a><a href="?do=tools">Tools</a><a href="?do=addlink"><b>Add link</b></a>
+    <li><a href="?do=logout">Logout</a></li>
+    <li><a href="?do=tools">Tools</a></li>
+    <li><a href="?do=addlink">Add link</a></li>
     {elseif="$GLOBALS['config']['OPEN_SHAARLI']"}
-        <a href="?do=tools">Tools</a><a href="?do=addlink"><b>Add link</b></a>
+    <li><a href="?do=tools">Tools</a></li>
+    <li><a href="?do=addlink">Add link</a></li>
     {else}
-        <a href="?do=login">Login</a>
+    <li><a href="?do=login">Login</a></li>
     {/if}
-    <a href="{$feedurl}?do=rss{$searchcrits}" class="nomobile">RSS Feed</a>
+    <li><a href="{$feedurl}?do=rss{$searchcrits}" class="nomobile">RSS Feed</a></li>
     {if="$GLOBALS['config']['SHOW_ATOM']"}
-        <a href="{$feedurl}?do=atom{$searchcrits}" class="nomobile">ATOM Feed</a>
+    <li><a href="{$feedurl}?do=atom{$searchcrits}" class="nomobile">ATOM Feed</a></li>
     {/if}
-    <a href="?do=tagcloud">Tag cloud</a>
-    <a href="?do=picwall{$searchcrits}">Picture wall</a>
-    <a href="?do=daily">Daily</a>
+    <li><a href="?do=tagcloud">Tag cloud</a></li>
+    <li><a href="?do=picwall{$searchcrits}">Picture wall</a></li>
+    <li><a href="?do=daily">Daily</a></li>
 {/if}
-    <div class="clear"></div>
+  </ul>
+</div>
+
+
+<div class="clear"></div>
 
 
diff --git a/tpl/tools.html b/tpl/tools.html
index bf0539b1..e912f615 100644
--- a/tpl/tools.html
+++ b/tpl/tools.html
@@ -11,6 +11,7 @@
                 <a href="?do=import"><b>Import</b> <span>:  Import Netscape html bookmarks (as exported from Firefox, Chrome, Opera, delicious...)</span></a> <br><br>
                 <a href="?do=export"><b>Export</b> <span>:  Export Netscape html bookmarks (which can be imported in Firefox, Chrome, Opera, delicious...)</span></a><br><br>
                 <a class="smallbutton" onclick="alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...');return false;" href="javascript:javascript:(function(){var%20url%20=%20location.href;var%20title%20=%20document.title%20||%20url;window.open('{$pageabsaddr}?post='%20+%20encodeURIComponent(url)+'&amp;title='%20+%20encodeURIComponent(title)+'&amp;description='%20+%20encodeURIComponent(document.getSelection())+'&amp;source=bookmarklet','_blank','menubar=no,height=390,width=600,toolbar=no,scrollbars=no,status=no,dialog=1');})();"><b>✚Shaare link</b></a> <a href="#" style="clear:none;"><span>&#x21D0; Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).<br>&nbsp;&nbsp;&nbsp;&nbsp;Then click "✚Shaare link" button in any page you want to share.</span></a><br><br>
+                <a class="smallbutton" onclick="alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...');return false;" href="?private=1&post="><b>✚Add Note</b></a> <a href="#" style="clear:none;"><span>&#x21D0; Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).<br>&nbsp;&nbsp;&nbsp;&nbsp;Then click "✚Add Note" button anytime to start composing a (default private)  Note (text post) to your Shaarli.</span></a><br><br>
                 <div class="clear"></div>
         </div>
 </div>