Merge remote-tracking branch 'jnovack/markdown'

[phorkie.git] / data / templates / base.htm

diff --git a/data/templates/base.htm b/data/templates/base.htm
index 5681f80dd24f2d61002a1e10c75b8d1173c406cc..dc065662b29b37eb91c0d8f926c4d7ce20e6cbff 100644 (file)
--- a/data/templates/base.htm
+++ b/data/templates/base.htm
@@ -25,6 +25,15 @@
       <li>
        <a href="/list">List all</a>
       </li>
+      {% if db.adapter %}
+      <li>
+       <form class="navbar-search" action="/search" method="get">
+        <input type="text" class="search-query" name="q" placeholder="Search" value="{{query}}"/>
+       </form>
+      </li>
+      {% endif %}
+     </ul>
+     <ul class="nav pull-right">
       {% if identity %}
       <li>
        <a href="/user">{{name}} ({{email}})</a>
@@ -32,12 +41,9 @@
       <li>
        <a href="/login?logout">Logout</a>
       </li>
-      {% endif %}
-      {% if db.adapter %}
+      {% else %}
       <li>
-       <form class="navbar-search pull-left" action="/search" method="get">
-        <input type="text" class="search-query" name="q" placeholder="Search" value="{{query}}"/>
-       </form>
+       <a href="/login">Login</a>
       </li>
       {% endif %}
      </ul>
@@ -61,7 +67,7 @@
    <a href="//sf.net/p/phorkie/">phorkie</a>,
    the self-hosted, git-based pastebin software is available under the
    <a href="https://sf.net/p/phorkie/">
-    <acronym title="GNU Affero General Public License">AGPL</acronym></a>.
+    <abbr title="GNU Affero General Public License">AGPL</abbr></a>.
   </div>
 
  </body>