From 9c7e0e3bcb49f9e2cb3b3f3da827723f6cc99a19 Mon Sep 17 00:00:00 2001
From: Daniel Vincent Grippi <Dan@SPEEDRACER.local>
Date: Fri, 10 Sep 2010 23:16:46 -0700
Subject: [PATCH 01/13] minor sass tweaks

---
 app/views/shared/_group_nav.haml         |  9 ++--
 public/stylesheets/application.css       | 62 +++++++++++------------
 public/stylesheets/sass/application.sass | 63 +++++++++++-------------
 3 files changed, 63 insertions(+), 71 deletions(-)

diff --git a/app/views/shared/_group_nav.haml b/app/views/shared/_group_nav.haml
index 5c07b6e83..0b8345b5f 100644
--- a/app/views/shared/_group_nav.haml
+++ b/app/views/shared/_group_nav.haml
@@ -2,16 +2,15 @@
   %ul
     - for group in @groups
       %li{:id => group.id, :class => ("selected" if current_group?(group))}
-        %span.group_name
-          = link_for_group group
+        = link_for_group group
 
-    %li.new_group= link_to("+", "#add_group_pane", :id => "add_group_button")
+    %li.new_group= link_to("+", "#add_group_pane", :id => "add_group_button", :title => "Add a new relation")
 
     #group_manage_button
-      = link_to "manage", edit_group_path(Group.first), :class => "edit_group_button", :title => "Manage your facets."
+      = link_to "manage", edit_group_path(Group.first), :class => "edit_group_button", :title => "Manage your relations"
 
   %ul{ :style => "position:absolute;right:0;bottom:0;"}
-    %li{:class => ("selected" if @group == :all)}
+    %li{:class => ("selected" if @group == :all), :style => "margin-right:0;"}
       = link_to "All Relations", root_url
 
   .yo{ :style => "display:none;"}
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 029ccad0d..4bb3ca360 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -73,12 +73,11 @@ header {
   margin: -2em;
     margin-bottom: 2em;
   color: black;
-  background-color: #333333;
+  background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#333333), to(black));
   padding: 0;
   border-bottom: 1px solid #cccccc; }
   header #diaspora_text {
     z-index: 6;
-    position: absolute;
     display: inline;
     font-family: "BrandonGrotesqueLightRegular";
     font-size: 16px;
@@ -246,12 +245,14 @@ ul.comment_set {
       margin-top: -5px;
       margin-bottom: 0; }
 
-.profile_photo {
-  float: left;
-  margin-right: 10px; }
+.profile_photo img {
+  height: 150px;
+  width: 150px; }
 
 #profile ul {
-  list-style-type: none; }
+  list-style-type: none;
+  margin: 0;
+  padding: 0; }
 
 #stream img.person_picture, #profile img.person_picture,
 .comments img.person_picture {
@@ -452,49 +453,44 @@ h1.big_text {
 
 #group_nav {
   position: relative;
-  color: black; }
+  color: black;
+  margin-top: 7px;
+  margin-bottom: 1px; }
   #group_nav #group_manage_button {
-    display: inline;
-    margin-top: 1px;
-    font-size: 12px; }
+    display: inline; }
     #group_nav #group_manage_button a {
       color: #999999; }
   #group_nav ul {
-    margin-bottom: 0;
-    margin-right: 0;
+    margin: 0;
     padding: 0;
-      padding-bottom: 0px;
-      padding-top: 35px;
-      padding-right: 0;
-    display: inline-block;
-    list-style: none;
-    font-size: 14px; }
+    list-style: none; }
     #group_nav ul > li {
-      background-color: #444444;
+      padding: 0;
       display: inline;
-      margin-right: 0.5em;
-      padding: 3px 8px;
-      border: 1px solid #555555; }
-      #group_nav ul > li.last-child {
-        margin-right: 0; }
+      margin-right: 0.5em; }
       #group_nav ul > li a {
+        background-color: #444444;
+        border: 1px solid #555555;
+        -webkit-border-radius: 3;
+        position: relative;
+        padding: 3px 8px;
         color: #999999; }
         #group_nav ul > li a:hover {
           background: none; }
