made facebox wider, remove disable with, added default profile photo for those not connected to diaspora
This commit is contained in:
parent
8941448866
commit
9bd6b11ddf
3 changed files with 12 additions and 4 deletions
|
|
@ -5,7 +5,7 @@
|
||||||
- content_for :head do
|
- content_for :head do
|
||||||
= include_javascripts :aspects
|
= include_javascripts :aspects
|
||||||
|
|
||||||
#aspect_edit_pane
|
#aspect_edit_pane.larger
|
||||||
#facebox_header
|
#facebox_header
|
||||||
%h4
|
%h4
|
||||||
= t('.invite_your_friends_from', :service => params[:provider].titleize)
|
= t('.invite_your_friends_from', :service => params[:provider].titleize)
|
||||||
|
|
@ -44,10 +44,12 @@
|
||||||
= select_tag(:aspect_id, options_from_collection_for_select(@all_aspects, 'id', 'name'))
|
= select_tag(:aspect_id, options_from_collection_for_select(@all_aspects, 'id', 'name'))
|
||||||
= hidden_field_tag :uid, uid
|
= hidden_field_tag :uid, uid
|
||||||
= hidden_field_tag :provider, 'facebook'
|
= hidden_field_tag :provider, 'facebook'
|
||||||
= submit_tag "invite", :disable_with => "#{t('.generating')}..."
|
= submit_tag "invite"
|
||||||
|
|
||||||
- if friend[:person]
|
- if friend[:person]
|
||||||
= person_image_link(friend[:person])
|
= person_image_link(friend[:person])
|
||||||
|
- else
|
||||||
|
= image_tag('/images/user/default.png', :class => 'avatar')
|
||||||
|
|
||||||
%h4.name
|
%h4.name
|
||||||
- if friend[:person]
|
- if friend[:person]
|
||||||
|
|
@ -59,5 +61,9 @@
|
||||||
%br
|
%br
|
||||||
%br
|
%br
|
||||||
%br
|
%br
|
||||||
%h4
|
%br
|
||||||
|
%br
|
||||||
|
%br
|
||||||
|
%br
|
||||||
|
%h4{:style => 'text-align:center;'}
|
||||||
= link_to t('services.index.connect_to_facebook'), "/auth/facebook" if SERVICES['facebook']['app_id'] !=""
|
= link_to t('services.index.connect_to_facebook'), "/auth/facebook" if SERVICES['facebook']['app_id'] !=""
|
||||||
|
|
|
||||||
|
|
@ -430,7 +430,6 @@ en:
|
||||||
join_me_on_diaspora: "Join me on DIASPORA*"
|
join_me_on_diaspora: "Join me on DIASPORA*"
|
||||||
click_link_to_accept_invitation: "Click this link to accept your invitation"
|
click_link_to_accept_invitation: "Click this link to accept your invitation"
|
||||||
finder:
|
finder:
|
||||||
generating: "generating"
|
|
||||||
resend: "resend"
|
resend: "resend"
|
||||||
invite_your_friends_from: "Invite your friends from %{service}"
|
invite_your_friends_from: "Invite your friends from %{service}"
|
||||||
not_connected: "not connected"
|
not_connected: "not connected"
|
||||||
|
|
|
||||||
|
|
@ -2247,6 +2247,9 @@ ul.show_comments
|
||||||
:position absolute
|
:position absolute
|
||||||
:left 6px
|
:left 6px
|
||||||
|
|
||||||
|
&.larger
|
||||||
|
:width 600px
|
||||||
|
|
||||||
#facebox_header
|
#facebox_header
|
||||||
:padding 1em
|
:padding 1em
|
||||||
:background
|
:background
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue