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

moved invite link to account#edit on settings page. changed text on person partial.

Browse source
This commit is contained in:
danielvincent 2010-10-14 10:26:06 -07:00
parent 007b06c8ea
commit 58d5fbfb3e
5 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Gemfile.lock
View file

@ -122,6 +122,7 @@ GEM
selenium-webdriver (>= 0.0.3) selenium-webdriver (>= 0.0.3)
childprocess (0.0.7) childprocess (0.0.7)
ffi (~> 0.6.3) ffi (~> 0.6.3)
columnize (0.3.1)
crack (0.1.8) crack (0.1.8)
cucumber (0.9.2) cucumber (0.9.2)
builder (~> 2.1.2) builder (~> 2.1.2)
@ -162,6 +163,7 @@ GEM
i18n (0.4.1) i18n (0.4.1)
json (1.4.6) json (1.4.6)
json_pure (1.4.6) json_pure (1.4.6)
linecache (0.43)
mail (2.2.7) mail (2.2.7)
activesupport (>= 2.3.6) activesupport (>= 2.3.6)
mime-types mime-types
@ -223,6 +225,11 @@ GEM
rspec-expectations (= 2.0.0) rspec-expectations (= 2.0.0)
rspec-rails (2.0.0) rspec-rails (2.0.0)
rspec (= 2.0.0) rspec (= 2.0.0)
ruby-debug (0.10.3)
columnize (>= 0.1)
ruby-debug-base (~> 0.10.3.0)
ruby-debug-base (0.10.3)
linecache (>= 0.3)
rubyzip (0.9.4) rubyzip (0.9.4)
selenium-webdriver (0.0.29) selenium-webdriver (0.0.29)
childprocess (>= 0.0.7) childprocess (>= 0.0.7)
@ -280,6 +287,7 @@ DEPENDENCIES
roxml! roxml!
rspec (>= 2.0.0) rspec (>= 2.0.0)
rspec-rails (>= 2.0.0) rspec-rails (>= 2.0.0)
ruby-debug
sprinkle! sprinkle!
thin thin
webmock webmock

13
app/views/users/_account.haml
View file

@ -5,8 +5,13 @@
%h2 Account %h2 Account
%h3 Change Password = link_to "invite friends", new_user_invitation_path(current_user)
%br
%br
%br
%h3 Change Password
= form_for @user do |f| = form_for @user do |f|
= f.error_messages = f.error_messages
@ -23,12 +28,14 @@
= f.submit 'Change password' = f.submit 'Change password'
%h3 Export Data %h3 Export Data
= link_to "download my xml", users_export_path, :class => "button" = link_to "download my xml", users_export_path, :class => "button"
= link_to "download my photos", users_export_photos_path, :class => "button" = link_to "download my photos", users_export_photos_path, :class => "button"
%h3 Close Account %br
%br
%br
%h3 Close Account
= link_to "Close Account", current_user, = link_to "Close Account", current_user,
:confirm => "Are you sure?", :method => :delete, :confirm => "Are you sure?", :method => :delete,
:class => "button" :class => "button"

2
app/views/users/_profile.haml
View file

@ -4,8 +4,6 @@
%h2 Profile %h2 Profile
= link_to new_user_invitation_path(current_user)
= form_for @user do |f| = form_for @user do |f|
= f.error_messages = f.error_messages

4
public/stylesheets/application.css
View file

@ -195,8 +195,8 @@ li.message {
li.message .content .from a { li.message .content .from a {
font-weight: bold; } font-weight: bold; }
li.message .content div.info { li.message .content div.info {
color: #444444; color: #999999;
font-size: 13px; } font-size: smaller; }
li.message .content div.info a { li.message .content div.info a {
color: #cccccc; } color: #cccccc; }
li.message .content div.info .time { li.message .content div.info .time {

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

@ -266,8 +266,8 @@ li.message
:size 14px :size 14px
div.info div.info
:color #444 :color #999
:font-size 13px :font-size smaller
a a
:color #ccc :color #ccc
.time .time