From ec699ea216751aee447215dba29767f3d8a9d0b4 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Sat, 4 May 2013 12:10:01 +0200
Subject: [PATCH] Use a radio button instead of a listbox when necessary.

fixes #311
---
 modoboa/admin/app_settings.py                   |  8 +++++---
 modoboa/extensions/amavis/app_settings.py       |  5 +++--
 modoboa/extensions/sievefilters/app_settings.py |  5 +++--
 modoboa/extensions/webmail/app_settings.py      | 11 +++++++----
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/modoboa/admin/app_settings.py b/modoboa/admin/app_settings.py
index 0491d7e30..b074e2690 100644
--- a/modoboa/admin/app_settings.py
+++ b/modoboa/admin/app_settings.py
@@ -1,6 +1,6 @@
 from django import forms
 from django.utils.translation import ugettext as _, ugettext_lazy
-from modoboa.lib.formutils import YesNoField, SeparatorField
+from modoboa.lib.formutils import YesNoField, SeparatorField, InlineRadioSelect
 from modoboa.lib.sysutils import exec_cmd
 from modoboa.lib import parameters
 
@@ -34,7 +34,8 @@ class GeneralParametersForm(parameters.AdminParametersForm):
         choices=[('local', ugettext_lazy("Local")),
                  ('ldap', "LDAP")],
         initial="local",
-        help_text=ugettext_lazy("The backend used for authentication")
+        help_text=ugettext_lazy("The backend used for authentication"),
+        widget=InlineRadioSelect
     )
 
     password_scheme = forms.ChoiceField(
@@ -80,7 +81,8 @@ class GeneralParametersForm(parameters.AdminParametersForm):
         choices=[('searchbind', ugettext_lazy("Search and bind")),
                  ('directbind', ugettext_lazy("Direct bind"))],
         initial='searchbind',
-        help_text=ugettext_lazy("Choose the authentication method to use")
+        help_text=ugettext_lazy("Choose the authentication method to use"),
+        widget=InlineRadioSelect
     )
 
     ldap_bind_dn = forms.CharField(
diff --git a/modoboa/extensions/amavis/app_settings.py b/modoboa/extensions/amavis/app_settings.py
index 525e9b89d..27f170e66 100644
--- a/modoboa/extensions/amavis/app_settings.py
+++ b/modoboa/extensions/amavis/app_settings.py
@@ -2,7 +2,7 @@
 from django.utils.translation import ugettext_lazy as _
 from django import forms
 from modoboa.lib.parameters import AdminParametersForm, UserParametersForm
-from modoboa.lib.formutils import SeparatorField, YesNoField
+from modoboa.lib.formutils import SeparatorField, YesNoField, InlineRadioSelect
 
 
 class ParametersForm(AdminParametersForm):
@@ -26,7 +26,8 @@ class ParametersForm(AdminParametersForm):
         label=_("Amavis connection mode"),
         choices=[("inet", "inet"), ("unix", "unix")],
         initial="unix",
-        help_text=_("Mode used to access the PDP server")
+        help_text=_("Mode used to access the PDP server"),
+        widget=InlineRadioSelect
     )
 
     am_pdp_host = forms.CharField(
diff --git a/modoboa/extensions/sievefilters/app_settings.py b/modoboa/extensions/sievefilters/app_settings.py
index 56df2189c..275106599 100644
--- a/modoboa/extensions/sievefilters/app_settings.py
+++ b/modoboa/extensions/sievefilters/app_settings.py
@@ -3,7 +3,7 @@ from django.utils.translation import ugettext_lazy as _
 from django import forms
 from sievelib.managesieve import SUPPORTED_AUTH_MECHS
 from modoboa.lib.parameters import AdminParametersForm, UserParametersForm
-from modoboa.lib.formutils import SeparatorField, YesNoField
+from modoboa.lib.formutils import SeparatorField, YesNoField, InlineRadioSelect
 
 
 def supported_auth_mechs():
@@ -51,7 +51,8 @@ class UserSettings(UserParametersForm):
         initial="raw",
         label=_("Editor mode"),
         choices=[("raw", "raw"), ("gui", "simplified")],
-        help_text=_("Select the mode you want the editor to work in")
+        help_text=_("Select the mode you want the editor to work in"),
+        widget=InlineRadioSelect
     )
 
     @staticmethod
diff --git a/modoboa/extensions/webmail/app_settings.py b/modoboa/extensions/webmail/app_settings.py
index e01f72358..119d7b804 100644
--- a/modoboa/extensions/webmail/app_settings.py
+++ b/modoboa/extensions/webmail/app_settings.py
@@ -2,7 +2,7 @@
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 from modoboa.lib.parameters import AdminParametersForm, UserParametersForm
-from modoboa.lib.formutils import SeparatorField, YesNoField
+from modoboa.lib.formutils import SeparatorField, YesNoField, InlineRadioSelect
 
 
 class ParametersForm(AdminParametersForm):
@@ -50,7 +50,8 @@ class ParametersForm(AdminParametersForm):
                  ("starttls", "STARTTLS"),
                  ("ssl", "SSL/TLS")],
         initial="none",
-        help_text=_("Use a secured connection to access SMTP server")
+        help_text=_("Use a secured connection to access SMTP server"),
+        widget=InlineRadioSelect
     )
     
     smtp_port = forms.IntegerField(
@@ -75,7 +76,8 @@ class UserSettings(UserParametersForm):
         initial="plain",
         label=_("Default message display mode"),
         choices=[("html", "html"), ("plain", "text")],
-        help_text=_("The default mode used when displaying a message")
+        help_text=_("The default mode used when displaying a message"),
+        widget=InlineRadioSelect
     )
 
     enable_links = YesNoField(
@@ -122,7 +124,8 @@ class UserSettings(UserParametersForm):
         initial="plain",
         label=_("Default editor"),
         choices=[("html", "html"), ("plain", "text")],
-        help_text=_("The default editor to use when composing a message")
+        help_text=_("The default editor to use when composing a message"),
+        widget=InlineRadioSelect
     )
 
     signature = forms.CharField(