From 468076fbc050e52bff99c1871fa493e6f371599d Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Sun, 28 Sep 2014 18:22:27 +0200
Subject: [PATCH] Cleaner pills items.

see #585
---
 .../admin/templates/admin/aliasform.html           |  2 +-
 modoboa/static/css/custom.css                      |  3 +++
 modoboa/templates/common/tabforms.html             | 14 +++++++++-----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/modoboa/extensions/admin/templates/admin/aliasform.html b/modoboa/extensions/admin/templates/admin/aliasform.html
index 442f2ac81..6cbc5b75f 100644
--- a/modoboa/extensions/admin/templates/admin/aliasform.html
+++ b/modoboa/extensions/admin/templates/admin/aliasform.html
@@ -5,6 +5,6 @@
 {% if form.instance.domain.enabled %}
 {% render_field form.enabled %}
 {% else %}
-{% include "common/generic_field.html" with field=form.enabled inline_message=_("Domain is disabled") extra_classes="info" %}
+{% include "common/generic_field.html" with field=form.enabled label_width="col-sm-4" inline_message=_("Domain is disabled") extra_classes="info" %}
 {% endif %}
 {% endblock %}
diff --git a/modoboa/static/css/custom.css b/modoboa/static/css/custom.css
index c98b7f2b8..5e7256e93 100644
--- a/modoboa/static/css/custom.css
+++ b/modoboa/static/css/custom.css
@@ -302,6 +302,9 @@ html body div.navbar div.container-fluid div#navigate-navbar-collapse.collapse u
 
  /* modals */
 
+.modal-body .nav-pills { 
+    margin-bottom: 15px;
+}
 
  /* settings */
 
diff --git a/modoboa/templates/common/tabforms.html b/modoboa/templates/common/tabforms.html
index d88422249..8119cfb41 100644
--- a/modoboa/templates/common/tabforms.html
+++ b/modoboa/templates/common/tabforms.html
@@ -2,20 +2,24 @@
 {% load i18n form_tags %}
 {% block modalbody %}
   <form id="{{ formid }}" class="form-horizontal" action="{{ action }}" method="POST">{% csrf_token %}
-    <ul class="nav nav-pills">{% for tab in tabs %}
+    <ul class="nav nav-pills" role="tablist">
+      {% for tab in tabs %}
       <li class="{% if tabs.active_id == tab.id %}active{% endif %}">
-        <a href="#{{ tab.id }}" data-toggle="tab">{{ tab.title }}</a>
-      </li>{% endfor %}
+        <a href="#{{ tab.id }}" role="tab" data-toggle="pill">{{ tab.title }}</a>
+      </li>
+      {% endfor %}
       {% block extratabs %}{% endblock %}
     </ul>
     <div class="tab-content">
-      {% for tab in tabs %}<div class="tab-pane{% if tabs.active_id == tab.id %} active{% endif %}" id="{{ tab.id }}">
+      {% for tab in tabs %}
+      <div class="tab-pane{% if tabs.active_id == tab.id %} active{% endif %}" id="{{ tab.id }}">
         {% if tab.formtpl %}
         {% render_form tab.instance tab.formtpl %}
         {% else %}
         {% render_form tab.instance %}
         {% endif %}
-      </div>{% endfor %}
+      </div>
+      {% endfor %}
       {% block extratabs_content %}{% endblock %}
     </div>
   </form>