Merge branch 'master' of github.com:diaspora/diaspora

README.md

@@ -17,6 +17,12 @@ The privacy aware, personally controlled, do-it-all, open source social network.
 Also, we really want to continue to focus on features and improving the code base. When we think it is 
 ready for general use, we will post more detailed instructions.
 
+## Notice
+We currently run Diaspora with the [thin](http://code.macournoyer.com/thin/) as our webserver, behind [nginx](http://wiki.nginx.org/Main).  Diaspora uses the asynchronous feature of [EventMachine](http://rubyeventmachine.com/) to send messages between seeds.
+using the power of the [Reactor](http://en.wikipedia.org/wiki/Reactor_pattern) pattern.  If you use mod_rails, mongrel, or another non-eventmachine based application server, federation and/or websockets may not work.
+
+If you don't like thin, you can always try [Rainbows!](http://rainbows.rubyforge.org/)
+We will try and fully support more webservers later, but that is what works for now.
 
 
 These instructions are for machines running [Ubuntu](http://www.ubuntu.com/), [Fedora](http://www.fedoraproject.org) or Mac OS X.  We are developing Diaspora for the latest and greatest browsers, so please update your Firefox, Chrome or Safari to the latest and greatest.
@@ -235,14 +241,3 @@ Ongoing discussion:
 More general info and updates about the project can be found on our [blog](http://joindiaspora.com), [and on Twitter](http://twitter.com/joindiaspora).  Also, be sure to join the official [mailing list](http://http://eepurl.com/Vebk).
 
 If you wish to contact us privately about any exploits in Diaspora you may find, you can email [exploits@joindiaspora.com](mailto:exploits@joindiaspora.com).
-
-
-## 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 <http://www.gnu.org/licenses/>.
-

app/views/aspects/manage.html.haml

@@ -38,7 +38,9 @@
     %li.aspect
       
       .aspect_name
-        %h1{:contenteditable => true}= aspect.name
+        %span.edit_name_field
+          %h1{:contenteditable => true}= aspect.name
+          %span.tip click to edit
 
         %ul.tools
           %li= link_to "add a new friend", "#add_request_pane_#{aspect.id}", :class => 'add_request_button'
@@ -56,7 +58,7 @@
             %li.person{:id => person.id, :from_aspect_id => aspect.id}
               = person_image_tag(person)
               .name
-                = person.real_name
+                = link_to person.real_name, person
         .yo{:style => 'display:none'}
           %div{:id => "add_request_pane_#{aspect.id}"}
             = render "requests/new_request", :aspect => aspect

app/views/shared/_sub_header.haml

@@ -9,7 +9,7 @@
           - if @aspect == :all
             = link_to "All Aspects", root_path
           - elsif @aspect == :manage
-            = link_to "Manage Aspects", root_path
+            = "Manage Aspects"
           - else
             = link_to @aspect.name, @aspect
 

public/stylesheets/application.css

@@ -520,6 +520,16 @@ h1.big_text {
   .requests h1,
   .remove h1 {
     display: inline-block; }
+  .aspect .tip,
+  .requests .tip,
+  .remove .tip {
+    display: none;
+    color: #999999;
+    margin-left: 0.5em; }
+  .aspect .edit_name_field:hover .tip,
+  .requests .edit_name_field:hover .tip,
+  .remove .edit_name_field:hover .tip {
+    display: inline; }
   .aspect .aspect_name,
   .requests .aspect_name,
   .remove .aspect_name {

public/stylesheets/sass/application.sass

@@ -694,6 +694,19 @@ h1.big_text
   h1
     :display inline-block
 
+  .tip
+    :display none
+    :color #999
+    :margin
+      :left 0.5em
+
+  .edit_name_field:hover
+    .tip
+      :display inline
+
+
+    
+
   .aspect_name
     :position relative