[#744] Updated header and footer, and MyRSR page

akvo · Sep 29, 2014 · 4e04142 · 4e04142
1 parent b6b8327
commit 4e04142
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/akvo/templates/v3/base.html b/akvo/templates/v3/base.html
@@ -69,23 +69,15 @@
 
     <!-- Piwik -->
     {% tracking_code %}
-
-    {% block custom_page_css %}{% endblock %}
   </head>
 
   <body>
 
-    <!-- Part 1: Wrap all page content here -->
-
-
-      {% include 'v3/navigation.html' %}
-
-      <!-- Begin page content -->
-      <div class="container">
-        {% block maincontent %}{% endblock %}
-      </div>
-
+    {% include 'v3/navigation.html' %}
 
+    <div class="container">
+      {% block maincontent %}{% endblock %}
+    </div>
 
     {% include 'v3/footer.html' %}
 

diff --git a/akvo/templates/v3/navigation.html b/akvo/templates/v3/navigation.html
@@ -1,3 +1,5 @@
+{% load bootstrap3 %}
+
 <nav class="navbar navbar-default" role="navigation">
   <div class="container-fluid">
     <!-- Brand and toggle get grouped for better mobile display -->
@@ -19,7 +21,13 @@
         <li><a href="#">Organisations</a></li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
-        <li><a href="#">Add an update</a></li>
+        <li>
+          <form>
+            <a href="/#" class="btn btn-primary btn-sm navbar-btn">
+              {% bootstrap_icon "bullhorn" %} Add an update
+            </a>
+          </form>
+        </li>
         {% if not user.username %}
         <li><a href="/register">Register</a></li>
         <li><a href="/sign_in">Sign in</a></li>

diff --git a/akvo/templates/v3/register.html b/akvo/templates/v3/register.html
@@ -4,12 +4,6 @@
 
 {% block title %}{% trans 'Register your Akvo RSR account' %}{% endblock %}
 
-{% block custom_page_css %}
-      <style type="text/css">
-        form { padding-bottom: 55px; }
-      </style>
-{% endblock %}
-
 {% block maincontent %}
 <div class="col-md-6 col-md-offset-3">
 <form method="post" action="" name="registrationForm">