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

diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html
index 335ef686..67d0d0c4 100644
--- a/tpl/default/page.header.html
+++ b/tpl/default/page.header.html
@@ -11,7 +11,7 @@
   <div class="pure-u-1">
     <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">
+        <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>
@@ -24,9 +24,6 @@
             <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'|t}</a>
-        </li>
         <li class="pure-menu-item">
           <a href="?do=tagcloud" class="pure-menu-link">{'Tag cloud'|t}</a>
         </li>
@@ -36,21 +33,31 @@
         <li class="pure-menu-item">
           <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">
+          <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">
+          <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">
@@ -80,7 +87,7 @@
 
 <div id="header" class="pure-u-0 pure-u-lg-visible">
   <h1 id="header-title">
-    <a href="{if="{$titleLink}">
+    <a href="{$titleLink}">
       {$shaarlititle}
     </a>
   </h1>
@@ -99,7 +106,6 @@
         {if="!empty($search_term)"}
              value="{$search_term}"
         {/if}
-        tabindex="1"
       >
       <button type="submit" class="search-button"><i class="fa fa-search"></i></button>
     </form>
@@ -110,7 +116,6 @@
         {/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>
@@ -118,20 +123,38 @@
 </div>
 
 <div id="content">
-  <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>
+  {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>
-      <input type="hidden" name="token" value="{$token}">
-      <input type="hidden" name="returnurl">
-      <input type="submit" value="Login" tabindex="7">
-    </div>
-  </form>
-
+    </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>
@@ -153,11 +176,17 @@
 {/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>