diff --git a/modoboa/core/app_settings.py b/modoboa/core/app_settings.py index 99eaef814..413ef61ae 100644 --- a/modoboa/core/app_settings.py +++ b/modoboa/core/app_settings.py @@ -152,6 +152,7 @@ class GeneralParametersForm(parameters.AdminParametersForm): "An optional filter string (e.g. '(objectClass=person)'). " "In order to be valid, it must be enclosed in parentheses." ), + required=False, widget=forms.TextInput(attrs={"class": "form-control"}) ) @@ -162,6 +163,7 @@ class GeneralParametersForm(parameters.AdminParametersForm): "The template used to construct a user's DN. It should contain " "one placeholder (ie. %(user)s)" ), + required=False, widget=forms.TextInput(attrs={"class": "form-control"}) ) diff --git a/modoboa/core/models.py b/modoboa/core/models.py index 250edb5a8..56bdcbe35 100644 --- a/modoboa/core/models.py +++ b/modoboa/core/models.py @@ -167,9 +167,9 @@ class User(PermissionsMixin): @property def tags(self): - return [{"name": "account", "label": _("account"), "type": "label label-default idt"}, + return [{"name": "account", "label": _("account"), "type": "idt"}, {"name": self.group, "label": self.group, - "type": "grp label label-info"}] + "type": "grp", "color": "info"}] @property def fullname(self): diff --git a/modoboa/extensions/admin/models/alias.py b/modoboa/extensions/admin/models/alias.py index 7eef37b0e..64d587b9f 100644 --- a/modoboa/extensions/admin/models/alias.py +++ b/modoboa/extensions/admin/models/alias.py @@ -83,7 +83,7 @@ class Alias(AdminObject): "alias": _("alias") } altype = self.type - return [{"name": altype, "label": labels[altype], "type": "idt label label-default"}] + return [{"name": altype, "label": labels[altype], "type": "idt"}] def post_create(self, creator): from modoboa.lib.permissions import grant_access_to_object diff --git a/modoboa/extensions/admin/models/domain.py b/modoboa/extensions/admin/models/domain.py index 63c55a98c..c0a13d459 100644 --- a/modoboa/extensions/admin/models/domain.py +++ b/modoboa/extensions/admin/models/domain.py @@ -58,7 +58,7 @@ class Domain(AdminObject): @property def tags(self): - return [{"name": "domain", "label": _("Domain"), "type": "label label-default dom"}] + return [{"name": "domain", "label": _("Domain"), "type": "dom"}] @property def admins(self): diff --git a/modoboa/extensions/admin/templates/admin/searchform.html b/modoboa/extensions/admin/templates/admin/searchform.html index 1246ca0c0..8d39b6e52 100644 --- a/modoboa/extensions/admin/templates/admin/searchform.html +++ b/modoboa/extensions/admin/templates/admin/searchform.html @@ -1,6 +1,6 @@ {% load i18n %}
-
+
{{ read_access }} {% trans "Read" %} - +
diff --git a/modoboa/extensions/radicale/templates/radicale/rightsform.html b/modoboa/extensions/radicale/templates/radicale/rightsform.html index 3cbd20874..1017a4aae 100644 --- a/modoboa/extensions/radicale/templates/radicale/rightsform.html +++ b/modoboa/extensions/radicale/templates/radicale/rightsform.html @@ -6,7 +6,7 @@ {{ form.username }} - +
{% render_rule_fields form %}
diff --git a/modoboa/extensions/radicale/templatetags/radicale_tags.py b/modoboa/extensions/radicale/templatetags/radicale_tags.py index 1fd7de54b..b80fa3a0e 100644 --- a/modoboa/extensions/radicale/templatetags/radicale_tags.py +++ b/modoboa/extensions/radicale/templatetags/radicale_tags.py @@ -67,7 +67,7 @@ def calendar_actions(calendar): actions = [{ "name": "delcalendar", "title": _("Delete %s?" % calendar), - "img": "icon-trash" + "img": "glyphicon glyphicon-trash" }] if calendar.__class__.__name__ == 'UserCalendar': actions[0]["url"] = reverse("user_calendar", args=[calendar.id]) diff --git a/modoboa/extensions/stats/templates/stats/index.html b/modoboa/extensions/stats/templates/stats/index.html index 17ee3badc..140edafd1 100644 --- a/modoboa/extensions/stats/templates/stats/index.html +++ b/modoboa/extensions/stats/templates/stats/index.html @@ -31,8 +31,10 @@ $(document).ready(function() { {% trans "Filter" %}
  • -
    - +
    + + +
    • @@ -50,11 +52,11 @@ $(document).ready(function() {
    -
    +
    -
    +
    diff --git a/modoboa/extensions/webmail/forms.py b/modoboa/extensions/webmail/forms.py index 15eaa5a00..51ceb1557 100644 --- a/modoboa/extensions/webmail/forms.py +++ b/modoboa/extensions/webmail/forms.py @@ -77,11 +77,20 @@ def make_body_images_inline(body): class ComposeMailForm(forms.Form): - """Compose mail form. - """ - to = forms.CharField(label=_("To"), widget=forms.TextInput(attrs={"class": "form-control"})) - cc = forms.CharField(label=_("Cc"), required=False, widget=forms.TextInput(attrs={"class": "form-control"})) - cci = forms.CharField(label=_("Cci"), required=False, widget=forms.TextInput(attrs={"class": "form-control"})) + + """Compose mail form.""" + + to = forms.CharField( + label=_("To"), widget=forms.TextInput(attrs={"class": "form-control"}) + ) + cc = forms.CharField( + label=_("Cc"), required=False, + widget=forms.TextInput(attrs={"class": "form-control"}) + ) + cci = forms.CharField( + label=_("Cci"), required=False, + widget=forms.TextInput(attrs={"class": "form-control"}) + ) subject = forms.CharField( label=_("Subject"), max_length=255, @@ -93,7 +102,9 @@ class ComposeMailForm(forms.Form): widget=forms.HiddenInput(attrs={"class": "form-control"}), required=False ) - body = forms.CharField(widget=forms.widgets.Textarea(attrs={"class": "form-control"})) + body = forms.CharField( + widget=forms.widgets.Textarea(attrs={"class": "form-control"}) + ) def _html_msg(self): """Create a multipart message. diff --git a/modoboa/extensions/webmail/templates/webmail/index.html b/modoboa/extensions/webmail/templates/webmail/index.html index ee950157e..deecb692b 100644 --- a/modoboa/extensions/webmail/templates/webmail/index.html +++ b/modoboa/extensions/webmail/templates/webmail/index.html @@ -46,9 +46,8 @@ $(document).ready(function() {
    -
    +
    {{ quota }}%
    -
    {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/modoboa/lib/templatetags/lib_tags.py b/modoboa/lib/templatetags/lib_tags.py index 87da11a43..63e84a14f 100644 --- a/modoboa/lib/templatetags/lib_tags.py +++ b/modoboa/lib/templatetags/lib_tags.py @@ -151,7 +151,9 @@ def fromunix(value): @register.simple_tag def render_tags(tags): t = Template("""{% for tag in tags %} + {{ tag.label }} + {% endfor %} """) return t.render(Context({"tags": tags})) diff --git a/modoboa/static/css/custom.css b/modoboa/static/css/custom.css index e3b0387d6..854fc2a3e 100644 --- a/modoboa/static/css/custom.css +++ b/modoboa/static/css/custom.css @@ -261,12 +261,8 @@ label{ text-decoration: none; } -.label .idt{ - color: gray; -} - .label{ - margin-left:1px; + margin-left: 1px; } diff --git a/modoboa/static/js/global.js b/modoboa/static/js/global.js index 28f172cc4..93fbf84c3 100644 --- a/modoboa/static/js/global.js +++ b/modoboa/static/js/global.js @@ -111,7 +111,7 @@ if (!Object.keys) { * Clean all errors in a given form. */ function clean_form_errors(formid) { - $("#" + formid + " div.error").removeClass("error"); + $("#" + formid + " div.has-error").removeClass("has-error"); $("#" + formid + " span.help-block").remove(); } @@ -135,7 +135,7 @@ function display_form_errors(formid, data) { "html": value[0], "id": spanid }); - $widget.parents(".controls").append($span); + $widget.parents(".form-group").append($span); } else { $span.html(value[0]); } diff --git a/modoboa/static/js/notify.js b/modoboa/static/js/notify.js index cdf94874b..2b60070c9 100644 --- a/modoboa/static/js/notify.js +++ b/modoboa/static/js/notify.js @@ -8,7 +8,7 @@ constructor: Notify, build_box: function(bid) { - if (bid == undefined) { + if (bid === undefined) { bid = "notifybox"; } var div = $("
    ", { @@ -36,7 +36,7 @@ }, set_message: function(box, value) { - var content = '×' + value; + var content = '' + value; box.html(content); }, @@ -50,7 +50,7 @@ this.set_message(nbox, message); this.$element.append(nbox); this.set_position(nbox); - if (timer != undefined) { + if (timer !== undefined) { window.setTimeout(function() { nbox.alert('close'); }, timer); @@ -67,7 +67,7 @@ }, error: function(message, timer) { - return this.show.apply(this, ["error", message, timer]); + return this.show.apply(this, ["danger", message, timer]); }, warning: function(message, timer) { diff --git a/modoboa/templates/common/generic_field.html b/modoboa/templates/common/generic_field.html index 18e174843..c83878e6c 100644 --- a/modoboa/templates/common/generic_field.html +++ b/modoboa/templates/common/generic_field.html @@ -6,11 +6,11 @@ > {% if field.label %} - + {% endif %}