X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tpl%2Fdefault%2Fpage.header.html;h=5442ab425e7e3fca5621f759a1315ac064ccc595;hb=6eafe49eb9afad21b0ce2069489ef1dfc1daf941;hp=e368d00d8e12f504d8f0f0070702d8b3fd51d769;hpb=f26d4d56f99e2be9fa2ad4598a7b55ce0e9dcfdf;p=github%2Fshaarli%2FShaarli.git

diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html
index e368d00d..5442ab42 100644
--- a/tpl/default/page.header.html
+++ b/tpl/default/page.header.html
@@ -1,11 +1,9 @@
 <div class="shaarli-menu pure-g" id="shaarli-menu">
   <div class="pure-u-lg-0 pure-u-1">
     <div class="pure-menu">
-      <!-- FIXME! default value in PHP -->
-      <a href="{if="!empty($GLOBALS['titleLink'])"}{$GLOBALS['titleLink']}{else}?{/if}"
-        class="pure-menu-link">
+      <a href="{$titleLink}" class="pure-menu-link">
         <i class="fa fa-home"></i>
-        {$GLOBALS['title']}
+        {$shaarlititle}
       </a>
       <a href="#" class="menu-toggle" id="menu-toggle"><s class="bar"></s><s class="bar"></s></a>
     </div>
@@ -14,38 +12,29 @@
     <div class="pure-menu menu-transform pure-menu-horizontal pure-g">
       <ul class="pure-menu-list pure-u-lg-11-12 pure-u-1">
         <li class="pure-menu-item pure-menu-selected pure-u-0 pure-u-lg-visible">
-          <a href="{if="!empty($GLOBALS['titleLink'])"}{$GLOBALS['titleLink']}{else}?{/if}"
-            class="pure-menu-link">
+          <a href="{$titleLink}" class="pure-menu-link">
             <i class="fa fa-home"></i>
           </a>
         </li>
-        {if="isLoggedIn()"}
-          <li class="pure-menu-item">
-            <a href="?do=addlink" class="pure-menu-link">Shaare</a>
-          </li>
-          <li class="pure-menu-item">
-            <a href="?do=tools" class="pure-menu-link">Tools</a>
-          </li>
-
-        {elseif="$GLOBALS['config']['OPEN_SHAARLI']"}
+        {if="isLoggedIn() || $openshaarli"}
           <li class="pure-menu-item">
-            <a href="?do=addlink" class="pure-menu-link">Shaare</a>
+            <a href="?do=addlink" class="pure-menu-link">{'Shaare'|t}</a>
           </li>
           <li class="pure-menu-item">
-            <a href="?do=tools" class="pure-menu-link">Tools</a>
+            <a href="?do=tools" class="pure-menu-link">{'Tools'|t}</a>
           </li>
         {/if}
         <li class="pure-menu-item pure-u-lg-0">
-          <a href="?do=atom{$searchcrits}" class="pure-menu-link">RSS Feed</a>
+          <a href="?do=atom{$searchcrits}" class="pure-menu-link">{'RSS Feed'|t}</a>
         </li>
         <li class="pure-menu-item">
-          <a href="?do=tagcloud" class="pure-menu-link">Tag cloud</a>
+          <a href="?do=tagcloud" class="pure-menu-link">{'Tag cloud'|t}</a>
         </li>
         <li class="pure-menu-item">
-          <a href="?do=picwall{$searchcrits}" class="pure-menu-link">Picture wall</a>
+          <a href="?do=picwall{$searchcrits}" class="pure-menu-link">{'Picture wall'|t}</a>
         </li>
         <li class="pure-menu-item">
-          <a href="?do=daily" class="pure-menu-link">Daily</a>
+          <a href="?do=daily" class="pure-menu-link">{'Daily'|t}</a>
         </li>
         <!-- FIXME! update plugin system to handle this -->
         {loop="$plugins_header.buttons_toolbar"}
@@ -55,11 +44,11 @@
         {/loop}
         {if="isLoggedIn()"}
           <li class="pure-menu-item">
-            <a href="?do=logout" class="pure-menu-link">Logout</a>
+            <a href="?do=logout" class="pure-menu-link">{'Logout'|t}</a>
           </li>
         {else}
           <li class="pure-menu-item">
-            <a href="?do=login" class="pure-menu-link">Login</a>
+            <a href="?do=login" class="pure-menu-link">{'Login'|t}</a>
           </li>
         {/if}
       </ul>
@@ -67,19 +56,19 @@
         <ul class="pure-menu-list">
           {if="!isLoggedIn()"}
             <li class="pure-menu-item">
-              <a href="?do=login" class="pure-menu-link" id="login-button" title="Login">
+              <a href="?do=login" class="pure-menu-link" id="login-button" title="{'Login'|t}">
                 <i class="fa fa-user"></i>
               </a>
             </li>
           {else}
             <li class="pure-menu-item">
-              <a href="?do=logout" class="pure-menu-link" title="Logout">
+              <a href="?do=logout" class="pure-menu-link" title="{'Logout'|t}">
                 <i class="fa fa-sign-out"></i>
               </a>
             </li>
           {/if}
           <li class="pure-menu-item">
