Get rid of extra <hr>

[peojumk] / templates / base.html

diff --git a/templates/base.html b/templates/base.html
index 05d2b16ab1b9ed3b443e56eef248c5676915277b..108b165c3d3009efa87474c1dc62b0d6a9ae891d 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -19,6 +19,12 @@
       .sidebar-nav {
         padding: 9px 0;
       }
+
+      @media print {
+        .sidebar-nav {
+          display: none;
+        }
+      }
     </style>
 
 {% block extrastyle %}{% endblock %}
@@ -58,16 +64,6 @@
       </div>
     </div>
   </div>
-  {% block messages %}
-  <div class="span12">
-    {% if messages %}
-    <ul class="messagelist">{% for message in messages %}
-      <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
-      {% endfor %}</ul>
-    {% endif %}
-  </div>
-  {% endblock messages %}
-
   <div class="container-fluid">
     <div class="row-fluid">
       <div class="span2">
@@ -80,6 +76,26 @@
       </div><!--/.span3 -->
 
       <div class="span9">
+       {% block messages %}
+         {% if messages %}
+           {% for message in messages %}
+             <div class="alert {{ message.tags }}">
+                {{ message }}
+             </div>
+           {% endfor %}
+         {% endif %}
+         {% if alert_error %}
+           <div class="alert alert-error">
+             {{ alert_error }}
+           </div>
+         {% endif %}
+         {% if alert_warning %}
+           <div class="alert alert-warning">
+             {{ alert_warning }}
+           </div>
+         {% endif %}
+       {% endblock messages %}
+
          {% block pretitle %}{% endblock %}
          {% block content_title %}{% if title %}<h1>{{ title }}</h1>{% endif %}{% endblock %}
          {% block content %}
@@ -88,9 +104,8 @@
          {% endblock %}
          {% block sidebar %}{% endblock %}
       </div><!--/span-->
-    </div><!--/row-->
+     </div><!--/row-->
 
-      <hr>
 
     {% block footer %}<footer></footer>{% endblock %}
  </div><!--/.fluid-container-->