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

Subsitute "icon" with "glyphicon"

Browse Source
This commit is contained in:
Maël Solard
2014-08-07 18:38:40 +02:00
parent 6707b74595
commit 8169748b8c
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/extensions/amavis/general_callbacks.py
+1 -1
View File
@@ -109,7 +109,7 @@ def display_requests(user):
tpl = Template("""<ul class="nav pull-right {{ css }}">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="icon-white icon-bell"></i> <span id="alerts-counter" class="label label-important">{{ nbrequests }}</span>
<i class="glyphicon glyphicon-bell"></i> <span id="alerts-counter" class="label label-important">{{ nbrequests }}</span>
</a>
<ul class="dropdown-menu">
<li>
modoboa/extensions/amavis/templates/amavis/main_action_bar.html
+2 -2
View File
@@ -15,12 +15,12 @@
</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" %}
<i class="glyphicon glyphicon-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" %}
<i class="glyphicon glyphicon-trash"></i> {% trans "Delete" %}
</a>
</div>
{% include "common/email_searchbar.html" with extraopts=extraopts %}
modoboa/extensions/amavis/templatetags/amavis_tags.py
+4 -4
View File
@@ -12,14 +12,14 @@ register = template.Library()
def viewm_menu(mail_id, rcpt):
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 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")},
@@ -46,14 +46,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/templates/common/pagination_bar.html
+8 -8
View File
@@ -2,26 +2,26 @@
<ul>
<li>
{% if page.has_previous %}<a href="{{ baseurl }}page=1">
<i class="icon-white icon-fast-backward"></i></a>{% else %}
<i class="icon-white icon-fast-backward"></i>{% endif %}
<i class="glyphicon glyphicon-fast-backward"></i></a>{% else %}
<i class="glyphicon glyphicon-fast-backward"></i>{% endif %}
</li>
<li>
{% if page.has_previous %}<a href="{{ baseurl }}page={{ page.previous_page_number }}">
<i class="icon-step-backward icon-white"></i></a>{% else %}
<i class="icon-step-backward icon-white"></i>{% endif %}
<i class="glyphicon glyphicon-step-backward icon-white"></i></a>{% else %}
<i class="glyphicon glyphicon-step-backward icon-white"></i>{% endif %}
</li>
<li class="disabled navbar-text">
{{ page.number }}/{{ page.paginator.num_pages }}
</li>
<li>
{% if page.has_next %}<a href="{{ baseurl }}page={{ page.next_page_number }}">
<i class="icon-step-forward icon-white"></i></a>{% else %}
<i class="icon-step-forward icon-white"></i>{% endif %}
<i class="glyphicon glyphicon-step-forward icon-white"></i></a>{% else %}
<i class="glyphicon glyphicon-step-forward icon-white"></i>{% endif %}
</li>
<li>
{% if page.has_next %}<a href="{{ baseurl }}page={{ page.paginator.num_pages }}">
<i class="icon-fast-forward icon-white"></i></a>{% else %}
<i class="icon-fast-forward icon-white"></i>{% endif %}
<i class="glyphicon glyphicon-fast-forward icon-white"></i></a>{% else %}
<i class="glyphicon glyphicon-fast-forward icon-white"></i>{% endif %}
</li>
</ul>
</div>
modoboa/templates/nlayout.html
+3 -3
View File
@@ -33,9 +33,9 @@
<div class="navbar-header">
<button class="navbar-toggle" data-target="#bs-example-navbar-collapse-1" data-toggle="collapse" type="button">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="glyphicon glyphicon-bar"></span>
<span class="glyphicon glyphicon-bar"></span>
<span class="glyphicon glyphicon-bar"></span>
</button>
</div>
<div id="bs-example-navbar-collapse-1" class="collapse navbar-collapse">