FIX: URL for access_denied image

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

index 6dfb15a82599010855cff9d24d39f9db713fe5b5..ec2b7469d1398f2f7b229b62fbcc225693626002 100644 (file)
--- a/data/templates/base.htm
+++ b/data/templates/base.htm
@@ -2,13 +2,16 @@
  <!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" />
+  <link rel="stylesheet" href="/css/phorkie.css" />
    <title>{% block title %}{% endblock %} - {{title}}</title>
-  <script src="/jquery-1.7.2.min.js"></script>
-  <script src="/phorkie.js"></script>
+  <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">
@@ -17,18 +20,26 @@
       </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 identity %}
+      <li>
+       <a href="/user">{{name}} ({{email}})</a>
+      </li>
+      <li>
+       <a href="/auth?logout">Logout</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"/>
+        <input type="text" class="search-query" name="q" placeholder="Search" value="{{query}}"/>
         </form>
        </li>
-      -->
+      {% endif %}
       </ul>
      </div>
     </div>
@@ -54,4 +65,4 @@
    </div>
  
   </body>
-</html>
-\ No newline at end of file
+</html>