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

dim service icons when not public. remove 'make public' label, now checkbox title.

Browse source
This commit is contained in:
danielvincent 2010-12-18 20:00:13 -08:00
parent ee9e187e5c
commit a42a773d3d
2 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/views/shared/_publisher.haml
View file

@ -6,7 +6,8 @@
- content_for :head do - content_for :head do
:javascript :javascript
$(document).ready(function(){ $(document).ready(function(){
$("div.public_toggle input").live("click", function(evt){ $("div.public_toggle input").bind("click", function(evt){
$("#publisher_service_icons").toggleClass("dim");
if($(this).attr('checked') == true){ if($(this).attr('checked') == true){
$(".question_mark").click(); $(".question_mark").click();
}; };
@ -64,12 +65,13 @@
- if aspect == :all - if aspect == :all
.public_toggle .public_toggle
%p.checkbox_select %p.checkbox_select
= status.check_box( :public, {}, true, false ) = status.check_box( :public, {:title => t('.make_public')}, true, false)
= status.label :public, t('.make_public')
= link_to (image_tag "social_media_logos/feed-16x16.png", :title => "RSS"), current_user.public_url %span#publisher_service_icons.dim
- if current_user.services = link_to (image_tag "social_media_logos/feed-16x16.png", :title => "RSS"), current_user.public_url
- for service in current_user.services - if current_user.services
= image_tag "social_media_logos/#{service.provider}-16x16.png", :title => service.provider - for service in current_user.services
= image_tag "social_media_logos/#{service.provider}-16x16.png", :title => service.provider
= link_to '(?)', "#question_mark_pane", :class => 'question_mark', :style=>"display:none;" = link_to '(?)', "#question_mark_pane", :class => 'question_mark', :style=>"display:none;"

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

@ -714,9 +714,9 @@ textarea
:border 1px solid #ccc :border 1px solid #ccc
:height auto :height auto
:-webkit-border-radius 4px :-webkit-border-radius 3px
:-moz-border-radius 4px :-moz-border-radius 3px
:border-radius 4px :border-radius 3px
input[type='checkbox'] input[type='checkbox']
:width auto :width auto
@ -740,8 +740,7 @@ form p.checkbox_select
:top 3px :top 3px
img img
:position relative :position relative
:left 80px :top 6px
:top 5px
label label
:font :font
@ -853,9 +852,9 @@ label
:width 103px :width 103px
:margin 0 :margin 0
:-webkit-border-radius 5px :-webkit-border-radius 3px
:-moz-border-radius 5px :-moz-border-radius 3px
:border-radius 5px :border-radius 3px
:border 2px solid #ccc :border 2px solid #ccc
:background :background
@ -904,6 +903,10 @@ label
:width 82% :width 82%
:display inline :display inline
.dim
:opacity 0.3
#thumbnails #thumbnails
a a
:display inline-block :display inline-block