Update fa icons version

sshwsfc · Mar 10, 2014 · affb27f · affb27f
1 parent c599f4c
commit affb27f
Show file tree

Hide file tree

Showing 65 changed files with 641 additions and 2,753 deletions.
diff --git a/demo_app/data.db b/demo_app/data.db
diff --git a/xadmin/static/xadmin/js/xadmin.plugin.charts.js b/xadmin/static/xadmin/js/xadmin.plugin.charts.js
@@ -15,7 +15,7 @@ $(document).ready(function(){
 
         if($chart.data('chart-obj')) return;
 
-        $chart.html('<span class="text-muted"><i class="icon icon-spinner icon-spin"></i> Loading chart...</span>');
+        $chart.html('<span class="text-muted"><i class="icon fa-spinner fa-spin"></i> Loading chart...</span>');
 
         $.getJSON($chart.data('chart-url'), function(data){
             var chart = $.plot($chart, data.data, data.option);

diff --git a/xadmin/static/xadmin/js/xadmin.plugin.details.js b/xadmin/static/xadmin/js/xadmin.plugin.details.js
@@ -27,7 +27,7 @@
         }
         modal.find('.modal-title').html(el.attr('title'));
         modal.find('.edit-btn').attr('href', this.edit_uri);
-        modal.find('.modal-body').html('<h1 style="text-align:center;"><i class="icon-spinner icon-spin icon-large"></i></h1>');
+        modal.find('.modal-body').html('<h1 style="text-align:center;"><i class="fa-spinner fa-spin icon-large"></i></h1>');
         modal.find('.modal-body').load(this.res_uri + '?_format=html', function(response, status, xhr) {
           if (status == "error") {
             var msg = "Sorry but there was an error: ";

diff --git a/xadmin/static/xadmin/js/xadmin.plugin.editable.js b/xadmin/static/xadmin/js/xadmin.plugin.editable.js
@@ -67,11 +67,11 @@
 
     if(this.content == null){
       var that = this
-      $el.find('>i').removeClass('icon-edit').addClass('icon-spinner icon-spin')
+      $el.find('>i').removeClass('icon-edit').addClass('fa-spinner fa-spin')
       $.ajax({
         url: $el.data('editable-loadurl'),
         success: function(content){
-          $el.find('>i').removeClass('icon-spinner icon-spin').addClass('icon-edit')
+          $el.find('>i').removeClass('fa-spinner fa-spin').addClass('icon-edit')
           that.content = content
           that.toggle()
         },
@@ -94,7 +94,7 @@
     $form.submit($.proxy(this.submit, this))
 
     this.$form = $form
-    this.$mask = $('<div class="mask"><h2 style="text-align:center;"><i class="icon-spinner icon-spin icon-large"></i></h2></div>')
+    this.$mask = $('<div class="mask"><h2 style="text-align:center;"><i class="fa-spinner fa-spin icon-large"></i></h2></div>')
     $tip.find('.popover-content').prepend(this.$mask)
 
     $tip.removeClass('fade top bottom left right in')

diff --git a/xadmin/static/xadmin/js/xadmin.plugin.quick-form.js b/xadmin/static/xadmin/js/xadmin.plugin.quick-form.js
@@ -19,7 +19,7 @@
     constructor: AjaxForm
 
     , ainit: function(){
-      this.$mask = $('<div class="mask"><h1 style="text-align:center;"><i class="icon-spinner icon-spin icon-large"></i></h1></div>')
+      this.$mask = $('<div class="mask"><h1 style="text-align:center;"><i class="fa-spinner fa-spin icon-large"></i></h1></div>')
 
       this.$form.prepend(this.$mask)
       this.$form.submit($.proxy(this.submit, this))
@@ -174,7 +174,7 @@
         $('body').append(modal)
 
         var self = this
-        modal.find('.modal-body').html('<h2 style="text-align:center;"><i class="icon-spinner icon-spin icon-large"></i></h2>')
+        modal.find('.modal-body').html('<h2 style="text-align:center;"><i class="fa-spinner fa-spin icon-large"></i></h2>')
         modal.find('.modal-body').load(this.add_url, function(form_html, status, xhr){
           var form = $(this).find('form')
           form.addClass('quick-form')

diff --git a/xadmin/static/xadmin/js/xadmin.plugin.themes.js b/xadmin/static/xadmin/js/xadmin.plugin.themes.js
@@ -36,7 +36,7 @@
         if(topmenu.data('bs.collapse')) topmenu.collapse('hide');
 
         var modal = $('<div id="load-theme-modal" class="modal fade" role="dialog"><div class="modal-dialog"><div class="modal-content"><div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button><h4>'+ 
-            'Loading theme</h4></div><div class="modal-body"><h2 style="text-align:center;"><i class="icon-spinner icon-spin icon-large"></i></h2></div></div></div></div>');
+            'Loading theme</h4></div><div class="modal-body"><h2 style="text-align:center;"><i class="fa-spinner fa-spin icon-large"></i></h2></div></div></div></div>');
         $('body').append(modal);
 
         modal.on('shown.bs.modal', function(){