Merge branch 'update-template-585' of https://github.com/Toc-Toc/modoboa into Toc-Toc-update-template-585

Conflicts:
	modoboa/core/app_settings.py
	modoboa/extensions/admin/static/admin/js/admin.js
	modoboa/extensions/admin/views/domain.py
	modoboa/extensions/admin/views/identity.py
	modoboa/extensions/amavis/app_settings.py
	modoboa/extensions/amavis/general_callbacks.py
	modoboa/static/js/global.js
	modoboa/static/js/listing.js
	modoboa/templates/common/generic_modal.html
	modoboa/templates/common/wizard_forms.html
	modoboa/templates/nlayout.html

modoboa/core/app_settings.py

@@ -44,7 +44,7 @@ class GeneralParametersForm(parameters.AdminParametersForm):
                  ('ldap', "LDAP")],
         initial="local",
         help_text=ugettext_lazy("The backend used for authentication"),
-        widget=InlineRadioSelect
+        widget=forms.Select(attrs={"class": "form-control"})
     )
 
     password_scheme = forms.ChoiceField(
@@ -57,7 +57,8 @@ class GeneralParametersForm(parameters.AdminParametersForm):
                  ("crypt", ugettext_lazy("crypt (weak)")),
                  ("plain", ugettext_lazy("plain (weak)"))],
         initial="sha512crypt",
