finish moving page titles to base template so that messages display c…

…orrectly
LuxorLabs · Apr 1, 2015 · 99ef6de · 99ef6de
1 parent 58a59a4
commit 99ef6de
Show file tree

Hide file tree

Showing 12 changed files with 71 additions and 107 deletions.
diff --git a/templates/address_overview.html b/templates/address_overview.html
@@ -11,19 +11,16 @@
   {% endblocktrans %}
 {% endblock title %}
 
-{% block content %}
+{% block page_header %}
+  <h1>
+    <i class="fa fa-qrcode"></i> 
+    {{ coin_symbol|coin_symbol_to_display_name }} Address
+  </h1>
+  <h2 class="tagline wrapit semi">({{ address }})</h2>
+  {%  if wallet_name %}<h2 class="tagline wrapit semi">{{ wallet_name }}</h2>{%  endif %}
+{% endblock page_header %}
 
-<div class="page-header">
-  <div class="container">
-    <h1>
-      <i class="fa fa-qrcode"></i> 
-      {{ coin_symbol|coin_symbol_to_display_name }} Address
-    </h1>
-    <h2 class="tagline wrapit semi">({{ address }})</h2>
-    {%  if wallet_name %}<h2 class="tagline wrapit semi">{{ wallet_name }}</h2>{%  endif %}
-  </div>
-</div>
-
+{% block content %}
 <div class="container">
   <div class="section">
     <div class="col-md-4 text-center">

