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

pop-over close buttons, wip

Browse source
This commit is contained in:
Ilya Zhitomirskiy 2011-11-04 00:11:21 -07:00
parent 0f19076b40
commit 15e7a0cc6e
4 changed files with 11 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/application_helper.rb
View file

@ -71,4 +71,8 @@ module ApplicationHelper
def all_services_connected? def all_services_connected?
current_user.services.size == AppConfig[:configured_services].size current_user.services.size == AppConfig[:configured_services].size
end end
def popover_with_close_html(without_close_html)
without_close_html + "#{link_to(image_tag('deletelabel.png'), "#", :class => 'close')}"
end
end end

29
app/views/shared/_publisher.html.haml
View file

@ -19,32 +19,7 @@
:javascript :javascript
$(document).ready(function() $(document).ready(function()
{ {
$("#publisher .dropdown").popover({trigger: 'manual', offset: 10, placement:'below'}); Publisher.triggerGettingStarted();
$("#publisher .dropdown").bind("click", function(){$(this).popover("hide")});
$("#publisher #status_message_fake_text").popover({trigger: 'manual', placement: 'right', offset: 30, id: "first_message_explain"});
$("#publisher #status_message_fake_text").bind("click", function(){$(this).popover("hide")});
$("#gs-shim").popover({trigger: 'manual', placement: 'left', offset: -5});
$("#gs-shim").bind("click", function(){$(this).popover("hide")});
setTimeout(function(){
$("#publisher #status_message_fake_text").popover("show");
}, 600);
setTimeout(function(){
$("#publisher .dropdown").popover("show");
}, 1000);
setTimeout(function(){
$("#gs-shim").popover("show");
}, 1400);
$("#publisher .button.creation").bind("click", function(){
$("#publisher .dropdown").popover("hide");
$("#publisher #status_message_fake_text").popover("hide");
$("#gs-shim").popover("hide");
});
}); });
#publisher.closed{:class => ((aspect == :profile)? 'mention_popup' : nil )} #publisher.closed{:class => ((aspect == :profile)? 'mention_popup' : nil )}
@ -57,7 +32,7 @@
= link_to( image_tag('deletelabel.png'), "#", :id => "hide_publisher", :title => t('.discard_post')) = link_to( image_tag('deletelabel.png'), "#", :id => "hide_publisher", :title => t('.discard_post'))
%ul#photodropzone %ul#photodropzone
= status.text_area :fake_text, :rows => 2, :value => h(publisher_formatted_text), :tabindex => 1, :placeholder => t('.whats_on_your_mind'), = status.text_area :fake_text, :rows => 2, :value => h(publisher_formatted_text), :tabindex => 1, :placeholder => t('.whats_on_your_mind'),
:title => "1. #{t('shared.public_explain.share')}", 'data-content' => t('shared.public_explain.new_user_welcome_message') :title => "#{popover_with_close_html("1. #{t('shared.public_explain.share')}")}", 'data-content' => t('shared.public_explain.new_user_welcome_message')
= status.hidden_field :text, :value => h(publisher_hidden_text), :class => 'clear_on_submit' = status.hidden_field :text, :value => h(publisher_hidden_text), :class => 'clear_on_submit'
#file-upload{:title => t('.upload_photos')} #file-upload{:title => t('.upload_photos')}

2
public/javascripts/publisher.js
View file

@ -454,7 +454,7 @@ var Publisher = {
triggerGettingStarted: function(){ triggerGettingStarted: function(){
Publisher.setUpPopovers("#publisher .dropdown", {trigger: 'manual', offset: 10, placement:'below'}, 1000); Publisher.setUpPopovers("#publisher .dropdown", {trigger: 'manual', offset: 10, placement:'below'}, 1000);
Publisher.setUpPopovers("#publisher #status_message_fake_text", {trigger: 'manual', placement: 'right', offset: 30, id: "first_message_explain"}, 600); Publisher.setUpPopovers("#publisher #status_message_fake_text", {trigger: 'manual', placement: 'right', offset: 30, id: "first_message_explain", html:true}, 600);
Publisher.setUpPopovers("#gs-shim", {trigger: 'manual', placement: 'left', offset: -5}, 1400); Publisher.setUpPopovers("#gs-shim", {trigger: 'manual', placement: 'left', offset: -5}, 1400);
$("#publisher .button.creation").bind("click", function(){ $("#publisher .button.creation").bind("click", function(){

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

@ -3453,3 +3453,7 @@ a.toggle_selector
#tag_following_submit #tag_following_submit
&.hidden &.hidden
:display none :display none
.popover
.close
:float right