From 52cfb464fb6ce4880dad5939855d7dc1f4958188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Solard?= <mael.solard@laposte.net>
Date: Tue, 5 Aug 2014 14:29:47 +0200
Subject: [PATCH] Change the display of the modal checkboxs and scan button

---
 .../amavis/domain_content_filter.html         |  4 ++--
 .../postfix_relay_domains/service_field.html  |  2 +-
 modoboa/static/css/custom.css                 | 20 +++++++++++++++++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/modoboa/extensions/amavis/templates/amavis/domain_content_filter.html b/modoboa/extensions/amavis/templates/amavis/domain_content_filter.html
index fdbc8efaf..1e4610149 100644
--- a/modoboa/extensions/amavis/templates/amavis/domain_content_filter.html
+++ b/modoboa/extensions/amavis/templates/amavis/domain_content_filter.html
@@ -4,8 +4,8 @@
 <div class="input-group">
   <label class="control-label col-lg-1 col-md-2 col-sm-3">{% trans "Thresholds" %}</label>
   <div class="col-lg-11 col-md-10 col-sm-9">
-    {{ form.spam_tag2_level }} <span class="help-inline">{% trans "or more is spam" %}</span><br>
-    {{ form.spam_kill_level }} <span class="help-inline">{% trans "or more throw spam message away" %}</span>
+    {{ form.spam_tag2_level }} <span class="help-inline pull-right">{% trans "or more is spam" %}</span><br>
+    {{ form.spam_kill_level }} <span class="help-inline pull-right">{% trans "or more throw spam message away" %}</span>
   </div>
 </div>
 {% render_field_with_activator form.spam_subject_tag2 _("default") %}
diff --git a/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/service_field.html b/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/service_field.html
index c5ebd63a8..4f715103c 100644
--- a/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/service_field.html
+++ b/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/service_field.html
@@ -1,2 +1,2 @@
 {% extends "common/generic_field.html" %}{% load i18n %}
-{% block extra_controls %}<a id="btnscan" class="btn btn-success" style="margin-bottom: 8px" href="{% url 'modoboa.extensions.postfix_relay_domains.views.scan_for_services' %}">{% trans "Scan" %}</a>{% endblock %}
+{% block extra_controls %}<a id="btnscan" class="btn btn-success pull-right" style="margin-top: 2px" href="{% url 'modoboa.extensions.postfix_relay_domains.views.scan_for_services' %}">{% trans "Scan" %}</a>{% endblock %}
diff --git a/modoboa/static/css/custom.css b/modoboa/static/css/custom.css
index e06d5dddb..14c5130d8 100644
--- a/modoboa/static/css/custom.css
+++ b/modoboa/static/css/custom.css
@@ -229,8 +229,11 @@ div.container-fluid div.row-fluid .well  div.side-bar-responsive li:hover a{
 
 /* Bottom navBar*/
 
+ .nav-bottom {
+     margin-top: 80px;
+ }
+
 .navbar-fixed-bottom {
-    bottom: -6px;
     position: fixed;
 }
 
@@ -309,4 +312,17 @@ div.container-fluid div.row-fluid .well  div.side-bar-responsive li:hover a{
 
 .label{
     margin-left:1px;
-}
\ No newline at end of file
+}
+
+
+
+
+ /* modals */
+
+.modal-body .form-group input[type='checkbox'] {
+     margin: 11px 0 0;
+ }
+
+ .modal-body .form-group span.help-inline{
+    margin-top: 8px;
+ }
\ No newline at end of file