Skip to content

Commit

Permalink
Update javascript files to compact fa icons new version
Browse files Browse the repository at this point in the history
  • Loading branch information
sshwsfc committed Mar 10, 2014
1 parent affb27f commit 94c2f54
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion xadmin/static/xadmin/js/xadmin.plugin.bookmark.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
f.find('button[type=submit]').button('loading');
$.post(f.attr('action'), f.serialize(), function(data){
$('#bookmark-menu .add-bookmark').remove();
$('#bookmark-menu').append('<li><a href="'+ data.url +'" title="'+ data.title +'"><i class="icon-bookmark"></i> '+ data.title +'</a></li>');
$('#bookmark-menu').append('<li><a href="'+ data.url +'" title="'+ data.title +'"><i class="fa fa-bookmark"></i> '+ data.title +'</a></li>');
}, 'json');
return false;
});
Expand Down
4 changes: 2 additions & 2 deletions xadmin/static/xadmin/js/xadmin.plugin.details.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
'<div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button><h4 class="modal-title">'+
el.attr('title') +'</h4></div><div class="modal-body"></div>'+
'<div class="modal-footer"><button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>'+
'<a class="btn btn-submit btn-primary edit-btn"><i class="icon-pencil"></i> Edit</a></div></div></div></div>');
'<a class="btn btn-submit btn-primary edit-btn"><i class="fa fa-pencil"></i> Edit</a></div></div></div></div>');
$('body').append(modal);
}
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="fa-spinner fa-spin icon-large"></i></h1>');
modal.find('.modal-body').html('<h1 style="text-align:center;"><i class="fa-spinner fa-spin fa fa-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: ";
Expand Down
6 changes: 3 additions & 3 deletions xadmin/static/xadmin/js/xadmin.plugin.editable.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@

if(this.content == null){
var that = this
$el.find('>i').removeClass('icon-edit').addClass('fa-spinner fa-spin')
$el.find('>i').removeClass('fa fa-edit').addClass('fa-spinner fa-spin')
$.ajax({
url: $el.data('editable-loadurl'),
success: function(content){
$el.find('>i').removeClass('fa-spinner fa-spin').addClass('icon-edit')
$el.find('>i').removeClass('fa-spinner fa-spin').addClass('fa fa-edit')
that.content = content
that.toggle()
},
Expand All @@ -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="fa-spinner fa-spin icon-large"></i></h2></div>')
this.$mask = $('<div class="mask"><h2 style="text-align:center;"><i class="fa-spinner fa-spin fa fa-large"></i></h2></div>')
$tip.find('.popover-content').prepend(this.$mask)

$tip.removeClass('fade top bottom left right in')
Expand Down
2 changes: 1 addition & 1 deletion xadmin/static/xadmin/js/xadmin.plugin.portal.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jQuery(function() {
});

$( ".panel-heading .icon.chevron" ).click(function() {
$( this ).toggleClass( "icon-chevron-up" ).toggleClass( "icon-chevron-down" );
$( this ).toggleClass( "fa fa-chevron-up" ).toggleClass( "fa fa-chevron-down" );
$( this ).parents( ".panel:first" ).find( ".panel-body" ).toggle('fast');
});

Expand Down
4 changes: 2 additions & 2 deletions xadmin/static/xadmin/js/xadmin.plugin.quick-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
constructor: AjaxForm

, ainit: function(){
this.$mask = $('<div class="mask"><h1 style="text-align:center;"><i class="fa-spinner fa-spin icon-large"></i></h1></div>')
this.$mask = $('<div class="mask"><h1 style="text-align:center;"><i class="fa-spinner fa-spin fa fa-large"></i></h1></div>')

this.$form.prepend(this.$mask)
this.$form.submit($.proxy(this.submit, this))
Expand Down Expand Up @@ -174,7 +174,7 @@
$('body').append(modal)

var self = this
modal.find('.modal-body').html('<h2 style="text-align:center;"><i class="fa-spinner fa-spin icon-large"></i></h2>')
modal.find('.modal-body').html('<h2 style="text-align:center;"><i class="fa-spinner fa-spin fa fa-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')
Expand Down
2 changes: 1 addition & 1 deletion xadmin/static/xadmin/js/xadmin.plugin.themes.js
Original file line number Diff line number Diff line change
Expand Up @@ -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="fa-spinner fa-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 fa fa-large"></i></h2></div></div></div></div>');
$('body').append(modal);

modal.on('shown.bs.modal', function(){
Expand Down

0 comments on commit 94c2f54

Please sign in to comment.