Integrate local copy of Bootstrap and Font-Awesome

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

index e5033690a7a82623690d632804df2865dd577cc1..d13f9e9478d47448b9e976c9a9a5fe2a255ff41c 100644 (file)
--- a/data/templates/base.htm
+++ b/data/templates/base.htm
@@ -3,16 +3,21 @@
  <html>
   <head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <link rel="stylesheet" href="/css/bootstrap.min.css"/>
+  <link rel="stylesheet" href="/css/font-awesome.css">
+  <link rel="stylesheet" href="/css/phorkie.css"/>
+  {% if css %}
    <link rel="stylesheet" href="{{css}}"/>
-  <link rel="stylesheet" href="/css/phorkie.css" />
+  {% endif %}
    <title>{% block title %}{% endblock %} - {{title}}</title>
-  <script src="/js/jquery-1.7.2.min.js"></script>
+  <script src="/js/jquery.js"></script>
+  <script src="/js/bootstrap.min.js"></script>
    <script src="/js/phorkie.js"></script>
    {% block meta %}{% endblock %}
   </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 +30,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>
+       <a href="/user">{{name}}</a>
        </li>
        <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>
@@ -63,6 +74,5 @@
     <a href="https://sf.net/p/phorkie/">
      <abbr title="GNU Affero General Public License">AGPL</abbr></a>.
    </div>
-
   </body>
  </html>