Skip to content

Commit

Permalink
update font-awesome to 4.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Bertrand Mathieu committed Oct 3, 2014
1 parent 43efc05 commit 17bb9f8
Show file tree
Hide file tree
Showing 55 changed files with 3,600 additions and 9,600 deletions.
2 changes: 1 addition & 1 deletion abilian/web/admin/templates/admin/_macros.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{%- macro m_audit_entry(e) %}
<img class="avatar" src="{{ url_for("images.user_avatar", user_id=e.user.id, s=16) }}" alt="" />
{{ e.msg }}
{%- if e.entity_deleted %}<i class="icon-trash"></i>{% endif %}
{%- if e.entity_deleted %}<i class="fa fa-trash"></i>{% endif %}
{%- if e.changes %}
<ul>
{%- for msg in e.changes %}
Expand Down
2 changes: 1 addition & 1 deletion abilian/web/admin/templates/admin/audit.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<div class="form-group date">
<span id="date-chooser" class="input-group date" data-date-end-date="+1d">
<input class="form-control" type="text" value="{%if current_date %}{{ current_date }}{%- endif %}" />
<span class="input-group-addon"><i class="icon-calendar"></i></span>
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</span>
</div>

Expand Down
6 changes: 3 additions & 3 deletions abilian/web/forms/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def linkify_url(value):
if value.count("/") == 1 and value.endswith("/"):
value = value[0:-1]

return '<a href="%s">%s</a><i class="icon-share-alt"></i>' % (url, value)
return '<a href="%s">%s</a><i class="fa fa-share-alt"></i>' % (url, value)


def text2html(text):
Expand Down Expand Up @@ -634,7 +634,7 @@ def __call__(self, field, **kwargs):

s += u' <input size="13" type="text" class="form-control" {} />\n'.format(
html_params(name=field_name, id=field_id, value=value))
s += u' <span class="input-group-addon"><i class="icon-calendar"></i></span>\n'
s += u' <span class="input-group-addon"><i class="fa fa-calendar"></i></span>\n'
s += u'</div>\n'
return Markup(s)

Expand Down Expand Up @@ -843,7 +843,7 @@ def render_view(self, field):
class EmailWidget(object):
def render_view(self, field):
link = bleach.linkify(field.object_data, parse_email=True)
return (u'{}&nbsp;<i class="icon-envelope"></i>'.format(link)
return (u'{}&nbsp;<i class="fa fa-envelope"></i>'.format(link)
if link else u'')


Expand Down
Loading

0 comments on commit 17bb9f8

Please sign in to comment.