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

added feedback to all getting_started states. postive feedback, ftw.

Browse source
This commit is contained in:
danielgrippi 2011-10-26 17:33:59 -07:00
parent 9789e25c99
commit 96f74cf930
3 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/views/photos/_new_profile_photo.haml
View file

@ -35,6 +35,11 @@
$("#file-upload-spinner").addClass("hidden"); $("#file-upload-spinner").addClass("hidden");
$('#fileInfo').text(fileName + ' completed').fadeOut(2000); $('#fileInfo').text(fileName + ' completed').fadeOut(2000);
$('#file-upload').removeClass("loading"); $('#file-upload').removeClass("loading");
/* flash message prompt */
var message = Diaspora.I18n.t("photo_uploader.looking_good");
Diaspora.page.flashMessages.render({success: true, notice: message});
var id = responseJSON.data.photo.id; var id = responseJSON.data.photo.id;
var url = responseJSON.data.photo.unprocessed_image.url; var url = responseJSON.data.photo.unprocessed_image.url;
var oldPhoto = $('#photo_id'); var oldPhoto = $('#photo_id');

8
config/locales/javascript/javascript.en.yml
View file

@ -5,7 +5,6 @@
en: en:
javascripts: javascripts:
confirm_dialog: "Are you sure?" confirm_dialog: "Are you sure?"
timeago: timeago:
prefixAgo: "" prefixAgo: ""
@ -60,3 +59,10 @@ en:
select_all: "Select all" select_all: "Select all"
deselect_all: "Deselect all" deselect_all: "Deselect all"
no_aspects: "No aspects selected" no_aspects: "No aspects selected"
getting_started:
hey: "Hey, {{name}}!"
no_tags: "Hey, you haven't followed any tags! Continue anyway?"
alright_ill_wait: "Alright, I'll wait."
preparing_your_stream: "Preparing your personialized stream..."
photo_uploader:
looking_good: "OMG, you look awesome!"

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

@ -15,13 +15,16 @@ Diaspora.Pages.UsersGettingStarted = function() {
$('#edit_profile').bind('ajax:complete', function(evt, xhr, status){ $('#edit_profile').bind('ajax:complete', function(evt, xhr, status){
var firstNameField = $("#profile_first_name"); var firstNameField = $("#profile_first_name");
firstNameField.val(firstNameField.data("cachedValue")); firstNameField.val(firstNameField.data("cachedValue"));
/* flash message prompt */
var message = Diaspora.I18n.t("getting_started.hey", {'name': $("#profile_first_name").val()});
Diaspora.page.flashMessages.render({success: true, notice: message});
}); });
$("#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"); $('#form_spinner').removeClass("hidden");
}); });
$("#profile_first_name").bind("blur", function(){ $("#profile_first_name").bind("blur", function(){
@ -34,8 +37,21 @@ Diaspora.Pages.UsersGettingStarted = function() {
$("#awesome_button").bind("click", function(evt){ $("#awesome_button").bind("click", function(evt){
evt.preventDefault(); evt.preventDefault();
$('#awesome_spinner').removeClass("hidden");
$('.tag_input').submit(); var confirmMessage = Diaspora.I18n.t("getting_started.no_tags");
if(($("#as-selections-tags").find(".as-selection-item").length > 0) || confirm(confirmMessage)) {
$('#awesome_spinner').removeClass("hidden");
$('.tag_input').submit();
/* flash message prompt */
var message = Diaspora.I18n.t("getting_started.preparing_your_stream");
Diaspora.page.flashMessages.render({success: true, notice: message});
} else {
/* flash message prompt */
var message = Diaspora.I18n.t("getting_started.alright_ill_wait");
Diaspora.page.flashMessages.render({success: true, notice: message});
}
}); });
/* ------ */ /* ------ */