moved div.content-inner-wrap to the base template (finally)

templates/registration/activation_complete.html

@@ -3,15 +3,11 @@
 {% block page_title %}Account Activation{% endblock %}
 
 {% block content %}
-<div class='content-inner-wrap'>
-
 <p>
   Your account has been successfully activated. Welcome to the Nigeria
   MDG Information System.
 </p>
 
 <p>You may log in <a href="{% url auth_login %}">here</a>.</p>
 
-</div>
-
 {% endblock %}

templates/registration/login.html

@@ -6,14 +6,13 @@
 {% block account_links %}{% endblock %}
 
 {% block content %}
-<div class='content-inner-wrap'>
-  <p>
-    Welcome to the Nigeria MDGs Information System. In order to log in
-    you need a username and password. Please register
-     <a href="{% url registration_register %}">here</a> to get a
-    username and
-    password. To log in please fill in the form below.
-  </p>
+<p>
+  Welcome to the Nigeria MDGs Information System. In order to log in
+  you need a username and password. Please register
+   <a href="{% url registration_register %}">here</a> to get a
+  username and
+  password. To log in please fill in the form below.
+</p>
 
 <form method="post" action=".">
   <table>
@@ -33,5 +32,4 @@
   If you forget your username please email
   <a href="mailto:{{user_manager_email}}?subject=Forgot%20Password">OSSAP</a>.
 </p>
-</div>
 {% endblock %}

templates/registration/logout.html

@@ -4,8 +4,8 @@
 {% block page_title %} Successful Logout {% endblock %}
 
 {% block content %}
-<div class='content-inner-wrap'>
-<p>Thank you for visiting Nigeria MDG Information System. You have
-  now been logged out.</p>
-</div>
+<p>
+	Thank you for visiting Nigeria MDG Information System. You have
+    now been logged out.
+</p>
 {% endblock %}

templates/registration/password_change_done.html

@@ -1,7 +1,7 @@
 {% extends "ui_base.html" %}
 
 {% block content %}
-<div class='content-inner-wrap'>
-<p>Password changed</p>
-</div>
+<p>
+	Password changed
+</p>
 {% endblock %}

templates/registration/password_reset_form.html

@@ -1,12 +1,10 @@
 {% extends "ui_base.html" %}
 
 {% block content %}
-<div class='content-inner-wrap'>
-
 <p>
-To reset your password please enter your email address below. A
-message will be sent to your email address with a link for you to
-reset your password.
+	To reset your password please enter your email address below. A
+	message will be sent to your email address with a link for you to
+	reset your password.
 </p>
 
 <form method="post" action=".">
@@ -15,5 +13,5 @@
 
   <input type="submit" value="Submit" />
 </form>
-</div>
+
 {% endblock %}

templates/registration/registration_complete.html

@@ -4,12 +4,10 @@
 {% block page_title %}Registration Email Sent{% endblock %}
 
 {% block content %}
-<div class='content-inner-wrap'>
 <p>
   A user account has been created for you and a message has been sent
   to the email address you provided. To activate your account and
   complete the registration process, you must click on the link
   provided in the email.
 </p>
-</div>
 {% endblock %}

templates/registration/registration_form.html

@@ -4,7 +4,6 @@
 {% block page_title %}Registration{% endblock %}
 
 {% block content %}
-<div class='content-inner-wrap'>
 <p>
 To register please fill in the form below.
 </p>
@@ -16,5 +15,4 @@
 
   <input type="submit" value="{% trans 'Submit' %}" />
 </form>
-</div>
 {% endblock %}

uis_r_us/templates/ui.html

@@ -45,7 +45,6 @@
 		</div>
 	</div>
 </script>
-<div class='content-inner-wrap'>
 	<div class="widget-outer-wrap" style="bottom:0">
 		<div class="fullw-widget">
 			<div id="lga-widget-wrap"></div>
@@ -83,7 +82,6 @@ <h2 class="zone-title">
 		<div class="clearfix" style="clear:both;">
 		</div>
 	</div>
-</div>
 {% endblock %}
 {% block js %}
 <script src="/static/js/application.js" type="text/javascript" charset="utf-8"></script>

uis_r_us/templates/ui_base.html

@@ -62,7 +62,9 @@ <h2 class="title">
 			{% if navs %}
 			{% include 'embed_nav.html' %}
 			{% endif %}
-			{% block content %}{% endblock %}
+			<div class="content-inner-wrap">
+				{% block content %}{% endblock %}
+			</div>
 		</div>
 	</div>
 	{% if site_title %}

user_management/templates/access_denied.html

@@ -4,7 +4,7 @@
 {% block page_title %}Access Denied{% endblock %}
 
 {% block content %}
-<div class='content-inner-wrap'>
+
 {% if user.is_authenticated %}
 	<p>
 		I'm sorry, but at the moment your account has not been
@@ -23,5 +23,5 @@ <h1>
 		<a href="{% url auth_login %}">{% trans "Log in" %}</a>
 	</p>
 {% endif %}
-</div>
+
 {% endblock %}