From 0560b46080de407fc2555ecba520e5fa78a1abd3 Mon Sep 17 00:00:00 2001 From: ilya Date: Tue, 14 Sep 2010 11:58:40 -0700 Subject: [PATCH 01/20] MS IZ added friend redirect, and moved the webfinger responces to fixture directory --- app/views/shared/_aspect_friends.haml | 8 +- spec/fixtures/evan_hcard | 72 ++++++++++++ spec/fixtures/finger_xrd | 9 ++ spec/fixtures/hcard_response | 44 +++++++ spec/fixtures/host_xrd | 7 ++ spec/fixtures/nonseed_finger_xrd | 15 +++ spec/spec_helper.rb | 163 +------------------------- 7 files changed, 159 insertions(+), 159 deletions(-) create mode 100644 spec/fixtures/evan_hcard create mode 100644 spec/fixtures/finger_xrd create mode 100644 spec/fixtures/hcard_response create mode 100644 spec/fixtures/host_xrd create mode 100644 spec/fixtures/nonseed_finger_xrd diff --git a/app/views/shared/_aspect_friends.haml b/app/views/shared/_aspect_friends.haml index 137fea38d..71c41ef6a 100644 --- a/app/views/shared/_aspect_friends.haml +++ b/app/views/shared/_aspect_friends.haml @@ -21,7 +21,13 @@ - for friend in @friends = person_image_link(friend) - - unless @aspect == :all + -unless @aspect == :all = link_to (image_tag('add_friend_button.png', :height => "50px", :width => "50px")), "#add_request_pane", :id => 'add_request_button' + .yo{:style => 'display:none'} + #add_request_pane + = render "requests/new_request", :aspect => @aspect + -else + .clear + = link_to "add friends", aspects_manage_path diff --git a/spec/fixtures/evan_hcard b/spec/fixtures/evan_hcard new file mode 100644 index 000000000..d34408759 --- /dev/null +++ b/spec/fixtures/evan_hcard @@ -0,0 +1,72 @@ + + +
+
+ +
+

Evan Prodromou

+ +
+
+

User profile

+
+
Photo
+
+ evan +
+ +
+
+
Nickname
+
+ evan +
+
+
+
Full name
+ +
+ Evan Prodromou +
+
+
+
Location
+
Montreal, QC, Canada
+
+
+ +
URL
+
+ http://evan.prodromou.name/ +
+
+
+
Note
+
Montreal hacker and entrepreneur. Founder of identi.ca, lead developer of StatusNet, CEO of StatusNet Inc.
+ +
+
+
+
+
+ +
+ diff --git a/spec/fixtures/finger_xrd b/spec/fixtures/finger_xrd new file mode 100644 index 000000000..d897925e5 --- /dev/null +++ b/spec/fixtures/finger_xrd @@ -0,0 +1,9 @@ + + + acct:tom@tom.joindiaspora.com + "http://tom.joindiaspora.com/" + + + + + diff --git a/spec/fixtures/hcard_response b/spec/fixtures/hcard_response new file mode 100644 index 000000000..d87957a93 --- /dev/null +++ b/spec/fixtures/hcard_response @@ -0,0 +1,44 @@ +
+

Alexander Hamiltom

+
+
+

User profile

+
+
Nickname
+
+ Alexander Hamiltom +
+
+
+
Full name
+
+ Alexander +
+
+ +
+
Full name
+
+ Hamiltom +
+
+
+
Full name
+
+ Alexander Hamiltom +
+
+
+
URL
+
+ http://tom.joindiaspora.com/ +
+
+
+
Note
+
Diaspora is awesome! vi is better than emacs!
+
+
+
+ +
diff --git a/spec/fixtures/host_xrd b/spec/fixtures/host_xrd new file mode 100644 index 000000000..dcb67d767 --- /dev/null +++ b/spec/fixtures/host_xrd @@ -0,0 +1,7 @@ + + + + Resource Descriptor + + diff --git a/spec/fixtures/nonseed_finger_xrd b/spec/fixtures/nonseed_finger_xrd new file mode 100644 index 000000000..b26e7d15d --- /dev/null +++ b/spec/fixtures/nonseed_finger_xrd @@ -0,0 +1,15 @@ + + acct:evan@status.net + acct:evan@evan.status.net + http://evan.status.net/user/1 + + + + + + + + + + + diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index b2428aa6e..f3a82df41 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -113,174 +113,21 @@ end end def host_xrd - <<-XML - - - - Resource Descriptor - - - XML + File.open(File.dirname(__FILE__) + '/fixtures/host_xrd').read end def finger_xrd - <<-XML - - - acct:tom@tom.joindiaspora.com - "http://tom.joindiaspora.com/" - - - - - - XML + File.open(File.dirname(__FILE__) + '/fixtures/finger_xrd').read end def hcard_response - <<-FOO -
-

Alexander Hamiltom

-
-
-

User profile

-
-
Nickname
-
- Alexander Hamiltom -
-
-
-
Full name
-
- Alexander -
-
- -
-
Full name
-
- Hamiltom -
-
-
-
Full name
-
- Alexander Hamiltom -
-
-
-
URL
-
- http://tom.joindiaspora.com/ -
-
-
-
Note
-
Diaspora is awesome! vi is better than emacs!
-
-
-
- -
- - FOO + File.open(File.dirname(__FILE__) + '/fixtures/hcard_response').read end def nonseed_finger_xrd - <<-XML - - acct:evan@status.net - acct:evan@evan.status.net - http://evan.status.net/user/1 - - - - - - - - - - - - XML + File.open(File.dirname(__FILE__) + '/fixtures/nonseed_finger_xrd').read end def evan_hcard - <<-HCARD - - -
-
- -
-

Evan Prodromou

- -
-
-

User profile

