X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tpl%2Fdefault%2Fpage.header.html;h=bf5a65e8a51d4dd5b0f7b958f863d99a4125fcf3;hb=717aec2bd7a7061bab53d306c49a49459886f100;hp=3f2075c12d714fe331f74e8fc15bbf8cb4853eb9;hpb=d63f7cf5b8a25bba0de8ee11202edda3ca062eb4;p=github%2Fshaarli%2FShaarli.git

diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html
index 3f2075c1..bf5a65e8 100644
--- a/tpl/default/page.header.html
+++ b/tpl/default/page.header.html
@@ -1,20 +1,18 @@
 <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>
+        {$shaarlititle}
       </a>
       <a href="#" class="menu-toggle" id="menu-toggle"><s class="bar"></s><s class="bar"></s></a>
     </div>
   </div>
   <div class="pure-u-1">
-    <div class="pure-menu menu-transform pure-menu-horizontal">
-      <ul class="pure-menu-list">
+    <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>
@@ -26,26 +24,17 @@
             <a href="?do=tools" class="pure-menu-link">Tools</a>
           </li>
 
-        {elseif="$GLOBALS['config']['OPEN_SHAARLI']"}
+        {elseif="$openshaarli"}
           <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>
-        {else}
-          <li class="pure-menu-item">
-            <a href="?do=login" class="pure-menu-link">Login</a>
-          </li>
         {/if}
-        <li class="pure-menu-item">
-          <a href="{$feedurl}?do=rss{$searchcrits}" class="pure-menu-link">RSS Feed</a>
+        <li class="pure-menu-item pure-u-lg-0">
+          <a href="?do=atom{$searchcrits}" class="pure-menu-link">RSS Feed</a>
         </li>
-        {if="$GLOBALS['config']['SHOW_ATOM']"}
-          <li class="pure-menu-item">
-            <a href="{$feedurl}?do=atom{$searchcrits}" class="pure-menu-link">ATOM Feed</a>
-          </li>
-        {/if}
         <li class="pure-menu-item">
           <a href="?do=tagcloud" class="pure-menu-link">Tag cloud</a>
         </li>
@@ -71,36 +60,65 @@
           </li>
         {/if}
       </ul>
+      <div class="header-buttons pure-u-lg-1-12 pure-u-0 pure-u-lg-visible">
+        <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">
+                <i class="fa fa-user"></i>
+              </a>
+            </li>
+          {else}
+            <li class="pure-menu-item">
+              <a href="?do=logout" class="pure-menu-link" title="Logout">
+                <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">
+              <i class="fa fa-rss"></i>
+            </a>
+          </li>
+        </ul>
+      </div>
     </div>
   </div>
 </div>
 
 <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> shaares
+      {if="$privateLinkcount>0"}
+        - <span class="strong">{$privateLinkcount}</span> private links
+      {/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}"
+        {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)"}"
+        {if="!empty($search_tags)"}
+          value="{$search_tags}"
         {/if}
         autocomplete="off" data-multiple data-minChars="1"
         data-list="{loop="$tags"}{$key}, {/loop}"
+        tabindex="2"
       >
       <button type="submit" class="search-button"><i class="fa fa-search"></i></button>
     </form>
@@ -108,6 +126,39 @@
 </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>
+      </div>
+      <input type="hidden" name="token" value="{$token}">
+      <input type="hidden" name="returnurl">
+      <input type="submit" value="Login" tabindex="7">
+    </div>
+  </form>
+
+{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>.
+      </div>
+    {/if}
+    {if="$versionError"}
+      <div class="pure-u-20-24">
+        Error: {$versionError}
+      </div>
+    {/if}
+    <div class="pure-u-2-24">
+      <i id="new-version-dismiss" class="fa fa-times pure-alert-close"></i>
+    </div>
+  </div>
+{/if}
 
 
 {if="!empty($_GET['source']) && $_GET['source']=='bookmarklet'"}