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

invite link when you get a webfinger error

Browse source
This commit is contained in:
maxwell 2010-11-16 19:07:19 -08:00
parent 72f99afe9c
commit 092f0ef7a8
4 changed files with 9 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Gemfile.lock
View file

@ -63,15 +63,6 @@ GIT
carrierwave (0.5.0)
activesupport (~> 3.0)
GIT
remote: git://github.com/rsofaer/sprinkle.git
revision: 7c744ed158dda1f99a015e6a29d086e80bd8c635
specs:
sprinkle (0.3.1)
activesupport (>= 3.0.0beta4)
capistrano (>= 2.5.5)
highline (>= 1.4.0)
PATH
remote: vendor/gems/jasmine
specs:
@ -126,12 +117,6 @@ GEM
bson_ext (1.1)
builder (2.1.2)
bunny (0.6.0)
capistrano (2.5.19)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.0.0)
capybara (0.3.9)
culerity (>= 0.2.4)
mime-types (>= 1.16)
@ -195,7 +180,7 @@ GEM
gherkin (2.2.9)
json (~> 1.4.6)
term-ansicolor (~> 1.0.5)
haml (3.0.23)
haml (3.0.24)
hashie (0.4.0)
highline (1.6.1)
http_connection (1.4.0)
@ -208,9 +193,9 @@ GEM
configuration (>= 0.0.5)
rake (>= 0.8.1)
linecache (0.43)
mail (2.2.9.1)
mail (2.2.10)
activesupport (>= 2.3.6)
i18n (>= 0.4.1)
i18n (~> 0.4.1)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
@ -234,14 +219,7 @@ GEM
multi_json (0.0.5)
multipart-post (1.0.1)
net-ldap (0.1.1)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
net-ssh (2.0.23)
net-ssh-gateway (1.0.1)
net-ssh (>= 1.99.1)
nokogiri (1.4.3.1)
nokogiri (1.4.4)
oa-basic (0.1.6)
multi_json (~> 0.0.2)
nokogiri (~> 1.4.2)
@ -350,7 +328,7 @@ GEM
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.14.4)
treetop (1.4.8)
treetop (1.4.9)
polyglot (>= 0.3.1)
twitter (0.9.12)
hashie (~> 0.4.0)
@ -405,7 +383,6 @@ DEPENDENCIES
rspec-instafail
rspec-rails (>= 2.0.0)
ruby-debug
sprinkle!
thin
twitter
webmock

2
app/views/js/_websocket_js.haml
View file

@ -20,7 +20,7 @@
$('#loader').hide();
debug("got a " + obj['class']);
if(obj['status'] == 'fail'){
$('#request_result li:first').text(obj['response']).show();
$('#request_result li:first').show().$('#message').text(obj['response']).show();
}else{
processPerson(obj['html']);
}

3
app/views/requests/_manage_aspect_contacts.haml
View file

@ -33,7 +33,8 @@
#loader.hidden= image_tag 'ajax-loader.gif'
%ul#request_result{:aspect_id => aspect.id}
%li.error.hidden
= link_to t('.invite_someone'), "#invite_user_pane", :class => "invite_user_button", :title => t('.invite_someone')
#message
= link_to "Know their email address? You should invite them", "#invite_user_pane", :class => "invite_user_button"
%br
.yo{ :style => "display:none;"}
#invite_user_pane

2
app/views/requests/_new_request_with_aspect_to_person.haml
View file

@ -5,4 +5,4 @@
= form_for Request.new, :remote => true do |request|
= request.hidden_field :into, :value => "changeme"
= request.hidden_field :to, :value => destination_handle
= request.submit '+', :class => 'add', :disable_with => "Sending..."
= request.submit '+', :class => 'add', :disable_with => "Sending"