all content is on a panel be default

littleweaver · Jun 8, 2014 · 04539f6 · 04539f6
1 parent 9a13adf
commit 04539f6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/argus/templates/argus/__base.html b/argus/templates/argus/__base.html
@@ -18,6 +18,19 @@
 
 {% block navbar-brand %}Argus{% endblock %}
 
+{% block content %}
+	{% block before %}{% endblock %}
+	{% block main_panel %}
+		<div class="panel panel-default">
+			<div class="panel-body">
+				{% block main %}
+				{% endblock %}
+			</div>
+		</div>
+	{% endblock main_panel %}
+	{% block after %}{% endblock %}
+{% endblock %}
+
 {% block javascripts %}
 	{{ block.super }}
 	<script src="{% static "zenaida/js/bootstrap/tab.js" %}"></script>

diff --git a/argus/templates/argus/group_login.html b/argus/templates/argus/group_login.html
@@ -4,7 +4,7 @@
 
 {% block title %}{{ group.name|default:group.slug }} Login – {{block.super }}{% endblock %}
 
-{% block content %}
+{% block main %}
 	<h1>Log in to {{ group.name|default:group.slug }}</h1>
 
 	<form action="{{ request.path }}" method="post">
@@ -14,4 +14,4 @@ <h1>Log in to {{ group.name|default:group.slug }}</h1>
 	</form>
 
 	{% if group.confirmed_email %}<a href="{% url 'argus_group_password_reset' slug=group.slug %}">Send password reset email</a>{% endif %}
-{% endblock content %}
+{% endblock main %}