X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tpl%2Fpage.header.html;h=eac2ed4aa5acc20ad55d626f0030d1cf85897038;hb=8406a4b670957b7d0450f6ea5e4f2e61c7114e8f;hp=0fd65e401271d5f09d0d2a6243d3851444c2c1bb;hpb=3a82ed09f365fa44accaf68f07a909bdd8557992;p=github%2Fshaarli%2FShaarli.git

diff --git a/tpl/page.header.html b/tpl/page.header.html
index 0fd65e40..eac2ed4a 100644
--- a/tpl/page.header.html
+++ b/tpl/page.header.html
@@ -2,16 +2,17 @@
 <div id="logo" title="Share your links !" onclick="document.location='?';"></div>
 
 <div id="linkcount" class="nomobile">
-    {if="!empty($linkcount)"}{$linkcount} links{/if}
+    {if="!empty($linkcount)"}{$linkcount} links{/if}<br>
+    {if="!empty($privateLinkcount)"}{$privateLinkcount} private links{/if}
 </div>
 
 <div id="menu">
   <ul>
       <li><span id="shaarli_title">
-        <a href="{$titleLink}">{$shaarlititle|htmlspecialchars}</a>
+        <a href="{$titleLink}">{$shaarlititle}</a>
     </span>
     </li>
-  
+
 {if="!empty($_GET['source']) && $_GET['source']=='bookmarklet'"}
     {ignore} When called as a popup from bookmarklet, do not display menu. {/ignore}
 {else}
@@ -20,23 +21,33 @@
     <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']"}
+    {elseif="$openshaarli"}
     <li><a href="?do=tools">Tools</a></li>
     <li><a href="?do=addlink">Add link</a></li>
     {else}
     <li><a href="?do=login">Login</a></li>
     {/if}
     <li><a href="{$feedurl}?do=rss{$searchcrits}" class="nomobile">RSS Feed</a></li>
-    {if="$GLOBALS['config']['SHOW_ATOM']"}
+    {if="$showatom"}
     <li><a href="{$feedurl}?do=atom{$searchcrits}" class="nomobile">ATOM Feed</a></li>
     {/if}
     <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>
+    {loop="$plugins_header.buttons_toolbar"}
+        {$value}
+    {/loop}
 {/if}
   </ul>
 </div>
 
+{if="!empty($plugin_errors) && isLoggedIn()"}
+    <ul class="errors">
+        {loop="$plugin_errors"}
+            <li>{$value}</li>
+        {/loop}
+    </ul>
+{/if}
 
 <div class="clear"></div>