-            <a href="?do=atom{$searchcrits}" class="pure-menu-link" title="ATOM Feed">
+            <a href="?do=atom{$searchcrits}" class="pure-menu-link" title="{'RSS Feed'|t}">
               <i class="fa fa-rss"></i>
             </a>
           </li>
@@ -91,28 +80,33 @@
 
 <div id="header" class="pure-u-0 pure-u-lg-visible">
   <h1 id="header-title">
-    <a href="{if="!empty($GLOBALS['titleLink'])"}{$GLOBALS['titleLink']}{else}?{/if}">
-      {$GLOBALS['title']}
+    <a href="{if="{$titleLink}">
+      {$shaarlititle}
     </a>
   </h1>
   <div id="linkcount">
-    {if="!empty($linkcount)"}<span class="strong">{$linkcount}</span> shaares{/if}
+    {if="!empty($linkcount)"}
+      <span class="strong">{$linkcount}</span> {function="t('shaare', 'shaares', $linkcount)"}
+      {if="$privateLinkcount>0"}
+        - <span class="strong">{$privateLinkcount}</span> {function="t('private link', 'private links', $privateLinkcount)"}
+      {/if}
+    {/if}
   </div>
 
   <div id="search">
     <form method="GET" class="searchform" name="searchform">
-      <input type="text" tabindex="1" id="searchform_value" name="searchterm" placeholder="Search text"
-        {if="!empty($search_crits) && $search_type=='fulltext'"}
-          value="{$search_crits}"
+      <input type="text" tabindex="1" id="searchform_value" name="searchterm" placeholder="{'Search text'|t}"
+        {if="!empty($search_term)"}
+             value="{$search_term}"
         {/if}
         tabindex="1"
       >
       <button type="submit" class="search-button"><i class="fa fa-search"></i></button>
     </form>
     <form method="GET" class="tagfilter" name="tagfilter">
-      <input type="text" tabindex="2" name="searchtags" id="tagfilter_value" placeholder="Filter by tag"
-        {if="!empty($search_crits) && $search_type=='tags'"}
-          value="{function="implode(' ', $search_crits)"}"
+      <input type="text" tabindex="2" name="searchtags" id="tagfilter_value" placeholder="{'Filter by tag'|t}"
+        {if="!empty($search_tags)"}
+          value="{$search_tags}"
         {/if}
         autocomplete="off" data-multiple data-minChars="1"
         data-list="{loop="$tags"}{$key}, {/loop}"
@@ -124,32 +118,34 @@
 </div>
 
 <div id="content">
-  <form method="post" name="loginform">
-    <div id="header-login-form">
-      <input type="text" name="login" placeholder="Username" tabindex="3">
-      <input type="password" name="password" placeholder="Password" tabindex="5">
-      <div class="remember-me">
-        <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="6">
-        <label for="longlastingsession">Remember me</label>
+  {if="!isLoggedIn()"}
+    <form method="post" name="loginform">
+      <div id="header-login-form">
+        <input type="text" name="login" placeholder="{'Username'|t}" tabindex="3">
+        <input type="password" name="password" placeholder="{'Password'|t}" tabindex="5">
+        <div class="remember-me">
+          <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="6">
+          <label for="longlastingsession">{'Remember me'|t}</label>
+        </div>
+        <input type="hidden" name="token" value="{$token}">
+        <input type="hidden" name="returnurl">
+        <input type="submit" value="Login" tabindex="7">
       </div>
-      <input type="hidden" name="token" value="{$token}">
-      <input type="hidden" name="returnurl">
-      <input type="submit" value="Login" tabindex="7">
-    </div>
-  </form>
+    </form>
+  {/if}
 
 {if="!empty($newVersion) || !empty($versionError)"}
   <div class="pure-g new-version-message pure-alert pure-alert-warning pure-alert-closable">
     <div class="pure-u-2-24"></div>
     {if="$newVersion"}
       <div class="pure-u-20-24">
-        Shaarli {$newVersion} is
-        <a href="https://github.com/shaarli/Shaarli/releases">available</a>.
+        Shaarli {$newVersion}
+        <a href="https://github.com/shaarli/Shaarli/releases">{'is available'|t}</a>.
       </div>
     {/if}
     {if="$versionError"}
       <div class="pure-u-20-24">
-        Error: {$versionError}
+        {'Error'|t}: {$versionError}
       </div>
     {/if}
     <div class="pure-u-2-24">
@@ -158,20 +154,18 @@
   </div>
 {/if}
 
-
-{if="!empty($_GET['source']) && $_GET['source']=='bookmarklet'"}
-    {ignore} When called as a popup from bookmarklet, do not display menu. {/ignore}
-{else}
-
-{/if}
-
-
 {if="!empty($plugin_errors) && isLoggedIn()"}
-    <ul class="errors">
+  <div class="pure-g new-version-message pure-alert pure-alert-error pure-alert-closable">
+    <div class="pure-u-2-24"></div>
+    <div class="pure-u-20-24">
         {loop="plugin_errors"}
-            <li>{$value}</li>
+            <p>{$value}</p>
         {/loop}
-    </ul>
+    </div>
+    <div class="pure-u-2-24">
+      <i class="fa fa-times pure-alert-close"></i>
+    </div>
+  </div>
 {/if}
 
 <div class="clear"></div>