-        help_text=ugettext_lazy("Scheme used to crypt mailbox passwords")
+        help_text=ugettext_lazy("Scheme used to crypt mailbox passwords"),
+        widget=forms.Select(attrs={"class": "form-control"})
     )
 
     rounds_number = forms.IntegerField(
@@ -66,13 +67,15 @@ class GeneralParametersForm(parameters.AdminParametersForm):
         help_text=ugettext_lazy(
             "Number of rounds to use (only used by sha256crypt and "
             "sha512crypt). Must be between 1000 and 999999999, inclusive."
-        )
+        ),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     secret_key = forms.CharField(
         label=ugettext_lazy("Secret key"),
         initial=random_key(),
-        help_text=ugettext_lazy("Key used to encrypt/decrypt passwords")
+        help_text=ugettext_lazy("Key used to encrypt/decrypt passwords"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     # LDAP specific settings
@@ -82,13 +85,15 @@ class GeneralParametersForm(parameters.AdminParametersForm):
         label=ugettext_lazy("Server address"),
         initial="localhost",
         help_text=ugettext_lazy(
-            "The IP address of the DNS name of the LDAP server")
+            "The IP address of the DNS name of the LDAP server"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     ldap_server_port = forms.IntegerField(
         label=ugettext_lazy("Server port"),
         initial=389,
-        help_text=ugettext_lazy("The TCP port number used by the LDAP server")
+        help_text=ugettext_lazy("The TCP port number used by the LDAP server"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     ldap_secured = YesNoField(
@@ -104,7 +109,7 @@ class GeneralParametersForm(parameters.AdminParametersForm):
                  ('directbind', ugettext_lazy("Direct bind"))],
         initial='searchbind',
         help_text=ugettext_lazy("Choose the authentication method to use"),
-        widget=InlineRadioSelect
+        widget=forms.Select(attrs={"class": "form-control"})
     )
 
     ldap_bind_dn = forms.CharField(
@@ -114,7 +119,8 @@ class GeneralParametersForm(parameters.AdminParametersForm):
             "The distinguished name to use when binding to the LDAP server. "
             "Leave empty for an anonymous bind"
         ),
-        required=False
+        required=False,
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     ldap_bind_password = forms.CharField(
@@ -124,7 +130,8 @@ class GeneralParametersForm(parameters.AdminParametersForm):
             "The password to use when binding to the LDAP server "
             "(with 'Bind DN')"
         ),
-        widget=forms.PasswordInput(render_value=True),
+        widget=forms.PasswordInput(
+            attrs={"class": "form-control"}, render_value=True),
         required=False
     )
 
@@ -134,7 +141,8 @@ class GeneralParametersForm(parameters.AdminParametersForm):
         help_text=ugettext_lazy(
             "The distinguished name of the search base used to find users"
         ),
-        required=False
+        required=False,
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     ldap_search_filter = forms.CharField(
@@ -144,7 +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"})
     )
 
     ldap_user_dn_template = forms.CharField(
@@ -154,13 +162,14 @@ 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"})
     )
 
     ldap_password_attribute = forms.CharField(
         label=ugettext_lazy("Password attribute"),
         initial="userPassword",
-        help_text=ugettext_lazy("The attribute used to store user passwords")
+        help_text=ugettext_lazy("The attribute used to store user passwords"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     ldap_is_active_directory = YesNoField(
@@ -177,7 +186,8 @@ class GeneralParametersForm(parameters.AdminParametersForm):
             "Members of those LDAP Posix groups will be created as domain "
             "administrators. Use ';' characters to separate groups."
         ),
-        required=False
+        required=False,
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     ldap_groups_search_base = forms.CharField(
@@ -186,7 +196,8 @@ class GeneralParametersForm(parameters.AdminParametersForm):
         help_text=ugettext_lazy(
             "The distinguished name of the search base used to find groups"
         ),
-        required=False
+        required=False,
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     ldap_create_domain_mailbox = YesNoField(
@@ -203,7 +214,8 @@ class GeneralParametersForm(parameters.AdminParametersForm):
     top_notifications_check_interval = forms.IntegerField(
         label=_("Top notifications check interval"),
         initial=30,
-        help_text=_("Interval between two top notification checks")
+        help_text=_("Interval between two top notification checks"),
+        widget=forms.NumberInput(attrs={"class": "form-control"})
     )
 
     check_new_versions = YesNoField(
@@ -216,13 +228,15 @@ class GeneralParametersForm(parameters.AdminParametersForm):
     log_maximum_age = forms.IntegerField(
         label=ugettext_lazy("Maximum log record age"),
         initial=365,
-        help_text=ugettext_lazy("The maximum age in days of a log record")
+        help_text=ugettext_lazy("The maximum age in days of a log record"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     items_per_page = forms.IntegerField(
         label=ugettext_lazy("Items per page"),
         initial=30,
-        help_text=ugettext_lazy("Number of displayed items per page")
+        help_text=ugettext_lazy("Number of displayed items per page"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     default_top_redirection = forms.ChoiceField(
@@ -232,6 +246,7 @@ class GeneralParametersForm(parameters.AdminParametersForm):
         help_text=ugettext_lazy(
             "The default redirection used when no application is specified"
         )
+        widget=forms.Select(attrs={"class": "form-control"})
     )
 
     # Visibility rules
@@ -369,5 +384,6 @@ class UserSettings(parameters.UserParametersForm):
                  ("fr", "français"), ("it", "italiano"),
                  ("nl", "nederlands"), ("pt", "português"),
                  ("ru", "русский"), ("sv", "svenska")],
-        help_text=ugettext_lazy("Prefered language to display pages")
+        help_text=ugettext_lazy("Prefered language to display pages"),
+        widget=forms.Select(attrs={"class": "form-control"})
     )

modoboa/core/forms.py

@@ -8,11 +8,11 @@ from modoboa.lib import parameters
 class LoginForm(forms.Form):
     username = forms.CharField(
         label=ugettext_lazy("Username"),
-        widget=forms.TextInput(attrs={"class": "input-block-level"})
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
     password = forms.CharField(
         label=ugettext_lazy("Password"),
-        widget=forms.PasswordInput(attrs={"class": "input-block-level"})
+        widget=forms.PasswordInput(attrs={"class": "form-control"})
     )
     rememberme = forms.BooleanField(
         initial=False,
@@ -23,20 +23,24 @@ class LoginForm(forms.Form):
 class ProfileForm(forms.ModelForm):
     oldpassword = forms.CharField(
         label=ugettext_lazy("Old password"), required=False,
-        widget=forms.PasswordInput
+        widget=forms.PasswordInput(attrs={"class": "form-control"})
     )
     newpassword = forms.CharField(
         label=ugettext_lazy("New password"), required=False,
-        widget=forms.PasswordInput
+        widget=forms.PasswordInput(attrs={"class": "form-control"})
     )
     confirmation = forms.CharField(
         label=ugettext_lazy("Confirmation"), required=False,
-        widget=forms.PasswordInput
+        widget=forms.PasswordInput(attrs={"class": "form-control"})
     )
 
     class Meta:
         model = User
         fields = ("first_name", "last_name")
+        widgets = {
+                    'first_name': forms.TextInput(attrs={'class': 'form-control'}),
+                    'last_name': forms.TextInput(attrs={'class': 'form-control'})
+                 }
 
     def __init__(self, update_password, *args, **kwargs):
         super(ProfileForm, self).__init__(*args, **kwargs)

modoboa/core/models.py

@@ -167,9 +167,9 @@ class User(PermissionsMixin):
 
     @property
     def tags(self):
-        return [{"name": "account", "label": _("account"), "type": "idt"},
+        return [{"name": "account", "label": _("account"), "type": "label label-default idt"},
                 {"name": self.group, "label": self.group,
-                 "type": "grp", "color": "info"}]
+                 "type": "grp label label-info"}]
 
     @property
     def fullname(self):

modoboa/core/static/core/css/userprefs.css

@@ -1,9 +0,0 @@
-#uprefs_content .form-horizontal .control-label {
-    margin-left: 20px;
-    text-align: left;
-    width: 200px;
-}
-
-#uprefs_content > .form-horizontal .controls {
-    margin-left: 240px;
-}

modoboa/core/templates/core/parameters.html

@@ -4,4 +4,4 @@
   {% include "common/parameters.html" %}
 </form>
 <hr>
-<a href="#" class="btn btn-primary" id="update" name="update">{% trans 'Save' %}</a>
+<a href="#" class="btn btn-primary col-lg-offset-7 col-md-offset-7 col-sm-offset-7 col-lg-1 col-md-2 col-sm-2" id="update" name="update">{% trans 'Save' %}</a>

modoboa/core/templates/core/settings_header.html

@@ -19,5 +19,5 @@ $(document).ready(function() {
 });
 </script>
 {% endblock %}
-{% block leftcol %}<div class="well sidebar-nav">{% admin_menu left_selection user %}</div>{% endblock %}
+{% block leftcol %}<div class="well">{% admin_menu left_selection user %}</div>{% endblock %}
 {% block apparea %}<div id="settings_content"></div>{% endblock %}

modoboa/core/templates/core/user_index.html

@@ -17,5 +17,5 @@ $(document).ready(function() {
 });
 </script>
 {% endblock %}
-{% block leftcol %}<div class="well sidebar-nav">{% uprefs_menu left_selection user %}</div>{% endblock %}
+{% block leftcol %}<div class="well">{% uprefs_menu left_selection user %}</div>{% endblock %}
 {% block apparea %}<div id="uprefs_content"></div>{% endblock %}

modoboa/core/templates/core/user_preferences.html

@@ -5,5 +5,5 @@
       id="uprefs_form">{% csrf_token %}
   {% include "common/parameters.html" %}
   <hr>
-  <button type="submit" class="btn btn-primary" id="update" name="update">{% trans 'Save' %}</button>
+  <button type="submit" class="btn btn-primary col-lg-offset-8 col-md-offset-7 col-sm-offset-7 col-lg-1 col-md-2 col-sm-2" id="update" name="update">{% trans 'Save' %}</button>
 </form>

modoboa/core/templates/core/user_profile.html

@@ -5,6 +5,6 @@
       id="uprefs_form">{% csrf_token %}
   {% render_form form %}
   <div class="form-actions">
-    <button type="submit" class="btn btn-primary" id="update" name="update">{% trans 'Update' %}</button>
+    <button type="submit" class="btn btn-primary col-lg-offset-8 col-md-offset-7 col-sm-offset-7 col-lg-1 col-md-2 col-sm-2" id="update" name="update">{% trans 'Update' %}</button>
   </div>
 </form>

modoboa/core/templatetags/core_tags.py

@@ -63,7 +63,7 @@ def admin_menu(selection, user):
     ]
     return render_to_string('common/menu.html', {
         "entries": entries,
-        "css": "nav nav-list",
+        "css": "nav nav-pills nav-stacked",
         "selection": selection,
         "user": user
     })
@@ -73,11 +73,11 @@ def admin_menu(selection, user):
 def user_menu(user, selection):
     entries = [
         {"name": "user",
-         "img": "icon-user icon-white",
+         "img": "glyphicon glyphicon-user",
          "label": user.fullname,
          "menu": [
                 {"name": "settings",
-                 "img": "icon-list",
+                 "img": "glyphicon glyphicon-list",
                  "label": _("Settings"),
                  "url": reverse("modoboa.core.views.user.index")}
          ]}
@@ -88,7 +88,7 @@ def user_menu(user, selection):
         + [{"name": "logout",
             "url": reverse("modoboa.core.views.auth.dologout"),
             "label": _("Logout"),
-            "img": "icon-off"}]
+            "img": "glyphicon glyphicon-off"}]
 
     return render_to_string("common/menulist.html", {
         "selection": selection, "entries": entries, "user": user
@@ -111,7 +111,7 @@ def uprefs_menu(selection, user):
     entries = sorted(entries, key=lambda e: e["label"])
     return render_to_string('common/menu.html', {
         "entries": entries,
-        "css": "nav nav-list",
+        "css": "nav nav-pills nav-stacked",
         "selection": selection,
         "user": user
     })

modoboa/extensions/admin/app_settings.py

@@ -21,7 +21,8 @@ class AdminParametersForm(parameters.AdminParametersForm):
     mailboxes_owner = forms.CharField(
         label=ugettext_lazy("Mailboxes owner"),
         initial="vmail",
-        help_text=ugettext_lazy("The UNIX account who owns mailboxes on the filesystem")
+        help_text=ugettext_lazy("The UNIX account who owns mailboxes on the filesystem"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     default_domain_quota = forms.IntegerField(
@@ -31,7 +32,7 @@ class AdminParametersForm(parameters.AdminParametersForm):
             "Default quota (in MB) applied to freshly created domains with no "
             "value specified. A value of 0 means no quota."
         ),
-        widget=forms.TextInput(attrs={'class': 'span2'})
+        widget=forms.TextInput(attrs={'class': 'col-md-2 form-control'})
     )
 
     auto_account_removal = YesNoField(

modoboa/extensions/admin/forms/account.py

@@ -22,21 +22,30 @@ class AccountFormGeneral(forms.ModelForm):
         help_text=ugettext_lazy(
             "The user's name. Must be a valid e-mail address for simple users "
             "or administrators with a mailbox."
-        )
+        ),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
     role = forms.ChoiceField(
         label=ugettext_lazy("Role"),
         choices=[('', ugettext_lazy("Choose"))],
-        help_text=ugettext_lazy("What level of permission this user will have")
+        help_text=ugettext_lazy("What level of permission this user will have"),
+        widget=forms.Select(attrs={"class": "form-control"})
     )
     password1 = forms.CharField(
-        label=ugettext_lazy("Password"), widget=forms.PasswordInput
+        label=ugettext_lazy("Password"),
+        widget=forms.PasswordInput(attrs={"class": "form-control"})
     )
     password2 = forms.CharField(
         label=ugettext_lazy("Confirmation"),
-        widget=forms.PasswordInput,
+        widget=forms.PasswordInput(attrs={"class": "form-control"}),
         help_text=ugettext_lazy("Enter the same password as above, for verification.")
     )
+    first_name= forms.CharField(
+        widget=forms.TextInput(attrs={"class": "form-control"}),
+    )
+    last_name= forms.CharField(
+        widget=forms.TextInput(attrs={"class": "form-control"}),
+    )
 
     class Meta:
         model = User
@@ -51,7 +60,8 @@ class AccountFormGeneral(forms.ModelForm):
         if user.group == "DomainAdmins":
             self.fields["role"] = forms.CharField(
                 label="",
-                widget=forms.HiddenInput, required=False
+                widget=forms.HiddenInput(attrs={"class": "form-control"}),
+                required=False
             )
         else:
             self.fields["role"].choices = [('', ugettext_lazy("Choose"))]
@@ -127,7 +137,7 @@ class AccountFormGeneral(forms.ModelForm):
 
 
 class AccountFormMail(forms.Form, DynamicForm):
-    email = forms.EmailField(label=ugettext_lazy("E-mail"), required=False)
+    email = forms.EmailField(label=ugettext_lazy("E-mail"), required=False, widget=forms.TextInput(attrs={"class": "form-control"}))
     quota = forms.IntegerField(
         label=ugettext_lazy("Quota"),
         required=False,
@@ -135,7 +145,7 @@ class AccountFormMail(forms.Form, DynamicForm):
                     "use domain's default one. Leave empty to define an "
                     "unlimited value (not allowed for domain "
                     "administrators)."),
-        widget=forms.widgets.TextInput(attrs={"class": "span1"})
+        widget=forms.widgets.TextInput(attrs={"class": "col-md-1 form-control"})
     )
     quota_act = forms.BooleanField(required=False)
     aliases = forms.EmailField(
@@ -145,7 +155,8 @@ class AccountFormMail(forms.Form, DynamicForm):
             "Alias(es) of this mailbox. Indicate only one address per input, "
             "press ENTER to add a new input. Use the '*' character to create "
             "a 'catchall' alias (ex: *@domain.tld)."
-        )
+        ),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     def __init__(self, *args, **kwargs):

modoboa/extensions/admin/forms/alias.py

@@ -17,14 +17,16 @@ class AliasForm(forms.ModelForm, DynamicForm):
         help_text=ugettext_lazy(
             "The distribution list address. Use the '*' character to create a "
             "'catchall' address (ex: *@domain.tld)."
-        )
+        ),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
     recipients = forms.EmailField(
         label=ugettext_lazy("Recipients"), required=False,
         help_text=ugettext_lazy(
             "Mailbox(es) this alias will point to. Indicate only one address "
             "per input, press ENTER to add a new input."
-        )
+        ),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     class Meta:

modoboa/extensions/admin/forms/domain.py

@@ -24,7 +24,7 @@ class DomainFormGeneral(forms.ModelForm, DynamicForm):
             "Default quota in MB applied to mailboxes. Leave empty to use the "
             "default value."
         ),
-        widget=forms.TextInput(attrs={"class": "span1"})
+        widget=forms.TextInput(attrs={"class": "col-md-1 form-control"})
     )
     aliases = DomainNameField(
         label=ugettext_lazy("Alias(es)"),
@@ -32,8 +32,12 @@ 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"})
     )
+    name = DomainNameField(
+            widget=forms.TextInput(attrs={"class": "col-md-1 form-control"})
+        )
 
     class Meta:
         model = Domain
@@ -187,7 +191,7 @@ class DomainFormOptions(forms.Form):
             "The administrator's name. Don't include the domain's name here, "
             "it will be automatically appended."
         ),
-        widget=forms.widgets.TextInput(attrs={"class": "input-small"}),
+        widget=forms.widgets.TextInput(attrs={"class": "form-control input-small"}),
         required=False
     )
 

modoboa/extensions/admin/forms/export.py

@@ -4,15 +4,21 @@ from django.utils.translation import ugettext_lazy
 
 class ExportDataForm(forms.Form):
     filename = forms.CharField(
-        label=ugettext_lazy("File name"), max_length=100, required=False
+        label=ugettext_lazy("File name"),
+        max_length=100,
+        required=False,
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
     sepchar = forms.CharField(
-        label=ugettext_lazy("Separator"), max_length=1, required=False
+        label=ugettext_lazy("Separator"),
+        max_length=1,
+        required=False,
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     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"] == "":

modoboa/extensions/admin/forms/forward.py

@@ -10,7 +10,7 @@ from modoboa.extensions.admin.models import (
 class ForwardForm(forms.Form):
     dest = forms.CharField(
         label=ugettext_lazy("Recipient(s)"),
-        widget=forms.Textarea,
+        widget=forms.Textarea(attrs={"class": "form-control"}),
         required=False,
         help_text=ugettext_lazy("Indicate one or more recipients separated by a ','")
     )

modoboa/extensions/admin/forms/import_.py

@@ -5,7 +5,10 @@ from django.utils.translation import ugettext_lazy
 class ImportDataForm(forms.Form):
     sourcefile = forms.FileField(label=ugettext_lazy("Select a file"))
     sepchar = forms.CharField(
-        label=ugettext_lazy("Separator"), max_length=1, required=False
+        label=ugettext_lazy("Separator"),
+        max_length=1,
+        required=False,
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
     continue_if_exists = forms.BooleanField(
         label=ugettext_lazy("Continue on error"), required=False,
@@ -14,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"] == "":

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"}]
+        return [{"name": altype, "label": labels[altype], "type": "idt label label-default"}]
 
     def post_create(self, creator):
         from modoboa.lib.permissions import grant_access_to_object

modoboa/extensions/admin/models/domain.py

@@ -58,7 +58,7 @@ class Domain(AdminObject):
 
     @property
     def tags(self):
-        return [{"name": "domain", "label": _("Domain"), "type": "dom"}]
+        return [{"name": "domain", "label": _("Domain"), "type": "label label-default dom"}]
 
     @property
     def admins(self):

modoboa/extensions/admin/static/admin/css/settings.css

@@ -2,7 +2,6 @@
 #settings_content .form-horizontal .control-label {
     margin-left: 20px;
     text-align: left;
-    width: 200px;
 }
 
 #settings_content > .form-horizontal .controls {

modoboa/extensions/admin/static/admin/js/admin.js

@@ -39,7 +39,7 @@ Admin.prototype = {
                 return;
             }
             $("#import_status").css("display", "block");
-            $("#import_result").html("").removeClass("alert alert-error");
+            $("#import_result").html("").removeClass("alert alert-danger");
             $("#importform").submit();
         });
     },
@@ -50,7 +50,7 @@ Admin.prototype = {
             $("#modalbox").modal('hide');
             this.reload_listing(msg);
         } else {
-            $("#import_result").addClass("alert alert-error");
+            $("#import_result").addClass("alert alert-danger");
             $("#import_result").html(msg);
             this.importform_cb();
         }

modoboa/extensions/admin/templates/admin/forward.html

@@ -5,6 +5,6 @@
       id="uprefs_form">{% csrf_token %}
   {% render_form form %}
   <div class="form-actions">
-    <button type="submit" class="btn btn-primary" id="update" name="update">{% trans 'Update' %}</button>
+    <button type="submit" class="btn btn-primary col-lg-offset-8 col-md-offset-8 col-sm-offset-7 col-lg-1 col-md-1 col-sm-2" id="update" name="update">{% trans 'Update' %}</button>
   </div>
 </form>

modoboa/extensions/admin/templates/admin/listing.html

@@ -9,8 +9,8 @@
 var admin;
 </script>
 {% endblock %}
-{% block leftcol %}<div class="well sidebar-nav">
-  <ul class="nav nav-list">
+{% block leftcol %}<div class="well">
+  <ul class="nav nav-pills nav-stacked">
     <li class="nav-header">{% trans "Filter" %}</li>
     <li>{% include "admin/searchform.html" %}</li>
     <li id="taglist"></li>

modoboa/extensions/admin/templates/admin/quotas.html

@@ -15,8 +15,8 @@
       <td>{{ mbox.quota }}M</td>
       <td name="quota">
         <div id="quotabar" rel="tooltip" title="{{ mbox.get_quota_in_percent }}%"
-             class="progress {% progress_color mbox.get_quota_in_percent %}">
-          <div class="bar" style="width: {{ mbox.get_quota_in_percent }}%"></div>
+             class="progress">
+          <div class="{% progress_color mbox.get_quota_in_percent %}" style="width: {{ mbox.get_quota_in_percent }}%"></div>
         </div>
       </td>
     </tr>{% endfor %}

modoboa/extensions/admin/templates/admin/searchform.html

@@ -1,8 +1,8 @@
 {% load i18n %}
-<form id="searchform" class="form-horizontal">
-  <div class="input-prepend input-append">
-    <span class="add-on"><i class="icon-search"></i></span>
-    <input class="span10" type="text"
+<form id="searchform">
+  <div class="input-group">
+    <span class="input-group-addon"><i class="glyphicon glyphicon-search"></i></span>
+    <input class="form-control" type="text"
            value={% if squery %}"{{ squery }}"{% else %}"{% trans 'Search' %}"{% endif %}
            id="searchquery" name="searchquery" />
   </div>

modoboa/extensions/admin/templatetags/admin_tags.py

@@ -31,7 +31,7 @@ def domains_menu(selection, user):
     entries = [
         {"name": "newdomain",
          "label": _("Add domain"),
-         "img": "icon-plus",
+         "img": "glyphicon glyphicon-plus",
          "modal": True,
          "modalcb": "admin.newdomain_cb",
          "url": reverse("modoboa.extensions.admin.views.domain.newdomain")},
@@ -40,13 +40,13 @@ def domains_menu(selection, user):
     entries += [
         {"name": "import",
          "label": _("Import"),
-         "img": "icon-folder-open",
+         "img": "glyphicon glyphicon-folder-open",
          "url": reverse("modoboa.extensions.admin.views.import.import_domains"),
          "modal": True,
          "modalcb": "admin.importform_cb"},
         {"name": "export",
          "label": _("Export"),
-         "img": "icon-share-alt",
+         "img": "glyphicon glyphicon-share-alt",
          "url": reverse("modoboa.extensions.admin.views.export.export_domains"),
          "modal": True,
          "modalcb": "admin.exportform_cb"}
@@ -70,47 +70,47 @@ def identities_menu(user):
     entries = [
         {"name": "identities",
          "label": _("List identities"),
-         "img": "icon-user",
+         "img": "glyphicon glyphicon-user",
          "class": "ajaxlink",
          "url": "list/"},
         {"name": "quotas",
          "label": _("List quotas"),
-         "img": "icon-hdd",
+         "img": "glyphicon glyphicon-hdd",
          "class": "ajaxlink",
          "url": "quotas/"},
         {"name": "newaccount",
          "label": _("Add account"),
-         "img": "icon-plus",
+         "img": "glyphicon glyphicon-plus",
          "modal": True,
          "modalcb": "admin.newaccount_cb",
          "url": reverse("modoboa.extensions.admin.views.identity.newaccount")},
         {"name": "newalias",
          "label": _("Add alias"),
-         "img": "icon-plus",
+         "img": "glyphicon glyphicon-plus",
          "modal": True,
          "modalcb": "admin.aliasform_cb",
          "url": reverse("modoboa.extensions.admin.views.alias.newalias")},
         {"name": "newforward",
          "label": _("Add forward"),
-         "img": "icon-plus",
+         "img": "glyphicon glyphicon-plus",
          "modal": True,
          "modalcb": "admin.aliasform_cb",
          "url": reverse("modoboa.extensions.admin.views.alias.newforward")},
         {"name": "newdlist",
          "label": _("Add distribution list"),
-         "img": "icon-plus",
+         "img": "glyphicon glyphicon-plus",
          "modal": True,
          "modalcb": "admin.aliasform_cb",
          "url": reverse("modoboa.extensions.admin.views.alias.newdlist")},
         {"name": "import",
          "label": _("Import"),
-         "img": "icon-folder-open",
+         "img": "glyphicon glyphicon-folder-open",
          "url": reverse("modoboa.extensions.admin.views.import.import_identities"),
          "modal": True,
          "modalcb": "admin.importform_cb"},
         {"name": "export",
          "label": _("Export"),
-         "img": "icon-share-alt",
+         "img": "glyphicon glyphicon-share-alt",
          "url": reverse("modoboa.extensions.admin.views.export.export_identities"),
          "modal": True,
          "modalcb": "admin.exportform_cb"
@@ -131,7 +131,7 @@ def domain_actions(user, domain):
             {"name": "listidentities",
              "url": reverse("modoboa.extensions.admin.views.identity.identities") + "#list/?searchquery=@%s" % domain.name,
              "title": _("View the domain's identities"),
-             "img": "icon-user"}
+             "img": "glyphicon glyphicon-user"}
         ]
         if user.has_perm("admin.delete_domain"):
             actions.append({
@@ -141,7 +141,7 @@ def domain_actions(user, domain):
                     args=[domain.id]
                 ),
                 "title": _("Delete %s?" % domain.name),
-                "img": "icon-trash"
+                "img": "glyphicon glyphicon-trash"
             })
     else:
         actions = events.raiseQueryEvent('GetDomainActions', user, domain)
@@ -158,18 +158,31 @@ def identity_actions(user, ident):
         actions += [
             {"name": "delaccount",
              "url": reverse("modoboa.extensions.admin.views.identity.delaccount", args=[objid]),
-             "img": "icon-trash",
+             "img": "glyphicon glyphicon-trash",
              "title": _("Delete %s?" % ident.username)},
         ]
     else:
         actions = [
             {"name": "delalias",
              "url": reverse("modoboa.extensions.admin.views.alias.delalias") + "?selection=%s" % objid,
-             "img": "icon-trash",
+             "img": "glyphicon glyphicon-trash",
              "title": _("Delete %s?" % ident.full_address)},
         ]
     return render_actions(actions)
 
+@register.simple_tag
+def disable_identity(identity):
+    """Disable an identity.
+
+    Finding this information depends on the identity type.
+    """
+    if identity.__class__.__name__ == "User":
+        if identity.is_active and identity.mailbox_set.count() \
+           and identity.mailbox_set.all()[0].domain.enabled:
+            return ""
+    elif identity.enabled and identity.domain.enabled:
+        return ""
+    return "muted"
 
 @register.simple_tag
 def domain_modify_link(domain):
@@ -235,7 +248,7 @@ def domadmin_actions(daid, domid):
     actions = [{
         "name": "removeperm",
         "url": reverse("modoboa.extensions.admin.views.identity.remove_permission") + "?domid=%s&daid=%s" % (domid, daid),
-        "img": "icon-trash",
+        "img": "glyphicon glyphicon-trash",
         "title": _("Remove this permission")
     }]
     return render_actions(actions)
@@ -258,16 +271,3 @@ def get_extra_admin_content(user, target, currentpage):
     return "".join(res)
 
 
-@register.simple_tag
-def disable_identity(identity):
-    """Disable an identity.
-
-    Finding this information depends on the identity type.
-    """
-    if identity.__class__.__name__ == "User":
-        if identity.is_active and identity.mailbox_set.count() \
-           and identity.mailbox_set.all()[0].domain.enabled:
-            return ""
-    elif identity.enabled and identity.domain.enabled:
-        return ""
-    return "muted"

modoboa/extensions/amavis/app_settings.py

@@ -13,7 +13,8 @@ class ParametersForm(AdminParametersForm):
     max_messages_age = forms.IntegerField(
         label=_("Maximum message age"),
         initial=14,
-        help_text=_("Quarantine messages maximum age (in days) before deletion")
+        help_text=_("Quarantine messages maximum age (in days) before deletion"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     sep1 = SeparatorField(label=_("Messages releasing"))
@@ -29,25 +30,28 @@ class ParametersForm(AdminParametersForm):
         choices=[("inet", "inet"), ("unix", "unix")],
         initial="unix",
         help_text=_("Mode used to access the PDP server"),
-        widget=InlineRadioSelect
+        widget=InlineRadioSelect(attrs={"type": "checkbox"})
     )
 
     am_pdp_host = forms.CharField(
         label=_("PDP server address"),
         initial="localhost",
-        help_text=_("PDP server address (if inet mode)")
+        help_text=_("PDP server address (if inet mode)"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     am_pdp_port = forms.IntegerField(
         label=_("PDP server port"),
         initial=9998,
-        help_text=_("PDP server port (if inet mode)")
+        help_text=_("PDP server port (if inet mode)"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     am_pdp_socket = forms.CharField(
         label=_("PDP server socket"),
         initial="/var/amavis/amavisd.sock",
-        help_text=_("Path to the PDP server socket (if unix mode)")
+        help_text=_("Path to the PDP server socket (if unix mode)"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     user_can_release = YesNoField(
@@ -65,7 +69,8 @@ class ParametersForm(AdminParametersForm):
     notifications_sender = forms.EmailField(
         label=_("Notifications sender"),
         initial="notification@modoboa.org",
-        help_text=_("The e-mail address used to send notitications")
+        help_text=_("The e-mail address used to send notitications"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     visibility_rules = {
@@ -83,5 +88,6 @@ class UserSettings(UserParametersForm):
     messages_per_page = forms.IntegerField(
         initial=40,
         label=_("Number of displayed emails per page"),
-        help_text=_("Set the maximum number of messages displayed in a page")
+        help_text=_("Set the maximum number of messages displayed in a page"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )

modoboa/extensions/amavis/forms.py

@@ -15,9 +15,9 @@ class DomainPolicyForm(forms.ModelForm):
         widgets = {
             'bypass_virus_checks': InlineRadioSelect(),
             'bypass_spam_checks': InlineRadioSelect(),
-            'spam_tag2_level': forms.TextInput(attrs={'class': 'span1'}),
-            'spam_kill_level': forms.TextInput(attrs={'class': 'span1'}),
-            'spam_subject_tag2': forms.TextInput(attrs={'class': 'span2'}),
+            'spam_tag2_level': forms.TextInput(attrs={'class': 'col-md-1 form-control'}),
+            'spam_kill_level': forms.TextInput(attrs={'class': 'col-md-1 form-control'}),
+            'spam_subject_tag2': forms.TextInput(attrs={'class': 'col-md-2 form-control'}),
             'bypass_banned_checks': InlineRadioSelect(),
         }
 

modoboa/extensions/amavis/sql_listing.py

@@ -51,7 +51,7 @@ class Qtable(tables.Table):
     ]
 
     def parse_type(self, value):
-        color = 'important' if value in ['S', 'V'] else 'warning'
+        color = 'danger' if value in ['S', 'V'] else 'warning'
         return '<span class="label label-%s">%s</span>' % (color, value)
 
     def parse_date(self, value):

modoboa/extensions/amavis/static/amavis/css/quarantine.css

@@ -1,8 +1,36 @@
-#menubar { 
-    position: fixed;
+@media (max-width: 400px){
+    th#rstatus,
+    td[name='rstatus'],
+    th#type,
+    td[name='type']{
+        display: none;
+    }
+}
+@media (max-width: 600px){
+    th#subject,
+    td[name='subject']{
+        display: none;
+    }
+}
+@media (max-width: 767px){
+    th#to,
+    td[name='to']{
+        display: none;
+    }
+}
+
+@media (max-width: 990px){
+    #filters_bar,
+    th#date,
+    td[name='date']{
+        display: none;
+    }
+}
+
+#menubar {
     top: 60px;
-    padding-left: 15px;
-    padding-right: 15px;
+    padding-left: 6px;
+    padding-bottom:10px;
     left: 0;
     right: 0;
     z-index: 10;
@@ -12,11 +40,21 @@
     margin: 0;
 }
 
-#listing { 
-    position: fixed;
-    padding: 0 15px;
-    right: 0;
+#listing.fluid-content-quarantine{
+    position: relative;
+    padding-top: 30px;
+    height: 0;
+    overflow: hidden;
+    padding-bottom: 56.25%; /* proportion value to aspect ratio 16:9 (9 / 16 = 0.5625 or 56.25%) */
+}
+
+
+#listing.fluid-content-quarantine iframe {
+    position: absolute;
+    top: 0;
     left: 0;
+    width: 100%;
+    height: 100%;
 }
 
 #mailcontent {
@@ -27,29 +65,22 @@
     height: 100%;
 }
 
-#emails tbody tr:hover { 
+#emails tbody tr:hover {
     color: #0088cc;
 }
 
-#filters_bar {
-    /*padding-top: 5px;*/
-    padding-left: 15px;
-}
+
 
 thead tr {
     position: relative;
     z-index: 1;
 }
 
-td > input[type=checkbox] {
-    margin: 0;
-}
-
 td[name=type] span {
     cursor: pointer;
 }
 
-td.unseen { 
+td.unseen {
     font-weight: bold;
 }
 

modoboa/extensions/amavis/static/amavis/js/quarantine.js

@@ -42,13 +42,13 @@ Quarantine.prototype = {
             $("#menubar").html(data.menu);
             $("#searchfield").searchbar({navobj: this.navobj});
         }
+
         if (data.listing != undefined) {
+
+
             $("#listing").html(data.listing);
-            $("#listing").css({
-                top: $("#menubar").outerHeight() + 60 + "px",
-                bottom: $("#bottom-bar").outerHeight() + "px",
-                overflow: "auto"
-            });
+            $("#listing:has(iframe)").addClass("fluid-content-quarantine");
+
         }
         this.update_listing(data);
     },

modoboa/extensions/amavis/templates/amavis/domain_content_filter.html

@@ -1,11 +1,11 @@
 {% load i18n lib_tags %}
 {% render_field form.bypass_virus_checks %}
 {% render_field form.bypass_spam_checks %}
-<div class="control-group"> 
-  <label class="control-label">{% trans "Thresholds" %}</label>
-  <div class="controls spaced">
-    {{ 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>
+<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-block pull-right">{% trans "or more is spam" %}</span><br>
+    {{ form.spam_kill_level }} <span class="help-block pull-right">{% trans "or more throw spam message away" %}</span>
   </div>
 </div>
 {% render_field_with_activator form.spam_subject_tag2 _("default") %}

modoboa/extensions/amavis/templates/amavis/index.html

@@ -20,5 +20,5 @@ $(document).ready(function() {
 {% endblock %}
 {% block fixed_content %}
 <div id="menubar">{% quar_menu %}</div>
-<div id="listing"></div>
+<div id="listing" class="col-lg-12 col-md-12 col-dm-12 col-xs-12"></div>
 {% endblock %}

modoboa/extensions/amavis/templates/amavis/mailheaders.html

@@ -1,5 +1,5 @@
 {% extends "common/mailheaders.html" %}
 {% block emailheaders %}
-{% if qtype %}<div class="alert alert-error"><strong>{{ qtype }}</strong> {{ qreason }}</div>{% endif %}
+{% if qtype %}<div class="alert alert-danger"><strong>{{ qtype }}</strong> {{ qreason }}</div>{% endif %}
 {{ block.super }}
 {% endblock %}

modoboa/extensions/amavis/templates/amavis/main_action_bar.html

@@ -1,38 +1,49 @@
 {% load lib_tags i18n %}
-<div class="btn-toolbar pull-left">
-  <div class="btn-group" title="{% trans 'Select' %}">
-    <a class="btn"><input type="checkbox" id="selectall" /></a>
-    <button class="btn dropdown-toggle" data-toggle="dropdown">
-      <span class="caret"></span>
-    </button>
-    <ul class="dropdown-menu">
-      <li><a name="selectmsgs" href="S">{% trans "Spam" %}</a></li>
-      <li><a name="selectmsgs" href="V">{% trans "Virus" %}</a></li>
-      <li><a name="selectmsgs" href="H">{% trans "Bad Header" %}</a></li>
-      <li><a name="selectmsgs" href="M">{% trans "Bad MIME" %}</a></li>
-      <li><a name="selectmsgs" href="B">{% trans "Banned" %}</a></li>
-    </ul>
-  </div>
-  <div class="btn-group">
-    <a name="release-multi" href="{% url 'modoboa.extensions.amavis.views.process' %}" class="btn btn-success disabled">
-      <i class="icon-white icon-ok"></i> {% trans "Release" %}
-    </a>
-  </div>
-  <div class="btn-group">
-    <a name="delete-multi" href="{% url 'modoboa.extensions.amavis.views.process' %}" class="btn btn-danger disabled">
-      <i class="icon-white icon-trash"></i> {% trans "Delete" %}
-    </a>
-  </div>
-  {% include "common/email_searchbar.html" with extraopts=extraopts %}
+        <div class="col-lg-9 col-md-8 col-sm-12 col-xs-12">
+<div class="navbar-nav">
+
+        <div>
+            <div class="btn-group" title="{% trans 'Select' %}">
+                <a class="btn btn-default"><input type="checkbox" id="selectall" /></a>
+                <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                    <span class="caret"></span>
+                </button>
+                <ul class="dropdown-menu">
+                    <li><a name="selectmsgs" href="S">{% trans "Spam" %}</a></li>
+                    <li><a name="selectmsgs" href="V">{% trans "Virus" %}</a></li>
+                    <li><a name="selectmsgs" href="H">{% trans "Bad Header" %}</a></li>
+                    <li><a name="selectmsgs" href="M">{% trans "Bad MIME" %}</a></li>
+                    <li><a name="selectmsgs" href="B">{% trans "Banned" %}</a></li>
+                </ul>
+            </div>
+            <div class="btn-group">
+              <a name="release-multi" href="{% url 'modoboa.extensions.amavis.views.process' %}" class="btn btn-success disabled">
+                <i class="glyphicon glyphicon-ok"></i> <span>{% trans "Release" %}</span>
+              </a>
+            </div>
+            <div class="btn-group">
+              <a name="delete-multi" href="{% url 'modoboa.extensions.amavis.views.process' %}" class="btn btn-danger disabled">
+                <i class="glyphicon glyphicon-trash"></i> <span>{% trans "Delete" %}</span>
+              </a>
+            </div>
+            <div class="btn-group">
+            {% include "common/email_searchbar.html" with extraopts=extraopts %}
+            </div>
+        </div>
 </div>
-<div id="filters_bar" class="btn-toolbar pull-right">
-  <span class="label label-title">{% trans "Display" %}</span>
-  <div id="filters" class="btn-group" data-toggle="buttons-radio">
-    <button name="msgtype_all" class="btn" title="{% trans 'All messages' %}">{% trans "All" %}</button>
-    <button name="msgtype_S" class="btn btn-danger" title="{% trans 'Spam only' %}">S</button>
-    <button name="msgtype_V" class="btn btn-danger" title="{% trans 'Virus only' %}">V</button>
-    <button name="msgtype_H" class="btn btn-warning" title="{% trans 'Bad Header only' %}">H</button>
-    <button name="msgtype_M" class="btn btn-warning" title="{% trans 'Bad MIME only' %}">M</button>
-    <button name="msgtype_B" class="btn btn-warning" title="{% trans 'Banned only' %}">B</button>
-  </div>
 </div>
+        <div class="col-lg-3 col-md-4">
+            <div class="btn-group">
+                <div id="filters_bar" class="navbar-nav navbar-right">
+                    <span class="label label-default">{% trans "Display" %}</span>
+                    <div id="filters" class="btn-group" data-toggle="buttons-radio">
+                        <button name="msgtype_all" class="btn btn-default" title="{% trans 'All messages' %}">{% trans "All" %}</button>
+                        <button name="msgtype_S" class="btn btn-danger" title="{% trans 'Spam only' %}">S</button>
+                        <button name="msgtype_V" class="btn btn-danger" title="{% trans 'Virus only' %}">V</button>
+                        <button name="msgtype_H" class="btn btn-warning" title="{% trans 'Bad Header only' %}">H</button>
+                        <button name="msgtype_M" class="btn btn-warning" title="{% trans 'Bad MIME only' %}">M</button>
+                        <button name="msgtype_B" class="btn btn-warning" title="{% trans 'Banned only' %}">B</button>
+                    </div>
+                </div>
+            </div>
+        </div>

modoboa/extensions/amavis/templatetags/amavis_tags.py

@@ -11,19 +11,25 @@ register = template.Library()
 @register.simple_tag
 def viewm_menu(mail_id, rcpt):
     entries = [
+        {"name": "back",
+                 "url": "javascript:history.go(-2);",
+                 "img": "glyphicon glyphicon-arrow-left",
+                 "class": "btn-primary",
+                 "label": _("Back")},
         {"name": "release",
-         "img": "icon-white icon-ok",
+         "img": "glyphicon glyphicon-ok",
          "class": "btn-success",
          "url": reverse('modoboa.extensions.amavis.views.release', args=[mail_id])
          + ("?rcpt=%s" % rcpt if rcpt else ""),
          "label": _("Release")},
         {"name": "delete",
          "class": "btn-danger",
-         "img": "icon-white icon-trash",
+         "img": "glyphicon glyphicon-trash",
          "url": reverse('modoboa.extensions.amavis.views.delete', args=[mail_id])
          + ("?rcpt=%s" % rcpt if rcpt else ""),
          "label": _("Delete")},
         {"name": "headers",
+         "class": "btn-default",
          "url": reverse('modoboa.extensions.amavis.views.viewheaders', args=[mail_id]),
          "label": _("View full headers")},
     ]
@@ -46,14 +52,14 @@ def viewm_menu(mail_id, rcpt):
 def viewm_menu_simple(user, mail_id, rcpt, secret_id=""):
     entries = [
         {"name": "release",
-         "img": "icon-white icon-ok",
+         "img": "glyphicon glyphicon-ok",
          "class": "btn-success",
          "url": reverse('modoboa.extensions.amavis.views.release', args=[mail_id]) \
              + ("?rcpt=%s" % rcpt \
                     + (("&secret_id=%s" % secret_id) if secret_id != "" else "")),
          "label": _("Release")},
         {"name": "delete",
-         "img": "icon-white icon-trash",
+         "img": "glyphicon glyphicon-trash",
          "class": "btn-danger",
          "url": reverse('modoboa.extensions.amavis.views.delete', args=[mail_id]) \
              + "?rcpt=%s" % rcpt \

modoboa/extensions/limits/app_settings.py

@@ -13,31 +13,31 @@ class ParametersForm(AdminParametersForm):
         label=_("Domain admins"),
         initial=0,
         help_text=_("Maximum number of allowed domain administrators for a new administrator"),
-        widget=forms.widgets.TextInput(attrs={"class": "span1"})
+        widget=forms.widgets.TextInput(attrs={"class": "col-md-1 form-control"})
     )
     deflt_domains_limit = forms.IntegerField(
         label=_("Domains"),
         initial=0,
         help_text=_("Maximum number of allowed domains for a new administrator"),
-        widget=forms.widgets.TextInput(attrs={"class": "span1"})
+        widget=forms.widgets.TextInput(attrs={"class": "col-md-1 form-control"})
     )
     deflt_domain_aliases_limit = forms.IntegerField(
         label=_("Domain aliases"),
         initial=0,
         help_text=_("Maximum number of allowed domain aliases for a new administrator"),
-        widget=forms.widgets.TextInput(attrs={"class": "span1"})
+        widget=forms.widgets.TextInput(attrs={"class": "col-md-1 form-control"})
     )
     deflt_mailboxes_limit = forms.IntegerField(
         label=_("Mailboxes"),
         initial=0,
         help_text=_("Maximum number of allowed mailboxes for a new administrator"),
-        widget=forms.widgets.TextInput(attrs={"class": "span1"})
+        widget=forms.widgets.TextInput(attrs={"class": "col-md-1 form-control"})
     )
     deflt_mailbox_aliases_limit = forms.IntegerField(
         label=_("Mailbox aliases"),
         initial=0,
         help_text=_("Maximum number of allowed aliases for a new administrator"),
-        widget=forms.widgets.TextInput(attrs={"class": "span1"})
+        widget=forms.widgets.TextInput(attrs={"class": "col-md-1 form-control"})
     )
 
     def __init__(self, *args, **kwargs):

modoboa/extensions/limits/templates/limits/poolusage.html

@@ -1,10 +1,10 @@
 {% load i18n lib_tags %}
-<div class="well sidebar-nav">
-  <ul class="nav nav-list">
+<div class="well">
+  <ul class="nav nav-pills nav-stacked">
     <li class="nav-header">{% trans "Resources usage" %}</li>{% for l in limits %}
     <li class="resource">
       {{ l.label }} ({{ l }})
-      <div rel="tooltip" title="{{ l.curvalue }}/{{ l.maxvalue }}" class="progress {% progress_color l.usage %}"><div class="bar" style="width: {{ l }}"></div></div>
+      <div rel="tooltip" title="{{ l.curvalue }}/{{ l.maxvalue }}" class="progress"><div class="{% progress_color l.usage %}" style="width: {{ l }}"></div></div>
     </li>{% endfor %}
   </ul>
 </div>

modoboa/extensions/postfix_autoreply/app_settings.py

@@ -13,7 +13,8 @@ class ParametersForm(AdminParametersForm):
     autoreplies_timeout = forms.IntegerField(
         label=ugettext_lazy("Automatic reply timeout"),
         initial=86400,
-        help_text=ugettext_lazy("Timeout in seconds between two auto-replies to the same recipient")
+        help_text=ugettext_lazy("Timeout in seconds between two auto-replies to the same recipient"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     default_subject = forms.CharField(
@@ -21,7 +22,8 @@ class ParametersForm(AdminParametersForm):
         initial=ugettext_lazy("I'm off"),
         help_text=ugettext_lazy(
             "Default subject used when an auto-reply message is created automatically"
-        )
+        ),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     default_content = forms.CharField(
@@ -37,7 +39,7 @@ Best regards,
             "automatically. The '%(name)s' macro will be replaced by the "
             "user's full name."
         ),
-        widget=forms.widgets.Textarea
+        widget=forms.widgets.Textarea(attrs={"class": "form-control"})
     )
 
     def clean_default_content(self):

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,9 +19,19 @@ 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'}
         )
     )
+    subject = forms.CharField(
+            widget=forms.TextInput(
+                    attrs={'class': 'form-control'}
+                )
+    )
+    content = forms.CharField(
+                widget=forms.Textarea(
+                        attrs={'class': 'form-control'}
+                    )
+        )
 
     class Meta:
         model = ARmessage

modoboa/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html

@@ -6,6 +6,6 @@
       id="uprefs_form">{% csrf_token %}
   {% render_form form %}
   <div class="form-actions">
-    <button type="submit" class="btn btn-primary" id="update" name="update">{% trans 'Update' %}</button>
+    <button type="submit" class="btn btn-primary col-lg-offset-8 col-md-offset-8 col-sm-offset-7 col-lg-1 col-md-1 col-sm-2" id="update" name="update">{% trans 'Update' %}</button>
   </div>
 </form>

modoboa/extensions/postfix_relay_domains/app_settings.py

@@ -9,5 +9,6 @@ class AdminParametersForm(parameters.AdminParametersForm):
     master_cf_path = forms.CharField(
         label=ugettext_lazy("Postfix's master.cf path"),
         initial="/etc/postfix/master.cf",
-        help_text=ugettext_lazy('Path to the master.cf configuration file')
+        help_text=ugettext_lazy('Path to the master.cf configuration file'),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )

modoboa/extensions/postfix_relay_domains/forms.py

@@ -19,14 +19,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):

modoboa/extensions/postfix_relay_domains/general_callbacks.py

@@ -33,7 +33,7 @@ def extra_domain_menu_entries(user):
     return [
         {"name": "newrelaydomain",
          "label": ugettext_lazy("Add relay domain"),
-         "img": "icon-plus",
+         "img": "glyphicon glyphicon-plus",
          "modal": True,
          "modalcb": "rdomain.domainform_cb",
          "url": reverse(
@@ -82,7 +82,7 @@ def rdomain_actions(user, domain):
         "url": reverse("modoboa.extensions.postfix_relay_domains.views.delete",
                        args=[domain.id]),
         "title": ugettext_lazy("Delete %s?" % domain.name),
-        "img": "icon-trash"
+        "img": "glyphicon glyphicon-trash"
     }]
 
 

modoboa/extensions/postfix_relay_domains/limits_callbacks.py

@@ -18,7 +18,7 @@ def extra_parameters(app, level):
             help_text=ugettext_lazy(
                 "Maximum number of allowed relay domains for a new administrator"
             ),
-            widget=forms.widgets.TextInput(attrs={"class": "span1"})
+            widget=forms.widgets.TextInput(attrs={"class": "col-md-1 form-control"})
         ),
         'deflt_relay_domain_aliases_limit': forms.IntegerField(
             label=ugettext_lazy("Relay domain aliases"),
@@ -26,7 +26,7 @@ def extra_parameters(app, level):
             help_text=ugettext_lazy(
                 "Maximum number of allowed relay domain aliases for a new administrator"
             ),
-            widget=forms.widgets.TextInput(attrs={"class": "span1"})
+            widget=forms.widgets.TextInput(attrs={"class": "col-md-1 form-control"})
         )
     }
 

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 %}

modoboa/extensions/sievefilters/app_settings.py

@@ -21,13 +21,15 @@ class ParametersForm(AdminParametersForm):
     server = forms.CharField(
         label=_("Server address"),
         initial="127.0.0.1",
-        help_text=_("Address of your MANAGESIEVE server")
+        help_text=_("Address of your MANAGESIEVE server"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     port = forms.IntegerField(
         label=_("Server port"),
         initial=4190,
-        help_text=_("Listening port of your MANAGESIEVE server")
+        help_text=_("Listening port of your MANAGESIEVE server"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     starttls = YesNoField(
@@ -40,7 +42,8 @@ class ParametersForm(AdminParametersForm):
         label=_("Authentication mechanism"),
         choices=supported_auth_mechs(),
         initial="auto",
-        help_text=_("Prefered authentication mechanism")
+        help_text=_("Prefered authentication mechanism"),
+        widget=forms.Select(attrs={"class": "form-control"})
     )
 
 
@@ -54,7 +57,7 @@ class UserSettings(UserParametersForm):
         label=_("Editor mode"),
         choices=[("raw", "raw"), ("gui", "simplified")],
         help_text=_("Select the mode you want the editor to work in"),
-        widget=InlineRadioSelect
+        widget=InlineRadioSelect(attrs={"type": "checkbox"})
     )
 
     @staticmethod

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()
+    name = forms.CharField(
+        widget=forms.TextInput(attrs={"class": "form-control"})
+    )
     active = forms.BooleanField(
         label=gender("Active", "m"), required=False,
         initial=False,
@@ -31,7 +33,7 @@ class CustomRadioInput(RadioInput):
             label_for = ''
         choice_label = conditional_escape(force_unicode(self.choice_label))
         return mark_safe(
-            u'<label%s class="radio inline">%s %s</label>'
+            u'<label%s">%s %s</label>'
             % (label_for, self.tag(), choice_label)
         )
 
@@ -57,13 +59,13 @@ class FilterForm(forms.Form):
     def __init__(self, conditions, actions, request, *args, **kwargs):
         super(FilterForm, self).__init__(*args, **kwargs)
 
-        self.fields["name"] = forms.CharField(label=_("Name"))
+        self.fields["name"] = forms.CharField(label=_("Name"), widget=forms.TextInput(attrs={"class": "form-control"}))
         self.fields["match_type"] = forms.ChoiceField(
             choices=[("allof", _("All of the following")),
                      ("anyof", _("Any of the following")),
                      ("all", _("All messages"))],
             initial="anyof",
-            widget=CustomRadioSelect(attrs={"class": "radio inline"})
+            widget=CustomRadioSelect(attrs={"class": "checkbox-inline", "type": "checkbox"})
         )
 
         self.header_operators = [
@@ -117,12 +119,12 @@ class FilterForm(forms.Form):
                 if op != opdef[0]:
                     continue
                 if opdef[2] in ["string", "number"]:
-                    vfield = forms.CharField(max_length=255, initial=value)
+                    vfield = forms.CharField(max_length=255, initial=value, widget=forms.TextInput(attrs={"class": "form-control"}))
 
         self.fields["cond_target_%d" % self.conds_cnt] = \
-            forms.ChoiceField(initial=name, choices=targets)
+            forms.ChoiceField(initial=name, choices=targets, widget=forms.Select(attrs={"class": "form-control"}))
         self.fields["cond_operator_%d" % self.conds_cnt] = \
-            forms.ChoiceField(initial=op, choices=ops)
+            forms.ChoiceField(initial=op, choices=ops, widget=forms.Select(attrs={"class": "form-control"}))
         self.fields["cond_value_%d" % self.conds_cnt] = vfield
         self.conds_cnt += 1
 
@@ -149,15 +151,15 @@ class FilterForm(forms.Form):
             if name == tpl["name"]:
                 args = tpl["args"]
         self.fields["action_name_%d" % self.actions_cnt] = \
-            forms.ChoiceField(initial=name, choices=actions)
+            forms.ChoiceField(initial=name, choices=actions, widget=forms.Select(attrs={"class": "form-control"}))
         for cnt in xrange(0, len(args)):
             arg = args[cnt]
             aname = "action_arg_%d_%d" % (self.actions_cnt, cnt)
             if arg["type"] == "string":
-                self.fields[aname] = forms.CharField(max_length=255, initial=value)
+                self.fields[aname] = forms.CharField(max_length=255, initial=value, widget=forms.TextInput(attrs={"class": "form-control"}))
             elif arg["type"] == "list":
                 choices = getattr(self, arg["vloader"])(request)
-                self.fields[aname] = forms.ChoiceField(initial=value, choices=choices)
+                self.fields[aname] = forms.ChoiceField(initial=value, choices=choices, widget=forms.Select(attrs={"class": "form-control"}))
         self.actions_cnt += 1
 
     def _build_redirect_field(self, request, value):

modoboa/extensions/sievefilters/general_callbacks.py

@@ -13,7 +13,7 @@ def menu(target, user):
         {"name": "sievefilters",
          "label": _("Message filters"),
          "url": reverse("modoboa.extensions.sievefilters.views.index"),
-         "img": "icon-check"}
+         "img": "glyphicon glyphicon-check"}
     ]
 
 

modoboa/extensions/sievefilters/static/sievefilters/css/style.css

@@ -45,39 +45,17 @@
     white-space: pre-line;
 }
 
-#condlist {
-    border: 1px solid #CCC;
-    padding: 5px;
-}
-
-#actionlist {
-    border: 1px solid #CCC;
-    padding: 5px;
-    padding-top: 15px;
-}
-
-#condlist ul {
-    margin: 0;
-    padding: 0;
-    list-style: none;
-    display: inline;
-}
-
-#condlist li {
-    margin: 0;
-    padding: 0;
-    display: inline;
+#addfilterlist {
+    background-color: #FAFAFA;
+    border: 1px solid #CCCCCC;
+    border-radius: 26px 26px 26px 26px;
+    padding: 14px 5px 5px;
 }
 
 #matchtype {
-    margin-bottom: 10px;
-    margin-left: 7px;
     font-size: 0.9em;
 }
 
-#submit {
-    margin-top: 20px;
-}
 
 div.item {
     margin-bottom: 10px;
@@ -85,14 +63,6 @@ div.item {
     overflow: auto;
 }
 
-div.item input[type=text], div.item select {
-    width: 190px;
-}
-
-div.item input, div.item select {
-    margin: 0 2px;
-}
-
 ul.errors {
     list-style: none;
     display: inline;

modoboa/extensions/sievefilters/static/sievefilters/js/jquery.dynfields.js

@@ -8,7 +8,7 @@
         var $addlink = $('<a />', {
             href: '#',
             id: this.$element.attr("id") + '_rmbtn',
-            html: '<i class="icon-plus"></i>'
+            html: '<i class="glyphicon glyphicon-plus"></i>'
         });
         $("select[name*=cond_target_]").change($.proxy(this.target_change, this));
         $addlink.click($.proxy(this.addfields, this));
@@ -54,7 +54,7 @@
             return $('<a />', {
                 href: '#',
                 id: 'condition_' + this.nextid + '_rmbtn',
-                html: '<i class="icon-trash"></i>'
+                html: '<i class="glyphicon glyphicon-trash"></i>'
             }).click($.proxy(this.removefields, this));
         },
 
@@ -65,16 +65,19 @@
             });
             var $condtarget = $("<select />", {
                 id: "id_cond_target_" + this.nextid,
-                name: "cond_target_" + this.nextid
+                name: "cond_target_" + this.nextid,
+                class: "form-control element-inline-block"
             }).change($.proxy(this.target_change, this));
             var $condoperator = $("<select />", {
                 id: "id_cond_operator_" + this.nextid,
-                name: "cond_operator_" + this.nextid
+                name: "cond_operator_" + this.nextid,
+                class: "form-control element-inline-block"
             });
             var $condvalue = $("<input />", {
                 id: "id_cond_value_" + this.nextid,
                 name: "cond_value_" + this.nextid,
-                type: "text"
+                type: "text",
+                class: "form-control element-inline-block"
             });
             var $rmlink = this.newrmlink();
 
@@ -93,6 +96,9 @@
             }
 
             $div.append($condtarget, $condoperator, $condvalue, $rmlink);
+            $condtarget.wrap('<div class="col-lg-3 col-md-3 col-sm-3"/>');
+            $condoperator.wrap('<div class="col-lg-3 col-md-3 col-sm-3"/>');
+            $condvalue.wrap('<div class="col-lg-4 col-md-4 col-sm-4"/>');
             this.$element.after($div);
             this.nextid++;
             this.fields_cnt++;
@@ -154,7 +160,7 @@
         var $addlink = $('<a />', {
             href: '#',
             id: this.$element.attr("id") + '_rmbtn',
-            html: '<i class="icon-plus"></i>'
+            html: '<i class="glyphicon glyphicon-plus"></i>'
         });
         $("select[name*=action_name_]").change($.proxy(this.name_change, this));
         $addlink.click($.proxy(this.addfields, this));
@@ -202,7 +208,7 @@
                 var $child = null;
 
                 if (tpl.args[acpt].type == "list") {
-                    $child = $("<select />", {id: "id_" + argname, name: argname});
+                    $child = $("<select />", {id: "id_" + argname, name: argname, class: "form-control"});
                     if (tpl.args[acpt].vloader != undefined) {
                         this[tpl.args[acpt].vloader]($child);
                     }
@@ -210,7 +216,8 @@
                     $child = $("<input />", {
                         type: "text",
                         id: "id_" + argname,
-                        name: argname
+                        name: argname,
+                        class: "form-control"
                     });
                 }
                 res.push($child);
@@ -250,7 +257,7 @@
             return $('<a />', {
                 href: '#',
                 id: 'action_' + this.nextid + '_rmbtn',
-                html: '<i class="icon-trash"></i>'
+                html: '<i class="glyphicon glyphicon-trash"></i>'
             }).click($.proxy(this.removefields, this));
         },
 
@@ -259,7 +266,8 @@
             var $div = $("<div />", {id: "action_" + this.nextid, "class": "item"});
             var $actioname = $("<select />", {
                 id: "id_action_name_" + this.nextid,
-                name: "action_name_" + this.nextid
+                name: "action_name_" + this.nextid,
+                class: "form-control element-inline-block"
             });
             var $rmlink = this.newrmlink();
             var args = null;
@@ -281,7 +289,10 @@
             $actioname.change($.proxy(this.name_change, this));
             $.each(args, function(idx, element) {
                 $div.append(element);
+                element.wrap('<div class="col-lg-5 col-md-5 col-sm-5"/>');
             });
+
+            $actioname.wrap('<div class="col-lg-5 col-md-5 col-sm-5"/>');
             $div.append($rmlink);
             this.$element.after($div);
             this.nextid++;

modoboa/extensions/sievefilters/templates/sievefilters/filter.html

@@ -4,7 +4,7 @@
   {% if oldname %}<input type="hidden" name="oldname" value="{{ oldname }}" />{% endif %}
   {% render_field form.name %}
   <h6>{% trans "Conditions" %}</h6>
-  <div id="condlist">
+  <div id="addfilterlist">
     <div id="matchtype">
       {% render_field form.match_type %}
     </div>
@@ -15,7 +15,7 @@
     </div>
   </div>
   <h6>{% trans "Actions" %}</h6>
-  <div id="actionlist">
+  <div id="addfilterlist">
     {% for ea in actions_nb %}
     {% display_action form ea %}
     {% endfor %}

modoboa/extensions/sievefilters/templates/sievefilters/index.html

@@ -71,11 +71,11 @@ $(document).ready(function() {
 </script>
 {% endblock %}
 {% block leftcol %}
-<div class="well sidebar-nav">
-  <ul id="menu" class="nav nav-list">
+<div class="well">
+  <ul id="menu" class="nav nav-pills nav-stacked">
     <li class="nav-header">{% trans "Filter sets" %}</li>
-    <li>
-      <select id="curfset" class="span12">
+    <li class="form-group">
+      <select id="curfset" class="form-control">
         {% if active_script %}
         <option value="{{ active_script }}">{{ active_script }} ({% trans "active" %})</option>
         {% endif %}
@@ -84,7 +84,9 @@ $(document).ready(function() {
         {% endfor %}
       </select>
     </li>
+    {# It will add a li item : #}
     {% sfilters_menu user %}
+
   </ul>
 </div>
 {% endblock %}

modoboa/extensions/sievefilters/templatetags/sfilters_tags.py

@@ -11,7 +11,7 @@ register = template.Library()
 def sfilters_menu(user):
     entries = [
         {"name": "newfilterset",
-         "img": "icon-plus",
+         "img": "glyphicon glyphicon-plus",
          "label": _("New filters set"),
          "url": reverse("modoboa.extensions.sievefilters.views.new_filters_set"),
          "modal": True,
@@ -29,7 +29,7 @@ def fset_menu(mode, setname):
     if mode == "gui":
         entries += [
             {"name": "newfilter",
-             "img": "icon-plus",
+             "img": "glyphicon glyphicon-plus",
              "label": _("New filter"),
              "url": reverse("modoboa.extensions.sievefilters.views.newfilter",
                              args=[setname]),
@@ -40,7 +40,7 @@ def fset_menu(mode, setname):
     if mode == "raw":
         entries += [
             {"name": "savefs",
-             "img": "icon-download-alt",
+             "img": "glyphicon glyphicon-download-alt",
              "label": _("Save filters set"),
              "url": reverse("modoboa.extensions.sievefilters.views.savefs",
                              args=[setname])},
@@ -48,17 +48,17 @@ def fset_menu(mode, setname):
 
     entries += [
         {"name": "activatefs",
-         "img": "icon-ok",
+         "img": "glyphicon glyphicon-ok",
          "label": _("Activate filters set"),
          "url": reverse("modoboa.extensions.sievefilters.views.activate_filters_set",
                          args=[setname])},
         {"name": "removefs",
-         "img": "icon-trash",
+         "img": "glyphicon glyphicon-trash",
          "label": _("Remove filters set"),
          "url": reverse("modoboa.extensions.sievefilters.views.remove_filters_set",
                          args=[setname])},
         {"name": "downloadfs",
-         "img": "icon-download",
+         "img": "glyphicon glyphicon-download",
          "label": _("Download"),
          "url": reverse("modoboa.extensions.sievefilters.views.download_filters_set",
                          args=[setname])}
@@ -74,7 +74,7 @@ def filter_actions(setname, f, position, islast):
         {"name": "editfilter",
          "url": reverse("modoboa.extensions.sievefilters.views.editfilter",
                          args=[setname, f["name"]]),
-         "img": "icon-edit",
+         "img": "glyphicon glyphicon-edit",
          "title": _("Edit filter"),
          "modal": True,
          "autowidth": True,
@@ -82,7 +82,7 @@ def filter_actions(setname, f, position, islast):
         {"name": "removefilter",
          "url": reverse("modoboa.extensions.sievefilters.views.removefilter",
                          args=[setname, f["name"]]),
-         "img": "icon-trash",
+         "img": "glyphicon glyphicon-trash",
          "title": _("Remove this filter")}
     ]
     if position != 1:
@@ -90,7 +90,7 @@ def filter_actions(setname, f, position, islast):
             {"name": "movefilter_up",
              "url": reverse("modoboa.extensions.sievefilters.views.move_filter_up",
                              args=[setname, f["name"]]),
-             "img": "icon-arrow-up",
+             "img": "glyphicon glyphicon-arrow-up",
              "title": _("Move this filter up")}
         ]
     if not islast:
@@ -98,7 +98,7 @@ def filter_actions(setname, f, position, islast):
             {"name": "movefilter_down",
              "url": reverse("modoboa.extensions.sievefilters.views.move_filter_down",
                              args=[setname, f["name"]]),
-             "img": "icon-arrow-down",
+             "img": "glyphicon glyphicon-arrow-down",
              "title": _("Move this filter down")},
         ]
     return render_actions(actions)
@@ -127,7 +127,10 @@ def display_condition(form, cnt):
     value = form["cond_value_%d" % cnt]
     t = template.Template("""
 <div id="condition_{{ idx }}" class="item">
-  {{ tfield }}{{ofield}}{{ vfield }}{{ verrors }}
+  <div class="col-lg-3 col-md-3 col-sm-3">{{ tfield }}</div>
+  <div class="col-lg-3 col-md-3 col-sm-3">{{ofield}}</div>
+  <div class="col-lg-4 col-md-4 col-sm-4">{{ vfield }}</div>
+  {{ verrors }}
 </div>
 """)
     return t.render(template.Context({
@@ -155,7 +158,12 @@ def display_action(form, cnt):
             break
     t = template.Template("""
 <div id="action_{{ idx }}" class="item">
-  {{ afield }}{% for v in values %}{{ v }}{% endfor %}{{ verrors }}
+<div class="col-lg-5 col-md-5 col-sm-5">
+  {{ afield }}
+  </div>
+  {% for v in values %}
+    <div class="col-lg-5 col-md-5 col-sm-5">{{ v }}</div>
+  {% endfor %}{{ verrors }}
 </div>
 """)
     return t.render(template.Context({

modoboa/extensions/sievefilters/views.py

@@ -91,7 +91,7 @@ def getfs(request, name):
             fs=content
         ))
 
-    menu = '<ul id="fsetmenu" class="nav nav-list"><li class="nav-header">%s</li>%s</ul>' % \
+    menu = '<ul id="fsetmenu" class="nav nav-pills nav-stacked"><li class="nav-header">%s</li>%s</ul>' % \
         (_("Actions"), fset_menu(editormode, name))
     resp = dict(menu=menu, content=htmlcontent)
     return render_to_json_response(resp)

modoboa/extensions/stats/app_settings.py

@@ -13,11 +13,13 @@ class ParametersForm(AdminParametersForm):
     logfile = forms.CharField(
         label=ugettext_lazy("Path to the log file"),
         initial="/var/log/mail.log",
-        help_text=ugettext_lazy("Path to log file used to collect statistics")
+        help_text=ugettext_lazy("Path to log file used to collect statistics"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     rrd_rootdir = forms.CharField(
         label=ugettext_lazy("Directory to store RRD files"),
         initial="/tmp/modoboa",
-        help_text=ugettext_lazy("Path to directory where RRD files are stored")
+        help_text=ugettext_lazy("Path to directory where RRD files are stored"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )

modoboa/extensions/stats/templates/stats/index.html

@@ -25,51 +25,51 @@ $(document).ready(function() {
 </script>
 {% endblock %}
 {% block leftcol %}
-<div id="periods" class="well sidebar-nav">
-  <ul class="nav nav-list">
-    <li class="nav-header">
-      {% trans "Filter" %}
-    </li>
-    <li>
-      <div class="input-prepend input-append">
-        <span class="add-on"><i class="icon-search"></i></span>
-        <input class="span10" id="searchquery" type="text" value="{% trans 'Search a domain' %}">
-      </div>
-    </li>
-    <li class="nav-header">
-      {% trans "Predefined time ranges" %}
-    </li>
-    {% for p in periods %}<li class="period">
-      <a href="#" class="period_selector" data-period="{{ p.name }}">{% trans p.label %}</a>
-    </li>
-    {% endfor %}
-    <li class="nav-header">
-      {% trans "Custom time range" %}
-    </li>
-    <li>
-      <form class="form-inline">
-        <span id="custom-period">
-          <div class="input-prepend">
-            <span class="add-on"><i class="icon-indent-left"></i></span>
-            <input id="id_from" class="span10" name="date_from" value="{{ start }}" type="text" readonly="readonly" />
+<div id="periods" class="well">
+  <ul class="nav nav-pills nav-stacked">
+        <li class="nav-header">
+          {% trans "Filter" %}
+        </li>
+        <li>
+          <div class="input-group">
+            <span class="input-group-addon"><i class="glyphicon glyphicon-search"></i></span>
+            <input class="form-control" id="searchquery" type="text" value="{% trans 'Search a domain' %}">
           </div>
-          <div class="input-prepend">
-            <span class="add-on"><i class="icon-indent-right"></i></span>
-            <input id="id_to" class="span10" name="date_to" value="{{ end }}" type="text" readonly="readonly" />
-          </div>
-          <button class="btn" id="customsend">{% trans "Apply" %}</button>
-        </span>
-      </form>
-    </li>
-  </ul>
-</div>
-{% endblock %}
-{% block apparea %}
-<div id="graphs" class="tabbable">
-  <ul class="nav nav-tabs">{% for id, gset in graph_sets.items %}
-    <li {% if forloop.first %}class="active"{% endif %}>
-      <a href="#graphs_{{ gset.html_id }}" data-toggle="tab">{{ gset.title }}</a>
-    </li>
+        </li>
+        <li class="nav-header">
+          {% trans "Predefined time ranges" %}
+        </li>
+        {% for p in periods %}<li class="period">
+          <a href="#" class="period_selector" data-period="{{ p.name }}">{% trans p.label %}</a>
+        </li>
+        {% endfor %}
+        <li class="nav-header">
+                {% trans "Custom time range" %}
+        </li>
+        <li>
+          <form class="form-horizontal">
+            <span id="custom-period">
+              <div class="input-group input-group-sm">
+                <div class="input-group-addon"><i class="glyphicon glyphicon-indent-left"></i></div>
+                <input id="id_from" class="col-lg-10 form-control" name="date_from" value="{{ start }}" type="text" readonly="readonly" />
+              </div>
+              <div class="input-group input-group-sm">
+                <div class="input-group-addon"><i class="glyphicon glyphicon-indent-right"></i></div>
+                <input id="id_to" class="col-lg-10 form-control" name="date_to" value="{{ end }}" type="text" readonly="readonly" />
+              </div>
+              <button class="btn btn-primary pull-right" id="customsend">{% trans "Apply" %}</button>
+            </span>
+          </form>
+        </li>
+      </ul>
+    </div>
+    {% endblock %}
+    {% block apparea %}
+    <div id="graphs" class="tabbable">
+      <ul class="nav nav-tabs">{% for id, gset in graph_sets.items %}
+        <li {% if forloop.first %}class="active"{% endif %}>
+          <a href="#graphs_{{ gset.html_id }}" data-toggle="tab">{{ gset.title }}</a>
+        </li>
   </ul>{% endfor %}
   <div class="tab-content">{% for id, gset in graph_sets.items %}
     <div class="tab-pane {% if forloop.first %}active{% endif %}" id="graphs_{{ gset.html_id }}">

modoboa/extensions/webmail/app_settings.py

@@ -13,7 +13,8 @@ class ParametersForm(AdminParametersForm):
     max_attachment_size = forms.CharField(
         label=_("Maximum attachment size"),
         initial="2048",
-        help_text=_("Maximum attachment size in bytes (or KB, MB, GB if specified)")
+        help_text=_("Maximum attachment size in bytes (or KB, MB, GB if specified)"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     sep1 = SeparatorField(label=_("IMAP settings"))
@@ -21,7 +22,8 @@ class ParametersForm(AdminParametersForm):
     imap_server = forms.CharField(
         label=_("Server address"),
         initial="127.0.0.1",
-        help_text=_("Address of your IMAP server")
+        help_text=_("Address of your IMAP server"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     imap_secured = YesNoField(
@@ -33,7 +35,8 @@ class ParametersForm(AdminParametersForm):
     imap_port = forms.IntegerField(
         label=_("Server port"),
         initial=143,
-        help_text=_("Listening port of your IMAP server")
+        help_text=_("Listening port of your IMAP server"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     sep2 = SeparatorField(label=_("SMTP settings"))
@@ -41,7 +44,8 @@ class ParametersForm(AdminParametersForm):
     smtp_server = forms.CharField(
         label=_("Server address"),
         initial="127.0.0.1",
-        help_text=_("Address of your SMTP server")
+        help_text=_("Address of your SMTP server"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     smtp_secured_mode = forms.ChoiceField(
@@ -51,13 +55,14 @@ class ParametersForm(AdminParametersForm):
                  ("ssl", "SSL/TLS")],
         initial="none",
         help_text=_("Use a secured connection to access SMTP server"),
-        widget=InlineRadioSelect
+        widget=forms.Select(attrs={"class": "form-control"})
     )
     
     smtp_port = forms.IntegerField(
         label=_("Server port"),
         initial=25,
-        help_text=_("Listening port of your SMTP server")
+        help_text=_("Listening port of your SMTP server"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     smtp_authentication = YesNoField(
@@ -77,7 +82,7 @@ class UserSettings(UserParametersForm):
         label=_("Default message display mode"),
         choices=[("html", "html"), ("plain", "text")],
         help_text=_("The default mode used when displaying a message"),
-        widget=InlineRadioSelect
+        widget=InlineRadioSelect(attrs={"type": "checkbox"})
     )
 
     enable_links = YesNoField(
@@ -89,19 +94,22 @@ class UserSettings(UserParametersForm):
     messages_per_page = forms.IntegerField(
         initial=40,
         label=_("Number of displayed emails per page"),
-        help_text=_("Sets the maximum number of messages displayed in a page")
+        help_text=_("Sets the maximum number of messages displayed in a page"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     refresh_interval = forms.IntegerField(
         initial=300,
         label=_("Listing refresh rate"),
-        help_text=_("Automatic folder refresh rate (in seconds)")
+        help_text=_("Automatic folder refresh rate (in seconds)"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     mboxes_col_width = forms.IntegerField(
         initial=200,
         label=_("Mailboxes container's width"),
-        help_text=_("The width of the mailbox list container")
+        help_text=_("The width of the mailbox list container"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     sep2 = SeparatorField(label=_("Mailboxes"))
@@ -109,19 +117,22 @@ class UserSettings(UserParametersForm):
     trash_folder = forms.CharField(
         initial="Trash",
         label=_("Trash folder"),
-        help_text=_("Folder where deleted messages go")
+        help_text=_("Folder where deleted messages go"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     sent_folder = forms.CharField(
         initial="Sent",
         label=_("Sent folder"),
-        help_text=_("Folder where copies of sent messages go")
+        help_text=_("Folder where copies of sent messages go"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     drafts_folder = forms.CharField(
         initial="Drafts",
         label=_("Drafts folder"),
-        help_text=_("Folder where drafts go")
+        help_text=_("Folder where drafts go"),
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     sep3 = SeparatorField(label=_("Composing messages"))
@@ -131,14 +142,14 @@ class UserSettings(UserParametersForm):
         label=_("Default editor"),
         choices=[("html", "html"), ("plain", "text")],
         help_text=_("The default editor to use when composing a message"),
-        widget=InlineRadioSelect
+        widget=InlineRadioSelect(attrs={"type": "checkbox"})
     )
 
     signature = forms.CharField(
         initial="",
         label=_("Signature text"),
         help_text=_("User defined email signature"),
-        widget=forms.widgets.Textarea,
+        widget=forms.widgets.Textarea(attrs={"class": "form-control"}),
         required=False
     )
 

modoboa/extensions/webmail/forms.py

@@ -79,16 +79,21 @@ def make_body_images_inline(body):
 class ComposeMailForm(forms.Form):
     """Compose mail form.
     """
-    to = forms.CharField(label=_("To"))
-    cc = forms.CharField(label=_("Cc"), required=False)
-    cci = forms.CharField(label=_("Cci"), required=False)
+    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, required=False
+        label=_("Subject"),
+        max_length=255,
+        required=False,
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
     origmsgid = forms.CharField(
-        label="", widget=forms.HiddenInput(), required=False
+        label="",
+        widget=forms.HiddenInput(attrs={"class": "form-control"}),
+        required=False
     )
-    body = forms.CharField(widget=forms.widgets.Textarea)
+    body = forms.CharField(widget=forms.widgets.Textarea(attrs={"class": "form-control"}))
 
     def _html_msg(self):
         """Create a multipart message.
@@ -189,9 +194,11 @@ class ForwardMailForm(ComposeMailForm):
 
 class FolderForm(forms.Form):
     oldname = forms.CharField(
-        label="", widget=forms.HiddenInput(), required=False
+        label="",
+        widget=forms.HiddenInput(attrs={"class": "form-control"}),
+        required=False
     )
-    name = forms.CharField()
+    name = forms.CharField(widget=forms.TextInput(attrs={"class": "form-control"}))
 
 
 class AttachmentForm(forms.Form):

modoboa/extensions/webmail/lib/imaputils.py

@@ -473,14 +473,14 @@ class IMAPconnector(object):
             md_mailboxes = []
         else:
             md_mailboxes = [
-                {"name": "INBOX", "class": "icon-inbox"},
+                {"name": "INBOX", "class": "glyphicon glyphicon-inbox"},
                 {"name": parameters.get_user(user, "DRAFTS_FOLDER"),
-                 "class": "icon-file"},
-                {"name": 'Junk', "class": "icon-fire"},
+                 "class": "glyphicon glyphicon-file"},
+                {"name": 'Junk', "class": "glyphicon glyphicon-fire"},
                 {"name": parameters.get_user(user, "SENT_FOLDER"),
-                 "class": "icon-envelope"},
+                 "class": "glyphicon glyphicon-envelope"},
                 {"name": parameters.get_user(user, "TRASH_FOLDER"),
-                 "class": "icon-trash"}
+                 "class": "glyphicon glyphicon-trash"}
             ]
         if until_mailbox:
             name, parent = separate_mailbox(until_mailbox, self.hdelimiter)

modoboa/extensions/webmail/static/webmail/css/folders.css

@@ -1,146 +0,0 @@
-#folders {
-    float: left;
-    width: 160px;
-}
-
-#folders2 {
-    border: 1px solid #ccc;
-    background-color: #eee;
-    position: absolute;
-    top: 100px;
-    left: 20px;
-    right: 20px;
-    bottom: 40px;
-    overflow-x: hidden;
-    overflow-y: auto;
-}
-
-#fdcreate {
-    position: absolute;
-    top: 370px;
-    left: 20px;
-    right: 20px;
-    text-align: center;
-}
-
-div.boxtitle {
-    text-align: center; 
-    font-weight: bold;
-    margin: 5px auto;
-    width: 100px;
-}
-
-.boxtitle a {
-    float: left;
-}
-
-.boxtitle label {
-    float: left;
-}
-
-.box h3 {
-    font-size: small;
-    margin: 2px 0px 2px 0px;
-}
-
-.box ul {
-    list-style: none;
-    padding: 0 0 0 5px;
-    margin: 0;
-    background-color: #FFFFFF;
-}
-
-.box li ul {
-    padding: 0 0 0 8px;
-}
-
-.box li {
-    margin: 0;
-    background-position: 2px 2px;
-    position: relative;
-}
-
-.box li.selected {
-    background-color: #FFFF77;
-}
-
-.box a:link, .box a:visited {
-    color: black;
-    text-decoration: none;
-}
-
-a.block {
-    display: block;
-    padding: 2px 10px 2px 30px;
-}
-
-.box a:hover { 
-    color: #6AB0C5;
-    text-decoration: none;
-}
-
-.box img {
-    border: 0;
-}
-
-.box li.dragging {
-    background-color: #6AB0C5;
-}
-
-img.footer {
-    float: left;
-    margin-top: 10px;
-    margin-left: 18px;
-}
-
-li.inbox {
-    background-image: url("/static/pics/overview.png");
-    background-repeat: no-repeat;
-}
-
-li.trash {
-    background-image: url("/static/pics/trash.png");
-    background-repeat: no-repeat;
-}
-
-li.folder {
-    background-image: url("/static/pics/folder.png");
-    background-repeat: no-repeat;
-}
-
-li.drafts {
-    background-image: url("/static/pics/draft.png");
-    background-repeat: no-repeat;
-}
-
-li.subfolders {
-    background-image: url("/static/pics/folder.png");
-    background-repeat: no-repeat;
-}
-
-ul.hidden {
-    display: none;
-}
-
-ul.visible {
-    display: block;
-    padding-bottom: 0;
-}
-
-div.clickbox {
-    position: absolute;
-    left: 2px;
-    top: 2px;
-    width: 14px;
-    height: 14px;
-}
-
-div.collapsed {
-    background-image: url("../../pics/collapsed.png");
-    background-repeat: no-repeat;
-}
-
-div.expanded {
-    background-image: url("../../pics/expanded.png");
-    background-repeat: no-repeat;
-}

modoboa/extensions/webmail/static/webmail/css/webmail.css

@@ -1,13 +1,66 @@
+    /* MEDIA */
+@media (max-width: 400px) {
+    td#subject,
+    td[name='subject']
+    {
+        max-width: 120px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+}
+
+@media (max-width: 500px) {
+    th#date,
+    td[name="date"],
+    #menubar .Actions{
+        display: none;
+    }
+}
+
+@media (max-width: 770px) {
+    #searchbox{
+        margin-left: 20px;
+    }
+}
+
+@media (max-width: 1198px) {
+    .container-fluid{
+        padding:0;
+    }
+    th#date,
+    td[name="date"]{
+        max-width: 60px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+    th#withatts,
+    td[name="withatts"],
+    th#drag,
+    td[name="drag"]{
+        display: none;
+    }
+    #leftcol.leftcol-display-none{
+        display: none;
+    }
+    .display-up-1198-webmail{
+        display: none;
+    }
+    .display-less-1198{
+        display: inherit;
+    }
+
+}
+
+    /* GENERAL */
 body, html {
-    overflow: hidden; 
-    height: 100%;
+    overflow: hidden;
 }
 
 #folders {
     position: fixed;
-    top: 60px;
-    left: 15px;
-    width: 200px;
+    top: 73px;
     overflow-y: auto;
     margin-bottom: 5px;
 }
@@ -37,14 +90,10 @@ body, html {
     width: 8px;
 }
 
-#mboxes_container { 
+#mboxes_container {
     overflow: auto;
 }
 
-#mboxes_container .nav-list .nav-list {
-    padding-right: 0;
-}
-
 #mboxes_container a[name=loadfolder] {
     white-space: nowrap;
     overflow: hidden;
@@ -52,22 +101,6 @@ body, html {
     -o-text-overflow: ellipsis;
 }
 
-#menubar { 
-    position: fixed;
-    left: 215px;
-    right: 0;
-    padding-left: 15px;
-    padding-right: 15px;
-    z-index: 10;
-}
-
-#listing { 
-    position: fixed;
-    left: 215px;
-    right: 0;
-    padding-left: 15px;
-}
-
 #mailcontent {
     border: 0;
     margin: 0;
@@ -76,37 +109,65 @@ body, html {
     height: 100%;
 }
 
-.unseen { 
+.unseen {
     font-weight: bold;
 }
 
-td[name="date"] { 
+td[name="date"] {
     text-align: right;
 }
 
-#quotabar { 
-    margin: 12px 0 0 15px;
-    width: 200px;
+#quotabar {
+    margin: 15px 0 0;
+    width: 190px;
 }
 
-#quotaraw { 
+#quotaraw {
     margin-left: 10px;
 }
 
+
+/*
+ *TOP NAVBAR
+ */
+
+.navbar-header{
+    display: inline-block;
+}
+
+/*
+ *listing
+ */
+#listing{
+    overflow: auto;
+}
+#listing.listing-up-1198{
+    padding-left: 15px;
+}
+#listing.listing-less-1198{
+    bottom: 0px;
+    left: 0px;
+    padding-left: 0px;
+    right: 0;
+    top: 0px;
+    overflow-y: hidden;
+}
+
+#listing .test{
+    overflow-y: scroll;
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 41px;
+    bottom: 41px;
+}
+
 /*
  * Mailboxes list
  */
-#mboxactions { 
+#mboxactions {
     position: fixed;
-    padding-left: 14px;
-}
-
-#mboxactions .btn-toolbar { 
-    margin-bottom: 0px;
-}
-
-#folders li { 
-    position: relative;
+    padding-left: 30px;
 }
 
 div.clickbox {
@@ -127,6 +188,14 @@ div.expanded {
     background-repeat: no-repeat;
 }
 
+div#leftcol #mboxes_container .nav .droppable div.clickbox{
+    z-index:800;
+}
+
+li.droppable li{
+    margin-left: 10px;
+}
+
 /*
  * Compose form
  */
@@ -135,23 +204,18 @@ div.expanded {
     padding-bottom: 5px;
 }
 
-#mailheader input { 
-    width: 99%;
-    padding: 2px 0;
-}
-
-#mailheader textarea { 
+#mailheader textarea {
     width: 99%;
     height: 40px;
     padding: 2px 0;
 }
 
-#mailheader label { 
+#mailheader label {
     text-align: left;
 }
 
 #mailheader .options {
-    margin-left: 180px;
+    margin-bottom: 8px;
 }
 
 #add_cc {
@@ -178,21 +242,18 @@ div.expanded {
 }
 
 #body_container {
-    position: absolute;
-    left: 15px;
-    right: 0px;
-    bottom: 15px;
+    position: static;
 }
 
 #id_body {
-    width: 99%;
+    width: 100%;
     height: 100%;
 }
 
 /*
  * Attachments form
  */
-#submit { 
+#submit {
     margin: 0 auto;
 }
 
@@ -205,7 +266,7 @@ div.expanded {
 }
 
 #attachment_list i,
-#attachment_list label { 
+#attachment_list label {
     float: left;
 }
 
@@ -227,22 +288,52 @@ div.expanded {
 /*
  * Folder form
  */
-.modal-body { 
+.modal-body {
     max-height: 300px;
     overflow-y: auto;
 }
 
-#folders2 li { 
+#folders2 li {
     position: relative;
 }
 
 /*
  * Table
  */
-td > input[type=checkbox] {
-    margin: 0;
-}
 
 td[class*=openable] {
     cursor: pointer;
 }
+
+/*
+ *Action buttons
+ */
+
+#menubar .btn-toolbar ul.navbar-right{
+    margin-right: 3%;
+}
+
+#menubar .btn-toolbar .navbar-form{
+    margin: 0px;
+}
+
+#rightcol #menubar #searchbox #searchfield{
+    margin-left:5px;
+}
+
+#menubar .sm-margin-left-back{
+    margin-left: 6px;
+}
+
+#menubar .md-margin-left-back{
+    margin-left: 16px;
+}
+
+
+/*
+ *send mail
+ */
+
+#body_container{
+    height: 600px;
+}

modoboa/extensions/webmail/static/webmail/js/webmail.js

@@ -20,6 +20,8 @@ Webmail.prototype = {
         mboxes_col_width: 200
     },
 
+
+
     initialize: function(options) {
         this.options = $.extend({}, this.defaults, options);
         this.rtimer = null;
@@ -36,13 +38,103 @@ Webmail.prototype = {
         });
         this.record_unseen_messages();
 
-        $("#folders").css({
-            bottom: $("#bottom-bar").outerHeight(true),
-            width: this.options.mboxes_col_width + 'px'
-        });
+
         $("#mboxactions").css({
-            bottom: $("#bottom-bar").outerHeight(true) + 10
+            bottom: $("#bottom-bar").outerHeight(true) + 30
         });
+
+
+
+        /* Responsive */
+
+        /* Responsive -> init */
+
+
+        if ($( window ).width()<1198){
+            $("#leftcol").addClass(
+                "leftcol-display-none"
+            );
+            $("#listing").addClass(
+                "col-lg-12 col-md-12 col-ms-12 col-xs-12"
+            );
+            $("#listing").css({
+                height: $(window).height() - 150 + 'px'
+            });
+        }
+
+        if ($( window ).width()>1198){
+            $("#folders").css({
+                bottom: $("#bottom-bar").outerHeight(true) + 10,
+                width: this.options.mboxes_col_width + 'px'
+            });
+            $("#listing").addClass(
+                "listing-up-1198"
+            );
+
+            $("#listing").css({
+                height: $(window).height() - 180 + 'px'
+            });
+
+            $("#rightcol").css({
+                marginLeft: 200 + 'px',
+                paddingRight: 90 + 'px'
+            });
+        }
+
+        /* Responsive -> on resizing window */
+        var that = this;
+        $(window).resize(function(){
+
+            if ($( window ).width()<767){
+                $("tr td[name='from']").css({
+                    width: 35 + '%'
+                });
+            }
+            if ($( window ).width()>767){
+                $("tr td[name='from']").css({
+                    width: 20 + '%'
+                });
+            }
+
+            if ($( window ).width()<1198){
+                $("#leftcol").addClass(
+                    "leftcol-display-none"
+                );
+                $("#listing").addClass(
+                    "col-lg-12 col-md-12 col-ms-12 col-xs-12"
+                );
+                $("#listing").css({
+                    height: $(window).height() - 150 + 'px'
+                });
+                $("#listing").removeClass(
+                    "listing-up-1198"
+                );
+                $("#rightcol").css({
+                    marginLeft: 0 + 'px',
+                    paddingRight: 0 + 'px'
+                });
+            }
+
+            if ($( window ).width()>1198){
+                $("#folders").css({
+                    bottom: $("#bottom-bar").outerHeight(true) + 10,
+                    width: that.options.mboxes_col_width + 'px'
+                });
+                $("#listing").addClass(
+                    "listing-up-1198"
+                );
+                $("#listing").css({
+                    height: $(window).height() - 180 + 'px'
+                });
+
+                $("#rightcol").css({
+                    marginLeft: 200 + 'px',
+                    paddingRight: 90 + 'px'
+                });
+            }
+        });
+
+        /* Responsive -> on resizing folders (leftcol) */
         $("#folders").resizable({
             start: function(event, ui) {
                 $('#listing iframe').css('pointer-events','none');
@@ -54,12 +146,29 @@ Webmail.prototype = {
                 $('#listing iframe').css('pointer-events','auto');
             }
         });
-        $("#folders").bind("resize", function(event, ui) {
-            if (typeof(ui.size) != "undefined") {
-                $("#menubar").css("left", ui.size.width + 15 + "px");
-                $("#listing").css("left", ui.size.width + 15 + "px");
+
+        $( "#folders" ).resizable({
+            resize: function(event, ui) {
+                if ($( window ).width()>1198){
+                    var width = ui.size.width;
+                    $("#rightcol").css({
+                        marginLeft: width + 'px'
+                    });
+                    $("#folders").css({
+                        width : width + 'px'
+                    });
+                    $("#rightcol").css({
+                        paddingRight: width - 110 + 'px'
+                    });
+                    if ($( window ).width()<1800){
+                        $("#rightcol").css({
+                            paddingRight: width - 110 + 'px'
+                        });
+                    }
+                }
             }
         });
+        /* end Responsive */
 
         this.resize();
 
@@ -189,7 +298,7 @@ Webmail.prototype = {
     page_update: function(response) {
         var curmb = this.get_current_mailbox();
 
-        $(window).unbind("resize");
+//       $(window).unbind("resize");
         if (!$('li[name="' + curmb + '"]').hasClass("active")) {
             this.load_and_select_mailbox(curmb);
         }
@@ -206,12 +315,10 @@ Webmail.prototype = {
         }
         if (response.navbar) {
             $("#bottom-bar-right").html(response.navbar);
+            $("#pagination-responsive").html(response.navbar);
         }
         $("#listing").html(response.listing);
         $("#listing").css({
-            top: $("#menubar").outerHeight(true) + 60 + "px",
-            bottom: $("#bottom-bar").outerHeight(true) + "px",
-            overflow: "auto"
         });
     },
 
@@ -239,7 +346,7 @@ Webmail.prototype = {
         var $link = $('a[href="' + mailbox + '"]');
         var parts = mailbox.split(this.options.hdelimiter);
         var dname = " " + parts[parts.length - 1];
-        var $i = $link.children("i");
+        var $i = $link.children("i:visible");
 
         this.unseen_counters[mailbox] = value;
         if (value) {
@@ -306,7 +413,7 @@ Webmail.prototype = {
             href: mailbox
         });
         var parts = mailbox.split(this.options.hdelimiter);
-        var linkcontent = "<i class='icon-folder-close'></i> ";
+        var linkcontent = "<i class='glyphicon glyphicon-folder-close'></i> ";
         var displayname = linkcontent + parts[parts.length - 1];
 
         $li.append($link);
@@ -328,7 +435,7 @@ Webmail.prototype = {
     inject_mailboxes: function($parent, mboxes) {
         var $ul = $("<ul />", {
             name: $parent.attr("name"),
-            'class': "hidden nav nav-list"
+            'class': "hidden nav nav-pills nav-stacked"
         });
         var $plink = $parent.children("a");
 
@@ -584,6 +691,7 @@ Webmail.prototype = {
     },
 
     send_mark_request: function(e) {
+
         e.preventDefault();
         if (!this.htmltable.current_selection().length) {
             return;
@@ -847,7 +955,7 @@ Webmail.prototype = {
         var top = $mailheader.outerHeight(true);
 
         $("#body_container").css({
-            top: top + "px"
+            height: $(window).height()*0.58 + "px"
         });
     },
 
@@ -948,10 +1056,10 @@ Webmail.prototype = {
         var $delbtn = $("<a />", {
             name: "delattachment",
             href: this.options.delattachment_url + "?name=" + tmpname,
-            html: "<i class='icon-remove'></i>"
+            html: "<i class='glyphicon glyphicon-remove'></i>"
         });
         var $label = $("<label />", {html: fname});
-        var $div = $("<div />", {'class': "row-fluid"}).append($delbtn, $label);
+        var $div = $("<div />", {'class': "row"}).append($delbtn, $label);
 
         $delbtn.click(this.del_attachment);
         $("#id_attachment").val("");

modoboa/extensions/webmail/templates/webmail/attachments.html

@@ -2,7 +2,7 @@
 {% load i18n %}
 {% block modalbody %}
 {{ block.super }}
-<div id="test" style="text-align: center">
+<div id="test" class="col-lg-offset-1 col-md-offset-2 col-sm-offset-2">
 <input type="button" class="btn btn-primary" id="submit" name="submit" value="{% trans 'Attach' %}" />
 </div>
 <div id="upload_status" style="display:none">
@@ -12,10 +12,10 @@
         style="width:0;height:0;border:0px solid #fff;"></iframe>
 <div class="well" id="attachment_list">
 {% for att in attachments %}
-<div class="row-fluid">
+<div class="row">
   <a href="{% url 'modoboa.extensions.webmail.views.delattachment' %}?name={{ att.tmpname }}"
      name="delattachment">
-    <i class="icon-remove"></i>
+    <i class="glyphicon glyphicon-remove"></i>
   </a>
   <label>{{ att.fname }}</label>
 </div>

modoboa/extensions/webmail/templates/webmail/compose.html

@@ -1,10 +1,10 @@
 {% load i18n lib_tags %}{% load url from future %}
 <form class="form-horizontal" method="POST" action="{{ posturl }}" id="composemail">{% csrf_token %}
-  <div id="compose-container">
+  <div id="compose-container" class="col-lg-12">
     <div id="mailheader" class="well">
       {% render_field form.to %}
-      <div class="options">
-        {% if not form.cc.value %}<a id="add_cc" href="#">{% trans "Add Cc field" %}</a>{% endif %} <a id="add_cci" href="#">{% trans "Add Cci field" %}</a>
+      <div class="options col-lg-offset-4 col-lg-7 col-md-offset-4 col-md-7 col-sm-offset-4 col-sm-7">
+        {% if not form.cc.value %}<a id="add_cc" href="#" class="btn btn-xs btn-default glyphicon glyphicon-plus">{% trans "Cc" %}</a>{% endif %} <a id="add_cci" href="#" class="btn btn-xs btn-default glyphicon glyphicon-plus">{% trans "Cci" %}</a>
       </div>
       {% if form.cc.value %}{% render_field form.cc %}{% else %}{% render_and_hide_field form.cc %}{% endif %}
       {% render_and_hide_field form.cci %}
@@ -23,11 +23,11 @@
 
     <div id="body_container">
     {% if body %}
-    <textarea id="id_body" name="body" class="editor">{% if bodyheader %}{{ bodyheader }}{% endif %}
+    <textarea id="id_body" name="body" class="form-control editor">{% if bodyheader %}{{ bodyheader }}{% endif %}
 {{ body }}
 </textarea>
     {% else %}
-    <textarea id="id_body" name="body" class="editor"></textarea>
+    <textarea id="id_body" name="body" class="form-control editor"></textarea>
     {% endif %}
     </div>
   </div>

modoboa/extensions/webmail/templates/webmail/folder.html

@@ -2,7 +2,7 @@
 {% load i18n webmail_tags %}
 {% block extrafields %}
 <div id="folders2" class="well">
-  <ul class="nav nav-list">
+  <ul class="nav nav-pills nav-stacked">
     <li class="nav-header">{% trans "Parent mailbox" %}</li>
     {% print_mailboxes mboxes selected withunseen selectonly hdelimiter %}
   </ul>

modoboa/extensions/webmail/templates/webmail/folders.html

@@ -1,6 +1,6 @@
 {% load i18n webmail_tags %}
 <div id="mboxes_container">
-  <ul class="nav nav-list">
+  <ul class="nav nav-pills nav-stacked">
     <li class="nav-header">{% trans "Mailboxes" %}</li>
     {% print_mailboxes mboxes selected withunseen %}
   </ul>

modoboa/extensions/webmail/templates/webmail/index.html

@@ -29,22 +29,26 @@ $(document).ready(function() {
 });
 </script>
 {% endblock %}
+
 {% block fixed_content %}
-<div id="leftcol">
-  <div id="folders" class="well sidebar-nav">{{ mboxes }}</div>
+<div class="row">
+    <div id="leftcol" class="col-lg-2 col-md-3 col-ms-3 col-xs-0">
+      <div id="folders" class="well">{{ mboxes }}</div>
+    </div>
+    <div id="rightcol" class="col-lg-11 col-md-12 col-ms-12 col-xs-12">
+        <div id="menubar" class="col-lg-12 col-md-12 col-ms-12 col-xs-12"></div>
+        <div id="listing" class=""></div>
+    </div>
 </div>
-<div id="menubar"></div>
-<div id="listing"></div>
 {% endblock %}
 {% block footerleft %}
 {% if quota != -1 %}
 <div id="quotabox">
   <label class="pull-left navbar-text">{% trans "Mailbox quota" %}</label>
-  <div id="quotabar" class="pull-left progress {% progress_color quota %}">
-    <div class="bar" style="width: {{ quota }}%"></div>
+  <div id="quotabar" class="pull-left progress">
+    <div class="{% progress_color quota %}" style="width: {{ quota }}%"></div>
   </div>
   <label id="quotaraw" class="pull-left navbar-text">{{ quota }}%</label>
 </div>
 {% endif %}
-{% endblock %}
-
+{% endblock %}

modoboa/extensions/webmail/templatetags/webmail_tags.py

@@ -14,20 +14,29 @@ register = template.Library()
 @register.simple_tag
 def viewmail_menu(selection, folder, user, mail_id=None):
     entries = [
+        {"name": "back",
+             "url": "javascript:history.go(-2);",
+             "img": "glyphicon glyphicon-arrow-left",
+             "class": "btn-primary sm-margin-left-back",
+             "label": _("Back")},
         {"name": "reply",
          "url": "action=reply&mbox=%s&mailid=%s" % (folder, mail_id),
-         "img": "icon-share",
+         "img": "glyphicon glyphicon-share",
+         "class": "btn-default",
          "label": _("Reply")},
         {"name": "replyall",
          "url": "action=reply&mbox=%s&mailid=%s&all=1" % (folder, mail_id),
          "img": "",
+         "class": "btn-default",
          "label": _("Reply all")},
         {"name": "forward",
          "url": "action=forward&mbox=%s&mailid=%s" % (folder, mail_id),
-         "img": "icon-arrow-right",
+         "img": "glyphicon glyphicon-arrow-right",
+         "class": "btn-default",
          "label": _("Forward")},
         {"name": "delete",
-         "img": "icon-trash",
+         "img": "glyphicon glyphicon-trash",
+         "class": "btn-default",
          "url": reverse(webmail.views.delete) + "?mbox=%s&selection[]=%s" % (folder, mail_id),
          "label": _("Delete")},
         {"name": "display_options",
@@ -44,13 +53,6 @@ def viewmail_menu(selection, folder, user, mail_id=None):
                             {"selection": selection, "entries": entries,
                              "user": user, "extraclasses": "pull-left"})
 
-    entries = [{"name": "close",
-                "title": _("Close this message"),
-                "img": "icon-remove"}]
-    menu += render_to_string(
-        'common/buttons_list.html',
-        {"entries": entries, "extraclasses": "pull-right"}
-    )
     return menu
 
 
@@ -59,11 +61,13 @@ def compose_menu(selection, backurl, user):
     entries = [
         {"name": "back",
          "url": "javascript:history.go(-2);",
-         "img": "icon-arrow-left",
+         "img": "glyphicon glyphicon-arrow-left",
+         "class": "btn-primary md-margin-left-back",
          "label": _("Back")},
         {"name": "sendmail",
          "url": "",
-         "img": "icon-envelope",
+         "img": "glyphicon glyphicon-envelope",
+         "class": "btn-default",
          "label": _("Send")},
     ]
     return render_to_string('common/buttons_list.html',
@@ -76,18 +80,18 @@ def listmailbox_menu(selection, folder, user):
     entries = [
         {"name": "compose",
          "url": "compose",
-         "img": "icon-edit",
+         "img": "glyphicon glyphicon-edit",
          "label": _("New message"),
-         "class": "btn"},
+         "class": "btn btn-default"},
         {"name": "totrash",
          "label": "",
-         "class": "",
-         "img": "icon-trash",
+         "class": "btn btn-default",
+         "img": "glyphicon glyphicon-trash",
          "url": reverse("modoboa.extensions.webmail.views.delete"),
          },
         {"name": "mark",
          "label": _("Mark messages"),
-         "class": "btn",
+         "class": "btn btn-default",
          "menu": [
              {"name": "mark-read",
               "label": _("As read"),
@@ -99,7 +103,7 @@ def listmailbox_menu(selection, folder, user):
          },
         {"name": "actions",
          "label": _("Actions"),
-         "class": "btn",
+         "class": "btn btn-default",
          "menu": [
              {"name": "compress",
               "label": _("Compress folder"),
@@ -152,7 +156,7 @@ def print_mailboxes(tree, selected=None, withunseen=False, selectonly=False, hde
             label += " (%d)" % mbox["unseen"]
             cssclass += " unseen"
             extra_attrs = ' data-toggle="%d"' % mbox["unseen"]
-        iclass = mbox["class"] if "class" in mbox else "icon-folder-close"
+        iclass = mbox["class"] if "class" in mbox else "glyphicon glyphicon-folder-close"
         result += """<a href='%s' class='%s' name='%s'%s>
   <i class="%s"></i>
   %s
@@ -162,33 +166,32 @@ def print_mailboxes(tree, selected=None, withunseen=False, selectonly=False, hde
        extra_attrs, iclass, label)
 
         if "sub" in mbox and len(mbox["sub"]):
-            result += "<ul name='%s' class='nav nav-list %s'>" % (mbox["path"], ul_state) \
+            result += "<ul name='%s' class='nav nav-pills nav-stacked %s'>" % (mbox["path"], ul_state) \
                 + print_mailboxes(mbox["sub"], selected, withunseen, selectonly, hdelimiter) + "</ul>\n"
         result += "</li>\n"
     return result
 
-
 @register.simple_tag
 def mboxes_menu():
     entries = [
         {"name": "newmbox",
          "url": reverse(webmail.views.newfolder),
-         "img": "icon-plus",
+         "img": "glyphicon glyphicon-plus",
          "title": _("Create a new mailbox"),
          "modal": True,
          "modalcb": "webmail.mboxform_cb",
          "closecb": "webmail.mboxform_close",
-         "class": "btn btn-mini"},
+         "class": "btn-default btn-sm"},
         {"name": "editmbox",
          "url": reverse(webmail.views.editfolder),
-         "img": "icon-edit",
+         "img": "glyphicon glyphicon-edit",
          "title": _("Edit the selected mailbox"),
-         "class": "btn btn-mini"},
+         "class": "btn-default btn-sm"},
         {"name": "removembox",
          "url": reverse(webmail.views.delfolder),
-         "img": "icon-remove",
+         "img": "glyphicon glyphicon-remove",
          "title": _("Remove the selected mailbox"),
-         "class": "btn btn-mini"}
+         "class": "btn-default btn-sm"}
     ]
 
     return render_to_string('common/buttons_list.html', dict(

modoboa/lib/formutils.py

@@ -368,7 +368,7 @@ class CustomRadioInput(RadioInput):
             label_for = ''
         choice_label = conditional_escape(force_unicode(self.choice_label))
         return mark_safe(
-            u'<label class="radio inline" %s>%s %s</label>'
+            u'<label class="radio-inline" %s>%s %s</label>'
             % (label_for, self.tag(), choice_label)
         )
 

modoboa/lib/templatetags/lib_tags.py

@@ -114,7 +114,7 @@ def pagination_bar(page):
 @register.simple_tag
 def alert(msg, typ):
     t = Template("""<div class="alert alert-{{ type }}">
-<a class="close" data-dismiss="alert">×</a>
+<a class="btn btn-default close" data-dismiss="alert">×</a>
 {{ msg }}
 </div>""")
     return t.render(Context(dict(type=typ, msg=msg)))
@@ -137,10 +137,10 @@ class="{{ mdclass }}{% if link.class %} {{ link.class }}{% endif %}"
 def progress_color(value):
     value = int(value)
     if value < 50:
-        return "progress-success"
+        return "progress-bar progress-bar-primary"
     if value < 80:
-        return "progress-warning"
-    return "progress-danger"
+        return "progress-bar progress-bar-warning"
+    return "progress-bar-danger"
 
 
 @register.filter
@@ -151,9 +151,7 @@ def fromunix(value):
 @register.simple_tag
 def render_tags(tags):
     t = Template("""{% for tag in tags %}
-<span class="label{% if tag.color %} label-{{ tag.color }}{% endif %}">
   <a href="#" class="filter {{ tag.type }}" name="{{ tag.name }}">{{ tag.label }}</a>
-</span>
 {% endfor %}
 """)
     return t.render(Context({"tags": tags}))

modoboa/static/css/custom.css

@@ -1,53 +1,101 @@
-body {
-    padding-top: 60px;
-    padding-bottom: 60px;
-}
+ /* ------- Media ------- */
 
-@media (max-width: 980px) {
-    /* Enable use of floated navbar text */
-    .navbar-text.pull-right {
-        float: none;
-        padding-left: 5px;
-        padding-right: 5px;
+@media (max-width: 440px) {
+
+
+    .navbar .col-xs-8{
+        padding-right:0;
     }
 }
 
-#fixed_content { 
-    position: absolute;
-    top: 60px;
-    right: 0;
-    left: 0;
-    overflow: hidden;
+ @media (max-width: 768px) {
+
+     .navbar .navbar-header,
+     .navbar #pagination-responsive{
+         display: inline-block;
+     }
+
+     tr th#tags,
+     tr.muted td[name="tags"]{
+         display: none;
+     }
+     button.navbar-toggle[data-target="#navigate-navbar-collapse"]{
+         margin-left: 20px;
+     }
+
+     .container > .navbar-header, .container-fluid > .navbar-header, .container > .navbar-collapse, .container-fluid > .navbar-collapse {
+         margin-left: 0;
+         margin-right: 0;
+     }
+ }
+
+ @media (max-width: 1198px) {
+     #pagination-responsive .display-less-1198{
+         display: inherit;
+     }
+     .display-up-1198{
+         display: none;
+     }
+     .dropdown{
+         margin:0px;
+     }
+     .btn-group{
+         margin:0px;
+     }
 }
 
-#bottom-bar-middle {
-    text-align: center;
+ /* --------- general --------- */
+
+ /* Form */
+
+ #uprefs_content input[type="checkbox"],
+ .modal input[type="checkbox"]{
+     margin-top: 10px;
+ }
+ /* Buttons */
+
+ .navbar .btn-link:hover,
+ .navbar .btn-link:focus{
+     text-decoration: none;
+ }
+
+ .well .nav > li > a {
+     padding: 2px 5px;
+ }
+
+ /* Colapse Nav */
+
+ .navbar-inverse .navbar-toggle {
+     border-color: #999999;
+ }
+
+ .navbar-inverse .navbar-toggle span{
+     color: white;
+ }
+
+ .navbar-toggle{
+     background-color: #000;
+     margin-bottom: 4px;
+     margin-top: 2px;
+ }
+
+
+ /* Global */
+
+h5{
+    font-size:15px;
+    font-weight: bold;
 }
 
-.navbar-text { 
-    color: #999999 !important;
+label{
+    font-weight: normal;
 }
 
-.simplepagination ul { 
-    display: inline-block;
-    margin-bottom: 0;
+.modals div.input-group{
+    margin-bottom:8px;
 }
 
-.simplepagination li { 
-    display: inline;
-}
-
-.simplepagination .disabled a,
-.simplepagination .disabled a:hover { 
-    background-color: transparent;
-    cursor: default;
-}
-
-.sidebar-nav { 
-    padding: 9px 0;
-}
-
-.form-horizontal .param-label { 
+.form-horizontal .param-label {
     float: left;
     padding-top: 5px;
     text-align: left;
@@ -55,59 +103,39 @@ body {
     margin-left: 20px;
 }
 
-.form-horizontal .param-controls { 
-    margin-left: 210px;
+.form-horizontal .input-group {
+    margin-bottom: 8px;
 }
 
-.form-horizontal .control-group { 
-    margin-bottom: 8px;
+.dropdown{
+    margin-right: 20px;
 }
 
 .dropdown-menu .radio {
     padding: 3px 33px;
 }
 
-.no-margin { 
+.no-margin {
     margin: 0 !important;
 }
 
-.dropdown-menu label:hover { 
+.dropdown-menu label:hover {
     background-color: #0088CC;
     color: white;
 }
 
-.spaced select,
-.spaced input[type="text"],
-.spaced input[type="password"],
-.spaced span {
-    margin-bottom: 8px;
-}
-
-.padded5 { 
-    padding: 5px;
-}
-
-.buttons_list .bset { 
+.buttons_list .bset {
     display: none;
 }
 
-.buttons_list .active { 
-    display: inline;
-}
-
-.tr-selected { 
+.tr-selected {
     background-color: #F5F5F5;
 }
 
-.hidden { 
+.hidden {
     display: none;
 }
 
-.help-block { 
-    color: #999999;
-    font-style: italic;
-}
-
 .label a {
     color: #FFFFFF;
     text-decoration: none;
@@ -117,12 +145,132 @@ body {
     table-layout: fixed;
 }
 
-.menubar-text {
-    display: inline;
-    vertical-align: middle;
+
+
+/* --------- main page --------- */
+
+
+ /* Top navbar section */
+
+ .top-navbar{
+     border-radius: 0;
+ }
+
+ .display-less-1198{
+     display: none;
+ }
+
+ div#navigate-navbar-collapse.navbar-collapse{
+     z-index: 9999;
+ }
+ html body div.navbar div.container-fluid div#navigate-navbar-collapse.collapse ul.nav li.dropdown a.dropdown-toggle{
+     color: white;
+ }
+
+ #pagination-responsive #pagination_bar{
+     display: none;
+ }
+
+ /*left navSideBar */
+
+.well{
+    padding: 11px;
 }
 
-.label-title {
-    vertical-align: middle;
-    margin: 0 10px;
-}
+.nav-header {
+    color: #959595;
+    font-size: 12px;
+    font-weight: 700;
+    letter-spacing: 1px;
+    text-transform: uppercase;
+}
+
+.well ul.nav li i.glyphicon{
+    color:black;
+}
+ .well ul.nav li.active i.glyphicon{
+     color:white;
+ }
+
+ /* Action buttons */
+
+ .action-buttons {
+     margin-bottom: 4px;
+ }
+
+
+ /* listing */
+
+ #listing{
+     margin-bottom:60px;
+ }
+
+ .table > thead > tr > th {
+     border-bottom: 2px solid #FBFBFB;
+ }
+
+/* Bottom navBar*/
+
+ .nav-bottom {
+     margin-top: 80px;
+ }
+
+#bottom-bar-middle {
+    text-align: center;
+}
+
+#bottom-bar-right{
+    text-align: right;
+}
+
+.navbar-text {
+    color: #999999 !important;
+    float:none;
+ }
+
+.simplepagination ul {
+    margin-bottom: 0;
+}
+
+.simplepagination li {
+    display: inline;
+    cursor: pointer;
+}
+.simplepagination li i{
+    color: white;
+    margin-bottom: 15px;
+    margin-top: 15px;
+}
+
+.simplepagination .disabled a,
+.simplepagination .disabled a:hover {
+    cursor: default;
+}
+
+
+/* --------- specific pages --------- */
+
+/* identities tables */
+
+.muted a:hover{
+    color: black;
+    text-decoration: none;
+}
+
+.label .idt{
+        color: gray;
+}
+
+.label{
+    margin-left:1px;
+}
+
+
+ /* modals */
+
+
+ /* settings */
+
+ .container-fluid #uprefs_content .form-horizontal .form-actions{
+     margin-right: 16px;
+ }

modoboa/static/css/login.css

@@ -1,19 +1,22 @@
-#box {
-    margin: 0 auto;
-    max-width: 350px;
+@media (max-width: 767px) {
+    form.login-form div.checkbox button.btn{
+        margin-top: 20px;
+        margin-bottom: 0;
+    }
 }
 
-#logo { 
-    margin-top: 60px;
-    text-align: center;
-    margin: 60px 0 30px;
-    max-width: 260px;
+body{
+    background-color: #EDEDEC;
 }
 
-#logo img {
-    height: auto;
+#logo{
+    margin-bottom: 5%;
 }
 
+.thumbnail{
+    background-color: transparent;
+    border-color: transparent;
+}
 .form-actions { 
     background-color: transparent;
     padding-right: 0px;
@@ -21,13 +24,32 @@
     margin-bottom: 0px;
 }
 
-.login-form {
-    margin: 0 ;
-    max-width: 300px;
-    padding-bottom: 0;
-}
-
 .login-error {
     margin: 20px auto;
     max-width: 300px;
-}
+}
+
+html body div.container div#box div#logo.row ul.thumbnails li{
+    list-style-type: none;
+}
+
+
+.thumbnails{
+    padding-left: 0;
+}
+
+.input-group {
+    border-collapse: separate;
+    display: table;
+    position: relative;
+}
+
+
+form.login-form div.checkbox button.btn{
+    margin-bottom:20px;
+}
+
+.login-form .form-group div.checkbox label{
+    padding-top: 0;
+    padding-bottom: 10px;
+}

modoboa/static/css/searchbar.css

@@ -1,6 +1,5 @@
 #searchbox {
     margin-right: 10px;
-    /*margin-left: 10px;*/
     z-index: 2;
     position: relative;
 }

modoboa/static/css/viewmail.css

@@ -8,7 +8,7 @@ body{margin:5px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-siz
 .alert-heading{color:inherit;}
 .alert .close{position:relative;top:-2px;right:-21px;line-height:18px;}
 .alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#468847;}
-.alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;color:#b94a48;}
+.alert-danger{background-color:#f2dede;border-color:#eed3d7;color:#b94a48;}
 .alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#3a87ad;}
 .alert-block{padding-top:14px;padding-bottom:14px;}
 .alert-block>p,.alert-block>ul{margin-bottom:0;}
@@ -49,6 +49,6 @@ pre {
     margin-left: 10px;
     margin-right: 20px;
     font-weight: bold;
-    width: 7.5%;
+    width: 13.5%;
     padding: 0 0 2px 0;
 }

modoboa/static/fonts/glyphicons-halflings-regular.svg

@@ -0,0 +1,229 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata></metadata>
+<defs>
+<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
+<font-face units-per-em="1200" ascent="960" descent="-240" />
+<missing-glyph horiz-adv-x="500" />
+<glyph />
+<glyph />
+<glyph unicode="&#xd;" />
+<glyph unicode=" " />
+<glyph unicode="*" d="M100 500v200h259l-183 183l141 141l183 -183v259h200v-259l183 183l141 -141l-183 -183h259v-200h-259l183 -183l-141 -141l-183 183v-259h-200v259l-183 -183l-141 141l183 183h-259z" />
+<glyph unicode="+" d="M0 400v300h400v400h300v-400h400v-300h-400v-400h-300v400h-400z" />
+<glyph unicode="&#xa0;" />
+<glyph unicode="&#x2000;" horiz-adv-x="652" />
+<glyph unicode="&#x2001;" horiz-adv-x="1304" />
+<glyph unicode="&#x2002;" horiz-adv-x="652" />
+<glyph unicode="&#x2003;" horiz-adv-x="1304" />
+<glyph unicode="&#x2004;" horiz-adv-x="434" />
+<glyph unicode="&#x2005;" horiz-adv-x="326" />
+<glyph unicode="&#x2006;" horiz-adv-x="217" />
+<glyph unicode="&#x2007;" horiz-adv-x="217" />
+<glyph unicode="&#x2008;" horiz-adv-x="163" />
+<glyph unicode="&#x2009;" horiz-adv-x="260" />
+<glyph unicode="&#x200a;" horiz-adv-x="72" />
+<glyph unicode="&#x202f;" horiz-adv-x="260" />
+<glyph unicode="&#x205f;" horiz-adv-x="326" />
+<glyph unicode="&#x20ac;" d="M100 500l100 100h113q0 47 5 100h-218l100 100h135q37 167 112 257q117 141 297 141q242 0 354 -189q60 -103 66 -209h-181q0 55 -25.5 99t-63.5 68t-75 36.5t-67 12.5q-24 0 -52.5 -10t-62.5 -32t-65.5 -67t-50.5 -107h379l-100 -100h-300q-6 -46 -6 -100h406l-100 -100 h-300q9 -74 33 -132t52.5 -91t62 -54.5t59 -29t46.5 -7.5q29 0 66 13t75 37t63.5 67.5t25.5 96.5h174q-31 -172 -128 -278q-107 -117 -274 -117q-205 0 -324 158q-36 46 -69 131.5t-45 205.5h-217z" />
+<glyph unicode="&#x2212;" d="M200 400h900v300h-900v-300z" />
+<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
+<glyph unicode="&#x2601;" d="M-14 494q0 -80 56.5 -137t135.5 -57h750q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5z" />
+<glyph unicode="&#x2709;" d="M0 100l400 400l200 -200l200 200l400 -400h-1200zM0 300v600l300 -300zM0 1100l600 -603l600 603h-1200zM900 600l300 300v-600z" />
+<glyph unicode="&#x270f;" d="M-13 -13l333 112l-223 223zM187 403l214 -214l614 614l-214 214zM887 1103l214 -214l99 92q13 13 13 32.5t-13 33.5l-153 153q-15 13 -33 13t-33 -13z" />
+<glyph unicode="&#xe001;" d="M0 1200h1200l-500 -550v-550h300v-100h-800v100h300v550z" />
+<glyph unicode="&#xe002;" d="M14 84q18 -55 86 -75.5t147 5.5q65 21 109 69t44 90v606l600 155v-521q-64 16 -138 -7q-79 -26 -122.5 -83t-25.5 -111q18 -55 86 -75.5t147 4.5q70 23 111.5 63.5t41.5 95.5v881q0 10 -7 15.5t-17 2.5l-752 -193q-10 -3 -17 -12.5t-7 -19.5v-689q-64 17 -138 -7 q-79 -25 -122.5 -82t-25.5 -112z" />
+<glyph unicode="&#xe003;" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233z" />
+<glyph unicode="&#xe005;" d="M100 784q0 64 28 123t73 100.5t104.5 64t119 20.5t120 -38.5t104.5 -104.5q48 69 109.5 105t121.5 38t118.5 -20.5t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-149.5 152.5t-126.5 127.5 t-94 124.5t-33.5 117.5z" />
+<glyph unicode="&#xe006;" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1z" />
+<glyph unicode="&#xe007;" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1zM237 700l196 -142l-73 -226l192 140l195 -141l-74 229l193 140h-235l-77 211l-78 -211h-239z" />
+<glyph unicode="&#xe008;" d="M0 0v143l400 257v100q-37 0 -68.5 74.5t-31.5 125.5v200q0 124 88 212t212 88t212 -88t88 -212v-200q0 -51 -31.5 -125.5t-68.5 -74.5v-100l400 -257v-143h-1200z" />
+<glyph unicode="&#xe009;" d="M0 0v1100h1200v-1100h-1200zM100 100h100v100h-100v-100zM100 300h100v100h-100v-100zM100 500h100v100h-100v-100zM100 700h100v100h-100v-100zM100 900h100v100h-100v-100zM300 100h600v400h-600v-400zM300 600h600v400h-600v-400zM1000 100h100v100h-100v-100z M1000 300h100v100h-100v-100zM1000 500h100v100h-100v-100zM1000 700h100v100h-100v-100zM1000 900h100v100h-100v-100z" />
+<glyph unicode="&#xe010;" d="M0 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM0 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5zM600 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM600 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="&#xe011;" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 450v200q0 21 14.5 35.5t35.5 14.5h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="&#xe012;" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v200q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5 t-14.5 -35.5v-200zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="&#xe013;" d="M29 454l419 -420l818 820l-212 212l-607 -607l-206 207z" />
+<glyph unicode="&#xe014;" d="M106 318l282 282l-282 282l212 212l282 -282l282 282l212 -212l-282 -282l282 -282l-212 -212l-282 282l-282 -282z" />
+<glyph unicode="&#xe015;" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233zM300 600v200h100v100h200v-100h100v-200h-100v-100h-200v100h-100z" />
+<glyph unicode="&#xe016;" d="M23 694q0 200 142 342t342 142t342 -142t142 -342q0 -141 -78 -262l300 -299q7 -7 7 -18t-7 -18l-109 -109q-8 -8 -18 -8t-18 8l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 694q0 -136 97 -233t234 -97t233.5 97t96.5 233t-96.5 233t-233.5 97t-234 -97 t-97 -233zM300 601h400v200h-400v-200z" />
+<glyph unicode="&#xe017;" d="M23 600q0 183 105 331t272 210v-166q-103 -55 -165 -155t-62 -220q0 -177 125 -302t302 -125t302 125t125 302q0 120 -62 220t-165 155v166q167 -62 272 -210t105 -331q0 -118 -45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5 zM500 750q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v400q0 21 -14.5 35.5t-35.5 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-400z" />
+<glyph unicode="&#xe018;" d="M100 1h200v300h-200v-300zM400 1v500h200v-500h-200zM700 1v800h200v-800h-200zM1000 1v1200h200v-1200h-200z" />
+<glyph unicode="&#xe019;" d="M26 601q0 -33 6 -74l151 -38l2 -6q14 -49 38 -93l3 -5l-80 -134q45 -59 105 -105l133 81l5 -3q45 -26 94 -39l5 -2l38 -151q40 -5 74 -5q27 0 74 5l38 151l6 2q46 13 93 39l5 3l134 -81q56 44 104 105l-80 134l3 5q24 44 39 93l1 6l152 38q5 40 5 74q0 28 -5 73l-152 38 l-1 6q-16 51 -39 93l-3 5l80 134q-44 58 -104 105l-134 -81l-5 3q-45 25 -93 39l-6 1l-38 152q-40 5 -74 5q-27 0 -74 -5l-38 -152l-5 -1q-50 -14 -94 -39l-5 -3l-133 81q-59 -47 -105 -105l80 -134l-3 -5q-25 -47 -38 -93l-2 -6l-151 -38q-6 -48 -6 -73zM385 601 q0 88 63 151t152 63t152 -63t63 -151q0 -89 -63 -152t-152 -63t-152 63t-63 152z" />
+<glyph unicode="&#xe020;" d="M100 1025v50q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-50q0 -11 -7 -18t-18 -7h-1050q-11 0 -18 7t-7 18zM200 100v800h900v-800q0 -41 -29.5 -71t-70.5 -30h-700q-41 0 -70.5 30 t-29.5 71zM300 100h100v700h-100v-700zM500 100h100v700h-100v-700zM500 1100h300v100h-300v-100zM700 100h100v700h-100v-700zM900 100h100v700h-100v-700z" />
+<glyph unicode="&#xe021;" d="M1 601l656 644l644 -644h-200v-600h-300v400h-300v-400h-300v600h-200z" />
+<glyph unicode="&#xe022;" d="M100 25v1150q0 11 7 18t18 7h475v-500h400v-675q0 -11 -7 -18t-18 -7h-850q-11 0 -18 7t-7 18zM700 800v300l300 -300h-300z" />
+<glyph unicode="&#xe023;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 500v400h100 v-300h200v-100h-300z" />
+<glyph unicode="&#xe024;" d="M-100 0l431 1200h209l-21 -300h162l-20 300h208l431 -1200h-538l-41 400h-242l-40 -400h-539zM488 500h224l-27 300h-170z" />
+<glyph unicode="&#xe025;" d="M0 0v400h490l-290 300h200v500h300v-500h200l-290 -300h490v-400h-1100zM813 200h175v100h-175v-100z" />
+<glyph unicode="&#xe026;" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM188 600q0 -170 121 -291t291 -121t291 121t121 291t-121 291t-291 121 t-291 -121t-121 -291zM350 600h150v300h200v-300h150l-250 -300z" />
+<glyph unicode="&#xe027;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM350 600l250 300 l250 -300h-150v-300h-200v300h-150z" />
+<glyph unicode="&#xe028;" d="M0 25v475l200 700h800l199 -700l1 -475q0 -11 -7 -18t-18 -7h-1150q-11 0 -18 7t-7 18zM200 500h200l50 -200h300l50 200h200l-97 500h-606z" />
+<glyph unicode="&#xe029;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 397v401 l297 -200z" />
+<glyph unicode="&#xe030;" d="M23 600q0 -118 45.5 -224.5t123 -184t184 -123t224.5 -45.5t224.5 45.5t184 123t123 184t45.5 224.5h-150q0 -177 -125 -302t-302 -125t-302 125t-125 302t125 302t302 125q136 0 246 -81l-146 -146h400v400l-145 -145q-157 122 -355 122q-118 0 -224.5 -45.5t-184 -123 t-123 -184t-45.5 -224.5z" />
+<glyph unicode="&#xe031;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5q198 0 355 -122l145 145v-400h-400l147 147q-112 80 -247 80q-177 0 -302 -125t-125 -302h-150zM100 0v400h400l-147 -147q112 -80 247 -80q177 0 302 125t125 302h150q0 -118 -45.5 -224.5t-123 -184t-184 -123 t-224.5 -45.5q-198 0 -355 122z" />
+<glyph unicode="&#xe032;" d="M100 0h1100v1200h-1100v-1200zM200 100v900h900v-900h-900zM300 200v100h100v-100h-100zM300 400v100h100v-100h-100zM300 600v100h100v-100h-100zM300 800v100h100v-100h-100zM500 200h500v100h-500v-100zM500 400v100h500v-100h-500zM500 600v100h500v-100h-500z M500 800v100h500v-100h-500z" />
+<glyph unicode="&#xe033;" d="M0 100v600q0 41 29.5 70.5t70.5 29.5h100v200q0 82 59 141t141 59h300q82 0 141 -59t59 -141v-200h100q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-900q-41 0 -70.5 29.5t-29.5 70.5zM400 800h300v150q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-150z" />
+<glyph unicode="&#xe034;" d="M100 0v1100h100v-1100h-100zM300 400q60 60 127.5 84t127.5 17.5t122 -23t119 -30t110 -11t103 42t91 120.5v500q-40 -81 -101.5 -115.5t-127.5 -29.5t-138 25t-139.5 40t-125.5 25t-103 -29.5t-65 -115.5v-500z" />
+<glyph unicode="&#xe035;" d="M0 275q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 127 70.5 231.5t184.5 161.5t245 57t245 -57t184.5 -161.5t70.5 -231.5v-300q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 116 -49.5 227t-131 192.5t-192.5 131t-227 49.5t-227 -49.5t-192.5 -131t-131 -192.5 t-49.5 -227v-300zM200 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14zM800 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14z" />
+<glyph unicode="&#xe036;" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM688 459l141 141l-141 141l71 71l141 -141l141 141l71 -71l-141 -141l141 -141l-71 -71l-141 141l-141 -141z" />
+<glyph unicode="&#xe037;" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM700 857l69 53q111 -135 111 -310q0 -169 -106 -302l-67 54q86 110 86 248q0 146 -93 257z" />
+<glyph unicode="&#xe038;" d="M0 401v400h300l300 200v-800l-300 200h-300zM702 858l69 53q111 -135 111 -310q0 -170 -106 -303l-67 55q86 110 86 248q0 145 -93 257zM889 951l7 -8q123 -151 123 -344q0 -189 -119 -339l-7 -8l81 -66l6 8q142 178 142 405q0 230 -144 408l-6 8z" />
+<glyph unicode="&#xe039;" d="M0 0h500v500h-200v100h-100v-100h-200v-500zM0 600h100v100h400v100h100v100h-100v300h-500v-600zM100 100v300h300v-300h-300zM100 800v300h300v-300h-300zM200 200v100h100v-100h-100zM200 900h100v100h-100v-100zM500 500v100h300v-300h200v-100h-100v-100h-200v100 h-100v100h100v200h-200zM600 0v100h100v-100h-100zM600 1000h100v-300h200v-300h300v200h-200v100h200v500h-600v-200zM800 800v300h300v-300h-300zM900 0v100h300v-100h-300zM900 900v100h100v-100h-100zM1100 200v100h100v-100h-100z" />
+<glyph unicode="&#xe040;" d="M0 200h100v1000h-100v-1000zM100 0v100h300v-100h-300zM200 200v1000h100v-1000h-100zM500 0v91h100v-91h-100zM500 200v1000h200v-1000h-200zM700 0v91h100v-91h-100zM800 200v1000h100v-1000h-100zM900 0v91h200v-91h-200zM1000 200v1000h200v-1000h-200z" />
+<glyph unicode="&#xe041;" d="M0 700l1 475q0 10 7.5 17.5t17.5 7.5h474l700 -700l-500 -500zM148 953q0 -42 29 -71q30 -30 71.5 -30t71.5 30q29 29 29 71t-29 71q-30 30 -71.5 30t-71.5 -30q-29 -29 -29 -71z" />
+<glyph unicode="&#xe042;" d="M1 700l1 475q0 11 7 18t18 7h474l700 -700l-500 -500zM148 953q0 -42 30 -71q29 -30 71 -30t71 30q30 29 30 71t-30 71q-29 30 -71 30t-71 -30q-30 -29 -30 -71zM701 1200h100l700 -700l-500 -500l-50 50l450 450z" />
+<glyph unicode="&#xe043;" d="M100 0v1025l175 175h925v-1000l-100 -100v1000h-750l-100 -100h750v-1000h-900z" />
+<glyph unicode="&#xe044;" d="M200 0l450 444l450 -443v1150q0 20 -14.5 35t-35.5 15h-800q-21 0 -35.5 -15t-14.5 -35v-1151z" />
+<glyph unicode="&#xe045;" d="M0 100v700h200l100 -200h600l100 200h200v-700h-200v200h-800v-200h-200zM253 829l40 -124h592l62 124l-94 346q-2 11 -10 18t-18 7h-450q-10 0 -18 -7t-10 -18zM281 24l38 152q2 10 11.5 17t19.5 7h500q10 0 19.5 -7t11.5 -17l38 -152q2 -10 -3.5 -17t-15.5 -7h-600 q-10 0 -15.5 7t-3.5 17z" />
+<glyph unicode="&#xe046;" d="M0 200q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-150q-4 8 -11.5 21.5t-33 48t-53 61t-69 48t-83.5 21.5h-200q-41 0 -82 -20.5t-70 -50t-52 -59t-34 -50.5l-12 -20h-150q-41 0 -70.5 -29.5t-29.5 -70.5v-600z M356 500q0 100 72 172t172 72t172 -72t72 -172t-72 -172t-172 -72t-172 72t-72 172zM494 500q0 -44 31 -75t75 -31t75 31t31 75t-31 75t-75 31t-75 -31t-31 -75zM900 700v100h100v-100h-100z" />
+<glyph unicode="&#xe047;" d="M53 0h365v66q-41 0 -72 11t-49 38t1 71l92 234h391l82 -222q16 -45 -5.5 -88.5t-74.5 -43.5v-66h417v66q-34 1 -74 43q-18 19 -33 42t-21 37l-6 13l-385 998h-93l-399 -1006q-24 -48 -52 -75q-12 -12 -33 -25t-36 -20l-15 -7v-66zM416 521l178 457l46 -140l116 -317h-340 z" />
+<glyph unicode="&#xe048;" d="M100 0v89q41 7 70.5 32.5t29.5 65.5v827q0 28 -1 39.5t-5.5 26t-15.5 21t-29 14t-49 14.5v71l471 -1q120 0 213 -88t93 -228q0 -55 -11.5 -101.5t-28 -74t-33.5 -47.5t-28 -28l-12 -7q8 -3 21.5 -9t48 -31.5t60.5 -58t47.5 -91.5t21.5 -129q0 -84 -59 -156.5t-142 -111 t-162 -38.5h-500zM400 200h161q89 0 153 48.5t64 132.5q0 90 -62.5 154.5t-156.5 64.5h-159v-400zM400 700h139q76 0 130 61.5t54 138.5q0 82 -84 130.5t-239 48.5v-379z" />
+<glyph unicode="&#xe049;" d="M200 0v57q77 7 134.5 40.5t65.5 80.5l173 849q10 56 -10 74t-91 37q-6 1 -10.5 2.5t-9.5 2.5v57h425l2 -57q-33 -8 -62 -25.5t-46 -37t-29.5 -38t-17.5 -30.5l-5 -12l-128 -825q-10 -52 14 -82t95 -36v-57h-500z" />
+<glyph unicode="&#xe050;" d="M-75 200h75v800h-75l125 167l125 -167h-75v-800h75l-125 -167zM300 900v300h150h700h150v-300h-50q0 29 -8 48.5t-18.5 30t-33.5 15t-39.5 5.5t-50.5 1h-200v-850l100 -50v-100h-400v100l100 50v850h-200q-34 0 -50.5 -1t-40 -5.5t-33.5 -15t-18.5 -30t-8.5 -48.5h-49z " />
+<glyph unicode="&#xe051;" d="M33 51l167 125v-75h800v75l167 -125l-167 -125v75h-800v-75zM100 901v300h150h700h150v-300h-50q0 29 -8 48.5t-18 30t-33.5 15t-40 5.5t-50.5 1h-200v-650l100 -50v-100h-400v100l100 50v650h-200q-34 0 -50.5 -1t-39.5 -5.5t-33.5 -15t-18.5 -30t-8 -48.5h-50z" />
+<glyph unicode="&#xe052;" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 350q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM0 650q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1000q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 950q0 -20 14.5 -35t35.5 -15h600q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-600q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" />
+<glyph unicode="&#xe053;" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 650q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM200 350q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM200 950q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" />
+<glyph unicode="&#xe054;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1000q-21 0 -35.5 15 t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-600 q-21 0 -35.5 15t-14.5 35z" />
+<glyph unicode="&#xe055;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100 q-21 0 -35.5 15t-14.5 35z" />
+<glyph unicode="&#xe056;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM300 50v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800 q-21 0 -35.5 15t-14.5 35zM300 650v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 950v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15 h-800q-21 0 -35.5 15t-14.5 35z" />
+<glyph unicode="&#xe057;" d="M-101 500v100h201v75l166 -125l-166 -125v75h-201zM300 0h100v1100h-100v-1100zM500 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35 v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 650q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100 q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100z" />
+<glyph unicode="&#xe058;" d="M1 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 650 q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM801 0v1100h100v-1100 h-100zM934 550l167 -125v75h200v100h-200v75z" />
+<glyph unicode="&#xe059;" d="M0 275v650q0 31 22 53t53 22h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53zM900 600l300 300v-600z" />
+<glyph unicode="&#xe060;" d="M0 44v1012q0 18 13 31t31 13h1112q19 0 31.5 -13t12.5 -31v-1012q0 -18 -12.5 -31t-31.5 -13h-1112q-18 0 -31 13t-13 31zM100 263l247 182l298 -131l-74 156l293 318l236 -288v500h-1000v-737zM208 750q0 56 39 95t95 39t95 -39t39 -95t-39 -95t-95 -39t-95 39t-39 95z " />
+<glyph unicode="&#xe062;" d="M148 745q0 124 60.5 231.5t165 172t226.5 64.5q123 0 227 -63t164.5 -169.5t60.5 -229.5t-73 -272q-73 -114 -166.5 -237t-150.5 -189l-57 -66q-10 9 -27 26t-66.5 70.5t-96 109t-104 135.5t-100.5 155q-63 139 -63 262zM342 772q0 -107 75.5 -182.5t181.5 -75.5 q107 0 182.5 75.5t75.5 182.5t-75.5 182t-182.5 75t-182 -75.5t-75 -181.5z" />
+<glyph unicode="&#xe063;" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM173 600q0 -177 125.5 -302t301.5 -125v854q-176 0 -301.5 -125 t-125.5 -302z" />
+<glyph unicode="&#xe064;" d="M117 406q0 94 34 186t88.5 172.5t112 159t115 177t87.5 194.5q21 -71 57.5 -142.5t76 -130.5t83 -118.5t82 -117t70 -116t50 -125.5t18.5 -136q0 -89 -39 -165.5t-102 -126.5t-140 -79.5t-156 -33.5q-114 6 -211.5 53t-161.5 139t-64 210zM243 414q14 -82 59.5 -136 t136.5 -80l16 98q-7 6 -18 17t-34 48t-33 77q-15 73 -14 143.5t10 122.5l9 51q-92 -110 -119.5 -185t-12.5 -156z" />
+<glyph unicode="&#xe065;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5q366 -6 397 -14l-186 -186h-311q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v125l200 200v-225q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM436 341l161 50l412 412l-114 113l-405 -405zM995 1015l113 -113l113 113l-21 85l-92 28z" />
+<glyph unicode="&#xe066;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h261l2 -80q-133 -32 -218 -120h-145q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-53q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5 zM423 524q30 38 81.5 64t103 35.5t99 14t77.5 3.5l29 -1v-209l360 324l-359 318v-216q-7 0 -19 -1t-48 -8t-69.5 -18.5t-76.5 -37t-76.5 -59t-62 -88t-39.5 -121.5z" />
+<glyph unicode="&#xe067;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q61 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-169q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM342 632l283 -284l567 567l-137 137l-430 -431l-146 147z" />
+<glyph unicode="&#xe068;" d="M0 603l300 296v-198h200v200h-200l300 300l295 -300h-195v-200h200v198l300 -296l-300 -300v198h-200v-200h195l-295 -300l-300 300h200v200h-200v-198z" />
+<glyph unicode="&#xe069;" d="M200 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-1100l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="&#xe070;" d="M0 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-487l500 487v-1100l-500 488v-488l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="&#xe071;" d="M136 550l564 550v-487l500 487v-1100l-500 488v-488z" />
+<glyph unicode="&#xe072;" d="M200 0l900 550l-900 550v-1100z" />
+<glyph unicode="&#xe073;" d="M200 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5t-14.5 -35.5v-800zM600 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" />
+<glyph unicode="&#xe074;" d="M200 150q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v800q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" />
+<glyph unicode="&#xe075;" d="M0 0v1100l500 -487v487l564 -550l-564 -550v488z" />
+<glyph unicode="&#xe076;" d="M0 0v1100l500 -487v487l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-500 -488v488z" />
+<glyph unicode="&#xe077;" d="M300 0v1100l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438z" />
+<glyph unicode="&#xe078;" d="M100 250v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5zM100 500h1100l-550 564z" />
+<glyph unicode="&#xe079;" d="M185 599l592 -592l240 240l-353 353l353 353l-240 240z" />
+<glyph unicode="&#xe080;" d="M272 194l353 353l-353 353l241 240l572 -571l21 -22l-1 -1v-1l-592 -591z" />
+<glyph unicode="&#xe081;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM300 500h200v-200h200v200h200v200h-200v200h-200v-200h-200v-200z" />
+<glyph unicode="&#xe082;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM300 500h600v200h-600v-200z" />
+<glyph unicode="&#xe083;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM246 459l213 -213l141 142l141 -142l213 213l-142 141l142 141l-213 212l-141 -141l-141 142l-212 -213l141 -141 z" />
+<glyph unicode="&#xe084;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM270 551l276 -277l411 411l-175 174l-236 -236l-102 102z" />
+<glyph unicode="&#xe085;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM364 700h143q4 0 11.5 -1t11 -1t6.5 3t3 9t1 11t3.5 8.5t3.5 6t5.5 4t6.5 2.5t9 1.5t9 0.5h11.5h12.5 q19 0 30 -10t11 -26q0 -22 -4 -28t-27 -22q-5 -1 -12.5 -3t-27 -13.5t-34 -27t-26.5 -46t-11 -68.5h200q5 3 14 8t31.5 25.5t39.5 45.5t31 69t14 94q0 51 -17.5 89t-42 58t-58.5 32t-58.5 15t-51.5 3q-50 0 -90.5 -12t-75 -38.5t-53.5 -74.5t-19 -114zM500 300h200v100h-200 v-100z" />
+<glyph unicode="&#xe086;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM400 300h400v100h-100v300h-300v-100h100v-200h-100v-100zM500 800h200v100h-200v-100z" />
+<glyph unicode="&#xe087;" d="M0 500v200h195q31 125 98.5 199.5t206.5 100.5v200h200v-200q54 -20 113 -60t112.5 -105.5t71.5 -134.5h203v-200h-203q-25 -102 -116.5 -186t-180.5 -117v-197h-200v197q-140 27 -208 102.5t-98 200.5h-194zM290 500q24 -73 79.5 -127.5t130.5 -78.5v206h200v-206 q149 48 201 206h-201v200h200q-25 74 -75.5 127t-124.5 77v-204h-200v203q-75 -23 -130 -77t-79 -126h209v-200h-210z" />
+<glyph unicode="&#xe088;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM356 465l135 135 l-135 135l109 109l135 -135l135 135l109 -109l-135 -135l135 -135l-109 -109l-135 135l-135 -135z" />
+<glyph unicode="&#xe089;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM322 537l141 141 l87 -87l204 205l142 -142l-346 -345z" />
+<glyph unicode="&#xe090;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -115 62 -215l568 567q-100 62 -216 62q-171 0 -292.5 -121.5t-121.5 -292.5zM391 245q97 -59 209 -59q171 0 292.5 121.5t121.5 292.5 q0 112 -59 209z" />
+<glyph unicode="&#xe091;" d="M0 547l600 453v-300h600v-300h-600v-301z" />
+<glyph unicode="&#xe092;" d="M0 400v300h600v300l600 -453l-600 -448v301h-600z" />
+<glyph unicode="&#xe093;" d="M204 600l450 600l444 -600h-298v-600h-300v600h-296z" />
+<glyph unicode="&#xe094;" d="M104 600h296v600h300v-600h298l-449 -600z" />
+<glyph unicode="&#xe095;" d="M0 200q6 132 41 238.5t103.5 193t184 138t271.5 59.5v271l600 -453l-600 -448v301q-95 -2 -183 -20t-170 -52t-147 -92.5t-100 -135.5z" />
+<glyph unicode="&#xe096;" d="M0 0v400l129 -129l294 294l142 -142l-294 -294l129 -129h-400zM635 777l142 -142l294 294l129 -129v400h-400l129 -129z" />
+<glyph unicode="&#xe097;" d="M34 176l295 295l-129 129h400v-400l-129 130l-295 -295zM600 600v400l129 -129l295 295l142 -141l-295 -295l129 -130h-400z" />
+<glyph unicode="&#xe101;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM456 851l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5 t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5h-207q-21 0 -33 -14.5t-8 -34.5zM500 300h200v100h-200v-100z" />
+<glyph unicode="&#xe102;" d="M0 800h100v-200h400v300h200v-300h400v200h100v100h-111q1 1 1 6.5t-1.5 15t-3.5 17.5l-34 172q-11 39 -41.5 63t-69.5 24q-32 0 -61 -17l-239 -144q-22 -13 -40 -35q-19 24 -40 36l-238 144q-33 18 -62 18q-39 0 -69.5 -23t-40.5 -61l-35 -177q-2 -8 -3 -18t-1 -15v-6 h-111v-100zM100 0h400v400h-400v-400zM200 900q-3 0 14 48t36 96l18 47l213 -191h-281zM700 0v400h400v-400h-400zM731 900l202 197q5 -12 12 -32.5t23 -64t25 -72t7 -28.5h-269z" />
+<glyph unicode="&#xe103;" d="M0 -22v143l216 193q-9 53 -13 83t-5.5 94t9 113t38.5 114t74 124q47 60 99.5 102.5t103 68t127.5 48t145.5 37.5t184.5 43.5t220 58.5q0 -189 -22 -343t-59 -258t-89 -181.5t-108.5 -120t-122 -68t-125.5 -30t-121.5 -1.5t-107.5 12.5t-87.5 17t-56.5 7.5l-99 -55z M238.5 300.5q19.5 -6.5 86.5 76.5q55 66 367 234q70 38 118.5 69.5t102 79t99 111.5t86.5 148q22 50 24 60t-6 19q-7 5 -17 5t-26.5 -14.5t-33.5 -39.5q-35 -51 -113.5 -108.5t-139.5 -89.5l-61 -32q-369 -197 -458 -401q-48 -111 -28.5 -117.5z" />
+<glyph unicode="&#xe104;" d="M111 408q0 -33 5 -63q9 -56 44 -119.5t105 -108.5q31 -21 64 -16t62 23.5t57 49.5t48 61.5t35 60.5q32 66 39 184.5t-13 157.5q79 -80 122 -164t26 -184q-5 -33 -20.5 -69.5t-37.5 -80.5q-10 -19 -14.5 -29t-12 -26t-9 -23.5t-3 -19t2.5 -15.5t11 -9.5t19.5 -5t30.5 2.5 t42 8q57 20 91 34t87.5 44.5t87 64t65.5 88.5t47 122q38 172 -44.5 341.5t-246.5 278.5q22 -44 43 -129q39 -159 -32 -154q-15 2 -33 9q-79 33 -120.5 100t-44 175.5t48.5 257.5q-13 -8 -34 -23.5t-72.5 -66.5t-88.5 -105.5t-60 -138t-8 -166.5q2 -12 8 -41.5t8 -43t6 -39.5 t3.5 -39.5t-1 -33.5t-6 -31.5t-13.5 -24t-21 -20.5t-31 -12q-38 -10 -67 13t-40.5 61.5t-15 81.5t10.5 75q-52 -46 -83.5 -101t-39 -107t-7.5 -85z" />
+<glyph unicode="&#xe105;" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5t145.5 -23.5t132.5 -59t116.5 -83.5t97 -90t74.5 -85.5t49 -63.5t20 -30l26 -40l-26 -40q-6 -10 -20 -30t-49 -63.5t-74.5 -85.5t-97 -90t-116.5 -83.5t-132.5 -59t-145.5 -23.5 t-145.5 23.5t-132.5 59t-116.5 83.5t-97 90t-74.5 85.5t-49 63.5t-20 30zM120 600q7 -10 40.5 -58t56 -78.5t68 -77.5t87.5 -75t103 -49.5t125 -21.5t123.5 20t100.5 45.5t85.5 71.5t66.5 75.5t58 81.5t47 66q-1 1 -28.5 37.5t-42 55t-43.5 53t-57.5 63.5t-58.5 54 q49 -74 49 -163q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l105 105q-37 24 -75 72t-57 84l-20 36z" />
+<glyph unicode="&#xe106;" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5q61 0 121 -17l37 142h148l-314 -1200h-148l37 143q-82 21 -165 71.5t-140 102t-109.5 112t-72 88.5t-29.5 43zM120 600q210 -282 393 -336l37 141q-107 18 -178.5 101.5t-71.5 193.5 q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l47 47l23 87q-30 28 -59 69t-44 68l-14 26zM780 161l38 145q22 15 44.5 34t46 44t40.5 44t41 50.5t33.5 43.5t33 44t24.5 34q-97 127 -140 175l39 146q67 -54 131.5 -125.5t87.5 -103.5t36 -52l26 -40l-26 -40 q-7 -12 -25.5 -38t-63.5 -79.5t-95.5 -102.5t-124 -100t-146.5 -79z" />
+<glyph unicode="&#xe107;" d="M-97.5 34q13.5 -34 50.5 -34h1294q37 0 50.5 35.5t-7.5 67.5l-642 1056q-20 34 -48 36.5t-48 -29.5l-642 -1066q-21 -32 -7.5 -66zM155 200l445 723l445 -723h-345v100h-200v-100h-345zM500 600l100 -300l100 300v100h-200v-100z" />
+<glyph unicode="&#xe108;" d="M100 262v41q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44t106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -91 100 -113v-64q0 -20 -13 -28.5t-32 0.5l-94 78h-222l-94 -78q-19 -9 -32 -0.5t-13 28.5 v64q0 22 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5z" />
+<glyph unicode="&#xe109;" d="M0 50q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v750h-1100v-750zM0 900h1100v150q0 21 -14.5 35.5t-35.5 14.5h-150v100h-100v-100h-500v100h-100v-100h-150q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 100v100h100v-100h-100zM100 300v100h100v-100h-100z M100 500v100h100v-100h-100zM300 100v100h100v-100h-100zM300 300v100h100v-100h-100zM300 500v100h100v-100h-100zM500 100v100h100v-100h-100zM500 300v100h100v-100h-100zM500 500v100h100v-100h-100zM700 100v100h100v-100h-100zM700 300v100h100v-100h-100zM700 500 v100h100v-100h-100zM900 100v100h100v-100h-100zM900 300v100h100v-100h-100zM900 500v100h100v-100h-100z" />
+<glyph unicode="&#xe110;" d="M0 200v200h259l600 600h241v198l300 -295l-300 -300v197h-159l-600 -600h-341zM0 800h259l122 -122l141 142l-181 180h-341v-200zM678 381l141 142l122 -123h159v198l300 -295l-300 -300v197h-241z" />
+<glyph unicode="&#xe111;" d="M0 400v600q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5z" />
+<glyph unicode="&#xe112;" d="M100 600v200h300v-250q0 -113 6 -145q17 -92 102 -117q39 -11 92 -11q37 0 66.5 5.5t50 15.5t36 24t24 31.5t14 37.5t7 42t2.5 45t0 47v25v250h300v-200q0 -42 -3 -83t-15 -104t-31.5 -116t-58 -109.5t-89 -96.5t-129 -65.5t-174.5 -25.5t-174.5 25.5t-129 65.5t-89 96.5 t-58 109.5t-31.5 116t-15 104t-3 83zM100 900v300h300v-300h-300zM800 900v300h300v-300h-300z" />
+<glyph unicode="&#xe113;" d="M-30 411l227 -227l352 353l353 -353l226 227l-578 579z" />
+<glyph unicode="&#xe114;" d="M70 797l580 -579l578 579l-226 227l-353 -353l-352 353z" />
+<glyph unicode="&#xe115;" d="M-198 700l299 283l300 -283h-203v-400h385l215 -200h-800v600h-196zM402 1000l215 -200h381v-400h-198l299 -283l299 283h-200v600h-796z" />
+<glyph unicode="&#xe116;" d="M18 939q-5 24 10 42q14 19 39 19h896l38 162q5 17 18.5 27.5t30.5 10.5h94q20 0 35 -14.5t15 -35.5t-15 -35.5t-35 -14.5h-54l-201 -961q-2 -4 -6 -10.5t-19 -17.5t-33 -11h-31v-50q0 -20 -14.5 -35t-35.5 -15t-35.5 15t-14.5 35v50h-300v-50q0 -20 -14.5 -35t-35.5 -15 t-35.5 15t-14.5 35v50h-50q-21 0 -35.5 15t-14.5 35q0 21 14.5 35.5t35.5 14.5h535l48 200h-633q-32 0 -54.5 21t-27.5 43z" />
+<glyph unicode="&#xe117;" d="M0 0v800h1200v-800h-1200zM0 900v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-100h-1200z" />
+<glyph unicode="&#xe118;" d="M1 0l300 700h1200l-300 -700h-1200zM1 400v600h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-200h-1000z" />
+<glyph unicode="&#xe119;" d="M302 300h198v600h-198l298 300l298 -300h-198v-600h198l-298 -300z" />
+<glyph unicode="&#xe120;" d="M0 600l300 298v-198h600v198l300 -298l-300 -297v197h-600v-197z" />
+<glyph unicode="&#xe121;" d="M0 100v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM31 400l172 739q5 22 23 41.5t38 19.5h672q19 0 37.5 -22.5t23.5 -45.5l172 -732h-1138zM800 100h100v100h-100v-100z M1000 100h100v100h-100v-100z" />
+<glyph unicode="&#xe122;" d="M-101 600v50q0 24 25 49t50 38l25 13v-250l-11 5.5t-24 14t-30 21.5t-24 27.5t-11 31.5zM100 500v250v8v8v7t0.5 7t1.5 5.5t2 5t3 4t4.5 3.5t6 1.5t7.5 0.5h200l675 250v-850l-675 200h-38l47 -276q2 -12 -3 -17.5t-11 -6t-21 -0.5h-8h-83q-20 0 -34.5 14t-18.5 35 q-55 337 -55 351zM1100 200v850q0 21 14.5 35.5t35.5 14.5q20 0 35 -14.5t15 -35.5v-850q0 -20 -15 -35t-35 -15q-21 0 -35.5 15t-14.5 35z" />
+<glyph unicode="&#xe123;" d="M74 350q0 21 13.5 35.5t33.5 14.5h18l117 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3 32t29 13h94q20 0 29 -10.5t3 -29.5q-18 -36 -18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q20 0 33.5 -14.5t13.5 -35.5q0 -20 -13 -40t-31 -27q-8 -3 -23 -8.5 t-65 -20t-103 -25t-132.5 -19.5t-158.5 -9q-125 0 -245.5 20.5t-178.5 40.5l-58 20q-18 7 -31 27.5t-13 40.5zM497 110q12 -49 40 -79.5t63 -30.5t63 30.5t39 79.5q-48 -6 -102 -6t-103 6z" />
+<glyph unicode="&#xe124;" d="M21 445l233 -45l-78 -224l224 78l45 -233l155 179l155 -179l45 233l224 -78l-78 224l234 45l-180 155l180 156l-234 44l78 225l-224 -78l-45 233l-155 -180l-155 180l-45 -233l-224 78l78 -225l-233 -44l179 -156z" />
+<glyph unicode="&#xe125;" d="M0 200h200v600h-200v-600zM300 275q0 -75 100 -75h61q124 -100 139 -100h250q46 0 83 57l238 344q29 31 29 74v100q0 44 -30.5 84.5t-69.5 40.5h-328q28 118 28 125v150q0 44 -30.5 84.5t-69.5 40.5h-50q-27 0 -51 -20t-38 -48l-96 -198l-145 -196q-20 -26 -20 -63v-400z M400 300v375l150 213l100 212h50v-175l-50 -225h450v-125l-250 -375h-214l-136 100h-100z" />
+<glyph unicode="&#xe126;" d="M0 400v600h200v-600h-200zM300 525v400q0 75 100 75h61q124 100 139 100h250q46 0 83 -57l238 -344q29 -31 29 -74v-100q0 -44 -30.5 -84.5t-69.5 -40.5h-328q28 -118 28 -125v-150q0 -44 -30.5 -84.5t-69.5 -40.5h-50q-27 0 -51 20t-38 48l-96 198l-145 196 q-20 26 -20 63zM400 525l150 -212l100 -213h50v175l-50 225h450v125l-250 375h-214l-136 -100h-100v-375z" />
+<glyph unicode="&#xe127;" d="M8 200v600h200v-600h-200zM308 275v525q0 17 14 35.5t28 28.5l14 9l362 230q14 6 25 6q17 0 29 -12l109 -112q14 -14 14 -34q0 -18 -11 -32l-85 -121h302q85 0 138.5 -38t53.5 -110t-54.5 -111t-138.5 -39h-107l-130 -339q-7 -22 -20.5 -41.5t-28.5 -19.5h-341 q-7 0 -90 81t-83 94zM408 289l100 -89h293l131 339q6 21 19.5 41t28.5 20h203q16 0 25 15t9 36q0 20 -9 34.5t-25 14.5h-457h-6.5h-7.5t-6.5 0.5t-6 1t-5 1.5t-5.5 2.5t-4 4t-4 5.5q-5 12 -5 20q0 14 10 27l147 183l-86 83l-339 -236v-503z" />
+<glyph unicode="&#xe128;" d="M-101 651q0 72 54 110t139 38l302 -1l-85 121q-11 16 -11 32q0 21 14 34l109 113q13 12 29 12q11 0 25 -6l365 -230q7 -4 17 -10.5t26.5 -26t16.5 -36.5v-526q0 -13 -86 -93.5t-94 -80.5h-341q-16 0 -29.5 20t-19.5 41l-130 339h-107q-84 0 -139 39t-55 111zM-1 601h222 q15 0 28.5 -20.5t19.5 -40.5l131 -339h293l107 89v502l-343 237l-87 -83l145 -184q10 -11 10 -26q0 -11 -5 -20q-1 -3 -3.5 -5.5l-4 -4t-5 -2.5t-5.5 -1.5t-6.5 -1t-6.5 -0.5h-7.5h-6.5h-476v-100zM1000 201v600h200v-600h-200z" />
+<glyph unicode="&#xe129;" d="M97 719l230 -363q4 -6 10.5 -15.5t26 -25t36.5 -15.5h525q13 0 94 83t81 90v342q0 15 -20 28.5t-41 19.5l-339 131v106q0 84 -39 139t-111 55t-110 -53.5t-38 -138.5v-302l-121 84q-15 12 -33.5 11.5t-32.5 -13.5l-112 -110q-22 -22 -6 -53zM172 739l83 86l183 -146 q22 -18 47 -5q3 1 5.5 3.5l4 4t2.5 5t1.5 5.5t1 6.5t0.5 6.5v7.5v6.5v456q0 22 25 31t50 -0.5t25 -30.5v-202q0 -16 20 -29.5t41 -19.5l339 -130v-294l-89 -100h-503zM400 0v200h600v-200h-600z" />
+<glyph unicode="&#xe130;" d="M2 585q-16 -31 6 -53l112 -110q13 -13 32 -13.5t34 10.5l121 85q0 -51 -0.5 -153.5t-0.5 -148.5q0 -84 38.5 -138t110.5 -54t111 55t39 139v106l339 131q20 6 40.5 19.5t20.5 28.5v342q0 7 -81 90t-94 83h-525q-17 0 -35.5 -14t-28.5 -28l-10 -15zM77 565l236 339h503 l89 -100v-294l-340 -130q-20 -6 -40 -20t-20 -29v-202q0 -22 -25 -31t-50 0t-25 31v456v14.5t-1.5 11.5t-5 12t-9.5 7q-24 13 -46 -5l-184 -146zM305 1104v200h600v-200h-600z" />
+<glyph unicode="&#xe131;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM298 701l2 -201h300l-2 -194l402 294l-402 298v-197h-300z" />
+<glyph unicode="&#xe132;" d="M0 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t231.5 47.5q122 0 232.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-218 -217.5t-300 -80t-299.5 80t-217.5 217.5t-80 299.5zM200 600l402 -294l-2 194h300l2 201h-300v197z" />
+<glyph unicode="&#xe133;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600h200v-300h200v300h200l-300 400z" />
+<glyph unicode="&#xe134;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600l300 -400l300 400h-200v300h-200v-300h-200z" />
+<glyph unicode="&#xe135;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM254 780q-8 -33 5.5 -92.5t7.5 -87.5q0 -9 17 -44t16 -60 q12 0 23 -5.5t23 -15t20 -13.5q24 -12 108 -42q22 -8 53 -31.5t59.5 -38.5t57.5 -11q8 -18 -15 -55t-20 -57q42 -71 87 -80q0 -6 -3 -15.5t-3.5 -14.5t4.5 -17q104 -3 221 112q30 29 47 47t34.5 49t20.5 62q-14 9 -37 9.5t-36 7.5q-14 7 -49 15t-52 19q-9 0 -39.5 -0.5 t-46.5 -1.5t-39 -6.5t-39 -16.5q-50 -35 -66 -12q-4 2 -3.5 25.5t0.5 25.5q-6 13 -26.5 17t-24.5 7q2 22 -2 41t-16.5 28t-38.5 -20q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q12 -19 32 -37.5t34 -27.5l14 -8q0 3 9.5 39.5t5.5 57.5 q-4 23 14.5 44.5t22.5 31.5q5 14 10 35t8.5 31t15.5 22.5t34 21.5q-6 18 10 37q8 0 23.5 -1.5t24.5 -1.5t20.5 4.5t20.5 15.5q-10 23 -30.5 42.5t-38 30t-49 26.5t-43.5 23q11 39 2 44q31 -13 58 -14.5t39 3.5l11 4q7 36 -16.5 53.5t-64.5 28.5t-56 23q-19 -3 -37 0 q-15 -12 -36.5 -21t-34.5 -12t-44 -8t-39 -6q-15 -3 -45.5 0.5t-45.5 -2.5q-21 -7 -52 -26.5t-34 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -90.5t-29.5 -79.5zM518 916q3 12 16 30t16 25q10 -10 18.5 -10t14 6t14.5 14.5t16 12.5q0 -24 17 -66.5t17 -43.5 q-9 2 -31 5t-36 5t-32 8t-30 14zM692 1003h1h-1z" />
+<glyph unicode="&#xe136;" d="M0 164.5q0 21.5 15 37.5l600 599q-33 101 6 201.5t135 154.5q164 92 306 -9l-259 -138l145 -232l251 126q13 -175 -151 -267q-123 -70 -253 -23l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5z" />
+<glyph unicode="&#xe137;" horiz-adv-x="1220" d="M0 196v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 596v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5zM0 996v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM600 596h500v100h-500v-100zM800 196h300v100h-300v-100zM900 996h200v100h-200v-100z" />
+<glyph unicode="&#xe138;" d="M100 1100v100h1000v-100h-1000zM150 1000h900l-350 -500v-300l-200 -200v500z" />
+<glyph unicode="&#xe139;" d="M0 200v200h1200v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500z M500 1000h200v100h-200v-100z" />
+<glyph unicode="&#xe140;" d="M0 0v400l129 -129l200 200l142 -142l-200 -200l129 -129h-400zM0 800l129 129l200 -200l142 142l-200 200l129 129h-400v-400zM729 329l142 142l200 -200l129 129v-400h-400l129 129zM729 871l200 200l-129 129h400v-400l-129 129l-200 -200z" />
+<glyph unicode="&#xe141;" d="M0 596q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 596q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM291 655 q0 23 15.5 38.5t38.5 15.5t39 -16t16 -38q0 -23 -16 -39t-39 -16q-22 0 -38 16t-16 39zM400 850q0 22 16 38.5t39 16.5q22 0 38 -16t16 -39t-16 -39t-38 -16q-23 0 -39 16.5t-16 38.5zM514 609q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 22 16 38.5t39 16.5 q22 0 38 -16t16 -39t-16 -39t-38 -16q-14 0 -29 10l-55 -145q17 -22 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5zM800 655q0 22 16 38t39 16t38.5 -15.5t15.5 -38.5t-16 -39t-38 -16q-23 0 -39 16t-16 39z" />
+<glyph unicode="&#xe142;" d="M-40 375q-13 -95 35 -173q35 -57 94 -89t129 -32q63 0 119 28q33 16 65 40.5t52.5 45.5t59.5 64q40 44 57 61l394 394q35 35 47 84t-3 96q-27 87 -117 104q-20 2 -29 2q-46 0 -78.5 -16.5t-67.5 -51.5l-389 -396l-7 -7l69 -67l377 373q20 22 39 38q23 23 50 23 q38 0 53 -36q16 -39 -20 -75l-547 -547q-52 -52 -125 -52q-55 0 -100 33t-54 96q-5 35 2.5 66t31.5 63t42 50t56 54q24 21 44 41l348 348q52 52 82.5 79.5t84 54t107.5 26.5q25 0 48 -4q95 -17 154 -94.5t51 -175.5q-7 -101 -98 -192l-252 -249l-253 -256l7 -7l69 -60 l517 511q67 67 95 157t11 183q-16 87 -67 154t-130 103q-69 33 -152 33q-107 0 -197 -55q-40 -24 -111 -95l-512 -512q-68 -68 -81 -163z" />
+<glyph unicode="&#xe143;" d="M80 784q0 131 98.5 229.5t230.5 98.5q143 0 241 -129q103 129 246 129q129 0 226 -98.5t97 -229.5q0 -46 -17.5 -91t-61 -99t-77 -89.5t-104.5 -105.5q-197 -191 -293 -322l-17 -23l-16 23q-43 58 -100 122.5t-92 99.5t-101 100q-71 70 -104.5 105.5t-77 89.5t-61 99 t-17.5 91zM250 784q0 -27 30.5 -70t61.5 -75.5t95 -94.5l22 -22q93 -90 190 -201q82 92 195 203l12 12q64 62 97.5 97t64.5 79t31 72q0 71 -48 119.5t-105 48.5q-74 0 -132 -83l-118 -171l-114 174q-51 80 -123 80q-60 0 -109.5 -49.5t-49.5 -118.5z" />
+<glyph unicode="&#xe144;" d="M57 353q0 -95 66 -159l141 -142q68 -66 159 -66q93 0 159 66l283 283q66 66 66 159t-66 159l-141 141q-8 9 -19 17l-105 -105l212 -212l-389 -389l-247 248l95 95l-18 18q-46 45 -75 101l-55 -55q-66 -66 -66 -159zM269 706q0 -93 66 -159l141 -141q7 -7 19 -17l105 105 l-212 212l389 389l247 -247l-95 -96l18 -17q47 -49 77 -100l29 29q35 35 62.5 88t27.5 96q0 93 -66 159l-141 141q-66 66 -159 66q-95 0 -159 -66l-283 -283q-66 -64 -66 -159z" />
+<glyph unicode="&#xe145;" d="M200 100v953q0 21 30 46t81 48t129 38t163 15t162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5zM300 300h600v700h-600v-700zM496 150q0 -43 30.5 -73.5t73.5 -30.5t73.5 30.5t30.5 73.5t-30.5 73.5t-73.5 30.5 t-73.5 -30.5t-30.5 -73.5z" />
+<glyph unicode="&#xe146;" d="M0 0l303 380l207 208l-210 212h300l267 279l-35 36q-15 14 -15 35t15 35q14 15 35 15t35 -15l283 -282q15 -15 15 -36t-15 -35q-14 -15 -35 -15t-35 15l-36 35l-279 -267v-300l-212 210l-208 -207z" />
+<glyph unicode="&#xe148;" d="M295 433h139q5 -77 48.5 -126.5t117.5 -64.5v335q-6 1 -15.5 4t-11.5 3q-46 14 -79 26.5t-72 36t-62.5 52t-40 72.5t-16.5 99q0 92 44 159.5t109 101t144 40.5v78h100v-79q38 -4 72.5 -13.5t75.5 -31.5t71 -53.5t51.5 -84t24.5 -118.5h-159q-8 72 -35 109.5t-101 50.5 v-307l64 -14q34 -7 64 -16.5t70 -31.5t67.5 -52t47.5 -80.5t20 -112.5q0 -139 -89 -224t-244 -96v-77h-100v78q-152 17 -237 104q-40 40 -52.5 93.5t-15.5 139.5zM466 889q0 -29 8 -51t16.5 -34t29.5 -22.5t31 -13.5t38 -10q7 -2 11 -3v274q-61 -8 -97.5 -37.5t-36.5 -102.5 zM700 237q170 18 170 151q0 64 -44 99.5t-126 60.5v-311z" />
+<glyph unicode="&#xe149;" d="M100 600v100h166q-24 49 -44 104q-10 26 -14.5 55.5t-3 72.5t25 90t68.5 87q97 88 263 88q129 0 230 -89t101 -208h-153q0 52 -34 89.5t-74 51.5t-76 14q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -28 16.5 -69.5t28 -62.5t41.5 -72h241v-100h-197q8 -50 -2.5 -115 t-31.5 -94q-41 -59 -99 -113q35 11 84 18t70 7q33 1 103 -16t103 -17q76 0 136 30l50 -147q-41 -25 -80.5 -36.5t-59 -13t-61.5 -1.5q-23 0 -128 33t-155 29q-39 -4 -82 -17t-66 -25l-24 -11l-55 145l16.5 11t15.5 10t13.5 9.5t14.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221z" />
+<glyph unicode="&#xe150;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM602 900l298 300l298 -300h-198v-900h-200v900h-198z" />
+<glyph unicode="&#xe151;" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v200h100v-100h200v-100h-300zM700 400v100h300v-200h-99v-100h-100v100h99v100h-200zM700 700v500h300v-500h-100v100h-100v-100h-100zM801 900h100v200h-100v-200z" />
+<glyph unicode="&#xe152;" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v500h300v-500h-100v100h-100v-100h-100zM700 700v200h100v-100h200v-100h-300zM700 1100v100h300v-200h-99v-100h-100v100h99v100h-200zM801 200h100v200h-100v-200z" />
+<glyph unicode="&#xe153;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 100v400h300v-500h-100v100h-200zM800 1100v100h200v-500h-100v400h-100zM901 200h100v200h-100v-200z" />
+<glyph unicode="&#xe154;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 400v100h200v-500h-100v400h-100zM800 800v400h300v-500h-100v100h-200zM901 900h100v200h-100v-200z" />
+<glyph unicode="&#xe155;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h500v-200h-500zM700 400v200h400v-200h-400zM700 700v200h300v-200h-300zM700 1000v200h200v-200h-200z" />
+<glyph unicode="&#xe156;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h200v-200h-200zM700 400v200h300v-200h-300zM700 700v200h400v-200h-400zM700 1000v200h500v-200h-500z" />
+<glyph unicode="&#xe157;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q162 0 281 -118.5t119 -281.5v-300q0 -165 -118.5 -282.5t-281.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500z" />
+<glyph unicode="&#xe158;" d="M0 400v300q0 163 119 281.5t281 118.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-163 0 -281.5 117.5t-118.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM400 300l333 250l-333 250v-500z" />
+<glyph unicode="&#xe159;" d="M0 400v300q0 163 117.5 281.5t282.5 118.5h300q163 0 281.5 -119t118.5 -281v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 700l250 -333l250 333h-500z" />
+<glyph unicode="&#xe160;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -162 -118.5 -281t-281.5 -119h-300q-165 0 -282.5 118.5t-117.5 281.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 400h500l-250 333z" />
+<glyph unicode="&#xe161;" d="M0 400v300h300v200l400 -350l-400 -350v200h-300zM500 0v200h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-500v200h400q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-400z" />
+<glyph unicode="&#xe162;" d="M217 519q8 -19 31 -19h302q-155 -438 -160 -458q-5 -21 4 -32l9 -8h9q14 0 26 15q11 13 274.5 321.5t264.5 308.5q14 19 5 36q-8 17 -31 17l-301 -1q1 4 78 219.5t79 227.5q2 15 -5 27l-9 9h-9q-15 0 -25 -16q-4 -6 -98 -111.5t-228.5 -257t-209.5 -237.5q-16 -19 -6 -41 z" />
+<glyph unicode="&#xe163;" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q47 0 100 15v185h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h500v185q-14 4 -114 7.5t-193 5.5l-93 2q-165 0 -282.5 -117.5t-117.5 -282.5v-300zM600 400v300h300v200l400 -350l-400 -350v200h-300z " />
+<glyph unicode="&#xe164;" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q163 0 281.5 117.5t118.5 282.5v98l-78 73l-122 -123v-148q0 -41 -29.5 -70.5t-70.5 -29.5h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h156l118 122l-74 78h-100q-165 0 -282.5 -117.5t-117.5 -282.5 v-300zM496 709l353 342l-149 149h500v-500l-149 149l-342 -353z" />
+<glyph unicode="&#xe165;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM406 600 q0 80 57 137t137 57t137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137z" />
+<glyph unicode="&#xe166;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 800l445 -500l450 500h-295v400h-300v-400h-300zM900 150h100v50h-100v-50z" />
+<glyph unicode="&#xe167;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 700h300v-300h300v300h295l-445 500zM900 150h100v50h-100v-50z" />
+<glyph unicode="&#xe168;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 705l305 -305l596 596l-154 155l-442 -442l-150 151zM900 150h100v50h-100v-50z" />
+<glyph unicode="&#xe169;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 988l97 -98l212 213l-97 97zM200 400l697 1l3 699l-250 -239l-149 149l-212 -212l149 -149zM900 150h100v50h-100v-50z" />
+<glyph unicode="&#xe170;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM200 612l212 -212l98 97l-213 212zM300 1200l239 -250l-149 -149l212 -212l149 148l249 -237l-1 697zM900 150h100v50h-100v-50z" />
+<glyph unicode="&#xe171;" d="M23 415l1177 784v-1079l-475 272l-310 -393v416h-392zM494 210l672 938l-672 -712v-226z" />
+<glyph unicode="&#xe172;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-850q0 -21 -15 -35.5t-35 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200z" />
+<glyph unicode="&#xe173;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-218l-276 -275l-120 120l-126 -127h-378v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM581 306l123 123l120 -120l353 352l123 -123l-475 -476zM600 1000h100v200h-100v-200z" />
+<glyph unicode="&#xe174;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-269l-103 -103l-170 170l-298 -298h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200zM700 133l170 170l-170 170l127 127l170 -170l170 170l127 -128l-170 -169l170 -170 l-127 -127l-170 170l-170 -170z" />
+<glyph unicode="&#xe175;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-300h-400v-200h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300l300 -300l300 300h-200v300h-200v-300h-200zM600 1000v200h100v-200h-100z" />
+<glyph unicode="&#xe176;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-402l-200 200l-298 -298h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300h200v-300h200v300h200l-300 300zM600 1000v200h100v-200h-100z" />
+<glyph unicode="&#xe177;" d="M0 250q0 -21 14.5 -35.5t35.5 -14.5h1100q21 0 35.5 14.5t14.5 35.5v550h-1200v-550zM0 900h1200v150q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 300v200h400v-200h-400z" />
+<glyph unicode="&#xe178;" d="M0 400l300 298v-198h400v-200h-400v-198zM100 800v200h100v-200h-100zM300 800v200h100v-200h-100zM500 800v200h400v198l300 -298l-300 -298v198h-400zM800 300v200h100v-200h-100zM1000 300h100v200h-100v-200z" />
+<glyph unicode="&#xe179;" d="M100 700v400l50 100l50 -100v-300h100v300l50 100l50 -100v-300h100v300l50 100l50 -100v-400l-100 -203v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447zM800 597q0 -29 10.5 -55.5t25 -43t29 -28.5t25.5 -18l10 -5v-397q0 -21 14.5 -35.5 t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v1106q0 31 -18 40.5t-44 -7.5l-276 -116q-25 -17 -43.5 -51.5t-18.5 -65.5v-359z" />
+<glyph unicode="&#xe180;" d="M100 0h400v56q-75 0 -87.5 6t-12.5 44v394h500v-394q0 -38 -12.5 -44t-87.5 -6v-56h400v56q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v888q0 22 25 34.5t50 13.5l25 2v56h-400v-56q75 0 87.5 -6t12.5 -44v-394h-500v394q0 38 12.5 44t87.5 6v56h-400v-56q4 0 11 -0.5 t24 -3t30 -7t24 -15t11 -24.5v-888q0 -22 -25 -34.5t-50 -13.5l-25 -2v-56z" />
+<glyph unicode="&#xe181;" d="M0 300q0 -41 29.5 -70.5t70.5 -29.5h300q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-300q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM100 100h400l200 200h105l295 98v-298h-425l-100 -100h-375zM100 300v200h300v-200h-300zM100 600v200h300v-200h-300z M100 1000h400l200 -200v-98l295 98h105v200h-425l-100 100h-375zM700 402v163l400 133v-163z" />
+<glyph unicode="&#xe182;" d="M16.5 974.5q0.5 -21.5 16 -90t46.5 -140t104 -177.5t175 -208q103 -103 207.5 -176t180 -103.5t137 -47t92.5 -16.5l31 1l163 162q17 18 13.5 41t-22.5 37l-192 136q-19 14 -45 12t-42 -19l-118 -118q-142 101 -268 227t-227 268l118 118q17 17 20 41.5t-11 44.5 l-139 194q-14 19 -36.5 22t-40.5 -14l-162 -162q-1 -11 -0.5 -32.5z" />
+<glyph unicode="&#xe183;" d="M0 50v212q0 20 10.5 45.5t24.5 39.5l365 303v50q0 4 1 10.5t12 22.5t30 28.5t60 23t97 10.5t97 -10t60 -23.5t30 -27.5t12 -24l1 -10v-50l365 -303q14 -14 24.5 -39.5t10.5 -45.5v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-20 0 -35 14.5t-15 35.5zM0 712 q0 -21 14.5 -33.5t34.5 -8.5l202 33q20 4 34.5 21t14.5 38v146q141 24 300 24t300 -24v-146q0 -21 14.5 -38t34.5 -21l202 -33q20 -4 34.5 8.5t14.5 33.5v200q-6 8 -19 20.5t-63 45t-112 57t-171 45t-235 20.5q-92 0 -175 -10.5t-141.5 -27t-108.5 -36.5t-81.5 -40 t-53.5 -36.5t-31 -27.5l-9 -10v-200z" />
+<glyph unicode="&#xe184;" d="M100 0v100h1100v-100h-1100zM175 200h950l-125 150v250l100 100v400h-100v-200h-100v200h-200v-200h-100v200h-200v-200h-100v200h-100v-400l100 -100v-250z" />
+<glyph unicode="&#xe185;" d="M100 0h300v400q0 41 -29.5 70.5t-70.5 29.5h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-400zM500 0v1000q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-1000h-300zM900 0v700q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-700h-300z" />
+<glyph unicode="&#xe186;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" />
+<glyph unicode="&#xe187;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h100v200h100v-200h100v500h-100v-200h-100v200h-100v-500zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" />
+<glyph unicode="&#xe188;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v100h-200v300h200v100h-300v-500zM600 300h300v100h-200v300h200v100h-300v-500z" />
+<glyph unicode="&#xe189;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 550l300 -150v300zM600 400l300 150l-300 150v-300z" />
+<glyph unicode="&#xe190;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300v500h700v-500h-700zM300 400h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130v-300zM575 549 q0 -65 27 -107t68 -42h130v300h-130q-38 0 -66.5 -43t-28.5 -108z" />
+<glyph unicode="&#xe191;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z" />
+<glyph unicode="&#xe192;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v400h-200v100h-100v-500zM301 400v200h100v-200h-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z" />
+<glyph unicode="&#xe193;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 700v100h300v-300h-99v-100h-100v100h99v200h-200zM201 300v100h100v-100h-100zM601 300v100h100v-100h-100z M700 700v100h200v-500h-100v400h-100z" />
+<glyph unicode="&#xe194;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 500v200 l100 100h300v-100h-300v-200h300v-100h-300z" />
+<glyph unicode="&#xe195;" d="M0 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 400v400h300 l100 -100v-100h-100v100h-200v-100h200v-100h-200v-100h-100zM700 400v100h100v-100h-100z" />
+<glyph unicode="&#xe197;" d="M-14 494q0 -80 56.5 -137t135.5 -57h222v300h400v-300h128q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200h200v300h200v-300h200 l-300 -300z" />
+<glyph unicode="&#xe198;" d="M-14 494q0 -80 56.5 -137t135.5 -57h8l414 414l403 -403q94 26 154.5 104.5t60.5 178.5q0 120 -85 206.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200l300 300 l300 -300h-200v-300h-200v300h-200z" />
+<glyph unicode="&#xe199;" d="M100 200h400v-155l-75 -45h350l-75 45v155h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170z" />
+<glyph unicode="&#xe200;" d="M121 700q0 -53 28.5 -97t75.5 -65q-4 -16 -4 -38q0 -74 52.5 -126.5t126.5 -52.5q56 0 100 30v-306l-75 -45h350l-75 45v306q46 -30 100 -30q74 0 126.5 52.5t52.5 126.5q0 24 -9 55q50 32 79.5 83t29.5 112q0 90 -61.5 155.5t-150.5 71.5q-26 89 -99.5 145.5 t-167.5 56.5q-116 0 -197.5 -81.5t-81.5 -197.5q0 -4 1 -11.5t1 -11.5q-14 2 -23 2q-74 0 -126.5 -52.5t-52.5 -126.5z" />
+</font>
+</defs></svg> 

modoboa/static/js/confirmation.js

@@ -13,7 +13,7 @@
 
              this.box = this.buildbox();
              this.box.modal();
-             this.box.on('hidden', $.proxy(this.hidden_callback, this));
+             this.box.on('hidden.bs.modal', $.proxy(this.hidden_callback, this));
          },
 
          buildcheckboxes: function() {
@@ -44,7 +44,7 @@
              var $container = $("<div />", {"class" : "container-fluid"});
              box.append($container);
              if (this.options.warning) {
-                 $container.append($("<div />", {"class" : "row-fluid"})
+                 $container.append($("<div />", {"class" : "row"})
                      .append($("<div />", {
                          "class": "alert alert-danger",
                          html: "<h4>" + gettext("Warning") + "</h4>" + this.options.warning

modoboa/static/js/creation_wizard.js

@@ -83,13 +83,13 @@
             evt.preventDefault();
             var step_id = this.get_current_step_id();
             this.titles[step_id] = this.get_current_title();
-            this.$element.on('slid', this.update_buttons);
+            this.$element.on('slid.bs.carousel', this.update_buttons);
             this.post(false);
         },
 
         prev: function(evt) {
             evt.preventDefault();
-            this.$element.on('slid', this.update_buttons);
+            this.$element.on('slid.bs.carousel', this.update_buttons);
             this.$element.carousel('prev');
             this.set_current_title(this.titles[this.get_current_step_id()]);
         },

modoboa/static/js/dynamic_input.js

@@ -25,7 +25,7 @@
         addrmlink: function(input) {
             var $rmlink = $('<a href="#"'
                 + 'id="' + input.attr("id") + '_rmbtn' + '"'
-                + '"><i class="icon-remove"></i></a>');
+                + '"><i class="glyphicon glyphicon-remove"></i></a>');
 
             $rmlink.click($.proxy(this.removeinput, $rmlink));
             return $rmlink;

modoboa/static/js/global.js

@@ -40,7 +40,7 @@ function modalbox(e, css, defhref, defcb, defclosecb) {
         });
 
         $div.modal({show: false});
-        $div.one('shown', function() {
+        $div.one('shown.bs.modal', function() {
             $(".selectpicker").selectpicker({
                 container: 'body'
             });
@@ -48,33 +48,30 @@ function modalbox(e, css, defhref, defcb, defclosecb) {
                 container: "#modalbox",
                 trigger: "hover"
             }).click(function(e) {e.preventDefault();});
-            if (modalcb != undefined) {
+            if (modalcb !== undefined) {
                 if (typeof modalcb === "function") modalcb(); else eval(modalcb + '()');
             }
-        }).on('hidden', function(e) {
+        }).on('hidden.bs.modal', function(e) {
             var $target = $(e.target);
 
             if (!$target.is($(this))) {
                 return;
             }
             $("#modalbox").remove();
-            if (closecb != undefined) {
+            if (closecb !== undefined) {
                 if (typeof closecb === "function") closecb(); else eval(closecb + '()');
             }
         });
         $div.modal('show');
 
-        if (css != undefined) {
+        if (css !== undefined) {
             $div.css(css);
         }
     });
 }
 
 function modalbox_autowidth(e) {
-    modalbox.apply(this, [e, {
-        width: 'auto',
-        'margin-left': function() { return -($(this).width() / 2); }
-    }]);
+    modalbox.apply(this, [e]);
 }
 
 /*
@@ -115,7 +112,7 @@ if (!Object.keys) {
  */
 function clean_form_errors(formid) {
     $("#" + formid + " div.error").removeClass("error");
-    $("#" + formid + " span.help-inline").remove();
+    $("#" + formid + " span.help-block").remove();
 }
 
 /*
@@ -129,12 +126,12 @@ function display_form_errors(formid, data) {
         var spanid = fullid + "-error";
         var $span = $("#" + spanid);
 
-        if (!$widget.parents(".control-group").hasClass("error")) {
-            $widget.parents(".control-group").addClass("error");
+        if (!$widget.parents(".form-group").hasClass("has-error")) {
+            $widget.parents(".form-group").addClass("has-error");
         }
         if (!$span.length) {
             $span = $("<span />", {
-                "class": "help-inline",
+                "class": "help-block",
                 "html": value[0],
                 "id": spanid
             });

modoboa/static/js/jquery.sortable.js

@@ -51,7 +51,7 @@
                  }
              }
              this.$element.append($("<i/>", {
-                 "class": "sort-selection icon-chevron-" + ((dir == 'asc') ? 'up' : 'down')
+                 "class": "sort-selection glyphicon glyphicon-chevron-" + ((dir == 'asc') ? 'up' : 'down')
              }));
              return dir;
          }

modoboa/static/js/listing.js

@@ -6,6 +6,7 @@ Listing.prototype = {
     constructor: Listing,
 
     listing_defaults: {
+        presp_container: '#pagination-responsive',
         pbar_container: '#bottom-bar-right',
         pbar_id: '#pagination_bar',
         sortable_selector: '.sortable',
@@ -18,6 +19,8 @@ Listing.prototype = {
         this.navobj = new History(this.options);
         $(document).on("click", this.options.pbar_container + " a",
             $.proxy(this.load_page, this));
+        $(document).on("click", this.options.presp_container + " a",
+            $.proxy(this.load_page, this));
         if (this.options.with_searchform) {
             this.init_searchform();
         }
@@ -69,6 +72,7 @@ Listing.prototype = {
     update_listing: function(data) {
         if (data.paginbar) {
             $(this.options.pbar_container).html(data.paginbar);
+            $(this.options.presp_container).html(data.paginbar);
             $(this.options.pbar_id).find(".disabled a").click(function(e) {
                 e.preventDefault();
             });
@@ -127,8 +131,8 @@ Listing.prototype = {
     },
 
     make_tag: function(text, type) {
-        var $tag = $("<a />", {"name": type, "class" : "btn btn-mini", "html": text});
-        var $i = $("<i />", {"class" : "icon-remove"}).prependTo($tag);
+        var $tag = $("<a />", {"name": type, "class" : "btn btn-xs", "html": text});
+        var $i = $("<i />", {"class" : "glyphicon glyphicon-remove"}).prependTo($tag);
 
         $tag.click($.proxy(this.remove_tag, this));
         return $tag;

modoboa/static/js/twocols_nav.js

@@ -77,7 +77,7 @@ TwocolsNav.prototype = {
     select_change: function(e) {
         var instance = this;
         var $target = $(e.target);
-        var $parent = $target.parents("div.control-group");
+        var $parent = $target.parents("div.form-group");
 
         $('div[data-visibility-field="' + $target.attr("id") + '"]').each(function(idx) {
             instance.toggle_field_visibility($(this), $parent, $target.val());
@@ -90,7 +90,7 @@ TwocolsNav.prototype = {
     radio_clicked: function(e) {
         var instance = this;
         var $target = $(e.target);
-        var $parent = $target.parents("div.control-group");
+        var $parent = $target.parents("div.form-group");
         var realid = $target.attr("id");
 
         realid = realid.substr(0, realid.length - 2);

modoboa/templates/500.html

@@ -1,6 +1,6 @@
 {% extends "layout_simple.html" %}{% load i18n %}
 {% block content %}
-<div class="alert alert-error">
+<div class="alert alert-danger">
   <h4>{% trans "Sorry" %}</h4>
   <p>{% trans "An internal error occured." %}</p>
 </div>

modoboa/templates/common/buttons_list.html

@@ -1,12 +1,17 @@
 {% load lib_tags %}
-<div class="btn-toolbar {{ extraclasses }}">{% for entry in entries %}
-  <div class="btn-group">{% if entry.menu %}
-    <a class="btn dropdown-toggle" data-toggle="dropdown">{% if entry.img %}<i class="{{ entry.img}}"></i>{% endif %}{{ entry.label }} <span class="caret"></span></a>  
-    <ul class="dropdown-menu">{% for sentry in entry.menu %}
-      <li>{% render_link sentry %}</li>
-      {% endfor %}</ul>
-    {% else %}{% render_link entry "btn" %}{% endif %}
-  </div>
-{% endfor %}{% block extracontent %}{% endblock %}
-</div>
+
+        <!-- Brand and toggle get grouped for better mobile display -->
+            <div class="btn-toolbar {{ extraclasses }}">{% for entry in entries %}
+                <ul class="nav navbar-nav action-buttons btn-group">{% if entry.menu %}
+                    <a class="btn btn-default dropdown-toggle {{ entry.label }}" data-toggle="dropdown">{% if entry.img %}<i class="{{ entry.img}}"></i>{% endif %}{{ entry.label }} <span class="caret"></span></a>
+                    <ul class="dropdown-menu">{% for sentry in entry.menu %}
+                      <li>{% render_link sentry %}</li>
+                      {% endfor %}</ul>
+                    {% else %}{% render_link entry "btn" %}{% endif %}
+                </ul>
+                {% endfor %}
+                <ul class="nav navbar-nav action-buttons navbar-right">
+                    {% block extracontent %}{% endblock %}
+                </ul>
+            </div>
 

modoboa/templates/common/email_searchbar.html

@@ -1,7 +1,8 @@
 {% load i18n %}
-<div id="searchbox" class="btn-group">
-  <a href="#" class="btn dropdown-toggle" data-toggle="dropdown"><i class="icon-search" id="searchopts"></i></a>
-  <ul class="dropdown-menu" id="searchparams">
+<div id="searchbox" class="navbar-form navbar-left">
+    <div class="input-group">
+    <input type="text" class="form-control" name="searchfield" id="searchfield" placeholder="{% trans "Search..." %}" />
+  <ul class="dropdown-menu pull-right" id="searchparams">
     <li><label class="radio"><input type="radio" id="crit_from_addr" name="scriteria" value="from_addr" checked>{% trans "From address" %}</label></li>
     <li><label class="radio"><input type="radio" id="crit_subject" name="scriteria" value="subject">{% trans "Subject" %}</label></li>
     {% for opt in extraopts %}
@@ -9,5 +10,6 @@
     {% endfor %}
     <li><label class="radio"><input type="radio" id="crit_both" name="scriteria" value="both">{% trans "Both" %}</label></li>
   </ul>
-  <input type="text" class="no-margin" name="searchfield" id="searchfield" value="{% trans "Search..." %}" />
-</div>
+        <a href="#" class="input-group-addon" data-toggle="dropdown"><i class="glyphicon glyphicon-search" id="searchopts"></i></a>
+    </div>
+</div>

modoboa/templates/common/error.html

@@ -1,5 +1,5 @@
 {% extends "layout_simple.html" %}
 {% load i18n %}
 {% block content %}
-<div class="alert alert-error"><strong>{% trans "Error:" %}</strong> {{ error }}</div>
+<div class="alert alert-danger"><strong>{% trans "Error:" %}</strong> {{ error }}</div>
 {% endblock %}

modoboa/templates/common/generic_field.html

@@ -1,13 +1,54 @@
 {% load i18n core_tags lib_tags %}
-<div class="control-group {% if field.errors %}error{% endif %}{{ extra_classes }}"{% visirule field %}{% if hidden %}style="display: none"{% endif %}>
-  {% if field.label %}<label class="control-label" for="id_{{ field.html_name }}">{{ field.label }}</label>{% endif %}{% if help_display_mode == "tooltip" and field.help_text %}<a href="#" class="help pull-left" data-original-title="{% trans 'Help:' %} {{ field.label }}" data-content="{{ field.help_text }}" rel="popover">?</a>{% endif %}
-  <div class="controls spaced">
-    {% if appended_text %}<div class="input-append">{% endif %}
-    {{ field }}{% if appended_text %}<span class="add-on">{{ appended_text }}</span></div>{% endif %}{% if help_display_mode == "inline" and field.help_text %}<span class="help-inline">{{ field.help_text }}</span>{% endif %}{% if inline_message %}<span class="help-inline">{{ inline_message }}</span>{% endif %}
-    {% if activator %}<label class="checkbox inline" for="id_{{ field.name }}_act">
-      <input type="checkbox" class="activator" id="id_{{ field.name }}_act" name="{{ field.name }}_act" {% if activator_value %}checked='checked'{% else %}{% if deactivate_if_empty and field.value == None %}checked='checked'{% endif %}{% endif %}/>{{ activator_label }}
-    </label>{% endif %}
-    {% if field.errors %}<p class="help-block">{% for error in field.errors %}{{ error|safe }}{% endfor %}</p>{% endif %}
-    {% block extra_controls %}{% endblock %}
-  </div>
+<div class="form-group
+    {% if field.errors %}error{% endif %}
+    {{ extra_classes }}"{% visirule field %}
+    {% if hidden %}style="display: none"{% endif %}
+>
+
+    {% if field.label %}
+        <label class="control-label col-lg-4 col-md-4 col-sm-4" for="id_{{ field.html_name }}">{{ field.label }}
+        {% if help_display_mode == "tooltip" and field.help_text %}
+            <a href="#" class="help" data-original-title="{% trans 'Help:' %} {{ field.label }}" data-content="{{ field.help_text }}" rel="popover">?</a>
+        {% endif %}
+        </label>
+    {% endif %}
+
+    <div class="col-lg-5 col-md-5 col-sm-5">
+    {% if appended_text %}
+        <div class="input-group">
+    {% endif %}
+    {{ field }}
+    {% if appended_text %}
+            <span class="input-group-addon">{{ appended_text }}</span></div>
+    {% endif %}
+    {% if help_display_mode == "inline" and field.help_text %}
+        <span class="help-block pull-right">{{ field.help_text }}</span>
+    {% endif %}
+    {% if inline_message %}
+        <span class="help-block pull-right">{{ inline_message }}</span>
+    {% endif %}
+    {% if activator %}
+        <div class="checkbox">
+            <label class="checkbox-inline" for="id_{{ field.name }}_act">
+                <input type="checkbox" class="activator" id="id_{{ field.name }}_act" name="{{ field.name }}_act"
+                    {% if activator_value %}checked='checked'
+                    {% else %}
+                        {% if deactivate_if_empty and field.value == None %}
+                            checked='checked'
+                        {% endif %}
+                    {% endif %}/>
+                  {{ activator_label }}
+            </label>
+        </div>
+        {% endif %}
+    {% if field.errors %}
+        <p class="help-block">
+            {% for error in field.errors %}
+                {{ error|safe }}
+            {% endfor %}
+        </p>
+        {% endif %}
+        {% block extra_controls %}
+        {% endblock %}
+    </div>
 </div>

modoboa/templates/common/generic_fields_group.html

@@ -1,9 +1,21 @@
 {% load i18n %}
-<div class="control-group{% if haserror %} error{% endif %}">
-  <label class="control-label">{{ label }}</label>{% if help_text %}<a href="#" class="help pull-left" data-original-title="{% trans 'Help:' %} {{ label }}" data-content="{{ help_text }}" rel="popover">?</a>{% endif %}
-  <div class="controls spaced">
-    {% for field in group %}
-    {{ field }}{% if field.errors %}<p class="help-block">{% for error in field.errors %}{{ error|safe }}{% endfor %}</p>{% endif %}
-    {% endfor %}
-  </div>
+<div class="form-group {% if haserror %} error{% endif %}">
+    <label class="control-label col-lg-4 col-md-4 col-sm-4">
+        {{ label }}
+        {% if help_text %}
+        <a href="#" class="help" data-original-title="{% trans 'Help:' %} {{ label }}" data-content="{{ help_text }}" rel="popover">?</a>
+        {% endif %}
+    </label>
+    <div class="controls col-lg-5 col-md-5 col-sm-5">
+        {% for field in group %}
+            {{ field }}
+            {% if field.errors %}
+                <p class="help-block">
+                {% for error in field.errors %}
+                    {{ error|safe }}
+                {% endfor %}
+                </p>
+            {% endif %}
+        {% endfor %}
+    </div>
 </div>

modoboa/templates/common/generic_modal.html

@@ -1,12 +1,17 @@
 {% load i18n %}
-<div class="modal-header">
-  <a class="close" data-dismiss="modal">x</a>
-  <h3>{{ title }}</h3>
-</div>
-<div class="modal-body" style="overflow: visible;">
-  {% block modalbody %}{% endblock %}
-</div>
-<div class="modal-footer">
-  {% if action_label %}<a href="#" class="btn btn-primary {{ action_classes }}">{{ action_label }}</a>{% endif %}
-  <a class="btn" data-dismiss="modal">{% trans "Close" %}</a>
-</div>
+
+<div class="modal-dialog">
+  <div class="modal-content">
+    <div class="modal-header">
+      <a class="close btn btn-default" data-dismiss="modal">x</a>
+      <h3 class="modal-title">{{ title }}</h3>
+    </div>
+    <div class="modal-body">    
+      {% block modalbody %}{% endblock %}
+    </div>
+    <div class="modal-footer">
+      {% if action_label %}<a href="#" class="btn btn-primary {{ action_classes }}">{{ action_label }}</a>{% endif %}
+      <a class="btn btn-default" data-dismiss="modal">{% trans "Close" %}</a>
+    </div>
+  </div><!-- /.modal-content -->
+</div><!-- /.modal-dialog -->

modoboa/templates/common/generic_modal_form.html

@@ -1,7 +1,7 @@
 {% extends "common/generic_modal.html" %}
 {% load lib_tags %}
 {% block modalbody %}
-{% if error %}<div class="alert alert-error">{{ error }}</div>{% endif %}
+{% if error %}<div class="alert alert-danger">{{ error }}</div>{% endif %}
 <form class="form-horizontal" action="{{ action }}" enctype="{{ enctype }}" 
       method="POST" id="{{ formid }}" name="{{ formid }}"
       target="{{ target }}">{% csrf_token %}

modoboa/templates/common/menulist.html

@@ -9,8 +9,7 @@
       {% if entry.img %}<i class="{{ entry.img }}"></i>{% endif %}
       {{ entry.label }}
     </a>
-    <ul class="dropdown-menu"
-        {% if entry.width %}style="width: {{ entry.width }}px"{% endif %}>
+    <ul class="dropdown-menu" {% if entry.width %}style="width: {{ entry.width }}px"{% endif %}>
       {% for sentry in entry.menu %}
       <li>{% render_link sentry %}</li>
       {% endfor %}