-
-
Photo
-
- evan -
- -
-
-
Nickname
-
- evan -
-
-
-
Full name
- -
- Evan Prodromou -
-
-
-
Location
-
Montreal, QC, Canada
-
-
- -
URL
-
- http://evan.prodromou.name/ -
-
-
-
Note
-
Montreal hacker and entrepreneur. Founder of identi.ca, lead developer of StatusNet, CEO of StatusNet Inc.
- -
-
-
-
-
- -
- - HCARD - + File.open(File.dirname(__FILE__) + '/fixtures/evan_hcard').read end From 0d37f065dcd2ab5f5494990a1e194810ecf9b9ce Mon Sep 17 00:00:00 2001 From: maxwell Date: Tue, 14 Sep 2010 15:13:55 -0700 Subject: [PATCH 02/20] MS RS fixed a small group adding bug --- app/controllers/application_controller.rb | 2 +- app/controllers/aspects_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 2eec8cf23..76fd30729 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -21,7 +21,7 @@ class ApplicationController < ActionController::Base protect_from_forgery :except => :receive - before_filter :set_friends_and_status + before_filter :set_friends_and_status, :except => [:create, :update] before_filter :count_requests layout :layout_by_resource diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb index e8dd82889..e7c07d0ef 100644 --- a/app/controllers/aspects_controller.rb +++ b/app/controllers/aspects_controller.rb @@ -31,7 +31,7 @@ class AspectsController < ApplicationController def create @aspect = current_user.aspect params[:aspect] flash[:notice] = "Click on the plus on the left side to tell Diaspora who can see your new aspect." - respond_with :location => edit_aspect_path(@aspect) + respond_with :location => aspects_manage_path end def new From 4d7d9376c49410f5a59bbd5443f3ebb801e115f4 Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Tue, 14 Sep 2010 15:42:40 -0700 Subject: [PATCH 03/20] updates to readme --- README.md | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index bd9be556f..48a40b786 100644 --- a/README.md +++ b/README.md @@ -4,20 +4,37 @@ Diaspora The privacy aware, personally controlled, do-it-all, open source social network. -Getting started ---------------- +Preparing your system +--------------------- In order to run Diaspora for development, there are a few external dependencies in getting your environment set up: -- [MongoDB](http://www.mongodb.org/downloads) - noSQL data layer. -- [OpenSSL](http://www.openssl.org/source/) - Used in the current encryption implementation. -- [ImageMagick](http://www.imagemagick.org/script/binary-releases.php?ImageMagick=0nfesabhe916b9afjc4qiikv03) - Image processing library used to resize uploaded photos. +- [Ruby](http://www.ruby-lang.org) - The Ruby programming language. (We're using 1.8. Comes preinstalled on Mac OS X.) +- [MongoDB](http://www.mongodb.org) - A snappy noSQL database. +- [OpenSSL](http://www.openssl.org/) - An encryption implementation. (Comes preinstalled on Mac OS X and later versions of Ubuntu.) +- [ImageMagick](http://www.imagemagick.org/) - An Image processing library used to resize uploaded photos. +- [Git](http://git-scm.com/) - The fast version controll system. + +We suggest using a package management system to download these dependencies. Trust us, it's going to make your life a lot easier. If you're using Mac OS X, you can use [homebrew](http://mxcl.github.com/homebrew/); and if you're using Debian, just use Synaptic (it comes pre-installed). + + +After you have Ruby installed on your system, you will need to get Bundler. + - [Bundler](http://gembundler.com/) - Gem management tool for Ruby projects. +Getting Diaspora +---------------- + +To download Diaspora, you will want to clone it from the official github repository [here](http://github.com/diaspora/diaspora). If you have never used github before, their [help desk](http://help.github.com/) has a pretty awesome guide on getting setup[.](http://www.youtube.com/watch?v=OQSNhk5ICTI) + + +Running Diaspora +---------------- + After installing the above, run the following command from where mongo is installed to start mongo. - sudo bin/mongod -Diaspora will **not run** until mongo is running. Mongo will not run by default, and will need to be started every time you wish to use or run the test suite for Diaspora. It is highly recommended you alias the command to start the database in your .bashrc file. + sudo mongod +Diaspora will **not run** unless mongo is running. Mongo will not run by default, and will need to be started every time you wish to use or run the test suite for Diaspora. In order to start the app server for the first time, bundler needs to grab Diaspora's gem depencencies. To allow this, run the following command from Diaspora's root directory. bundle install From 95169a2fee85c7d8e5f5c0fb95ea648fad06836d Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Tue, 14 Sep 2010 15:57:59 -0700 Subject: [PATCH 04/20] added agpl license to readme --- README.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 48a40b786..700a1e7f0 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Preparing your system In order to run Diaspora for development, there are a few external dependencies in getting your environment set up: -- [Ruby](http://www.ruby-lang.org) - The Ruby programming language. (We're using 1.8. Comes preinstalled on Mac OS X.) +- [Ruby](http://www.ruby-lang.org) - The Ruby programming language. __(We're using 1.8. Comes preinstalled on Mac OS X.)__ - [MongoDB](http://www.mongodb.org) - A snappy noSQL database. - [OpenSSL](http://www.openssl.org/) - An encryption implementation. (Comes preinstalled on Mac OS X and later versions of Ubuntu.) - [ImageMagick](http://www.imagemagick.org/) - An Image processing library used to resize uploaded photos. @@ -60,3 +60,15 @@ There are multiple outlets of ongoing discussion on the development of Diaspora. More general info and updates about the project can be found on our [blog](http://joindiaspora.com), [twitter](http://twitter.com/joindiaspora). Also, be sure to join the official [mailing list](http://http://eepurl.com/Vebk). + +License +------- +Copyright 2010 Diaspora Inc. + +Diaspora is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + +Diaspora is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License along with Diaspora. If not, see . + + From 2c2cc9c1859332bf243fd640388b74fdb33fc9ea Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Tue, 14 Sep 2010 16:10:31 -0700 Subject: [PATCH 05/20] atx-style headers --- README.md | 45 ++++++++++++++++++--------------------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 700a1e7f0..e73a01dfa 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,12 @@ -Diaspora -======== +# Diaspora The privacy aware, personally controlled, do-it-all, open source social network. -Preparing your system ---------------------- - +## Preparing your system In order to run Diaspora for development, there are a few external dependencies in getting your environment set up: -- [Ruby](http://www.ruby-lang.org) - The Ruby programming language. __(We're using 1.8. Comes preinstalled on Mac OS X.)__ +- [Ruby](http://www.ruby-lang.org) - The Ruby programming language. (We're using 1.8. Comes preinstalled on Mac OS X.) - [MongoDB](http://www.mongodb.org) - A snappy noSQL database. - [OpenSSL](http://www.openssl.org/) - An encryption implementation. (Comes preinstalled on Mac OS X and later versions of Ubuntu.) - [ImageMagick](http://www.imagemagick.org/) - An Image processing library used to resize uploaded photos. @@ -18,40 +15,36 @@ In order to run Diaspora for development, there are a few external dependencies We suggest using a package management system to download these dependencies. Trust us, it's going to make your life a lot easier. If you're using Mac OS X, you can use [homebrew](http://mxcl.github.com/homebrew/); and if you're using Debian, just use Synaptic (it comes pre-installed). -After you have Ruby installed on your system, you will need to get Bundler. +After you have Ruby installed on your system, you will need to get Rubygems, then install Bundler: +- [RubyGems](http://rubygems.org/) - Source for Ruby gems. - [Bundler](http://gembundler.com/) - Gem management tool for Ruby projects. -Getting Diaspora ----------------- - +## Getting Diaspora To download Diaspora, you will want to clone it from the official github repository [here](http://github.com/diaspora/diaspora). If you have never used github before, their [help desk](http://help.github.com/) has a pretty awesome guide on getting setup[.](http://www.youtube.com/watch?v=OQSNhk5ICTI) -Running Diaspora ----------------- +## Running Diaspora -After installing the above, run the following command from where mongo is installed to start mongo. - sudo mongod +### Start Mongo +After installing the above, run `sudo mongod` from where mongo is installed to start mongo. + Diaspora will **not run** unless mongo is running. Mongo will not run by default, and will need to be started every time you wish to use or run the test suite for Diaspora. -In order to start the app server for the first time, bundler needs to grab Diaspora's gem depencencies. To allow this, run the following command from Diaspora's root directory. - bundle install +### Install required gems +In order to start the app server for the first time, bundler needs to grab Diaspora's gem depencencies. To allow this, run `bundle install` from Diaspora's root directory. It is important to run a bundle install every so often, in the event of a new gem dependency. We will make sure to make an announcement in the event of a gem change. -Once mongo is running and bundler has finished, run: - bundle exec thin start -This will start the app server in development mode. +### Run the app server +Once mongo is running and bundler has finished, run `bundle exec thin start`. This will start the app server in development mode. -Diaspora's test suite uses [rspec](http://rspec.info/), a behavior driven testing framework. In order to run the tests, run the following command: - bundle exec rspec spec +### Testing +Diaspora's test suite uses [rspec](http://rspec.info/), a behavior driven testing framework. In order to run the tests, run `bundle exec rspec spec`. -Getting Help ------------- - +## Getting Help There are multiple outlets of ongoing discussion on the development of Diaspora. - [Diaspora Developer Google Group](http://groups.google.com/group/diaspora-dev) @@ -61,8 +54,7 @@ There are multiple outlets of ongoing discussion on the development of Diaspora. More general info and updates about the project can be found on our [blog](http://joindiaspora.com), [twitter](http://twitter.com/joindiaspora). Also, be sure to join the official [mailing list](http://http://eepurl.com/Vebk). -License -------- +## License Copyright 2010 Diaspora Inc. Diaspora is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. @@ -71,4 +63,3 @@ Diaspora is distributed in the hope that it will be useful, but WITHOUT ANY WARR You should have received a copy of the GNU Affero General Public License along with Diaspora. If not, see . - From 259143b8fc29644ca316d81c5b54b28071472520 Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Tue, 14 Sep 2010 16:24:41 -0700 Subject: [PATCH 06/20] disclaimer --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e73a01dfa..d5d012f0b 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,11 @@ The privacy aware, personally controlled, do-it-all, open source social network. +**DISCLAIMER: THIS IS PRE-ALPHA SOFTWARE AND SHOULD BE TREATED ACCORDINGLY.** +These instructions are designed for developers running [Ubuntu](http://www.ubuntu.com/) (Debian) or Mac OS X. ## Preparing your system -In order to run Diaspora for development, there are a few external dependencies in getting your environment set up: +In order to run Diaspora, you will need to download the following dependencies: - [Ruby](http://www.ruby-lang.org) - The Ruby programming language. (We're using 1.8. Comes preinstalled on Mac OS X.) - [MongoDB](http://www.mongodb.org) - A snappy noSQL database. @@ -12,7 +14,7 @@ In order to run Diaspora for development, there are a few external dependencies - [ImageMagick](http://www.imagemagick.org/) - An Image processing library used to resize uploaded photos. - [Git](http://git-scm.com/) - The fast version controll system. -We suggest using a package management system to download these dependencies. Trust us, it's going to make your life a lot easier. If you're using Mac OS X, you can use [homebrew](http://mxcl.github.com/homebrew/); and if you're using Debian, just use Synaptic (it comes pre-installed). +We suggest using a package management system to download these dependencies. Trust us, it's going to make your life a lot easier. If you're using Mac OS X, you can use [homebrew](http://mxcl.github.com/homebrew/); and if you're using Ubuntu (Debian), just use [Synaptic](http://www.nongnu.org/synaptic/) (it comes pre-installed). After you have Ruby installed on your system, you will need to get Rubygems, then install Bundler: From a5c86ac3a78abb74fa1e31fd37a939a1ccff25d6 Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Tue, 14 Sep 2010 16:56:47 -0700 Subject: [PATCH 07/20] testing markup --- README.md | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 64 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d5d012f0b..4e39406cc 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ The privacy aware, personally controlled, do-it-all, open source social network. These instructions are designed for developers running [Ubuntu](http://www.ubuntu.com/) (Debian) or Mac OS X. ## Preparing your system -In order to run Diaspora, you will need to download the following dependencies: +In order to run Diaspora, you will need to download the following dependencies (specific instructions follow): - [Ruby](http://www.ruby-lang.org) - The Ruby programming language. (We're using 1.8. Comes preinstalled on Mac OS X.) - [MongoDB](http://www.mongodb.org) - A snappy noSQL database. @@ -14,14 +14,74 @@ In order to run Diaspora, you will need to download the following dependencies: - [ImageMagick](http://www.imagemagick.org/) - An Image processing library used to resize uploaded photos. - [Git](http://git-scm.com/) - The fast version controll system. -We suggest using a package management system to download these dependencies. Trust us, it's going to make your life a lot easier. If you're using Mac OS X, you can use [homebrew](http://mxcl.github.com/homebrew/); and if you're using Ubuntu (Debian), just use [Synaptic](http://www.nongnu.org/synaptic/) (it comes pre-installed). - - After you have Ruby installed on your system, you will need to get Rubygems, then install Bundler: - [RubyGems](http://rubygems.org/) - Source for Ruby gems. - [Bundler](http://gembundler.com/) - Gem management tool for Ruby projects. +**We suggest using a package management system to download these dependencies. Trust us, it's going to make your life a lot easier. If you're using Mac OS X, you can use [homebrew](http://mxcl.github.com/homebrew/); and if you're using Ubuntu (Debian), just use [Synaptic](http://www.nongnu.org/synaptic/) (it comes pre-installed). The below instructions assume you have these installed.** + +### Ruby + +To install Ruby 1.8.7 on **Ubuntu**, run the following command: + + sudo apt-get install ruby-full + +If you're on **Mac OS X**, you already have Ruby on your system. Yay! + +### MongoDB + +To install MongoDB on **Ubuntu**, run the following commands: + + **Download** + + - 32 bit + http://fastdl.mongodb.org/linux/mongodb-linux-i686-1.6.2.tgz + + - 64 bit + http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-1.6.2.tgz + + # extract + tar xzf mongodb-linux-i686-1.4.0.tgz + # create the required data directory + sudo mkdir -p /data/db + sudo chmod -Rv 777 /data/ + + +To install MongoDB on **Mac OS X**, run the following: + + brew install mongo + +### OpenSSL + +If you're running either **Ubuntu** or **Mac OS X** you already have OpenSSL installed! + +### ImageMagick + +To install ImageMagick on **Ubuntu**, run the following: + +To install ImageMagick on **Mac OS X**, run the following: + +### Git + +To install Git on **Ubuntu**, run the following: + + sudo apt-get install git + +To install Git on **Mac OS X**, run the following: + + brew install git + + +### Rubygems + +This step is OS-independent. + + +### Bundler + +This step is also OS-independent. + ## Getting Diaspora To download Diaspora, you will want to clone it from the official github repository [here](http://github.com/diaspora/diaspora). If you have never used github before, their [help desk](http://help.github.com/) has a pretty awesome guide on getting setup[.](http://www.youtube.com/watch?v=OQSNhk5ICTI) From fb9d504f295cd518b57dcf5cf56b9ece7ae71081 Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Tue, 14 Sep 2010 17:17:02 -0700 Subject: [PATCH 08/20] more instructions --- README.md | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 4e39406cc..5cb28af68 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ After you have Ruby installed on your system, you will need to get Rubygems, the To install Ruby 1.8.7 on **Ubuntu**, run the following command: - sudo apt-get install ruby-full + sudo apt-get install ruby-full If you're on **Mac OS X**, you already have Ruby on your system. Yay! @@ -33,24 +33,19 @@ If you're on **Mac OS X**, you already have Ruby on your system. Yay! To install MongoDB on **Ubuntu**, run the following commands: - **Download** - - 32 bit - http://fastdl.mongodb.org/linux/mongodb-linux-i686-1.6.2.tgz +If you're running a 32-bit system, run `wget http://fastdl.mongodb.org/linux/mongodb-linux-i686-1.6.2.tgz`. If you're running a 64-bit system, run `wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-1.6.2.tgz`. - - 64 bit - http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-1.6.2.tgz - - # extract - tar xzf mongodb-linux-i686-1.4.0.tgz - # create the required data directory - sudo mkdir -p /data/db - sudo chmod -Rv 777 /data/ + # extract + tar xzf mongodb-linux-i686-1.4.0.tgz + # create the required data directory + sudo mkdir -p /data/db + sudo chmod -Rv 777 /data/ To install MongoDB on **Mac OS X**, run the following: - brew install mongo + brew install mongo ### OpenSSL @@ -62,25 +57,35 @@ To install ImageMagick on **Ubuntu**, run the following: To install ImageMagick on **Mac OS X**, run the following: + brew install imagemagick + ### Git To install Git on **Ubuntu**, run the following: - sudo apt-get install git + sudo apt-get install git-core To install Git on **Mac OS X**, run the following: - brew install git + brew install git ### Rubygems -This step is OS-independent. +On **Ubuntu**, run the following: + + wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz + tar -xf rubygems-1.3.7.tgz + cd rubygems-1.3.7 + 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`. ### Bundler -This step is also OS-independent. +After RubyGems is updated, simply run `gem install bundler` to get Bundler. ## Getting Diaspora From fa947b1036cde2c98e2b144f922f746d72bdf75f Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Tue, 14 Sep 2010 17:51:35 -0700 Subject: [PATCH 09/20] minor changes --- README.md | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 5cb28af68..3268fcdfc 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,14 @@ The privacy aware, personally controlled, do-it-all, open source social network. **DISCLAIMER: THIS IS PRE-ALPHA SOFTWARE AND SHOULD BE TREATED ACCORDINGLY.** -These instructions are designed for developers running [Ubuntu](http://www.ubuntu.com/) (Debian) or Mac OS X. +These instructions are designed for machines running [Ubuntu](http://www.ubuntu.com/) or Mac OS X. ## Preparing your system In order to run Diaspora, you will need to download the following dependencies (specific instructions follow): -- [Ruby](http://www.ruby-lang.org) - The Ruby programming language. (We're using 1.8. Comes preinstalled on Mac OS X.) +- [Ruby](http://www.ruby-lang.org) - The Ruby programming language. (We're using 1.8. It comes preinstalled on Mac OS X.) - [MongoDB](http://www.mongodb.org) - A snappy noSQL database. -- [OpenSSL](http://www.openssl.org/) - An encryption implementation. (Comes preinstalled on Mac OS X and later versions of Ubuntu.) +- [OpenSSL](http://www.openssl.org/) - An encryption implementation. (It comes preinstalled on Mac OS X and later versions of Ubuntu.) - [ImageMagick](http://www.imagemagick.org/) - An Image processing library used to resize uploaded photos. - [Git](http://git-scm.com/) - The fast version controll system. @@ -19,7 +19,7 @@ After you have Ruby installed on your system, you will need to get Rubygems, the - [RubyGems](http://rubygems.org/) - Source for Ruby gems. - [Bundler](http://gembundler.com/) - Gem management tool for Ruby projects. -**We suggest using a package management system to download these dependencies. Trust us, it's going to make your life a lot easier. If you're using Mac OS X, you can use [homebrew](http://mxcl.github.com/homebrew/); and if you're using Ubuntu (Debian), just use [Synaptic](http://www.nongnu.org/synaptic/) (it comes pre-installed). The below instructions assume you have these installed.** +**We suggest using a package management system to download these dependencies. Trust us, it's going to make your life a lot easier. If you're using Mac OS X, you can use [homebrew](http://mxcl.github.com/homebrew/); and if you're using Ubuntu, just use [Synaptic](http://www.nongnu.org/synaptic/) (it comes pre-installed). The below instructions assume you have these installed.** ### Ruby @@ -55,6 +55,8 @@ If you're running either **Ubuntu** or **Mac OS X** you already have OpenSSL ins To install ImageMagick on **Ubuntu**, run the following: + sudo apt-get install imagemagick libmagick9-dev + To install ImageMagick on **Mac OS X**, run the following: brew install imagemagick @@ -94,18 +96,18 @@ To download Diaspora, you will want to clone it from the official github reposit ## Running Diaspora +### Install required gems +In order to start the app server for the **first time**, bundler needs to grab Diaspora's gem depencencies. To allow this, run `bundle install` from Diaspora's root directory. + +It is important to run a bundle install every so often, in the event of a new gem dependency. We will make sure to make an announcement in the event of a gem change. + ### Start Mongo After installing the above, run `sudo mongod` from where mongo is installed to start mongo. Diaspora will **not run** unless mongo is running. Mongo will not run by default, and will need to be started every time you wish to use or run the test suite for Diaspora. -### Install required gems -In order to start the app server for the first time, bundler needs to grab Diaspora's gem depencencies. To allow this, run `bundle install` from Diaspora's root directory. - -It is important to run a bundle install every so often, in the event of a new gem dependency. We will make sure to make an announcement in the event of a gem change. - ### Run the app server -Once mongo is running and bundler has finished, run `bundle exec thin start`. This will start the app server in development mode. +Once mongo is running and bundler has finished, run `bundle exec thin start` from the root Diaspora directory. This will start the app server in development mode. ### Testing Diaspora's test suite uses [rspec](http://rspec.info/), a behavior driven testing framework. In order to run the tests, run `bundle exec rspec spec`. From d3b24f3dc4f52a5dfe10e433aa93617c34f9a0e0 Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Tue, 14 Sep 2010 18:10:40 -0700 Subject: [PATCH 10/20] added installation of build tools --- README.md | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 3268fcdfc..50ea55527 100644 --- a/README.md +++ b/README.md @@ -3,23 +3,32 @@ The privacy aware, personally controlled, do-it-all, open source social network. **DISCLAIMER: THIS IS PRE-ALPHA SOFTWARE AND SHOULD BE TREATED ACCORDINGLY.** -These instructions are designed for machines running [Ubuntu](http://www.ubuntu.com/) or Mac OS X. +These instructions are for machines running [Ubuntu](http://www.ubuntu.com/) or Mac OS X. ## Preparing your system In order to run Diaspora, you will need to download the following dependencies (specific instructions follow): -- [Ruby](http://www.ruby-lang.org) - The Ruby programming language. (We're using 1.8. It comes preinstalled on Mac OS X.) +- Build Tools - Packages needed to compile the components that follow. +- [Ruby](http://www.ruby-lang.org) - The Ruby programming language. (We're using **1.8.7**. It comes preinstalled on Mac OS X.) - [MongoDB](http://www.mongodb.org) - A snappy noSQL database. -- [OpenSSL](http://www.openssl.org/) - An encryption implementation. (It comes preinstalled on Mac OS X and later versions of Ubuntu.) +- [OpenSSL](http://www.openssl.org/) - An encryption library. (It comes preinstalled on Mac OS X and Ubuntu.) - [ImageMagick](http://www.imagemagick.org/) - An Image processing library used to resize uploaded photos. -- [Git](http://git-scm.com/) - The fast version controll system. +- [Git](http://git-scm.com/) - The fast version control system. -After you have Ruby installed on your system, you will need to get Rubygems, then install Bundler: +After you have Ruby installed on your system, you will need to get RubyGems, then install Bundler: - [RubyGems](http://rubygems.org/) - Source for Ruby gems. - [Bundler](http://gembundler.com/) - Gem management tool for Ruby projects. -**We suggest using a package management system to download these dependencies. Trust us, it's going to make your life a lot easier. If you're using Mac OS X, you can use [homebrew](http://mxcl.github.com/homebrew/); and if you're using Ubuntu, just use [Synaptic](http://www.nongnu.org/synaptic/) (it comes pre-installed). The below instructions assume you have these installed.** +**We suggest using a package management system to download these dependencies. Trust us, it's going to make your life a lot easier. If you're using Mac OS X, you can use [homebrew](http://mxcl.github.com/homebrew/); and if you're using Ubuntu, just use [Synaptic](http://www.nongnu.org/synaptic/) (it comes pre-installed). The instructions below assume you have these installed.** + +### Build Tools + +To install build tools on **Ubuntu**, run the following (includes the gcc and xml parsing dependencies): + + sudo apt-get install build-essential libxslt1.1 libxslt1-dev libxml2 + +To install build tools on **Mac OS X**, you need to download and install [Xcode](http://developer.apple.com/technologies/tools/xcode.html). ### Ruby @@ -97,7 +106,7 @@ To download Diaspora, you will want to clone it from the official github reposit ## Running Diaspora ### Install required gems -In order to start the app server for the **first time**, bundler needs to grab Diaspora's gem depencencies. To allow this, run `bundle install` from Diaspora's root directory. +To start the app server for the **first time**, Bundler needs to grab Diaspora's gem depencencies. To allow this, run `bundle install` from Diaspora's root directory. It is important to run a bundle install every so often, in the event of a new gem dependency. We will make sure to make an announcement in the event of a gem change. From ea0d0cbeb68f339fd590b1158dd9de40a5e0ff15 Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Tue, 14 Sep 2010 18:17:46 -0700 Subject: [PATCH 11/20] link to tracker and wishlist --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 50ea55527..cb63f543b 100644 --- a/README.md +++ b/README.md @@ -122,8 +122,11 @@ Once mongo is running and bundler has finished, run `bundle exec thin start` fro Diaspora's test suite uses [rspec](http://rspec.info/), a behavior driven testing framework. In order to run the tests, run `bundle exec rspec spec`. -## Getting Help -There are multiple outlets of ongoing discussion on the development of Diaspora. +## Resources + +We are maintaining a [public tracker project](http://www.pivotaltracker.com/projects/61641) and a [wishlist](#). + +Ongoing discussion: - [Diaspora Developer Google Group](http://groups.google.com/group/diaspora-dev) - [Diaspora Discussion Google Group](http://groups.google.com/group/diaspora-discuss) From 89d8e86493c3bb7136615a958d1d5d09587b9554 Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Tue, 14 Sep 2010 18:27:06 -0700 Subject: [PATCH 12/20] added git clone command --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index cb63f543b..d4e9bcbe5 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,10 @@ After RubyGems is updated, simply run `gem install bundler` to get Bundler. ## Getting Diaspora -To download Diaspora, you will want to clone it from the official github repository [here](http://github.com/diaspora/diaspora). If you have never used github before, their [help desk](http://help.github.com/) has a pretty awesome guide on getting setup[.](http://www.youtube.com/watch?v=OQSNhk5ICTI) + + git clone git@github.com:diaspora/diaspora.git + +If you have never used github before, their [help desk](http://help.github.com/) has a pretty awesome guide on getting setup[.](http://www.youtube.com/watch?v=OQSNhk5ICTI) ## Running Diaspora From 3de13d0c197d4392d648f51305e01b7248c41a53 Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Tue, 14 Sep 2010 18:46:37 -0700 Subject: [PATCH 13/20] minor edit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d4e9bcbe5..b9f1eafb3 100644 --- a/README.md +++ b/README.md @@ -103,7 +103,7 @@ After RubyGems is updated, simply run `gem install bundler` to get Bundler. git clone git@github.com:diaspora/diaspora.git -If you have never used github before, their [help desk](http://help.github.com/) has a pretty awesome guide on getting setup[.](http://www.youtube.com/watch?v=OQSNhk5ICTI) +If you have never used github before, their [help desk](http://help.github.com/) has a pretty awesome guide on getting setup. ## Running Diaspora @@ -119,7 +119,7 @@ After installing the above, run `sudo mongod` from where mongo is installed to s Diaspora will **not run** unless mongo is running. Mongo will not run by default, and will need to be started every time you wish to use or run the test suite for Diaspora. ### Run the app server -Once mongo is running and bundler has finished, run `bundle exec thin start` from the root Diaspora directory. This will start the app server in development mode. +Once mongo is running and bundler has finished, run `bundle exec thin start` from the root Diaspora directory. This will start the app server in development mode[.](http://bit.ly/9mwtUw) ### Testing Diaspora's test suite uses [rspec](http://rspec.info/), a behavior driven testing framework. In order to run the tests, run `bundle exec rspec spec`. From 02e1ed82a3207f0b583fc5181827b0b0d3ccf789 Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Tue, 14 Sep 2010 19:07:23 -0700 Subject: [PATCH 14/20] making profiles socket --- app/models/person.rb | 1 + app/models/user.rb | 2 ++ 2 files changed, 3 insertions(+) diff --git a/app/models/person.rb b/app/models/person.rb index b9fd85cc0..3edb350a2 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -23,6 +23,7 @@ class Person include MongoMapper::Document include ROXML include Encryptor::Public + include Diaspora::Socketable xml_accessor :_id xml_accessor :email diff --git a/app/models/user.rb b/app/models/user.rb index cefa4e4d4..c798a50eb 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -263,6 +263,8 @@ class User person = Diaspora::Parser.owner_id_from_xml xml person.profile = object person.save + + object.socket_to_uid(id, :aspect_ids => aspect_ids) if object.respond_to?(:socket_to_uid) elsif object.is_a?(Comment) object.person = Diaspora::Parser.parse_or_find_person_from_xml( xml ).save if object.person.nil? From f256d433fdb6620965d139020941a04182c1b25d Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Tue, 14 Sep 2010 19:34:26 -0700 Subject: [PATCH 15/20] nevermind --- app/models/person.rb | 1 - app/models/user.rb | 2 -- 2 files changed, 3 deletions(-) diff --git a/app/models/person.rb b/app/models/person.rb index 3edb350a2..b9fd85cc0 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -23,7 +23,6 @@ class Person include MongoMapper::Document include ROXML include Encryptor::Public - include Diaspora::Socketable xml_accessor :_id xml_accessor :email diff --git a/app/models/user.rb b/app/models/user.rb index c798a50eb..cefa4e4d4 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -263,8 +263,6 @@ class User person = Diaspora::Parser.owner_id_from_xml xml person.profile = object person.save - - object.socket_to_uid(id, :aspect_ids => aspect_ids) if object.respond_to?(:socket_to_uid) elsif object.is_a?(Comment) object.person = Diaspora::Parser.parse_or_find_person_from_xml( xml ).save if object.person.nil? From fc3fb817c8efe1258e618910722780b195d86ce8 Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Tue, 14 Sep 2010 19:48:11 -0700 Subject: [PATCH 16/20] profile photo doesn't change to null if not changed on profile update --- app/views/users/edit.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml index 20c30ea11..08a89abbb 100644 --- a/app/views/users/edit.html.haml +++ b/app/views/users/edit.html.haml @@ -32,9 +32,9 @@ %h3 Picture %div#image_picker - = p.hidden_field :image_url, :value => @profile.image_url, :id => 'image_url_field' + = p.hidden_field :image_url, :value => @profile.image_url.sub(@user.url,'/'), :id => 'image_url_field' - for photo in @photos - - if photo.url(:thumb_medium) == @profile.image_url + - if photo.url(:thumb_medium) == @profile.image_url.sub(@user.url,'/') %div.small_photo{:id => photo.url(:thumb_medium), :class=>'selected'} = check_box_tag 'checked_photo', true, true = link_to image_tag(photo.url(:thumb_medium)), "#" From d0c8f9ccd64c5563bdb1973081864ee7541749a0 Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Tue, 14 Sep 2010 19:54:48 -0700 Subject: [PATCH 17/20] silent comments on views --- app/views/layouts/application.html.haml | 34 ++++++++++++------------ app/views/layouts/session_wall.html.haml | 34 ++++++++++++------------ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 9e24a380a..62a655091 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,20 +1,20 @@ -/ Copyright 2010 Diaspora Inc. -/ -/ This file is part of Diaspora. -/ -/ Diaspora is free software: you can redistribute it and/or modify -/ it under the terms of the GNU Affero General Public License as published by -/ the Free Software Foundation, either version 3 of the License, or -/ (at your option) any later version. -/ -/ Diaspora is distributed in the hope that it will be useful, -/ but WITHOUT ANY WARRANTY; without even the implied warranty of -/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -/ GNU Affero General Public License for more details. -/ -/ You should have received a copy of the GNU Affero General Public License -/ along with Diaspora. If not, see . -/ +-# Copyright 2010 Diaspora Inc. +-# +-# This file is part of Diaspora. +-# +-# Diaspora is free software: you can redistribute it and/or modify +-# it under the terms of the GNU Affero General Public License as published by +-# the Free Software Foundation, either version 3 of the License, or +-# (at your option) any later version. +-# +-# Diaspora is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU Affero General Public License for more details. +-# +-# You should have received a copy of the GNU Affero General Public License +-# along with Diaspora. If not, see . +-# !!! diff --git a/app/views/layouts/session_wall.html.haml b/app/views/layouts/session_wall.html.haml index 56ef4646b..f31226102 100644 --- a/app/views/layouts/session_wall.html.haml +++ b/app/views/layouts/session_wall.html.haml @@ -1,20 +1,20 @@ -/ Copyright 2010 Diaspora Inc. -/ -/ This file is part of Diaspora. -/ -/ Diaspora is free software: you can redistribute it and/or modify -/ it under the terms of the GNU Affero General Public License as published by -/ the Free Software Foundation, either version 3 of the License, or -/ (at your option) any later version. -/ -/ Diaspora is distributed in the hope that it will be useful, -/ but WITHOUT ANY WARRANTY; without even the implied warranty of -/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -/ GNU Affero General Public License for more details. -/ -/ You should have received a copy of the GNU Affero General Public License -/ along with Diaspora. If not, see . -/ +-# Copyright 2010 Diaspora Inc. +-# +-# This file is part of Diaspora. +-# +-# Diaspora is free software: you can redistribute it and/or modify +-# it under the terms of the GNU Affero General Public License as published by +-# the Free Software Foundation, either version 3 of the License, or +-# (at your option) any later version. +-# +-# Diaspora is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU Affero General Public License for more details. +-# +-# You should have received a copy of the GNU Affero General Public License +-# along with Diaspora. If not, see . +-# !!! From f2c6e7b820203638363dcdd0be4392a595e70f05 Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Tue, 14 Sep 2010 20:35:30 -0700 Subject: [PATCH 18/20] made group manage a little nicer --- app/views/aspects/manage.html.haml | 12 ++++-- public/javascripts/aspect-edit.js | 10 ++--- public/stylesheets/application.css | 51 ++++++++++++++++++------ public/stylesheets/sass/application.sass | 40 ++++++++++++------- 4 files changed, 79 insertions(+), 34 deletions(-) diff --git a/app/views/aspects/manage.html.haml b/app/views/aspects/manage.html.haml index a4a363513..640c545ca 100644 --- a/app/views/aspects/manage.html.haml +++ b/app/views/aspects/manage.html.haml @@ -22,7 +22,7 @@ = javascript_include_tag 'aspect-edit.js' - content_for :left_pane do - %h3 + %h1 Requests .requests @@ -46,7 +46,14 @@ %ul#aspect_list - for aspect in @aspects %li.aspect - %h1{:contenteditable => true}= aspect.name + + .aspect_name + %h1{:contenteditable => true}= aspect.name + + .tools + = link_to "add a new friend", "#add_request_pane_#{aspect.id}", :class => 'add_request_button' + | + = link_to "show", aspect_path(aspect) %ul{:id => aspect.id} @@ -60,7 +67,6 @@ = person_image_tag(person) .name = person.real_name - = link_to (image_tag('add_friend_button.png', :height => "50px", :width => "50px")), "#add_request_pane_#{aspect.id}", :class => 'add_request_button' .yo{:style => 'display:none'} %div{:id => "add_request_pane_#{aspect.id}"} = render "requests/new_request", :aspect => aspect diff --git a/public/javascripts/aspect-edit.js b/public/javascripts/aspect-edit.js index 18eafd34b..b21a9dd9f 100644 --- a/public/javascripts/aspect-edit.js +++ b/public/javascripts/aspect-edit.js @@ -22,7 +22,7 @@ $('#move_friends_link').live( 'click', function(){ { 'moves' : $('#aspect_list').data() }, function(){ $('#aspect_title').html("Groups edited successfully!");}); - $(".person").css('background-color','white'); + $(".person").css('background-color','none'); $('#aspect_list').removeData(); $(".person").attr('from_aspect_id', function(){return $(this).parent().attr('id')}) @@ -46,7 +46,7 @@ $(function() { url: "/requests/" + ui.draggable[0].getAttribute('request_id') , data: {"accept" : true , "aspect_id" : $(this)[0].id } }); - alert("Sent the ajax, check it out!") + }else { var move = {}; move[ 'friend_id' ] = ui.draggable[0].id @@ -54,7 +54,7 @@ $(function() { move[ 'from' ] = ui.draggable[0].getAttribute('from_aspect_id'); if (move['to'] == move['from']){ $('#aspect_list').data( ui.draggable[0].id, []); - ui.draggable.css('background-color','white'); + ui.draggable.css('background-color','#eee'); } else { $('#aspect_list').data( ui.draggable[0].id, move); ui.draggable.css('background-color','orange'); @@ -87,7 +87,7 @@ $(function() { }); }); -$(".aspect h3").live( 'click', function() { +$(".aspect h1").live( 'click', function() { var $this = $(this); var id = $this.closest("li").children("ul").attr("id"); @@ -107,7 +107,7 @@ $(".aspect h3").live( 'click', function() { } //update all other aspect links $this.keyup(function(e) { - $("a[href='"+link+"']").text($this.text()); + $("#aspect_nav a[href='"+link+"']").text($this.text()); }); }); }); diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 2b4494e09..00449e660 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -507,10 +507,25 @@ h1.big_text { .requests, .remove { list-style: none; } - .aspect h3, - .requests h3, - .remove h3 { + .aspect h1, + .requests h1, + .remove h1 { display: inline-block; } + .aspect .aspect_name, + .requests .aspect_name, + .remove .aspect_name { + position: relative; } + .aspect .aspect_name .tools, + .requests .aspect_name .tools, + .remove .aspect_name .tools { + position: absolute; + top: 10px; + right: 0; + display: none; } + .aspect .aspect_name:hover .tools, + .requests .aspect_name:hover .tools, + .remove .aspect_name:hover .tools { + display: inline; } .aspect ul, .requests ul, .remove ul { @@ -530,26 +545,38 @@ h1.big_text { .remove .person, .remove .requested_person { display: inline-block; - margin-left: 0; padding: 5px; cursor: move; margin: 5px; - background-color: #cccccc; - -webkit-border-radius: 3px; + z-index: 10; text-align: center; - width: 75px; - height: 75px; - padding: 5px; - border: 1px solid #999999; } + width: 125px; + height: 120px; } .aspect .person img, .aspect .requested_person img, .requests .person img, .requests .requested_person img, .remove .person img, .remove .requested_person img { - height: 50px; - width: 50px; + height: 100px; + width: 100px; display: inline-block; } + .aspect .person:active, + .aspect .requested_person:active, + .requests .person:active, + .requests .requested_person:active, + .remove .person:active, + .remove .requested_person:active { + color: #666666; } + .aspect .person:active img, + .aspect .requested_person:active img, + .requests .person:active img, + .requests .requested_person:active img, + .remove .person:active img, + .remove .requested_person:active img { + -webkit-box-shadow: 0 1px 3px #333333; + -moz-box-shadow: 0 2px 4px #333333; + opacity: 0.9; } .aspect .person .grey, .aspect .requested_person .grey, .requests .person .grey, diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 83c218a40..804c2d3d4 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -688,9 +688,22 @@ h1.big_text :list :style none - h3 + h1 :display inline-block + .aspect_name + :position relative + + .tools + :position absolute + :top 10px + :right 0 + :display none + + &:hover + .tools + :display inline + ul :min-height 20px :margin 0 @@ -708,30 +721,29 @@ h1.big_text .person, .requested_person :display inline-block - :margin - :left 0 :padding 5px :cursor move :margin 5px - - :background - :color #ccc - :-webkit-border-radius 3px + :z-index 10 :text :align center - :width 75px - :height 75px - :padding 5px - - :border 1px solid #999 + :width 125px + :height 120px img - :height 50px - :width 50px + :height 100px + :width 100px :display inline-block + &:active + :color #666 + img + :-webkit-box-shadow 0 1px 3px #333 + :-moz-box-shadow 0 2px 4px #333 + :opacity 0.9 + .grey :font From c763a663ac30d47e48e540738d08475bec53b8c0 Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Tue, 14 Sep 2010 20:37:31 -0700 Subject: [PATCH 19/20] z-index fix --- public/stylesheets/application.css | 1 + public/stylesheets/sass/application.sass | 1 + 2 files changed, 2 insertions(+) diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 00449e660..4f6f57262 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -567,6 +567,7 @@ h1.big_text { .requests .requested_person:active, .remove .person:active, .remove .requested_person:active { + z-index: 20; color: #666666; } .aspect .person:active img, .aspect .requested_person:active img, diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 804c2d3d4..c9a8e9888 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -738,6 +738,7 @@ h1.big_text :display inline-block &:active + :z-index 20 :color #666 img :-webkit-box-shadow 0 1px 3px #333 From 8a59f3b26eee2388ddc78dd0ad6978807d4a3109 Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Tue, 14 Sep 2010 20:42:08 -0700 Subject: [PATCH 20/20] aspect manage less rounded --- public/stylesheets/application.css | 2 -- public/stylesheets/sass/application.sass | 3 --- 2 files changed, 5 deletions(-) diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 4f6f57262..dc43acdfa 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -531,11 +531,9 @@ h1.big_text { .remove ul { min-height: 20px; margin: 0; - margin-left: 1em; margin-bottom: 25px; background-color: #efefef; border: 1px solid #cccccc; - border-radius: 3px; list-style: none; padding: 15px; } .aspect .person, diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index c9a8e9888..45413512f 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -707,13 +707,10 @@ h1.big_text ul :min-height 20px :margin 0 - :left 1em :bottom 25px :background :color #efefef :border 1px solid #ccc - :border - :radius 3px :list :style none :padding 15px