diff --git a/README.md b/README.md index b9f1eafb3..772bf7504 100644 --- a/README.md +++ b/README.md @@ -91,12 +91,12 @@ On **Ubuntu**, run the following: sudo ruby setup.rb sudo ln -s /usr/bin/gem1.8 /usr/bin/gem -On **Mac OS X**, RubyGems comes preinstalled; however, you might need to update it for use with the latest Bundler. To update RubyGems, run `gem update --system`. +On **Mac OS X**, RubyGems comes preinstalled; however, you might need to update it for use with the latest Bundler. To update RubyGems, run `sudo gem update --system`. ### Bundler -After RubyGems is updated, simply run `gem install bundler` to get Bundler. +After RubyGems is updated, simply run `sudo gem install bundler` to get Bundler. ## Getting Diaspora diff --git a/app/views/aspects/manage.html.haml b/app/views/aspects/manage.html.haml index 640c545ca..54cb3eee8 100644 --- a/app/views/aspects/manage.html.haml +++ b/app/views/aspects/manage.html.haml @@ -29,7 +29,7 @@ %ul - for request in @remote_requests %li.requested_person{:id => request.person.id, :request_id => request.id} - = image_tag(request.person.profile.image_url(:thumb_small)) unless request.person.profile.image_url.nil? + = person_image_tag(request.person) .name = request.person.real_name %h1 diff --git a/config/deploy.rb b/config/deploy.rb index 374f06455..451f57ebc 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -135,24 +135,6 @@ namespace :db do run "cd #{current_path} && bundle exec rake db:purge --trace RAILS_ENV=#{rails_env}" end - - task :tom_seed, :roles => :tom do - run "cd #{current_path} && bundle exec rake db:seed:tom --trace RAILS_ENV=#{rails_env}" - run "curl -silent -u tom@tom.joindiaspora.com:evankorth http://tom.joindiaspora.com/zombiefriends" - backers.each do |backer| - run "curl -silent -u #{backer['username']}@#{backer['username']}.joindiaspora.com:#{backer['username']}#{backer['pin']} http://#{backer['username']}.joindiaspora.com/zombiefriendaccept" - #run "curl -silent -u #{backer['username']}@#{backer['username']}.joindiaspora.com:#{backer['username']}#{backer['pin']} http://#{backer['username']}.joindiaspora.com/set_profile_photo" - end - - end - - task :backer_seed, :roles => :backer do - (0..10).each { |n| - run "curl -silent http://localhost/set_backer_number?number=#{n}", :only => {:number => n} - } - run "cd #{current_path} && bundle exec rake db:seed:backer --trace RAILS_ENV=#{rails_env}" - end - task :reset do purge end diff --git a/public/javascripts/aspect-edit.js b/public/javascripts/aspect-edit.js index b21a9dd9f..15562780c 100644 --- a/public/javascripts/aspect-edit.js +++ b/public/javascripts/aspect-edit.js @@ -28,6 +28,20 @@ $('#move_friends_link').live( 'click', function(){ }); +function decrementRequestsCounter(){ + var old_request_count = $(".new_requests").html().match(/\d+/); + + if( old_request_count == 1 ) { + $(".new_requests").html( + $(".new_requests").html().replace(/ \(\d+\)/,'')); + + } else { + $(".new_requests").html( + $(".new_requests").html().replace(/\d+/,old_request_count-1)); + } + +} + $(function() { $("ul .person").draggable({ revert: true @@ -44,7 +58,10 @@ $(function() { $.ajax({ type: "DELETE", url: "/requests/" + ui.draggable[0].getAttribute('request_id') , - data: {"accept" : true , "aspect_id" : $(this)[0].id } + data: {"accept" : true , "aspect_id" : $(this)[0].id }, + success: function(data){ + decrementRequestsCounter(); + } }); }else { @@ -72,7 +89,7 @@ $(function() { type: "DELETE", url: "/requests/" + ui.draggable[0].getAttribute('request_id') }); - alert("Removed Request, proably want an undo countdown.") + decrementRequestsCounter(); $(ui.draggable[0]).fadeOut('slow') }else{ $.ajax({ diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index dc43acdfa..fb34cdc83 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -85,9 +85,9 @@ header { margin: -2em; margin-bottom: 2em; color: black; - background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(black), to(#333333)); - background: -moz-linear-gradient(19% 75% 90deg, #333333, black); - background-color: #222222; + background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#666666), to(#222222)); + background: -moz-linear-gradient(19% 75% 90deg, #222222, #666666); + background-color: #666666; padding: 0; padding-top: 5px; border-bottom: 1px solid #cccccc; } @@ -120,7 +120,7 @@ header { header #aspect_header { z-index: 5; background-color: #eeeeee; - border-top: 1px solid #555555; + border-top: 1px solid white; padding: 20px 0; } header #aspect_header h1 { margin-bottom: 0; @@ -469,15 +469,17 @@ h1.big_text { padding-bottom: 2px; color: #999999; } #aspect_nav ul > li a:hover { - background-color: #555555; + background-color: #4e4e4e; color: #cccccc; } #aspect_nav ul > li.selected a { - padding-top: 5px; - padding-bottom: 3px; + text-shadow: 0 2px 0 white; + padding-top: 4px; + padding-bottom: 4px; line-height: 18px; font-weight: bold; background-color: #eeeeee; - border-bottom: 1px solid #eeeeee; + border: 1px solid white; + border-bottom: none; color: black; } #aspect_nav ul > li.selected a:hover { background-color: #efefef; } diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 45413512f..a96b19507 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -112,10 +112,10 @@ header :margin -2em :bottom 2em :color #000 - :background -webkit-gradient(linear, 0% 0%, 0% 100%, from(#000000), to(#333333)) - :background -moz-linear-gradient(19% 75% 90deg, #333333, #000000) + :background -webkit-gradient(linear, 0% 0%, 0% 100%, from(#666), to(#222)) + :background -moz-linear-gradient(19% 75% 90deg, #222, #666) :background - :color #222 + :color #666 :padding 0 :top 5px :border @@ -164,7 +164,7 @@ header :background :color #eee :border - :top 1px solid #555 + :top 1px solid #fff :padding 20px 0 h1 @@ -633,21 +633,22 @@ h1.big_text &:hover :background - :color #555 + :color #4e4e4e :color #ccc &.selected a + :text-shadow 0 2px 0 #fff :padding - :top 5px - :bottom 3px + :top 4px + :bottom 4px :line :height 18px :font :weight bold :background :color #eee - :border - :bottom 1px solid #eee + :border 1px solid #fff + :bottom none :color #000 &:hover :background