move login link and user name+email to the right on the navigation bar

diff --git a/data/templates/base.htm b/data/templates/base.htm
index 7722105789c35a934db884b88d013ae78b71b433..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>
       <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>
       {% if identity %}
       <li>
        <a href="/user">{{name}} ({{email}})</a>


@@ -37,13 +46,6 @@
        <a href="/login">Login</a>
       </li>
       {% endif %}
        <a href="/login">Login</a>
       </li>
       {% endif %}

-      {% if db.adapter %}
-      <li>
-       <form class="navbar-search pull-left" action="/search" method="get">
-        <input type="text" class="search-query" name="q" placeholder="Search" value="{{query}}"/>
-       </form>
-      </li>
-      {% endif %}

      </ul>
     </div>
    </div>
      </ul>
     </div>
    </div>