add padding fix to edit page

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

index e5033690a7a82623690d632804df2865dd577cc1..8738bb061f510c60fde60185bb8724afcead6cc0 100644 (file)
--- a/data/templates/base.htm
+++ b/data/templates/base.htm
@@ -3,41 +3,63 @@
  <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 navbar-static-top">
     <div class="navbar-inner">
      <div class="container">
-     <a class="brand" href="/">
-      {{title}}
-     </a>
       <ul class="nav">
+      <li>
+       <a class="brand" href="/">{{title}}</a>
+      </li>
        <li>
         <a href="/new">New paste</a>
        </li>
        <li>
         <a href="/list">List all</a>
        </li>
+      {% if db.adapter %}
+      <li class="nav-collapse">
+       <form class="span4 pull-right navbar-form" 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>
+      {% endif %}
+      {% if db.adapter %}
        <li>
-       <a href="/login?logout">Logout</a>
+       <button class="btn btn-navbar btn-inverse pull-right" data-toggle="collapse" data-target=".nav-collapse">
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+       </button>
        </li>
        {% endif %}
-      {% if db.adapter %}
+      {% if identity %}
        <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?logout">Logout</a>
+      </li>
+      {% else %}
+      <li>
+       <a href="/login">Login</a>
        </li>
        {% endif %}
       </ul>
@@ -51,7 +73,7 @@
       {% block content %}{% endblock %}
      </div>
      <div class="span3">
-     <div style="height: 1em"></div>
+     <div class="content-padding-fix"></div>
       {% block sidebar %}{% endblock %}
      </div>
     </div>
@@ -63,6 +85,5 @@
     <a href="https://sf.net/p/phorkie/">
      <abbr title="GNU Affero General Public License">AGPL</abbr></a>.
    </div>
-
   </body>
  </html>