1 files changed, 40 insertions, 5 deletions

diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html
index 7a67fb2a..e6cf5aff 100644
--- a/tpl/default/page.header.html
+++ b/tpl/default/page.header.html
@@ -63,11 +63,21 @@
           </li>
         {/if}
       </ul>
-      <div class="pure-u-lg-1-12 pure-u-sm-0 pure-u-lg-visible">
-        <!--<i class="fa fa-user"></i>-->
-        <a href="?do=atom{$searchcrits}" class="pure-menu-link">
-          <i class="fa fa-rss"></i>
-        </a>
+      <div class="header-buttons pure-u-lg-1-12 pure-u-sm-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">
+                <i class="fa fa-user"></i>
+              </a>
+            </li>
+          {/if}
+          <li class="pure-menu-item">
+            <a href="?do=atom{$searchcrits}" class="pure-menu-link">
+              <i class="fa fa-rss"></i>
+            </a>
+          </li>
+        </ul>
       </div>
     </div>
   </div>
@@ -106,6 +116,31 @@
 </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>
+
+{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'"}