X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tpl%2Fdefault%2Fpage.header.html;h=67d0d0c4c0c2bba61adf5d4f352659756a41cdd8;hb=d7bcecd79e906b64a844404597edc3abb4073cb9;hp=9a4ecd8546cf08ea43fa387914bc695bd159a3eb;hpb=4ed6d1babe673a38351e66da991db1cb8e2cb70c;p=github%2Fshaarli%2FShaarli.git

diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html
index 9a4ecd85..67d0d0c4 100644
--- a/tpl/default/page.header.html
+++ b/tpl/default/page.header.html
@@ -1,128 +1,192 @@
 <div class="shaarli-menu pure-g" id="shaarli-menu">
   <div class="pure-u-lg-0 pure-u-1">
     <div class="pure-menu">
-      <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">
-        <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">
+    <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-u-0 pure-u-lg-visible">
+          <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']"}
-          <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}
+        {if="isLoggedIn() || $openshaarli"}
           <li class="pure-menu-item">
-            <a href="?do=login" class="pure-menu-link">Login</a>
+            <a href="?do=addlink" class="pure-menu-link">{'Shaare'|t}</a>
           </li>
-        {/if}
-        <li class="pure-menu-item">
-          <a href="{$feedurl}?do=rss{$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>
+            <a href="?do=tools" class="pure-menu-link">{'Tools'|t}</a>
           </li>
         {/if}
         <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"}
           <li class="pure-menu-item">
-            <a href="{$value.url}" class="pure-menu-link">{$value.title}</a>
+            <a
+              {$value.class=isset($value.class) ? $value.class . ' pure-menu-link' : 'pure-menu-link'}
+              {loop="$value"}
+                {if="$key!='html'"}
+                  {$key}="{$value}"
+                {/if}
+              {/loop}>
+              {$value.html}
+            </a>
           </li>
         {/loop}
         {if="isLoggedIn()"}
-          <li class="pure-menu-item">
-            <a href="?do=logout" class="pure-menu-link">Logout</a>
+          <li class="pure-menu-item pure-u-lg-0">
+            <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>
+          <li class="pure-menu-item pure-u-lg-0">
+            <a href="?do=login" class="pure-menu-link">{'Login'|t}</a>
           </li>
         {/if}
+        <li class="pure-menu-item pure-u-lg-0">
+          <a href="?do=atom{$searchcrits}" class="pure-menu-link">{'RSS Feed'|t}</a>
+        </li>
       </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'|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'|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="{'RSS Feed'|t}">
+              <i class="fa fa-rss"></i>
+            </a>
+          </li>
+        </ul>
+      </div>
     </div>
   </div>
 </div>
 
-<div id="logo" title="Share your links !" onclick="document.location='?';"></div>
+<div id="header" class="pure-u-0 pure-u-lg-visible">
+  <h1 id="header-title">
+    <a href="{$titleLink}">
+      {$shaarlititle}
+    </a>
+  </h1>
+  <div id="linkcount">
+    {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="linkcount" class="nomobile">
-    {if="!empty($linkcount)"}{$linkcount} links{/if}
+  <div id="search">
+    <form method="GET" class="searchform" name="searchform">
+      <input type="text" tabindex="1" id="searchform_value" name="searchterm" placeholder="{'Search text'|t}"
+        {if="!empty($search_term)"}
+             value="{$search_term}"
+        {/if}
+      >
+      <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'|t}"
+        {if="!empty($search_tags)"}
+          value="{$search_tags}"
+        {/if}
+        autocomplete="off" data-multiple data-minChars="1"
+        data-list="{loop="$tags"}{$key}, {/loop}"
+      >
+      <button type="submit" class="search-button"><i class="fa fa-search"></i></button>
+    </form>
+  </div>
 </div>
 
-<div id="menu">
-  <ul>
-      <li><span id="shaarli_title">
-        <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}
-<li><a href="?" class="nomobile">Home</a></li>
-    {if="isLoggedIn()"}
-    <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']"}
-    <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>
+<div id="content">
+  {loop="$plugins_header.fields_toolbar"}
+    <form
+      {loop="$value"}
+        {if="$key!='inputs'"}
+          {$key}="{$value}"
+        {/if}
+      {/loop}>
+      <div class="subheader-form open pure-u-0 pure-u-lg-visible pure-u-lg-1">
+        {loop="$value.inputs"}
+          <input
+            {loop="$value"}
+              {$key}="{$value}"
+            {/loop}>
+        {/loop}
+      </div>
+    </form>
+  {/loop}
+  {if="!isLoggedIn()"}
+    <form method="post" name="loginform">
+      <div class="subheader-form" 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>
+    </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}
+        <a href="https://github.com/shaarli/Shaarli/releases">{'is available'|t}</a>.
+      </div>
     {/if}
-    <li><a href="{$feedurl}?do=rss{$searchcrits}" class="nomobile">RSS Feed</a></li>
-    {if="$GLOBALS['config']['SHOW_ATOM']"}
-    <li><a href="{$feedurl}?do=atom{$searchcrits}" class="nomobile">ATOM Feed</a></li>
+    {if="$versionError"}
+      <div class="pure-u-20-24">
+        {'Error'|t}: {$versionError}
+      </div>
     {/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}
+    <div class="pure-u-2-24">
+      <i id="new-version-dismiss" class="fa fa-times pure-alert-close"></i>
+    </div>
+  </div>
 {/if}
-  </ul>
-</div>
 
 {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>
-
-