1 files changed, 25 insertions, 9 deletions

diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html
index e6cf5aff..e368d00d 100644
--- a/tpl/default/page.header.html
+++ b/tpl/default/page.header.html
@@ -12,7 +12,7 @@
   </div>
   <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-sm-1">
+      <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">
@@ -63,17 +63,23 @@
           </li>
         {/if}
       </ul>
-      <div class="header-buttons pure-u-lg-1-12 pure-u-sm-0 pure-u-lg-visible">
+      <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">
+              <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">
+            <a href="?do=atom{$searchcrits}" class="pure-menu-link" title="ATOM Feed">
               <i class="fa fa-rss"></i>
             </a>
           </li>
@@ -99,6 +105,7 @@
         {if="!empty($search_crits) && $search_type=='fulltext'"}
           value="{$search_crits}"
         {/if}
+        tabindex="1"
       >
       <button type="submit" class="search-button"><i class="fa fa-search"></i></button>
     </form>
@@ -109,6 +116,7 @@
         {/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>
@@ -116,11 +124,19 @@
 </div>
 
 <div id="content">
-  <div id="header-login-form">
-    <input type="text" name="login" placeholder="Username">
-    <input type="password" name="password" placeholder="Password">
-    <input type="submit" value="Login">
-  </div>
+  <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">