Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Luke Hatcher 2012-10-03 18:40:17 -04:00
parent 2c46e56b35
commit 1abf1ca230
2 changed files with 46 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
symposion/templates/reviews/base.html
View file

@ -50,53 +50,44 @@
{% block body_class %}reviews{% endblock %} {% block body_class %}reviews{% endblock %}
{% block body_base %} {% block body_outer %}
<div class="container"> <div class="row">
<div class="span2">
{% include "_messages.html" %} {% block sidebar %}
<ul class="nav nav-list well">
{% block breadcrumbs %} {% for section in review_sections %}
{% sitetree_breadcrumbs from "main" %} <li class="nav-header">
{% endblock %} {{ section }}
</li>
<div class="row"> <li>
<div class="span2"> <a href="{% url review_section section.section.slug %}">
{% block sidebar %} {% trans "All Reviews" %}
<ul class="nav nav-list well"> </a>
{% for section in review_sections %} </li>
<li class="nav-header"> {% comment %}
{{ section }} <li>
</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> <li>
<a href="{% url review_section section.section.slug %}"> <a href="{% url result_notification section.section.slug 'accepted' %}">Result Notification</a>
{% trans "All Reviews" %}
</a>
</li> </li>
{% comment %} {% endif %}
<li> {% endfor %}
<a href="{% url review_section_assignments section.section.slug %}"> </ul>
{% trans "Your Assignments" %} {% endblock %}
</a> </div>
</li> <div class="span10">
{% endcomment %} {% block body %}
<li> {% endblock %}
<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>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

28
symposion_project/templates/symposion_sidebar_base.html
View file

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