nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed spinny location on getting_started

Browse source
This commit is contained in:
danielgrippi 2011-10-27 18:03:09 -07:00
parent 0b18e47b82
commit c8fc9fcb76
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/users/getting_started.haml
View file

@ -37,7 +37,7 @@
= label_tag 'profile[first_name]', "Your name", :class => "bootstrapped" = label_tag 'profile[first_name]', "Your name", :class => "bootstrapped"
.input .input
= text_field_tag 'profile[first_name]', current_user.person.profile.first_name = text_field_tag 'profile[first_name]', current_user.person.profile.first_name
= image_tag 'ajax-loader.gif', :id => "form_spinner", :class => "hidden" = image_tag 'ajax-loader.gif', :id => "gs-name-form-spinner", :class => "hidden"
%span.saved{:class => "hidden"} %span.saved{:class => "hidden"}
= image_tag 'icons/check_yes_ok.png' = image_tag 'icons/check_yes_ok.png'
@ -77,5 +77,3 @@
.input .input
= link_to "#{t('.awesome_take_me_to_diaspora')} »", "#", :id => "awesome_button", :class => "btn primary" = link_to "#{t('.awesome_take_me_to_diaspora')} »", "#", :id => "awesome_button", :class => "btn primary"
= image_tag 'ajax-loader.gif', :id => "awesome_spinner", :class => "hidden"

5
public/javascripts/pages/users-getting-started.js
View file

@ -6,7 +6,7 @@ Diaspora.Pages.UsersGettingStarted = function() {
self.tagSearch = self.instantiate("Search", body.find("form.tag_input.search_form")); self.tagSearch = self.instantiate("Search", body.find("form.tag_input.search_form"));
$('#edit_profile').bind('ajax:success', function(evt, data, status, xhr){ $('#edit_profile').bind('ajax:success', function(evt, data, status, xhr){
$('#form_spinner').addClass("hidden"); $('#gs-name-form-spinner').addClass("hidden");
$('.profile .saved').show(); $('.profile .saved').show();
$('.profile .saved').fadeOut(2000); $('.profile .saved').fadeOut(2000);
}); });
@ -24,7 +24,7 @@ Diaspora.Pages.UsersGettingStarted = function() {
$("#profile_first_name").bind("change", function(){ $("#profile_first_name").bind("change", function(){
$(this).data("cachedValue", $(this).val()); $(this).data("cachedValue", $(this).val());
$('#edit_profile').submit(); $('#edit_profile').submit();
$('#form_spinner').removeClass("hidden"); $('#gs-name-form-spinner').removeClass("hidden");
}); });
$("#profile_first_name").bind("blur", function(){ $("#profile_first_name").bind("blur", function(){
@ -41,7 +41,6 @@ Diaspora.Pages.UsersGettingStarted = function() {
var confirmMessage = Diaspora.I18n.t("getting_started.no_tags"); var confirmMessage = Diaspora.I18n.t("getting_started.no_tags");
if(($("#as-selections-tags").find(".as-selection-item").length > 0) || confirm(confirmMessage)) { if(($("#as-selections-tags").find(".as-selection-item").length > 0) || confirm(confirmMessage)) {
$('#awesome_spinner').removeClass("hidden");
$('.tag_input').submit(); $('.tag_input').submit();
/* flash message prompt */ /* flash message prompt */

5
public/stylesheets/sass/application.sass
View file

@ -3432,3 +3432,8 @@ a.toggle_selector
:float none :float none
:height 20px :height 20px
:width 20px :width 20px
#gs-name-form-spinner
:position absolute
:top 24px
:right -33px