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

make the invite flow not look totally terrible

Browse source
This commit is contained in:
Maxwell Salzberg 2012-03-19 19:47:46 -07:00
parent 3cb7003361
commit 7b0c7ee4a0
3 changed files with 34 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Gemfile.lock
View file

@ -152,8 +152,8 @@ GEM
erubis (2.6.6) erubis (2.6.6)
abstract (>= 1.0.0) abstract (>= 1.0.0)
eventmachine (1.0.0.beta.4) eventmachine (1.0.0.beta.4)
excon (0.9.6) excon (0.12.0)
factory_girl (2.6.3) factory_girl (2.6.4)
activesupport (>= 2.3.9) activesupport (>= 2.3.9)
factory_girl_rails (1.7.0) factory_girl_rails (1.7.0)
factory_girl (~> 2.6.0) factory_girl (~> 2.6.0)
@ -170,15 +170,24 @@ GEM
fixture_builder (0.3.1) fixture_builder (0.3.1)
activerecord (>= 2) activerecord (>= 2)
activesupport (>= 2) activesupport (>= 2)
fog (1.1.2) fog (1.2.0)
builder builder
excon (~> 0.9.0) builder
excon (~> 0.12.0)
excon (~> 0.12.0)
formatador (~> 0.2.0)
formatador (~> 0.2.0) formatador (~> 0.2.0)
mime-types mime-types
multi_json (~> 1.0.3) mime-types
multi_json (~> 1.0)
multi_json (~> 1.0)
net-scp (~> 1.0.4)
net-scp (~> 1.0.4) net-scp (~> 1.0.4)
net-ssh (>= 2.1.3) net-ssh (>= 2.1.3)
net-ssh (>= 2.1.3)
nokogiri (~> 1.5.0) nokogiri (~> 1.5.0)
nokogiri (~> 1.5.0)
ruby-hmac
ruby-hmac ruby-hmac
foreigner (1.1.5) foreigner (1.1.5)
activerecord (>= 3.0.0) activerecord (>= 3.0.0)
@ -191,15 +200,15 @@ GEM
rspec-instafail (~> 0.1.8) rspec-instafail (~> 0.1.8)
ruby-progressbar (~> 0.0.10) ruby-progressbar (~> 0.0.10)
gem_plugin (0.2.3) gem_plugin (0.2.3)
gherkin (2.9.0) gherkin (2.9.1)
json (>= 1.4.6) json (>= 1.4.6)
haml (3.1.4) haml (3.1.4)
hashie (1.2.0) hashie (1.2.0)
heroku (2.21.2) heroku (2.21.3)
launchy (>= 0.3.2) launchy (>= 0.3.2)
netrc (~> 0.7.1)
rest-client (~> 1.6.1) rest-client (~> 1.6.1)
rubyzip rubyzip
term-ansicolor (~> 1.0.5)
heroku_san (1.3.0) heroku_san (1.3.0)
heroku (>= 2) heroku (>= 2)
rails (>= 2) rails (>= 2)
@ -208,7 +217,7 @@ GEM
http_accept_language (1.0.2) http_accept_language (1.0.2)
http_parser.rb (0.5.3) http_parser.rb (0.5.3)
i18n (0.5.0) i18n (0.5.0)
i18n-inflector (2.6.3) i18n-inflector (2.6.6)
i18n (>= 0.4.1) i18n (>= 0.4.1)
i18n-inflector-rails (1.0.6) i18n-inflector-rails (1.0.6)
actionpack (~> 3.0) actionpack (~> 3.0)
@ -231,7 +240,7 @@ GEM
multi_json multi_json
jwt (0.1.4) jwt (0.1.4)
json (>= 1.2.4) json (>= 1.2.4)
kgio (2.7.2) kgio (2.7.3)
launchy (2.0.3) launchy (2.0.3)
linecache (0.46) linecache (0.46)
rbx-require-relative (> 0.0.4) rbx-require-relative (> 0.0.4)
@ -266,7 +275,8 @@ GEM
net-ssh (2.3.0) net-ssh (2.3.0)
net-ssh-gateway (1.1.0) net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1) net-ssh (>= 1.99.1)
newrelic_rpm (3.3.2) netrc (0.7.1)
newrelic_rpm (3.3.2.1)
nokogiri (1.5.0) nokogiri (1.5.0)
oauth (0.4.5) oauth (0.4.5)
oauth2 (0.5.0) oauth2 (0.5.0)
@ -350,7 +360,7 @@ GEM
resque (~> 1.0) resque (~> 1.0)
rest-client (1.6.7) rest-client (1.6.7)
mime-types (>= 1.16) mime-types (>= 1.16)
rpm_contrib (2.1.7) rpm_contrib (2.1.8)
newrelic_rpm (>= 3.1.1) newrelic_rpm (>= 3.1.1)
newrelic_rpm (>= 3.1.1) newrelic_rpm (>= 3.1.1)
rspec (2.8.0) rspec (2.8.0)

8
app/helpers/invitation_codes_helper.rb
View file

@ -1,9 +1,11 @@
module InvitationCodesHelper module InvitationCodesHelper
def invite_welcome_message def invite_welcome_message
if invite.present? if invite.present?
content_tag(:div) do content_tag(:div, :class => 'media well') do
person_image_link(invite.user.person) + person_image_link(invite.user.person, :class => 'img') +
I18n.translate('invitation_codes.excited', :name => invite.user.name) content_tag(:div, :class => 'bd') do
I18n.translate('invitation_codes.excited', :name => invite.user.name)
end
end end
end end
end end

11
app/views/people/_add_contact.html.haml
View file

@ -1,5 +1,8 @@
.alert-message.block-message.success .span7.offset1.well
= t('.invited_by') = t('.invited_by')
= person_image_link inviter .media
= person_link inviter .float-right
= aspect_membership_dropdown(contact, inviter, false) = aspect_membership_dropdown(contact, inviter, false)
= person_image_link(inviter, :class => 'img')
.bd
= person_link(inviter)