Update fontawesome to 4.0.3

demo_app/app/adminx.py

@@ -30,8 +30,9 @@ class BaseSetting(object):
 class GlobalSetting(object):
     global_search_models = [Host, IDC]
     global_models_icon = {
-        Host: 'laptop', IDC: 'cloud'
+        Host: 'fa fa-laptop', IDC: 'fa fa-cloud'
     }
+    menu_style = 'accordion'
 xadmin.site.register(views.CommAdminView, GlobalSetting)
 
 
@@ -84,6 +85,7 @@ def open_web(self, instance):
     save_as = True
 
     aggregate_fields = {"guarantee_date": "min"}
+    grid_layouts = ('table', 'thumbnails')
 
     form_layout = (
         Main(

xadmin/adminx.py

@@ -4,6 +4,6 @@
 
 
 class UserSettingsAdmin(object):
-    model_icon = 'cog'
+    model_icon = 'fa fa-cog'
     hidden_menu = True
 xadmin.site.register(UserSettings, UserSettingsAdmin)

xadmin/plugins/actions.py

@@ -31,7 +31,7 @@ def action_checkbox(obj):
 class BaseActionView(ModelAdminView):
     action_name = None
     description = None
-    icon = 'tasks'
+    icon = 'fa fa-tasks'
 
     model_perm = 'change'
 
@@ -57,7 +57,7 @@ class DeleteSelectedAction(BaseActionView):
     delete_selected_confirmation_template = None
 
     model_perm = 'delete'
-    icon = 'remove'
+    icon = 'fa fa-times'
 
     @filter_hook
     def delete_models(self, queryset):

xadmin/plugins/auth.py

@@ -44,7 +44,7 @@ class GroupAdmin(object):
     search_fields = ('name',)
     ordering = ('name',)
     style_fields = {'permissions': 'm2m_transfer'}
-    model_icon = 'group'
+    model_icon = 'fa fa-group'
 
     def get_field_attrs(self, db_field, **kwargs):
         attrs = super(GroupAdmin, self).get_field_attrs(db_field, **kwargs)
@@ -60,7 +60,7 @@ class UserAdmin(object):
     search_fields = ('username', 'first_name', 'last_name', 'email')
     ordering = ('username',)
     style_fields = {'user_permissions': 'm2m_transfer'}
-    model_icon = 'user'
+    model_icon = 'fa fa-user'
     relfield_style = 'fk-ajax'
 
     def get_field_attrs(self, db_field, **kwargs):
@@ -111,7 +111,7 @@ def show_name(self, p):
     show_name.short_description = _('Permission Name')
     show_name.is_column = True
 
-    model_icon = 'lock'
+    model_icon = 'fa fa-lock'
     list_display = ('show_name', )
 
 site.register(Group, GroupAdmin)
@@ -156,7 +156,7 @@ def queryset(self, qs):
 class AccountMenuPlugin(BaseAdminPlugin):
 
     def block_top_account_menu(self, context, nodes):
-        return '<li><a href="%s"><i class="icon-key"></i> %s</a></li>' % (self.get_admin_url('account_password'), _('Change Password'))
+        return '<li><a href="%s"><i class="fa fa-key"></i> %s</a></li>' % (self.get_admin_url('account_password'), _('Change Password'))
 
 site.register_plugin(AccountMenuPlugin, CommAdminView)
 

xadmin/plugins/bookmark.py

@@ -141,7 +141,7 @@ def post(self, request):
 
 class BookmarkAdmin(object):
 
-    model_icon = 'book'
+    model_icon = 'fa fa-book'
     list_display = ('title', 'user', 'url_name', 'query')
     list_display_links = ('title',)
     user_fields = ['user']
@@ -169,6 +169,7 @@ def has_change_permission(self, obj=None):
 @widget_manager.register
 class BookmarkWidget(PartialBaseWidget):
     widget_type = _('bookmark')
+    widget_icon = 'fa fa-bookmark'
     description = _(
         'Bookmark Widget, can show user\'s bookmark list data in widget.')
     template = "xadmin/widgets/list.html"

xadmin/plugins/chart.py

@@ -23,6 +23,7 @@ class ChartWidget(ModelBaseWidget):
     widget_type = 'chart'
     description = _('Show models simple chart.')
     template = 'xadmin/widgets/chart.html'
+    widget_icon = 'fa fa-bar-chart-o'
 
     def convert(self, data):
         self.list_params = data.pop('params', {})

xadmin/plugins/comments.py

@@ -41,7 +41,7 @@ class CommentsAdmin(object):
     ordering = ('-submit_date',)
     search_fields = ('comment', UsernameSearch(), 'user_name', 'user_email', 'user_url', 'ip_address')
     actions = ["flag_comments", "approve_comments", "remove_comments"]
-    model_icon = 'comment'
+    model_icon = 'fa fa-comment'
 
     def get_actions(self):
         actions = super(CommentsAdmin, self).get_actions()

xadmin/plugins/details.py

@@ -48,7 +48,7 @@ def result_item(self, item, obj, field_name, row):
                                 args=(getattr(rel_obj, opts.pk.attname),))
                         else:
                             edit_url = ''
-                        item.btns.append('<a data-res-uri="%s" data-edit-uri="%s" class="details-handler" rel="tooltip" title="%s"><i class="icon-info-sign"></i></a>'
+                        item.btns.append('<a data-res-uri="%s" data-edit-uri="%s" class="details-handler" rel="tooltip" title="%s"><i class="fa fa-info-sign"></i></a>'
                                          % (item_res_uri, edit_url, _(u'Details of %s') % str(rel_obj)))
                 except NoReverseMatch:
                     pass

xadmin/plugins/editable.py

@@ -43,7 +43,7 @@ def result_item(self, item, obj, field_name, row):
             item.wraps.insert(0, '<span class="editable-field">%s</span>')
             item.btns.append((
                 '<a class="editable-handler" title="%s" data-editable-field="%s" data-editable-loadurl="%s">'+
-                '<i class="icon-edit"></i></a>') %
+                '<i class="fa fa-edit"></i></a>') %
                  (_(u"Enter %s") % field_label, field_name, self.admin_view.model_admin_url('patch', pk) + '?fields=' + field_name))
 
             if field_name not in self.editable_need_fields:

xadmin/plugins/images.py

@@ -16,12 +16,12 @@ def get_gallery_modal():
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                 <h4 class="modal-title"></h4>
               </div>
-              <div class="modal-body"><div class="modal-image"><h1 class="loader"><i class="icon-spinner icon-spin icon-large loader"></i></h1></div></div>
+              <div class="modal-body"><div class="modal-image"><h1 class="loader"><i class="fa-spinner fa-spin fa fa-large loader"></i></h1></div></div>
               <div class="modal-footer">
-                  <a class="btn btn-info modal-prev"><i class="icon-arrow-left icon-white"></i> <span>%s</span></a>
-                  <a class="btn btn-primary modal-next"><span>%s</span> <i class="icon-arrow-right icon-white"></i></a>
-                  <a class="btn btn-success modal-play modal-slideshow" data-slideshow="5000"><i class="icon-play icon-white"></i> <span>%s</span></a>
-                  <a class="btn btn-default modal-download" target="_blank"><i class="icon-download"></i> <span>%s</span></a>
+                  <a class="btn btn-info modal-prev"><i class="fa fa-arrow-left"></i> <span>%s</span></a>
+                  <a class="btn btn-primary modal-next"><span>%s</span> <i class="fa fa-arrow-right"></i></a>
+                  <a class="btn btn-success modal-play modal-slideshow" data-slideshow="5000"><i class="fa fa-play"></i> <span>%s</span></a>
+                  <a class="btn btn-default modal-download" target="_blank"><i class="fa fa-download"></i> <span>%s</span></a>
               </div>
             </div><!-- /.modal-content -->
           </div><!-- /.modal-dialog -->

xadmin/plugins/layout.py

@@ -11,13 +11,13 @@
 DEFAULT_LAYOUTS = {
     'table': {
         'key': 'table',
-        'icon': 'table',
+        'icon': 'fa fa-table',
         'name': _(u'Table'),
         'template': 'views/model_list.html',
     },
     'thumbnails': {
         'key': 'thumbnails',
-        'icon': 'th-large',
+        'icon': 'fa fa-th-large',
         'name': _(u'Thumbnails'),
         'template': 'grids/thumbnails.html',
     },

xadmin/plugins/passwords.py

@@ -61,7 +61,7 @@ class ResetLinkPlugin(BaseAdminPlugin):
 
     def block_form_bottom(self, context, nodes):
         reset_link = self.get_admin_url('xadmin_password_reset')
-        return '<div class="text-info" style="margin-top:15px;"><a href="%s"><i class="icon-question-sign"></i> %s</a></div>' % (reset_link, _('Forgotten your password or username?'))
+        return '<div class="text-info" style="margin-top:15px;"><a href="%s"><i class="fa fa-question-sign"></i> %s</a></div>' % (reset_link, _('Forgotten your password or username?'))
 
 site.register_plugin(ResetLinkPlugin, LoginView)
 

xadmin/plugins/quickform.py

@@ -72,7 +72,7 @@ def render(self, name, value, *args, **kwargs):
         self.widget.choices = self.choices
         output = []
         if self.add_url:
-            output.append(u'<a href="%s" title="%s" class="btn btn-primary btn-sm btn-ajax pull-right" data-for-id="id_%s" data-refresh-url="%s"><i class="icon-plus"></i></a>'
+            output.append(u'<a href="%s" title="%s" class="btn btn-primary btn-sm btn-ajax pull-right" data-for-id="id_%s" data-refresh-url="%s"><i class="fa fa-plus"></i></a>'
                           % (
                               self.add_url, (_('Create New %s') % self.rel.to._meta.verbose_name), name,
                               "%s?_field=%s&%s=" % (self.rel_add_url, name, name)))

xadmin/plugins/relate.py

@@ -52,14 +52,14 @@ def related_link(self, instance):
 
             link = ''.join(('<li class="with_menu_btn">',
 
-                            '<a href="%s?%s=%s" title="%s"><i class="icon icon-th-list"></i> %s</a>' %
+                            '<a href="%s?%s=%s" title="%s"><i class="icon fa fa-th-list"></i> %s</a>' %
                           (
                             reverse('%s:%s_%s_changelist' % (
                                     self.admin_site.app_name, label, model_name)),
                             RELATE_PREFIX + lookup_name, str(instance.pk), verbose_name, verbose_name) if view_perm else
-                            '<a><span class="text-muted"><i class="icon icon-blank"></i> %s</span></a>' % verbose_name,
+                            '<a><span class="text-muted"><i class="icon fa fa-blank"></i> %s</span></a>' % verbose_name,
 
-                            '<a class="add_link dropdown-menu-btn" href="%s?%s=%s"><i class="icon icon-plus pull-right"></i></a>' %
+                            '<a class="add_link dropdown-menu-btn" href="%s?%s=%s"><i class="icon fa fa-plus pull-right"></i></a>' %
                           (
                             reverse('%s:%s_%s_add' % (
                                     self.admin_site.app_name, label, model_name)),
@@ -70,7 +70,7 @@ def related_link(self, instance):
             links.append(link)
         ul_html = '<ul class="dropdown-menu" role="menu">%s</ul>' % ''.join(
             links)
-        return '<div class="dropdown related_menu pull-right"><a title="%s" class="relate_menu dropdown-toggle" data-toggle="dropdown"><i class="icon icon-list"></i></a>%s</div>' % (_('Related Objects'), ul_html)
+        return '<div class="dropdown related_menu pull-right"><a title="%s" class="relate_menu dropdown-toggle" data-toggle="dropdown"><i class="icon fa fa-list"></i></a>%s</div>' % (_('Related Objects'), ul_html)
     related_link.short_description = '&nbsp;'
     related_link.allow_tags = True
     related_link.allow_export = False
@@ -121,7 +121,7 @@ def get_brand_name(self):
         else:
             to_model_name = force_unicode(self.to_model._meta.verbose_name)
 
-        return mark_safe(u"<span class='rel-brand'>%s <i class='icon-caret-right'></i></span> %s" % (to_model_name, force_unicode(self.opts.verbose_name_plural)))
+        return mark_safe(u"<span class='rel-brand'>%s <i class='fa fa-caret-right'></i></span> %s" % (to_model_name, force_unicode(self.opts.verbose_name_plural)))
 
 
 class BaseRelateDisplayPlugin(BaseAdminPlugin):

xadmin/plugins/xversion.py

@@ -163,23 +163,23 @@ def post(self, __, request, *args, **kwargs):
     # Block Views
     def block_top_toolbar(self, context, nodes):
         recoverlist_url = self.admin_view.model_admin_url('recoverlist')
-        nodes.append(mark_safe('<div class="btn-group"><a class="btn btn-default btn-sm" href="%s"><i class="icon-trash"></i> %s</a></div>' % (recoverlist_url, _(u"Recover"))))
+        nodes.append(mark_safe('<div class="btn-group"><a class="btn btn-default btn-sm" href="%s"><i class="fa fa-trash-o"></i> %s</a></div>' % (recoverlist_url, _(u"Recover"))))
 
     def block_nav_toggles(self, context, nodes):
         obj = getattr(
             self.admin_view, 'org_obj', getattr(self.admin_view, 'obj', None))
         if obj:
             revisionlist_url = self.admin_view.model_admin_url(
                 'revisionlist', quote(obj.pk))
-            nodes.append(mark_safe('<a href="%s" class="navbar-toggle pull-right"><i class="icon-time"></i></a>' % revisionlist_url))
+            nodes.append(mark_safe('<a href="%s" class="navbar-toggle pull-right"><i class="fa fa-time"></i></a>' % revisionlist_url))
 
     def block_nav_btns(self, context, nodes):
         obj = getattr(
             self.admin_view, 'org_obj', getattr(self.admin_view, 'obj', None))
         if obj:
             revisionlist_url = self.admin_view.model_admin_url(
                 'revisionlist', quote(obj.pk))
-            nodes.append(mark_safe('<a href="%s" class="btn btn-default"><i class="icon-time"></i> <span>%s</span></a>' % (revisionlist_url, _(u'History'))))
+            nodes.append(mark_safe('<a href="%s" class="btn btn-default"><i class="fa fa-time"></i> <span>%s</span></a>' % (revisionlist_url, _(u'History'))))
 
 
 class BaseReversionView(ModelAdminView):
@@ -628,7 +628,7 @@ class VersionInline(object):
     style = 'accordion'
 
 class ReversionAdmin(object):
-    model_icon = 'exchange'
+    model_icon = 'fa fa-exchange'
 
     list_display = ('__str__', 'date_created', 'user', 'comment')
     list_display_links = ('__str__',)

xadmin/static/xadmin/css/xadmin.responsive.css

@@ -16,7 +16,7 @@
     display: none;
   }
   ul.nav-sitemenu > li.app_menu>hr{ margin: 0px;}
-  ul.nav-sitemenu > li.app_menu>a>i[class^="icon-"]{
+  ul.nav-sitemenu > li.app_menu>a>i.icon{
     font-size: 20px;
     line-height: 1.7em;
   }

xadmin/static/xadmin/js/xadmin.page.list.js

@@ -1,15 +1,18 @@
 jQuery(function($){
     //full screen btn
     $('.layout-btns .layout-full').click(function(e){
+        var icon = $(this).find('i')
         if($(this).hasClass('active')){
             // reset
             $('#left-side, ul.breadcrumb').show('fast');
             $('#content-block').removeClass('col-md-12 col-sm-12 full-content').addClass('col-sm-11 col-md-10');
+            icon.removeClass('fa-compress').addClass('fa-expand');
             $(window).trigger('resize');
         } else {
             // full screen
             $('#left-side, ul.breadcrumb').hide('fast', function(){
                 $('#content-block').removeClass('col-sm-11 col-md-10').addClass('col-md-12 col-sm-12 full-content');
+                icon.removeClass('fa-expand').addClass('fa-compress');
                 $(window).trigger('resize');
             });
         }

xadmin/templates/xadmin/base_site.html

@@ -22,7 +22,7 @@
             </ul>
           </li>
         {% endif %}
-        <li><a href="{% url 'admin:logout' %}"><i class="show-sm fa fa-signout"></i><span class="hide-sm">{% trans 'Log out' %}</span></a></li>
+        <li><a href="{% url 'admin:logout' %}"><i class="show-sm fa fa-sign-out"></i><span class="hide-sm">{% trans 'Log out' %}</span></a></li>
       </ul>
       {% view_block 'top_navbar' %}
     </div>

xadmin/templates/xadmin/blocks/model_list.nav_menu.filters.html

@@ -5,7 +5,7 @@
   <span class="caret"></span></a>
   <ul id="filter-menu" class="dropdown-menu" role="menu" aria-labelledby="drop-filter">
     {% if cl.has_query_param %}
-    <li><a href="{{cl.clean_query_url}}"><i class="fa fa-trash"></i> {% trans "Clean Filters" %}</a></li>
+    <li><a href="{{cl.clean_query_url}}"><i class="fa fa-trash-o"></i> {% trans "Clean Filters" %}</a></li>
     <li class="divider"></li>
     {% endif %}
   	{% for spec in cl.filter_specs %}{{ spec|safe }}{% endfor %}

xadmin/templates/xadmin/blocks/model_list.results_bottom.actions.html

@@ -10,7 +10,7 @@
     <span class="caret"></span></a>
     <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
       {% for name, descr, icon in action_choices %}
-        <li><a onclick="$.do_action('{{name}}');"><i class="fa fa-{{icon}}"></i> {{descr}}</a></li>
+        <li><a onclick="$.do_action('{{name}}');"><i class="{{icon}}"></i> {{descr}}</a></li>
       {% endfor %}
     </ul>
   </div>

xadmin/templates/xadmin/blocks/model_list.results_top.charts.html

@@ -1,7 +1,7 @@
 {% extends "xadmin/includes/box.html" %}
 {% load i18n xadmin_tags %}
 {% block box_title %}
-  <i class="fa fa-bar-chart"></i> {% trans "Charts" %}
+  <i class="fa fa-bar-chart-o"></i> {% trans "Charts" %}
 {% endblock box_title %}
 
 {% block box_content_class %}nopadding{% endblock box_content_class %}

xadmin/templates/xadmin/blocks/model_list.top_toolbar.layouts.html

@@ -1,12 +1,12 @@
 {% load i18n %}
 <div class="btn-group grid-layout">
   <a class="dropdown-toggle btn btn-default btn-sm" data-toggle="dropdown" href="#">
-    <i class="fa fa-{{current_icon}}"></i> {% trans "Layout" %} <span class="caret"></span>
+    <i class="{{current_icon}}"></i> {% trans "Layout" %} <span class="caret"></span>
   </a>
   <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
     {% for r in layouts %}
       <li{% if r.selected %} class="active"{% endif %}>
-      <a href="{{r.url}}"><i class="fa fa-{{r.icon}}"></i> {{r.name}}</a></li>
+      <a href="{{r.url}}"><i class="{{r.icon}}"></i> {{r.name}}</a></li>
     {% endfor %}
   </ul>
 </div>

xadmin/templates/xadmin/edit_inline/accordion.html

@@ -7,7 +7,7 @@
   <div class="panel formset-row row fieldset">
     <div class="panel-heading">
       {% if formset.formset.can_delete %}
-        <a class="delete-row pull-right"><i class="icon fa fa-remove"></i></a>
+        <a class="delete-row pull-right"><i class="fa fa-times"></i></a>
       {% endif %}
       <a class="panel-toggle" data-toggle="collapse" data-parent="#{{ formset.css_id }}-{{inline_style}}" href="#{{ prefix }}-{{ forloop.counter0 }}-body"><b>{{ formset.opts.verbose_name|title }}:</b>&nbsp;{% if fs.instance.pk %}{{ fs.instance }}{% else %}#<span class="formset-num">{{ forloop.counter }}</span>{% endif %}
       </a>
@@ -23,7 +23,7 @@
   <div class="panel formset-row row fieldset">
     <div class="panel-heading">
       {% if formset.formset.can_delete %}
-          <a class="delete-row pull-right"><i class="icon fa fa-remove"></i></a>
+          <a class="delete-row pull-right"><i class="fa fa-times"></i></a>
       {% endif %}
       <a class="panel-toggle" data-toggle="collapse" data-parent="#{{ formset.css_id }}-{{inline_style}}" href="#{{ prefix }}-__prefix__-body">
         <b>{{ formset.opts.verbose_name|title }}:</b>&nbsp;{% if fs.instance.pk %}{{ fs.instance }}{% else %}#<span class="formset-num">{{ forloop.counter }}</span>{% endif %}

xadmin/templates/xadmin/edit_inline/base.html

@@ -6,7 +6,7 @@
 
 {% block box_title %}
   {% if not formset.formset.detail_page %}
-  <a class="add-row" id="{{ prefix }}-add-row" href="javascript:void(0)"><i class="icon fa fa-plus"></i></a>
+  <a class="add-row" id="{{ prefix }}-add-row" href="javascript:void(0)"><i class="fa fa-plus"></i></a>
   {% endif %}
   {{ formset.opts.verbose_name_plural|title }}
 {% endblock box_title %}

xadmin/templates/xadmin/edit_inline/stacked.html

@@ -7,7 +7,7 @@
   <div class="panel formset-row row fieldset">
     <div class="panel-heading">
       {% if formset.formset.can_delete %}
-        <a class="delete-row pull-right"><i class="icon fa fa-remove"></i></a>
+        <a class="delete-row pull-right"><i class="fa fa-times"></i></a>
       {% endif %}
       <b>{{ formset.opts.verbose_name|title }}:</b>&nbsp;{% if fs.instance.pk %}{{ fs.instance }}{% else %}#<span class="formset-num">{{ forloop.counter }}</span>{% endif %}
     </div>
@@ -21,7 +21,7 @@
   <div class="panel formset-row row fieldset">
     <div class="panel-heading">
       {% if formset.formset.can_delete %}
-        <a class="delete-row pull-right"><i class="icon fa fa-remove"></i></a>
+        <a class="delete-row pull-right"><i class="fa fa-times"></i></a>
       {% endif %}
       <b>{{ formset.opts.verbose_name|title }}:</b>&nbsp;#<span class="formset-num"></span>
     </div>

xadmin/templates/xadmin/edit_inline/tab.html

@@ -17,7 +17,7 @@
   {% for fs in formset.formset %}
     <div class="formset-row tab-pane col-xs-12{% if forloop.first%} active{% endif %}" id="{{ prefix }}-{{ forloop.counter0 }}-body">
       {% if formset.formset.can_delete %}
-        <a class="delete-row pull-right"><i class="icon fa fa-remove"></i></a>
+        <a class="delete-row pull-right"><i class="fa fa-times"></i></a>
       {% endif %}
       {% crispy fs formset.formset.helper %}
     </div>
@@ -28,7 +28,7 @@
 {% block formset_empty %}
   <div class="formset-row tab-pane col-xs-12" data-replace-id="{{ prefix }}-__prefix__-body">
       {% if formset.formset.can_delete %}
-        <a class="delete-row pull-right"><i class="icon fa fa-remove"></i></a>
+        <a class="delete-row pull-right"><i class="fa fa-times"></i></a>
       {% endif %}
     {% crispy formset.formset.empty_form formset.formset.helper %}
   </div>