github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-18 05:51:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use fontawesome icons.

Browse Source 
see #585
This commit is contained in:
Antoine Nguyen
2014-10-01 17:13:35 +02:00
parent ffbf69e70e
commit 6ef8df9daf
14 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/core/templatetags/core_tags.py
+3 -3
View File
@@ -73,11 +73,11 @@ def admin_menu(selection, user):
def user_menu(user, selection):
entries = [
{"name": "user",
"img": "glyphicon glyphicon-user",
"img": "fa fa-user",
"label": user.fullname,
"menu": [
{"name": "settings",
"img": "glyphicon glyphicon-list",
"img": "fa fa-list",
"label": _("Settings"),
"url": reverse("core:user_index")}
]}
@@ -88,7 +88,7 @@ def user_menu(user, selection):
+ [{"name": "logout",
"url": reverse("core:logout"),
"label": _("Logout"),
"img": "glyphicon glyphicon-off"}]
"img": "fa fa-off"}]
return render_to_string("common/menulist.html", {
"selection": selection, "entries": entries, "user": user
modoboa/extensions/admin/templates/admin/searchform.html
+1 -1
View File
@@ -5,7 +5,7 @@
<input class="form-control" type="text"
value={% if squery %}"{{ squery }}"{% else %}"{% trans 'Search' %}"{% endif %}
id="searchquery" name="searchquery" />
<span class="glyphicon glyphicon-search form-control-feedback"></span>
<span class="fa fa-search form-control-feedback"></span>
</div>
</div>
</form>
modoboa/extensions/amavis/templates/amavis/main_action_bar.html
+2 -2
View File
@@ -18,12 +18,12 @@
</div>
<div class="btn-group">
<a name="release-multi" href="{% url 'amavis:mail_process' %}" class="btn btn-success disabled">
<i class="glyphicon glyphicon-ok"></i> <span>{% trans "Release" %}</span>
<i class="fa fa-check"></i> <span>{% trans "Release" %}</span>
</a>
</div>
<div class="btn-group">
<a name="delete-multi" href="{% url 'amavis:mail_process' %}" class="btn btn-danger disabled">
<i class="glyphicon glyphicon-trash"></i> <span>{% trans "Delete" %}</span>
<i class="fa fa-trash"></i> <span>{% trans "Delete" %}</span>
</a>
</div>
<div class="btn-group">
modoboa/extensions/amavis/templatetags/amavis_tags.py
+5 -5
View File
@@ -13,18 +13,18 @@ def viewm_menu(mail_id, rcpt):
entries = [
{"name": "back",
"url": "javascript:history.go(-2);",
"img": "glyphicon glyphicon-arrow-left",
"img": "fa fa-arrow-left",
"class": "btn-primary",
"label": _("Back")},
{"name": "release",
"img": "glyphicon glyphicon-ok",
"img": "fa fa-check",
"class": "btn-success",
"url": reverse('amavis:mail_release', args=[mail_id])
+ ("?rcpt=%s" % rcpt if rcpt else ""),
"label": _("Release")},
{"name": "delete",
"class": "btn-danger",
"img": "glyphicon glyphicon-trash",
"img": "fa fa-trash",
"url": reverse('amavis:mail_delete', args=[mail_id])
+ ("?rcpt=%s" % rcpt if rcpt else ""),
"label": _("Delete")},
@@ -52,14 +52,14 @@ def viewm_menu(mail_id, rcpt):
def viewm_menu_simple(user, mail_id, rcpt, secret_id=""):
entries = [
{"name": "release",
"img": "glyphicon glyphicon-ok",
"img": "fa fa-check",
"class": "btn-success",
"url": reverse('amavis:mail_release', args=[mail_id]) \
+ ("?rcpt=%s" % rcpt \
+ (("&secret_id=%s" % secret_id) if secret_id != "" else "")),
"label": _("Release")},
{"name": "delete",
"img": "glyphicon glyphicon-trash",
"img": "fa fa-trash",
"class": "btn-danger",
"url": reverse('amavis:mail_delete', args=[mail_id]) \
+ "?rcpt=%s" % rcpt \
modoboa/extensions/radicale/templatetags/radicale_tags.py
+3 -3
View File
@@ -22,7 +22,7 @@ def radicale_left_menu(user):
entries = [
{"name": "newusercalendar",
"label": _("Add calendar"),
"img": "glyphicon glyphicon-plus",
"img": "fa fa-plus",
"modal": True,
"modalcb": "radicale.add_calendar_cb",
"url": reverse("radicale:user_calendar_add")},
@@ -31,7 +31,7 @@ def radicale_left_menu(user):
entries += [
{"name": "newsharedcalendar",
"label": _("Add shared calendar"),
"img": "glyphicon glyphicon-plus",
"img": "fa fa-plus",
"modal": True,
"modalcb": "radicale.shared_calendar_cb",
"url": reverse("radicale:shared_calendar_add")},
@@ -67,7 +67,7 @@ def calendar_actions(calendar):
actions = [{
"name": "delcalendar",
"title": _("Delete %s?" % calendar),
"img": "glyphicon glyphicon-trash"
"img": "fa fa-trash"
}]
if calendar.__class__.__name__ == 'UserCalendar':
actions[0]["url"] = reverse(
modoboa/extensions/sievefilters/general_callbacks.py
+1 -1
View File
@@ -13,7 +13,7 @@ def menu(target, user):
{"name": "sievefilters",
"label": _("Message filters"),
"url": reverse("sievefilters:index"),
"img": "glyphicon glyphicon-check"}
"img": "fa fa-filter"}
]
modoboa/extensions/sievefilters/static/sievefilters/js/jquery.dynfields.js
+4 -4
View File
@@ -8,7 +8,7 @@
var $addlink = $('<a />', {
href: '#',
id: this.$element.attr("id") + '_rmbtn',
html: '<i class="glyphicon glyphicon-plus"></i>'
html: '<i class="fa fa-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="glyphicon glyphicon-trash"></i>'
html: '<i class="fa fa-trash"></i>'
}).click($.proxy(this.removefields, this));
},
@@ -160,7 +160,7 @@
var $addlink = $('<a />', {
href: '#',
id: this.$element.attr("id") + '_rmbtn',
html: '<i class="glyphicon glyphicon-plus"></i>'
html: '<i class="fa fa-plus"></i>'
});
$("select[name*=action_name_]").change($.proxy(this.name_change, this));
$addlink.click($.proxy(this.addfields, this));
@@ -257,7 +257,7 @@
return $('<a />', {
href: '#',
id: 'action_' + this.nextid + '_rmbtn',
html: '<i class="glyphicon glyphicon-trash"></i>'
html: '<i class="fa fa-trash"></i>'
}).click($.proxy(this.removefields, this));
},
modoboa/extensions/sievefilters/templatetags/sfilters_tags.py
+10 -10
View File
@@ -13,7 +13,7 @@ register = template.Library()
def sfilters_menu(user):
entries = [
{"name": "newfilterset",
"img": "glyphicon glyphicon-plus",
"img": "fa fa-plus",
"label": _("New filters set"),
"url": reverse("sievefilters:fs_add"),
"modal": True,
@@ -31,7 +31,7 @@ def fset_menu(mode, setname):
if mode == "gui":
entries += [
{"name": "newfilter",
"img": "glyphicon glyphicon-plus",
"img": "fa fa-plus",
"label": _("New filter"),
"url": reverse("sievefilters:filter_add",
args=[setname]),
@@ -42,7 +42,7 @@ def fset_menu(mode, setname):
if mode == "raw":
entries += [
{"name": "savefs",
"img": "glyphicon glyphicon-download-alt",
"img": "fa fa-download-alt",
"label": _("Save filters set"),
"url": reverse("sievefilters:fs_save",
args=[setname])},
@@ -50,16 +50,16 @@ def fset_menu(mode, setname):
entries += [
{"name": "activatefs",
"img": "glyphicon glyphicon-ok",
"img": "fa fa-check",
"label": _("Activate filters set"),
"url": reverse("sievefilters:fs_activate",
args=[setname])},
{"name": "removefs",
"img": "glyphicon glyphicon-trash",
"img": "fa fa-trash",
"label": _("Remove filters set"),
"url": reverse("sievefilters:fs_delete", args=[setname])},
{"name": "downloadfs",
"img": "glyphicon glyphicon-download",
"img": "fa fa-download",
"label": _("Download"),
"url": reverse("sievefilters:fs_download", args=[setname])}
]
@@ -74,7 +74,7 @@ def filter_actions(setname, f, position, islast):
{"name": "editfilter",
"url": reverse(
"sievefilters:filter_change", args=[setname, f["name"]]),
"img": "glyphicon glyphicon-edit",
"img": "fa fa-edit",
"title": _("Edit filter"),
"modal": True,
"autowidth": True,
@@ -82,7 +82,7 @@ def filter_actions(setname, f, position, islast):
{"name": "removefilter",
"url": reverse(
"sievefilters:filter_delete", args=[setname, f["name"]]),
"img": "glyphicon glyphicon-trash",
"img": "fa fa-trash",
"title": _("Remove this filter")}
]
if position != 1:
@@ -90,7 +90,7 @@ def filter_actions(setname, f, position, islast):
{"name": "movefilter_up",
"url": reverse(
"sievefilters:filter_move_up", args=[setname, f["name"]]),
"img": "glyphicon glyphicon-arrow-up",
"img": "fa fa-chevron-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(
"sievefilters:filter_move_down", args=[setname, f["name"]]),
"img": "glyphicon glyphicon-arrow-down",
"img": "fa fa-chevron-down",
"title": _("Move this filter down")},
]
return render_actions(actions)
modoboa/extensions/stats/templates/stats/index.html
+3 -3
View File
@@ -34,7 +34,7 @@ $(document).ready(function() {
<div class="form-group has-feedback">
<div class="col-sm-12">
<input class="form-control" id="searchquery" type="text" value="{% trans 'Search a domain' %}">
<span class="glyphicon glyphicon-search form-control-feedback"></span>
<span class="fa fa-search form-control-feedback"></span>
</div>
</div>
</form>
@@ -57,13 +57,13 @@ $(document).ready(function() {
<span id="custom-period">
<div class="form-group">
<div class="input-group">
<div class="input-group-addon"><span class="glyphicon glyphicon-indent-left"></span></div>
<div class="input-group-addon"><span class="fa fa-indent-left"></span></div>
<input id="id_from" class="form-control" name="date_from" value="{{ start }}" type="text" readonly="readonly" />
</div>
</div>
<div class="form-group">
<div class="input-group">
<div class="input-group-addon"><span class="glyphicon glyphicon-indent-right"></span></div>
<div class="input-group-addon"><span class="fa fa-indent-right"></span></div>
<input id="id_to" class="form-control" name="date_to" value="{{ end }}" type="text" readonly="readonly" />
</div>
</div>
modoboa/static/js/jquery.sortable.js
+3 -3
View File
@@ -50,8 +50,8 @@
dir = "desc";
}
}
this.$element.append($("<i/>", {
"class": "sort-selection glyphicon glyphicon-chevron-" + ((dir == 'asc') ? 'up' : 'down')
this.$element.append($("<span/>", {
"class": "sort-selection fa fa-chevron-" + ((dir == 'asc') ? 'up' : 'down')
}));
return dir;
}
@@ -78,4 +78,4 @@
$.fn.sortable.defaults = {
onSortOrderChange: null
};
})(jQuery);
})(jQuery);
modoboa/static/js/listing.js
+1 -1
View File
@@ -136,7 +136,7 @@ Listing.prototype = {
"html": text
});
$("<span />", {"class" : "glyphicon glyphicon-remove"}).prependTo($tag);
$("<span />", {"class" : "fa fa-remove"}).prependTo($tag);
$tag.click($.proxy(this.remove_tag, this));
return $tag;
},
modoboa/templates/common/pagination_bar.html
+12 -12
View File
@@ -3,18 +3,18 @@
{% if page.has_previous %}
<li>
<a href="{{ baseurl }}page=1">
<span class="glyphicon glyphicon-fast-backward"></span></a>
<span class="fa fa-fast-backward"></span></a>
</li>
<li>
<a href="{{ baseurl }}page={{ page.previous_page_number }}">
<span class="glyphicon glyphicon-step-backward"></span></a>
<span class="fa fa-step-backward"></span></a>
</li>
{% else %}
<li>
<span class="glyphicon glyphicon-fast-backward"></span>
<span class="fa fa-fast-backward"></span>
</li>
<li>
<span class="glyphicon glyphicon-step-backward"></span>
<span class="fa fa-step-backward"></span>
</li>
{% endif %}
<li class="disabled navbar-text">
@@ -23,18 +23,18 @@
{% if page.has_next %}
<li>
<a href="{{ baseurl }}page={{ page.next_page_number }}">
<span class="glyphicon glyphicon-step-forward"></span></a>
<span class="fa fa-step-forward"></span></a>
</li>
<li>
<a href="{{ baseurl }}page={{ page.paginator.num_pages }}">
<span class="glyphicon glyphicon-fast-forward"></span></a>
<span class="fa fa-fast-forward"></span></a>
</li>
{% else %}
<li>
<span class="glyphicon glyphicon-step-forward"></span>
<span class="fa fa-step-forward"></span>
</li>
<li>
<span class="glyphicon glyphicon-fast-forward"></span>
<span class="fa fa-fast-forward"></span>
</li>
{% endif %}
</ul>
@@ -42,13 +42,13 @@
<div class="display-less-1198 pull-right">
{% if page.has_previous %}
<a href="{{ baseurl }}page={{ page.previous_page_number }}" class="btn btn-lg btn-link glyphicon glyphicon-chevron-left" type="button"></a>
<a href="{{ baseurl }}page={{ page.previous_page_number }}" class="btn btn-lg btn-link fa fa-chevron-left" type="button"></a>
{% else %}
<a class="btn btn-lg btn-link glyphicon glyphicon-chevron-left" type="button"></a>
<a class="btn btn-lg btn-link fa fa-chevron-left" type="button"></a>
{% endif %}
{% if page.has_next %}
<a href="{{ baseurl }}page={{ page.next_page_number }}" class="btn btn-lg btn-link glyphicon glyphicon-chevron-right" type="button"></a>
<a href="{{ baseurl }}page={{ page.next_page_number }}" class="btn btn-lg btn-link fa fa-chevron-right" type="button"></a>
{% else %}
<a class="btn btn-lg btn-link glyphicon glyphicon-chevron-right" type="button"></a>
<a class="btn btn-lg btn-link fa fa-chevron-right" type="button"></a>
{% endif %}
</div>
modoboa/templates/common/top_notifications.html
+1 -1
View File
@@ -1,7 +1,7 @@
<ul id="top_notifications" class="nav pull-right{% if not top_notifications %} hidden{% endif %}">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="glyphicon glyphicon-bell"></i> <span id="alerts-counter" class="label label-important">{{ top_notifications|length }}</span>
<i class="fa fa-bell"></i> <span id="alerts-counter" class="label label-important">{{ top_notifications|length }}</span>
</a>
<ul class="dropdown-menu">
{% for notification in top_notifications %}
modoboa/templates/nlayout.html
+5 -5
View File
@@ -55,31 +55,31 @@
<ul class="nav navbar-nav display-less-1198">
<li class="droppable active ui-droppable" name="INBOX">
<a class="block" name="loadfolder" href="INBOX">
<i class="glyphicon glyphicon-inbox"></i>
<i class="fa fa-inbox"></i>
INBOX
</a>
</li>
<li class="droppable ui-droppable" name="Drafts">
<a class="block" name="loadfolder" href="Drafts">
<i class="glyphicon glyphicon-file"></i>
<i class="fa fa-file"></i>
Drafts
</a>
</li>
<li class="droppable ui-droppable" name="Junk">
<a class="block" name="loadfolder" href="Junk">
<i class="glyphicon glyphicon-fire"></i>
<i class="fa fa-fire"></i>
Junk
</a>
</li>
<li class="droppable ui-droppable" name="Sent">
<a class="block" name="loadfolder" href="Sent">
<i class="glyphicon glyphicon-envelope"></i>
<i class="fa fa-envelope"></i>
Sent
</a>
</li>
<li class="droppable ui-droppable" name="Trash">
<a class="block" name="loadfolder" href="Trash">
<i class="glyphicon glyphicon-trash"></i>
<i class="fa fa-trash"></i>
Trash
</a>
</li>