-        #group_nav ul > li a.editable:hover {
-          background: yellow; }
-      #group_nav ul > li:hover {
-        background-color: #444444; }
-        #group_nav ul > li:hover a {
-          color: #999999; }
-      #group_nav ul > li.selected {
+      #group_nav ul > li:hover a {
+        background-color: #555555;
+        color: #cccccc; }
+      #group_nav ul > li.selected a {
+        padding-top: 5px;
+        padding-bottom: 3px;
+        line-height: 18px;
         font-weight: bold;
         background-color: #eeeeee;
         border-bottom: 1px solid #eeeeee;
         color: black; }
-        #group_nav ul > li.selected:hover {
+        #group_nav ul > li.selected a:hover {
           background-color: #efefef; }
-        #group_nav ul > li.selected a {
+        #group_nav ul > li.selected a a {
           color: black; }
 
 #add_photo_loader {
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 887af39ae..fbffd9f1a 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -78,15 +78,13 @@ header
   :margin -2em
     :bottom 2em
   :color #000
-  :background
-    :color #333
+  :background -webkit-gradient(linear, 0% 0%, 0% 100%, from(#333333), to(#000000))
   :padding 0
   :border
     :bottom 1px solid #ccc
 
   #diaspora_text
     :z-index 6
-    :position absolute
     :display inline
     :font
       :family 'BrandonGrotesqueLightRegular'
@@ -314,11 +312,15 @@ ul.comment_set
         :bottom 0
 
 .profile_photo
-  :float left
-  :margin-right 10px
+  img
+    :height 150px
+    :width 150px
+
 #profile
   ul
     :list-style-type none
+    :margin 0
+    :padding 0
         
 
 #stream, #profile,
@@ -577,59 +579,54 @@ h1.big_text
 #group_nav
   :position relative
   :color #000
+  :margin
+    :top 7px
+    :bottom 1px
 
 
   #group_manage_button
     :display inline
-    :margin
-      :top 1px
-    :font
-      :size 12px
 
     a
       :color #999
 
   ul
-    :margin
-      :bottom 0
-      :right 0
+    :margin 0
     :padding 0
-      :bottom 0px
-      :top 35px
-      :right 0
-    :display inline-block
     :list
       :style none
-    :font
-      :size 14px
+
 
     > li
-      :background
-        :color #444
+      :padding 0
       :display inline
       :margin
         :right 0.5em
-      :padding 3px 8px
-      :border 1px solid #555
-
-      &.last-child
-        :margin
-          :right 0
 
       a
+        :background
+          :color #444
+        :border 1px solid #555
+
+        :-webkit-border-radius 3
+
+        :position relative
+        :padding 3px 8px
         :color #999
         &:hover
           :background none
-        &.editable:hover
-          :background yellow
 
-      &:hover
+      &:hover a
         :background
-          :color #444
-        a
-          :color #999
+          :color #555
+        :color #ccc
 
-      &.selected
+      &.selected a
+        :padding
+          :top 5px
+          :bottom 3px
+        :line
+          :height 18px
         :font
           :weight bold
         :background

From 95765139d695a9706a814caab4120a595c440a7b Mon Sep 17 00:00:00 2001
From: Daniel Vincent Grippi <Dan@SPEEDRACER.local>
Date: Fri, 10 Sep 2010 23:37:16 -0700
Subject: [PATCH 02/13] link color less morbid.

---
 public/stylesheets/application.css       | 5 ++++-
 public/stylesheets/sass/application.sass | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 4bb3ca360..fb5e73c84 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -12,10 +12,13 @@ body {
 
 a {
   color: #556270;
+  color: #107fc9;
+  color: #019dbe;
   text-decoration: none; }
   a:hover {
     color: white;
-    background-color: #556270; }
+    background-color: #556270;
+    background-color: #019dbe; }
 
 .avatar {
   width: 50px;
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index fbffd9f1a..9fb7e044c 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -11,12 +11,15 @@ body
   :margin 0
 a
   :color #556270
+  :color #107FC9
+  :color #019DBE
   :text
     :decoration none
   &:hover
     :color #fff
     :background
       :color #556270
+      :color #019DBE
 
 .avatar
   :width 50px

From 266a896bde320fdc5f9db66d682efd00b8a5bccf Mon Sep 17 00:00:00 2001
From: Daniel Vincent Grippi <Dan@SPEEDRACER.local>
Date: Fri, 10 Sep 2010 23:55:33 -0700
Subject: [PATCH 03/13] mtweaking comments in stream

---
 app/views/layouts/application.html.haml  | 12 ++++++++----
 public/javascripts/stream.js             |  2 +-
 public/stylesheets/application.css       |  9 +++++----
 public/stylesheets/sass/application.sass | 10 ++++++----
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index d3c7e06fa..c3396aab9 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -58,12 +58,16 @@
       #group_header
         .container
           .span-5.last
-            - if @group == :all
+            - if @person
               %h1
-                = link_to "All Relations", root_path
+                = @person.real_name
             - else
-              %h1
-                = link_to @group.name, @group
+              - if @group == :all
+                %h1
+                  = link_to "All Relations", root_path
+              - else
+                %h1
+                  = link_to @group.name, @group
 
             .page_title
               = yield :page_title
diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js
index d1d91351a..ba442a831 100644
--- a/public/javascripts/stream.js
+++ b/public/javascripts/stream.js
@@ -46,6 +46,6 @@ $(".comment_box").live('blur', function(evt){
 });
 
 $(".comment_submit").live('click', function(evt){
-  $this.parents("p").parents("form").children("p").children(".comment_box").attr("rows", 1);
+  $(this).closest("form").children("p .comment_box").attr("rows", 1);
 });
 
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index fb5e73c84..ad271dfda 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -238,15 +238,16 @@ ul.comment_set {
     padding: 0.6em;
     border-bottom: 1px solid #cccccc; }
     ul.comment_set li.comment .from {
-      font-weight: normal; }
-      ul.comment_set li.comment .from a {
-        font-weight: bold; }
+      font-size: 1em; }
     ul.comment_set li.comment div.time {
       color: #666666;
       font-size: 70%; }
     ul.comment_set li.comment form {
       margin-top: -5px;
-      margin-bottom: 0; }
+      margin-bottom: 0;
+      font-size: 1em; }
+      ul.comment_set li.comment form textarea {
+        font-size: 1em; }
 
 .profile_photo img {
   height: 150px;
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 9fb7e044c..87bff2526 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -300,10 +300,7 @@ ul.comment_set
 
     .from
       :font
-        :weight normal
-      a
-        :font
-          :weight bold
+        :size 1em
     
     div.time
       :color #666
@@ -313,6 +310,11 @@ ul.comment_set
       :margin
         :top -5px
         :bottom 0
+      :font
+        :size 1em
+      textarea
+        :font
+          :size 1em
 
 .profile_photo
   img

From 1092c7b8d185ae50526bf706b2b33bc547ea5386 Mon Sep 17 00:00:00 2001
From: Daniel Vincent Grippi <Dan@SPEEDRACER.local>
Date: Sat, 11 Sep 2010 07:53:45 -0700
Subject: [PATCH 04/13] moved manage to be its own tab on right

---
 app/views/shared/_group_nav.haml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/shared/_group_nav.haml b/app/views/shared/_group_nav.haml
index 0b8345b5f..dbf531eb0 100644
--- a/app/views/shared/_group_nav.haml
+++ b/app/views/shared/_group_nav.haml
@@ -7,11 +7,12 @@
     %li.new_group= link_to("+", "#add_group_pane", :id => "add_group_button", :title => "Add a new relation")
 
     #group_manage_button
-      = link_to "manage", edit_group_path(Group.first), :class => "edit_group_button", :title => "Manage your relations"
 
   %ul{ :style => "position:absolute;right:0;bottom:0;"}
-    %li{:class => ("selected" if @group == :all), :style => "margin-right:0;"}
+    %li{:class => ("selected" if @group == :all)}
       = link_to "All Relations", root_url
+    %li{ :style => "margin-right:0;" }
+      = link_to "manage", edit_group_path(Group.first), :class => "edit_group_button", :title => "Manage your relations"
 
   .yo{ :style => "display:none;"}
     #add_group_pane

From 7fefdd3753d54a0201ee674afc34be75546f6c0e Mon Sep 17 00:00:00 2001
From: Daniel Vincent Grippi <Dan@SPEEDRACER.local>
Date: Sat, 11 Sep 2010 08:59:25 -0700
Subject: [PATCH 06/13] minor cleanup

---
 public/javascripts/group-edit.js         | 89 ++++++++++++++----------
 public/javascripts/view.js               | 78 +++++++--------------
 public/stylesheets/application.css       |  7 +-
 public/stylesheets/sass/application.sass |  6 +-
 4 files changed, 85 insertions(+), 95 deletions(-)

diff --git a/public/javascripts/group-edit.js b/public/javascripts/group-edit.js
index 5c136ebff..e24ff9a47 100644
--- a/public/javascripts/group-edit.js
+++ b/public/javascripts/group-edit.js
@@ -1,41 +1,58 @@
-$('#move_friends_link').live( 'click', 
-    function(){
-      $.post('/groups/move_friends',
-        {'moves' : $('#group_list').data()},
-        function(){ $('#group_title').html("Groups edited successfully!");});
-      $(".person").css('background-color','white');
-      $('#group_list').removeData();
-      $(".person").attr('from_group_id', function(){return $(this).parent().attr('id')})
-    });
+$('#move_friends_link').live( 'click', function(){
+  $.post('/groups/move_friends',
+    { 'moves' : $('#group_list').data() },
+    function(){ $('#group_title').html("Groups edited successfully!");});
+
+  $(".person").css('background-color','white');
+  $('#group_list').removeData();
+  $(".person").attr('from_group_id', function(){return $(this).parent().attr('id')})
+
+});
 
 $(function() {
-    $("li .person").draggable({
-		  revert: true
-    });
-    
-    $("li .person").draggable({
-		  revert: true
-    });
-		
-    $(".group ul").droppable({
-
-			drop: function(event, ui) {
-
-        var move = {};
-        move[ 'friend_id' ] = ui.draggable[0].id
-        move[ 'to' ] = $(this)[0].id;
-        move[ 'from' ] = ui.draggable[0].getAttribute('from_group_id');
-        if (move['to'] == move['from']){
-          $('#group_list').data( ui.draggable[0].id, []);
-          ui.draggable.css('background-color','white');
-        } else{
-          $('#group_list').data( ui.draggable[0].id, move);
-          ui.draggable.css('background-color','orange');
-        }
-        $(this).closest("ul").append(ui.draggable);
+  $("li .person").draggable({
+    revert: true
+  });
+  
+  $(".group ul").droppable({
+    drop: function(event, ui) {
+      var move = {};
+      move[ 'friend_id' ] = ui.draggable[0].id
+      move[ 'to' ] = $(this)[0].id;
+      move[ 'from' ] = ui.draggable[0].getAttribute('from_group_id');
+      if (move['to'] == move['from']){
+        $('#group_list').data( ui.draggable[0].id, []);
+        ui.draggable.css('background-color','white');
+      } else {
+        $('#group_list').data( ui.draggable[0].id, move);
+        ui.draggable.css('background-color','orange');
       }
-		});
+      $(this).closest("ul").append(ui.draggable);
+    }
+  });
+});
 
-    
+$(".group h3").live( 'click', function() {
 
-	});
+  var $this = $(this);
+  var id    = $this.closest("li").children("ul").attr("id");
+  var link  = "/groups/"+ id;
+
+  $this.keypress(function(e) {
+    if (e.which == 13) {
+      e.preventDefault();
+      $this.blur();
+
+      //save changes
+      $.ajax({
+        type: "PUT",
+        url: link,
+        data: {"group" : {"name" : $this.text() }}
+      });
+    }
+    //update all other group links
+    $this.keyup(function(e) {
+      $("a[href='"+link+"']").text($this.text());
+    });
+  });
+});
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index 8b4c44134..9881c9c57 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -16,7 +16,7 @@ $(document).ready(function(){
   });
 
   //buttons//////
-  $("#add_group_button").fancybox();
+  $("#add_group_button").fancybox({ 'titleShow' : false });
   $("#add_request_button").fancybox({ 'titleShow': false });
 
   $("input[type='submit']").addClass("button");
@@ -25,59 +25,31 @@ $(document).ready(function(){
     $(this).fadeIn("slow");
   });
 
-});//end document ready
-
-$(".group h3").live( 'click', function() {
-
-  var $this = $(this);
-  var id    = $this.closest("li").children("ul").attr("id");
-  var link  = "/groups/"+ id;
-
-  $this.keypress(function(e) {
-    if (e.which == 13) {
-      e.preventDefault();
-      $this.blur();
-
-      //save changes
-      $.ajax({
-        type: "PUT",
-        url: link,
-        data: {"group" : {"name" : $this.text() }}
-      });
-    }
-    //update all other group links
-    $this.keyup(function(e) {
-      $("a[href='"+link+"']").text($this.text());
-    });
-  });
-});
-
-
-function pane_toggler_button( name ) {
-  
-    $("#add_" + name + "_button").toggle(
-    function(evt){
-      evt.preventDefault();
-      $("#add_" + name + "_pane").fadeIn(300);
-    },function(evt){
-      evt.preventDefault();
-      $("#add_" + name +"_pane").fadeOut(200);
+  $("#global_search").hover(
+    function() {
+      $(this).fadeTo('fast', '1');
+    },
+    function() {
+      $(this).fadeTo('fast', '0.5');
     }
   );
-}
+
+});//end document ready
+
 
 //Called with $(selector).clearForm()
-	$.fn.clearForm = function() {
-		return this.each(function() {
-		var type = this.type, tag = this.tagName.toLowerCase();
-		if (tag == 'form')
-			return $(':input',this).clearForm();
-		if (type == 'text' || type == 'password' || tag == 'textarea')
-			this.value = '';
-		//else if (type == 'checkbox' || type == 'radio')
-			//this.checked = false;
-		else if (tag == 'select')
-			this.selectedIndex = -1;
-		$(this).blur();
-    });
-	};
+$.fn.clearForm = function() {
+  return this.each(function() {
+  var type = this.type, tag = this.tagName.toLowerCase();
+  if (tag == 'form')
+    return $(':input',this).clearForm();
+  if (type == 'text' || type == 'password' || tag == 'textarea')
+    this.value = '';
+  //else if (type == 'checkbox' || type == 'radio')
+    //this.checked = false;
+  else if (tag == 'select')
+    this.selectedIndex = -1;
+  $(this).blur();
+  });
+};
+
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index ad271dfda..0918b614e 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -78,6 +78,7 @@ header {
   color: black;
   background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#333333), to(black));
   padding: 0;
+    padding-top: 5px;
   border-bottom: 1px solid #cccccc; }
   header #diaspora_text {
     z-index: 6;
@@ -85,8 +86,7 @@ header {
     font-family: "BrandonGrotesqueLightRegular";
     font-size: 16px;
     border: none;
-    color: white;
-    top: 3px; }
+    color: white; }
     header #diaspora_text a {
       color: #999999; }
     header #diaspora_text a:hover {
@@ -458,7 +458,7 @@ h1.big_text {
 #group_nav {
   position: relative;
   color: black;
-  margin-top: 7px;
+  margin-top: 8px;
   margin-bottom: 1px; }
   #group_nav #group_manage_button {
     display: inline; }
@@ -562,6 +562,7 @@ h1.big_text {
 #global_search {
   display: inline;
   position: relative;
+  opacity: 0.5;
   padding-right: 167px; }
   #global_search form {
     display: inline; }
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 87bff2526..b851028ae 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -83,6 +83,7 @@ header
   :color #000
   :background -webkit-gradient(linear, 0% 0%, 0% 100%, from(#333333), to(#000000))
   :padding 0
+    :top 5px
   :border
     :bottom 1px solid #ccc
 
@@ -94,7 +95,6 @@ header
       :size 16px
     :border none
     :color #fff
-    :top 3px
 
     a
       :color #999
@@ -585,7 +585,7 @@ h1.big_text
   :position relative
   :color #000
   :margin
-    :top 7px
+    :top 8px
     :bottom 1px
 
 
@@ -733,6 +733,7 @@ h1.big_text
 #global_search
   :display inline
   :position relative
+  :opacity 0.5
   :padding
     :right 167px
 
@@ -824,4 +825,3 @@ h1.big_text
         :style italic
       :color #666
 
-

From db5d000757cb14d8bb6fddb622f24af0239db7c5 Mon Sep 17 00:00:00 2001
From: Daniel Vincent Grippi <Dan@SPEEDRACER.local>
Date: Sat, 11 Sep 2010 12:09:55 -0700
Subject: [PATCH 07/13] made a sticky request link on the bottom of every page

---
 README                                   | 13 -------------
 app/views/layouts/application.html.haml  |  3 +++
 public/stylesheets/application.css       | 10 ++++++++++
 public/stylesheets/sass/application.sass | 14 ++++++++++++++
 4 files changed, 27 insertions(+), 13 deletions(-)
 delete mode 100644 README

diff --git a/README b/README
deleted file mode 100644
index 4faa7886e..000000000
--- a/README
+++ /dev/null
@@ -1,13 +0,0 @@
-Some things that need doing:
-
-Rename relations:
-  post.person needs to be post.owner
-  group.people might want to be group.members
-  person.owner should probably be person.user
-
-Refactor receive:
-  user.receive is a little horrifying right now.
-  Maybe make a model.import or model.perform function which can be called on all the classes.
-  Definitely move the varied signature verification methods into a unified object.signature_valid?
-    or signatures_valid?
-
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index c3396aab9..de54600d3 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -85,3 +85,6 @@
       .span-19.prepend-5.last
         = render "posts/debug"
 
+      #notification_badge.requests
+        = link_to "requests (#{@request_count})", requests_path
+
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 0918b614e..60f00d037 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -628,3 +628,13 @@ h1.big_text {
     .requests .person .grey {
       font-style: italic;
       color: #666666; }
+
+#notification_badge {
+  position: fixed;
+  bottom: 0;
+  margin-left: 854px; }
+  #notification_badge a {
+    background-color: #eeeeee;
+    border: 1px solid #cccccc;
+      border-bottom: none;
+    padding: 3px 10px; }
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index b851028ae..5cf70a6bd 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -825,3 +825,17 @@ h1.big_text
         :style italic
       :color #666
 
+#notification_badge
+  :position fixed
+  :bottom 0
+  :margin
+    :left 854px
+
+  a
+    :background
+      :color #eee
+
+    :border 1px solid #ccc
+      :bottom none
+
+    :padding 3px 10px

From c60c8039acc17c378484ed17a23d2dae31e32970 Mon Sep 17 00:00:00 2001
From: Daniel Vincent Grippi <Dan@SPEEDRACER.local>
Date: Sat, 11 Sep 2010 12:10:20 -0700
Subject: [PATCH 08/13] made a quick set of instructions in the readme

---
 README.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 000000000..471395331
--- /dev/null
+++ b/README.md
@@ -0,0 +1,49 @@
+Diaspora
+========
+
+Decentralized social network, built on top of Ruby on Rails.
+
+
+Getting started
+---------------
+
+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.
+
+- [Bundler](http://gembundler.com/)
+
+
+After installing the above, run
+		sudo bin/mongod
+
+from where mongo is installed to start mongo.  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.
+
+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
+to begin 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
+		bundle exec rspec spec
+
+
+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)
+- [Diaspora Discussion Google Group]:(http://groups.google.com/group/diaspora-discuss)
+
+- [#diaspora-dev]:(irc://irc.freenode.net/#diaspora-dev)
+
+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://#).
+
+

From e72b558e197ecf74e6e04136face61ec74d7f2fe Mon Sep 17 00:00:00 2001
From: Daniel Vincent Grippi <Dan@SPEEDRACER.local>
Date: Sat, 11 Sep 2010 12:13:47 -0700
Subject: [PATCH 09/13] fixed links in readme.  added description used in our
 blog.

---
 README.md | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 471395331..aaa0c5458 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Diaspora
 ========
 
-Decentralized social network, built on top of Ruby on Rails.
+The privacy aware, personally controlled, do-it-all, open source social network.
 
 
 Getting started
@@ -12,8 +12,7 @@ In order to run Diaspora for development, there are a few external dependencies
 - [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.
-
-- [Bundler](http://gembundler.com/)
+- [Bundler](http://gembundler.com/) - Gem management tool for Ruby projects.
 
 
 After installing the above, run
@@ -39,11 +38,9 @@ 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)
-- [Diaspora Discussion Google Group]:(http://groups.google.com/group/diaspora-discuss)
-
-- [#diaspora-dev]:(irc://irc.freenode.net/#diaspora-dev)
-
-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://#).
+- [Diaspora Developer Google Group](http://groups.google.com/group/diaspora-dev)
+- [Diaspora Discussion Google Group](http://groups.google.com/group/diaspora-discuss)
+- [#diaspora-dev](irc://irc.freenode.net/#diaspora-dev)
 
+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).
 

From e17500e7021650e10d2ba0d1acb6f611d34ddb6f Mon Sep 17 00:00:00 2001
From: Daniel Vincent Grippi <Dan@SPEEDRACER.local>
Date: Sat, 11 Sep 2010 12:14:16 -0700
Subject: [PATCH 10/13] missed one link...

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index aaa0c5458..2b03d914f 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ Once mongo is running and bundler has finished, run
 		bundle exec thin start
 to begin 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
+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 08233a74c51ba601ead579644fc50686848af541 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Sat, 11 Sep 2010 14:39:09 -0700
Subject: [PATCH 11/13] MS added anohter logger so i can debug friend requests

---
 app/models/user.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/user.rb b/app/models/user.rb
index c767e3b91..6f53be3c6 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -204,6 +204,7 @@ class User
     Rails.logger.info("Received a salmon: #{cleartext}")
     salmon = Salmon::SalmonSlap.parse cleartext
     if salmon.verified_for_key?(salmon.author.public_key)
+      Rails.logger.info("data in salmon: #{salmon.data}")
       self.receive(salmon.data)
     end
   end

From b1dcc4cf431e65fee89b3f1a161309c7a85e1f2c Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Sat, 11 Sep 2010 21:58:01 -0700
Subject: [PATCH 12/13] testing request acceptance on remote

---
 public/javascripts/group-edit.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/public/javascripts/group-edit.js b/public/javascripts/group-edit.js
index e24ff9a47..4b2c43451 100644
--- a/public/javascripts/group-edit.js
+++ b/public/javascripts/group-edit.js
@@ -16,6 +16,14 @@ $(function() {
   
   $(".group ul").droppable({
     drop: function(event, ui) {
+      if (ui.draggable[0].getAttribute('request_id') != null){
+      $.ajax({
+        type: "DELETE",
+        url: "/requests/" + ui.draggable[0].getAttribute('request_id') ,
+        data: {"accept" : {"group_id" : $(this)[0].id }}
+      });
+      alert("Sent the ajax, check it out!")
+      }
       var move = {};
       move[ 'friend_id' ] = ui.draggable[0].id
       move[ 'to' ] = $(this)[0].id;

From 9b07c780c3e5893c1908e48613526503f775926f Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Sat, 11 Sep 2010 23:31:43 -0700
Subject: [PATCH 13/13] the acceptance now works need to do the ignores and
 unfriend bucket

---
 public/javascripts/group-edit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/group-edit.js b/public/javascripts/group-edit.js
index 4b2c43451..e5c995bed 100644
--- a/public/javascripts/group-edit.js
+++ b/public/javascripts/group-edit.js
@@ -20,7 +20,7 @@ $(function() {
       $.ajax({
         type: "DELETE",
         url: "/requests/" + ui.draggable[0].getAttribute('request_id') ,
-        data: {"accept" : {"group_id" : $(this)[0].id }}
+        data: {"accept" : true  , "group_id" : $(this)[0].id }
       });
       alert("Sent the ajax, check it out!")
       }