CS fixes

[phorkie.git] / data / templates / base.htm
diff --git a/data/templates/base.htm b/data/templates/base.htm

index ec2b7469d1398f2f7b229b62fbcc225693626002..6cfea7f676bcca48a0e6bc7a04eb6631065d8060 100644 (file)
--- a/data/templates/base.htm
+++ b/data/templates/base.htm
@@ -12,7 +12,7 @@
   </head>
   <body>
    {{topbar|raw}}
-  <div class="navbar">
+  <div class="navbar navbar-inverse">
     <div class="navbar-inner">
      <div class="container">
       <a class="brand" href="/">
@@ -25,19 +25,25 @@
        <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>
        </li>
        <li>
-       <a href="/auth?logout">Logout</a>
+       <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>