From d86e5fb80c02081bd4d272ef8f87524b19ae16c5 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Mon, 17 Nov 2014 18:09:17 +0100
Subject: [PATCH] Fix minor CSS issues and required django 1.6.

---
 modoboa/templates/common/generic_field.html |  2 +-
 modoboa/templates/nlayout.html              |  2 +-
 modoboa/templates/registration/login.html   | 28 ++++++++++++---------
 requirements.txt                            |  2 +-
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/modoboa/templates/common/generic_field.html b/modoboa/templates/common/generic_field.html
index bb8b85ef9..ccfb58c6c 100644
--- a/modoboa/templates/common/generic_field.html
+++ b/modoboa/templates/common/generic_field.html
@@ -1,6 +1,6 @@
 {% load i18n core_tags form_tags %}
 <div class="form-group
-    {% if field.errors %}error{% endif %}
+    {% if field.errors %}has-error{% endif %}
     {{ extra_classes }}"{% visirule field %}
     {% if hidden %}style="display: none"{% endif %}
 >
diff --git a/modoboa/templates/nlayout.html b/modoboa/templates/nlayout.html
index 822c3701f..3d82ffff9 100644
--- a/modoboa/templates/nlayout.html
+++ b/modoboa/templates/nlayout.html
@@ -61,7 +61,7 @@
     <script type="text/javascript" src="{% static 'moment/min/moment.min.js' %}"></script>
     <script src="{% static 'eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js' %}" type="text/javascript"></script>
     <script src="{% static 'bootstrap-select/dist/js/bootstrap-select.min.js' %}" type="text/javascript"></script>
-    {% if LANGUAGE_CODE != "en" %}<script src="{% static 'moment/locale/{{ LANGUAGE_CODE }}.js' %}" type="text/javascript"></script>{% endif %}
+    {% if LANGUAGE_CODE != "en" %}<script src="{{ STATIC_URL }}moment/locale/{{ LANGUAGE_CODE }}.js %}" type="text/javascript"></script>{% endif %}
     {% if TEMPLATE_DEBUG %}
     <script src="//maxcdn.bootstrapcdn.com/bootlint/0.4.0/bootlint.min.js"></script>
     {% endif %}
diff --git a/modoboa/templates/registration/login.html b/modoboa/templates/registration/login.html
index 804b1c250..d01a6781b 100644
--- a/modoboa/templates/registration/login.html
+++ b/modoboa/templates/registration/login.html
@@ -9,17 +9,6 @@
     <link rel="icon" type="image/png" href="{% static 'css/logo-icon.png' %}" />
     <link rel="stylesheet" type="text/css" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}" />
     <link rel="stylesheet" type="text/css" href="{% static 'css/login.css' %}" />
-    <script type="text/javascript" src="{% static 'jquery/jquery.js' %}"></script>
-    <script type="text/javascript" src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}"></script>
-    {% if TEMPLATE_DEBUG %}
-    <script src="//maxcdn.bootstrapcdn.com/bootlint/0.4.0/bootlint.min.js"></script>
-    {% endif %}
-    <script type="text/javascript" src="{% url 'django.views.i18n.javascript_catalog' %}"></script>
-    <script type="text/javascript">
-    $(document).ready(function() {
-        $('#id_username').focus();
-    });
-    </script>
   </head>
   <body>
     <div class="container">
@@ -60,7 +49,22 @@
         </div>
       </div>
       {% for annoucement in annoucements %}
-      <div class="col-lg-offset-3 col-lg-5 well">{{ annoucement|safe }}</div>
+      <div class="col-xs-12 col-sm-offset-3 col-sm-6">{{ annoucement|safe }}</div>
       {% endfor %}
+    </div>
+
+    <!-- Javascript -->
+    <script type="text/javascript" src="{% static 'jquery/jquery.js' %}"></script>
+    <script type="text/javascript" src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}"></script>
+    {% if TEMPLATE_DEBUG %}
+    <script src="//maxcdn.bootstrapcdn.com/bootlint/0.4.0/bootlint.min.js"></script>
+    {% endif %}
+    <script type="text/javascript" src="{% url 'django.views.i18n.javascript_catalog' %}"></script>
+    <script type="text/javascript">
+      $(document).ready(function() {
+      $('#id_username').focus();
+      });
+    </script>
+
   </body>
 </html>
diff --git a/requirements.txt b/requirements.txt
index 9e3dbb293..2b3e75796 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-django>=1.5,<1.6
+django>=1.6,<1.7
 django-reversion==1.8.0
 dj-database-url
 south