removeing the tooltips after submit
This commit is contained in:
parent
431fa3fd04
commit
e7584261c7
5 changed files with 18 additions and 7 deletions
|
|
@ -61,6 +61,6 @@ class TagFollowingsController < ApplicationController
|
|||
@tag_following = current_user.tag_followings.create(:tag_id => @tag.id)
|
||||
end
|
||||
|
||||
redirect_to aspects_path(:welcome => true)
|
||||
redirect_to aspects_path
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -24,9 +24,14 @@
|
|||
$("#publisher .dropdown").tipsy("show");
|
||||
$("#publisher .dropdown").bind("click", function(){$(this).tipsy("hide")});
|
||||
|
||||
$("#publisher #status_message_fake_text").tipsy({trigger: 'manual', gravity: 'w', id: "first_message_explain"});
|
||||
$("#publisher #status_message_fake_text").tipsy({trigger: 'manual', gravity: 'e', id: "first_message_explain"});
|
||||
$("#publisher #status_message_fake_text").tipsy("show");
|
||||
$("#publisher #status_message_fake_text").bind("click", function(){$(this).tipsy("hide")});
|
||||
|
||||
$("#publisher .button.creation").bind("click", function(){
|
||||
$("#publisher .dropdown").tipsy("hide");
|
||||
$("#publisher #status_message_fake_text").tipsy("hide");
|
||||
});
|
||||
});
|
||||
|
||||
#publisher.closed{:class => ((aspect == :profile)? 'mention_popup' : nil )}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
asHtmlID: "tags",
|
||||
neverSubmit: true,
|
||||
retriveLimit: 10,
|
||||
selectionLimit: 5,
|
||||
selectionLimit: false,
|
||||
minChars: 2,
|
||||
keyDelay: 200,
|
||||
startText: "",
|
||||
|
|
@ -72,14 +72,14 @@
|
|||
%p
|
||||
We can speed things up a bit by
|
||||
= link_to "hooking up your Facebook account", "auth/facebook?callback_url=#{getting_started_url}"
|
||||
to Diaspora. We can pull your name and photo, and enable cross-positng.
|
||||
to Diaspora. This will pull your name and photo, and enable cross-positng.
|
||||
|
||||
.span-12
|
||||
/= form_for(current_user.person.profile, :remote => true) do |profile|
|
||||
|
||||
= form_tag profile_path, :method => :put, :remote => true, :id => 'edit_profile' do |profile|
|
||||
.span-5
|
||||
= text_field_tag 'profile[first_name]', current_user.person.profile.first_name, :placeholder => t('profiles.edit.first_name')
|
||||
= text_field_tag 'profile[first_name]', current_user.person.profile.first_name, :placeholder => t('profiles.edit.your_name')
|
||||
= image_tag 'ajax-loader.gif', :id => "form_spinner", :class => "hidden"
|
||||
%span.saved{:class => "hidden"}
|
||||
= image_tag 'icons/check_yes_ok.png'
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ class Stream::Aspect < Stream::Base
|
|||
#
|
||||
# @return [String]
|
||||
def publisher_prefill
|
||||
prefill = I18n.t("shared.publisher.new_user_prefill.hello", :new_user_tag => "newHere")
|
||||
prefill = I18n.t("shared.publisher.new_user_prefill.hello", :new_user_tag => "newhere")
|
||||
if self.user.followed_tags.size > 0
|
||||
tag_string = self.user.followed_tags.map{|t| "##{t.name}"}.to_sentence
|
||||
prefill << I18n.t("shared.publisher.new_user_prefill.i_like", :tags => tag_string)
|
||||
|
|
|
|||
|
|
@ -3217,7 +3217,7 @@ ul#getting_started
|
|||
:width 210px
|
||||
|
||||
.profile
|
||||
:min-height 260px
|
||||
:min-height 235px
|
||||
#profile_photo_upload
|
||||
:padding
|
||||
:left 30px
|
||||
|
|
@ -3230,6 +3230,12 @@ ul#getting_started
|
|||
:top -120px
|
||||
:left 140px
|
||||
|
||||
#fileInfo
|
||||
:position absolute
|
||||
:left 1px
|
||||
:top 80px
|
||||
:overflow hidden
|
||||
|
||||
.button
|
||||
:top 10px
|
||||
:left 69px
|
||||
|
|
|
|||
Loading…
Reference in a new issue