only use body outer so we can reliably wrap all pages in an outside c…

…ontainer
pinax · Oct 3, 2012 · 1abf1ca · 1abf1ca
1 parent 2c46e56
commit 1abf1ca
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 63 deletions.
diff --git a/symposion/templates/reviews/base.html b/symposion/templates/reviews/base.html
@@ -50,53 +50,44 @@
 
 {% block body_class %}reviews{% endblock %}
 
-{% block body_base %}
-    <div class="container">
-
-        {% include "_messages.html" %}
-
-        {% block breadcrumbs %}
-            {% sitetree_breadcrumbs from "main" %}
-        {% endblock %}
-
-        <div class="row">
-            <div class="span2">
-                {% block sidebar %}
-                    <ul class="nav nav-list well">
-                        {% for section in review_sections %}
-                            <li class="nav-header">
-                                {{ section }}
-                            </li>
-                            <li>
-                                <a href="{% url review_section section.section.slug %}">
-                                    {% trans "All Reviews" %}
-                                </a>
-                            </li>
-                            {% comment %}
+{% block body_outer %}
+    <div class="row">
+        <div class="span2">
+            {% block sidebar %}
+                <ul class="nav nav-list well">
+                    {% for section in review_sections %}
+                        <li class="nav-header">
+                            {{ section }}
+                        </li>
+                        <li>
+                            <a href="{% url review_section section.section.slug %}">
+                                {% trans "All Reviews" %}
+                            </a>
+                        </li>
+                        {% comment %}
+                        <li>
+                            <a href="{% url review_section_assignments section.section.slug %}">
+                                {% trans "Your Assignments" %}
+                            </a>
+                        </li>
+                        {% endcomment %}
+                        <li>
+                            <a href="{% url review_status section.section.slug %}">
+                                {% trans "Voting Status" %}
+                            </a>
+                        </li>
+                        {% if request.user.is_staff %}
                             <li>
-                                <a href="{% url review_section_assignments section.section.slug %}">
-                                    {% trans "Your Assignments" %}
-                                </a>
+                                <a href="{% url result_notification section.section.slug 'accepted' %}">Result Notification</a>
                             </li>
-                            {% endcomment %}
-                            <li>
-                                <a href="{% url review_status section.section.slug %}">
-                                    {% trans "Voting Status" %}
-                                </a>
-                            </li>
-                            {% if request.user.is_staff %}
-                                <li>
-                                    <a href="{% url result_notification section.section.slug 'accepted' %}">Result Notification</a>
-                                </li>
-                            {% endif %}
-                        {% endfor %}
-                    </ul>
-                {% endblock %}
-            </div>
-            <div class="span10">
-                {% block body %}
-                {% endblock %}
-            </div>
+                        {% endif %}
+                    {% endfor %}
+                </ul>
+            {% endblock %}
+        </div>
+        <div class="span10">
+            {% block body %}
+            {% endblock %}
         </div>
     </div>
 {% endblock %}

diff --git a/symposion_project/templates/symposion_sidebar_base.html b/symposion_project/templates/symposion_sidebar_base.html
@@ -1,24 +1,16 @@
 {% extends "theme_base.html" %}
+
 {% load sitetree %}
 
-{% block body_base %}
-    <div class="container">
-
-        {% include "_messages.html" %}
-
-        {% block breadcrumbs %}
-            {% sitetree_breadcrumbs from "main" %}
-        {% endblock %}
-
-        <div class="row">
-            <div class="span9">
-                {% block body %}
-                {% endblock %}
-            </div>
-            <div class="span3">
-                {% block sidebar %}
-                {% endblock %}
-            </div>
+{% block body_outer %}
+    <div class="row">
+        <div class="span9">
+            {% block body %}
+            {% endblock %}
+        </div>
+        <div class="span3">
+            {% block sidebar %}
+            {% endblock %}
         </div>
     </div>
 {% endblock %}