Merge remote-tracking branch 'jnovack/markdown'
[phorkie.git] / data / templates / base.htm
index 879635b8ebb86ce9f14cd373023ef1923f673d6f..dc065662b29b37eb91c0d8f926c4d7ce20e6cbff 100644 (file)
@@ -2,33 +2,50 @@
 <!DOCTYPE html>
 <html>
  <head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <link rel="stylesheet" href="{{css}}"/>
-  <link rel="stylesheet" href="/phorkie.css" />
-  <title>{% block title %}{% endblock %} - phorkie</title>
-  <script src="/jquery-1.7.2.min.js"></script>
-  <script src="/phorkie.js"></script>
+  <link rel="stylesheet" href="/css/phorkie.css" />
+  <title>{% block title %}{% endblock %} - {{title}}</title>
+  <script src="/js/jquery-1.7.2.min.js"></script>
+  <script src="/js/phorkie.js"></script>
+  {% block meta %}{% endblock %}
  </head>
  <body>
+  {{topbar|raw}}
   <div class="navbar">
    <div class="navbar-inner">
     <div class="container">
      <a class="brand" href="/">
-      phorkie
+      {{title}}
      </a>
      <ul class="nav">
       <li>
-       <a href="/">New paste</a>
+       <a href="/new">New paste</a>
       </li>
       <li>
        <a href="/list">List all</a>
       </li>
-      <!--
+      {% if db.adapter %}
       <li>
-       <form class="navbar-search pull-left" action="/search" method="get">
-        <input type="text" class="search-query" name="q" placeholder="Search"/>
+       <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="/login?logout">Logout</a>
+      </li>
+      {% else %}
+      <li>
+       <a href="/login">Login</a>
+      </li>
+      {% endif %}
      </ul>
     </div>
    </div>
@@ -50,8 +67,8 @@
    <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>
-</html>
\ No newline at end of file
+</html>