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

fixed the css, added a space

Browse source
This commit is contained in:
zhitomirskiyi 2011-03-16 19:20:24 -07:00
parent b0ec5a0b2e
commit 6a33ae7795
4 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,13 +7,14 @@
$(".question_mark").tipsy({trigger: 'hover', gravity: 'w'}); $(".question_mark").tipsy({trigger: 'hover', gravity: 'w'});
}); });
#publisher #publisher.mention_popup
#click_to_share #click_to_share
= image_tag 'icons/doc_edit.png' -unless aspect == :profile
%span= t('.whats_on_your_mind') = image_tag 'icons/doc_edit.png'
%span= t('.whats_on_your_mind')
= t('aspects', :count => aspect_ids.length) = t('aspects', :count => aspect_ids.length)
.content_creation .content_creation
= form_for(StatusMessage.new, :remote => true, :html => {"data-type" => "json"}) do |status| = form_for(StatusMessage.new, :remote => true, :html => {"data-type" => "json"}) do |status|
@ -50,7 +51,7 @@
.public_toggle .public_toggle
%span#publisher_service_icons %span#publisher_service_icons
- if aspect == :all - if aspect == :all || :profile
= status.hidden_field( :public) = status.hidden_field( :public)
= image_tag "social_media_logos/feed-16x16.png", :title => "RSS", :class => 'public_icon dim' = image_tag "social_media_logos/feed-16x16.png", :title => "RSS", :class => 'public_icon dim'
- if current_user.services - if current_user.services

5
app/views/status_messages/new.haml
View file

@ -10,13 +10,14 @@
{ {
var person = {name: '#{@person.name}', handle: '#{@person.diaspora_handle}' }; var person = {name: '#{@person.name}', handle: '#{@person.diaspora_handle}' };
Publisher.autocompletion.onSelect($("#status_message_fake_text"),person,'#{@person.name}'); Publisher.autocompletion.onSelect($("#status_message_fake_text"),person,'#{@person.name}');
$("#publisher #status_message_fake_text").val(function(index, value){ return value + " " });
$("#publisher #status_message_submit.button").click(function(){$.facebox.close();}); $("#publisher #status_message_submit.button").click(function(){$.facebox.close();});
}); });
#new_status_message_pane #new_status_message_pane
.span-15 .span-15.last
#facebox_header #facebox_header
%h4 %h4
= t('mentioning') + @person.name = t('.mentioning') + @person.name
= render :partial => 'shared/publisher', :locals => { :aspect => @aspect, :aspect_ids => @aspect_ids, :aspects_with_person => @aspects_with_person, :person => @person} = render :partial => 'shared/publisher', :locals => { :aspect => @aspect, :aspect_ids => @aspect_ids, :aspects_with_person => @aspects_with_person, :person => @person}

2
config/locales/diaspora/en.yml
View file

@ -538,7 +538,7 @@ en:
cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)" cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
status_messages: status_messages:
new_status_message: new:
mentioning: "Mentioning: " mentioning: "Mentioning: "
show: show:
destroy: "Delete" destroy: "Delete"

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

@ -848,6 +848,15 @@ label
:border :border
:bottom 2px #777 solid :bottom 2px #777 solid
&.mention_popup
:padding 1px 12px
:margin
:bottom 0
:border
:bottom none
&.closed &.closed
.options_and_submit .options_and_submit
:display none !important :display none !important