From ecede081b231515b860c4fbc56e6ecedd19d7f2c 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:13:08 +0200
Subject: [PATCH] Add "form-control" class to some form tags

---
 modoboa/extensions/admin/forms/domain.py          | 3 ++-
 modoboa/extensions/admin/forms/export.py          | 2 +-
 modoboa/extensions/admin/forms/import_.py         | 2 +-
 modoboa/extensions/postfix_autoreply/forms.py     | 4 ++--
 modoboa/extensions/postfix_relay_domains/forms.py | 7 +++++--
 modoboa/extensions/sievefilters/forms.py          | 4 +++-
 modoboa/extensions/webmail/app_settings.py        | 2 +-
 7 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/modoboa/extensions/admin/forms/domain.py b/modoboa/extensions/admin/forms/domain.py
index 5e551b3c3..15291b10d 100644
--- a/modoboa/extensions/admin/forms/domain.py
+++ b/modoboa/extensions/admin/forms/domain.py
@@ -28,7 +28,8 @@ class DomainFormGeneral(forms.ModelForm, DynamicForm):
         help_text=ugettext_lazy(
             "Alias(es) of this domain. Indicate only one name per input, "
             "press ENTER to add a new input."
-        )
+        ),
+        widget=forms.TextInput(attrs={"class": "col-md-1 form-control"})
     )
 
     class Meta:
diff --git a/modoboa/extensions/admin/forms/export.py b/modoboa/extensions/admin/forms/export.py
index f3870b0e8..bee201157 100644
--- a/modoboa/extensions/admin/forms/export.py
+++ b/modoboa/extensions/admin/forms/export.py
@@ -18,7 +18,7 @@ class ExportDataForm(forms.Form):
 
     def __init__(self, *args, **kwargs):
         super(ExportDataForm, self).__init__(*args, **kwargs)
-        self.fields["sepchar"].widget.attrs = {"class": "span1"}
+        self.fields["sepchar"].widget.attrs = {"class": "col-md-1 form-control"}
 
     def clean_sepchar(self):
         if self.cleaned_data["sepchar"] == "":
diff --git a/modoboa/extensions/admin/forms/import_.py b/modoboa/extensions/admin/forms/import_.py
index 0cd4ce237..f63017037 100644
--- a/modoboa/extensions/admin/forms/import_.py
+++ b/modoboa/extensions/admin/forms/import_.py
@@ -17,7 +17,7 @@ class ImportDataForm(forms.Form):
 
     def __init__(self, *args, **kwargs):
         super(ImportDataForm, self).__init__(*args, **kwargs)
-        self.fields["sepchar"].widget.attrs = {"class": "span1"}
+        self.fields["sepchar"].widget.attrs = {"class": "col-md-1 form-control"}
 
     def clean_sepchar(self):
         if self.cleaned_data["sepchar"] == "":
diff --git a/modoboa/extensions/postfix_autoreply/forms.py b/modoboa/extensions/postfix_autoreply/forms.py
index f87b4dea6..a4bd90da7 100644
--- a/modoboa/extensions/postfix_autoreply/forms.py
+++ b/modoboa/extensions/postfix_autoreply/forms.py
@@ -11,7 +11,7 @@ class ARmessageForm(forms.ModelForm):
         required=False,
         help_text=ugettext_lazy("Activate your auto reply from this date"),
         widget=forms.TextInput(
-            attrs={'class': 'datefield', 'readonly': 'readonly'}
+            attrs={'class': 'datefield form-control', 'readonly': 'readonly'}
         )
     )
     untildate = forms.DateTimeField(
@@ -19,7 +19,7 @@ class ARmessageForm(forms.ModelForm):
         required=False,
         help_text=ugettext_lazy("Activate your auto reply until this date"),
         widget=forms.TextInput(
-            attrs={'class': 'datefield', 'readonly': 'readonly'}
+            attrs={'class': 'datefield form-control', 'readonly': 'readonly'}
         )
     )
 
diff --git a/modoboa/extensions/postfix_relay_domains/forms.py b/modoboa/extensions/postfix_relay_domains/forms.py
index 08cff2059..d1ab1a378 100644
--- a/modoboa/extensions/postfix_relay_domains/forms.py
+++ b/modoboa/extensions/postfix_relay_domains/forms.py
@@ -14,14 +14,17 @@ class RelayDomainFormGeneral(forms.ModelForm, DynamicForm):
         help_text=ugettext_lazy(
             "Alias(es) of this relay domain. Indicate only one name per input"
             ", press ENTER to add a new input."
-        )
+        ),
+        widget=forms.TextInput(attrs={'class': 'form-control'})
     )
 
     class Meta:
         model = RelayDomain
         exclude = ['dates']
         widgets = {
-            'service': forms.Select(attrs={'class': 'span2'})
+            'service': forms.Select(attrs={'class': 'col-mg-2 form-control'}),
+            'target_host': forms.TextInput(attrs={'class': 'form-control'}),
+            'name': forms.TextInput(attrs={'class': 'form-control'})
         }
 
     def __init__(self, *args, **kwargs):
diff --git a/modoboa/extensions/sievefilters/forms.py b/modoboa/extensions/sievefilters/forms.py
index 8f0f04443..27e7be344 100644
--- a/modoboa/extensions/sievefilters/forms.py
+++ b/modoboa/extensions/sievefilters/forms.py
@@ -9,7 +9,9 @@ from modoboa.extensions.admin.templatetags.admin_tags import gender
 
 
 class FiltersSetForm(forms.Form):
-    name = forms.CharField(widget=forms.TextInput(attrs={"class": "form-control"}))
+    name = forms.CharField(
+        widget=forms.TextInput(attrs={"class": "form-control"})
+    )
     active = forms.BooleanField(
         label=gender("Active", "m"), required=False,
         initial=False,
diff --git a/modoboa/extensions/webmail/app_settings.py b/modoboa/extensions/webmail/app_settings.py
index 458c91ea9..d9df02357 100644
--- a/modoboa/extensions/webmail/app_settings.py
+++ b/modoboa/extensions/webmail/app_settings.py
@@ -55,7 +55,7 @@ class ParametersForm(AdminParametersForm):
                  ("ssl", "SSL/TLS")],
         initial="none",
         help_text=_("Use a secured connection to access SMTP server"),
-        widget=InlineRadioSelect(attrs={"type": "checkbox"})
+        widget=forms.Select(attrs={"class": "form-control"})
     )
     
     smtp_port = forms.IntegerField(