diff --git a/templates/base.html b/templates/base.html
@@ -172,11 +172,8 @@
         {# Page Header Stuff #}
         <div class="page-header">
           <div class="container">
-            <h1>
-              {% block page_header %}
-                Dashboard
-              {% endblock page_header %}
-            </h1>
+            {% block page_header %}
+            {% endblock page_header %}
           </div>
         </div>
         {% include "partials/messages.html" %}

diff --git a/templates/block_overview.html b/templates/block_overview.html
@@ -10,18 +10,15 @@
   {% endblocktrans %}
 {% endblock title %}
 
-{% block content %}
-
-<div class="page-header">
-  <div class="container">
-    <h1>
-      <i class="fa fa-cube"></i> 
-      {{ coin_symbol|coin_symbol_to_display_name }} Block {{ block_details.height|intcomma }}
-    </h1>
-    <h2 class="tagline wrapit semi">({{ block_details.hash }})</h2>
-  </div>
-</div>
+{% block page_header %}
+  <h1>
+    <i class="fa fa-cube"></i> 
+    {{ coin_symbol|coin_symbol_to_display_name }} Block {{ block_details.height|intcomma }}
+  </h1>
+  <h2 class="tagline wrapit semi">({{ block_details.hash }})</h2>
+{% endblock page_header %}
 
+{% block content %}
 <div class="container">
   <nav>
     <a href="{% url 'block_overview' coin_symbol block_details.prev_block %}" class="btn btn-default pull-left">

diff --git a/templates/change_pw.html b/templates/change_pw.html
@@ -5,15 +5,11 @@
 
 {% block title %}{% trans "Change Password" %}{% endblock title %}
 
-{% block content %}
+{% block page_header %}
+  <h1>{% trans "Change Password" %}</h1>
+{% endblock page_header %}
 
-<div class="page-header">
-  <div class="container">
-    <h1>
-      {% trans "Change Password" %}
-    </h1>
-  </div>
-</div>
+{% block content %}
 
 <div class="form-page">
   <div class="container">

diff --git a/templates/coin_overview.html b/templates/coin_overview.html
@@ -11,18 +11,16 @@
   {% endblocktrans %}
 {% endblock title %}
 
-{% block content %}
-
-<div class="page-header">
-  <div class="container">
-    <div class="col-lg-1 col-md-2 col-sm-3 col-xs-4 text-center">
-      <div class="{{ coin_symbol }} coin"></div>
-    </div>
-    <div class="col-lg-11 col-md-10 col-sm-9 col-xs-8">
-      <h1>{{ coin_symbol|coin_symbol_to_display_name }} Explorer</h1>
-    </div>
+{% block page_header %}
+  <div class="col-lg-1 col-md-2 col-sm-3 col-xs-4 text-center">
+    <div class="{{ coin_symbol }} coin"></div>
   </div>
-</div>
+  <div class="col-lg-11 col-md-10 col-sm-9 col-xs-8">
+    <h1>{{ coin_symbol|coin_symbol_to_display_name }} Explorer</h1>
+  </div>
+{% endblock page_header %}
+
+{% block content %}
 
 <div class="container">
   <div class="section">

diff --git a/templates/login.html b/templates/login.html
@@ -5,15 +5,11 @@
 
 {% block title %}{% trans "Login" %}{% endblock title %}
 
-{% block content %}
+{% block page_header %}
+  <h1>{% trans "Login" %}</h1>
+{% endblock page_header %}
 
-<div class="page-header">
-  <div class="container">
-    <h1>
-      {% trans "Login" %}
-    </h1>
-  </div>
-</div>
+{% block content %}
 
 <div class="form-page">
   <div class="container">

diff --git a/templates/password_upsell.html b/templates/password_upsell.html
@@ -5,15 +5,11 @@
 
 {% block title %}{% trans "Set a Password" %}{% endblock title %}
 
-{% block content %}
+{% block page_header %}
+  <h1>{% trans "Set a Password" %}</h1>
+{% endblock page_header %}
 
-<div class="page-header">
-  <div class="container">
-    <h1>
-      {% trans "Set a Password" %}
-    </h1>
-  </div>
-</div>
+{% block content %}
 
 <div class="form-page">
   <div class="container">

diff --git a/templates/pushtx.html b/templates/pushtx.html
@@ -5,16 +5,14 @@
 {% load btc_formats %}
 {% load static %}
 
-{% block content %}
+{% block page_header %}
+  <h1>
+    <i class="fa fa-send"></i> 
+    Broadcast Your Transaction
+  </h1>
+{% endblock page_header %}
 
-<div class="page-header">
-  <div class="container">
-    <h1>
-      <i class="fa fa-send"></i> 
-      Broadcast Your Transaction
-    </h1>
-  </div>
-</div>
+{% block content %}
 
 <div class="section">
   <div class="container">

diff --git a/templates/signup.html b/templates/signup.html
@@ -5,15 +5,11 @@
 
 {% block title %}{% trans "Login" %}{% endblock title %}
 
-{% block content %}
+{% block page_header %}
+  <h1>{% trans "Sign Up" %}</h1>
+{% endblock page_header %}
 
-<div class="page-header">
-  <div class="container">
-    <h1>
-      {% trans "Sign Up" %}
-    </h1>
-  </div>
-</div>
+{% block content %}
 
 <div class="form-page">
   <div class="container">

diff --git a/templates/subscribe_address.html b/templates/subscribe_address.html
@@ -5,16 +5,14 @@
 {% load btc_formats %}
 {% load static %}
 
-{% block content %}
+{% block page_header %}
+  <h1>
+    <i class="fa fa-send"></i> 
+    Subscribe to an Address
+  </h1>
+{% endblock page_header %}
 
-<div class="page-header">
-  <div class="container">
-    <h1>
-      <i class="fa fa-send"></i> 
-      Subscribe to an Address
-    </h1>
-  </div>
-</div>
+{% block content %}
 
 <div class="section">
   <div class="container">

diff --git a/templates/transaction_overview.html b/templates/transaction_overview.html
@@ -11,17 +11,15 @@
   {% endblocktrans %}
 {% endblock title %}
 
-{% block content %}
+{% block page_header %}
+  <h1>
+    <i class="fa fa-exchange"></i> 
+    {{ coin_symbol|coin_symbol_to_display_name }} Transaction
+  </h1>
+  <h2 class="tagline wrapit semi">({{ tx_hash }})</h2>
+{% endblock page_header %}
 
-<div class="page-header">
-  <div class="container">
-    <h1>
-      <i class="fa fa-exchange"></i> 
-      {{ coin_symbol|coin_symbol_to_display_name }} Transaction
-    </h1>
-    <h2 class="tagline wrapit semi">({{ tx_hash }})</h2>
-  </div>
-</div>
+{% block content %}
 
 <div class="section">
   <div class="container">

diff --git a/templates/unconfirmed_email.html b/templates/unconfirmed_email.html
@@ -9,15 +9,12 @@
   Please Confirm Your Email Address
 {% endblock title %}
 
-{% block content %}
+{% block page_header %}
+  <h1>Confirm Your Email Address to Receive Notifications</h1>
+{% endblock page_header %}
 
-<div class="page-header">
-  <div class="container">
-    <h1>
-      Confirm Your Email Address to Receive Notifications
-    </h1>
-  </div>
-</div>
+
+{% block content %}
 
 <div class="container">
   <div class="section">