changed the pop-up boxes. going to probably switch to fancybox jquery plugin... also, fixed the user page so viewing it doesn't throw an error.

app/controllers/users_controller.rb

@@ -5,8 +5,8 @@ class UsersController < ApplicationController
     @users = User.sort(:created_at.desc).all
   end
   def show
-    @user= Person.first(:id => params[:id])
+    @user= User.first(:id => params[:id])
-    @user_profile = @user.profile
+    @user_profile = @user.person.profile
   end
 
   def edit

app/views/albums/edit.html.haml

@@ -12,6 +12,10 @@
   %p
     = a.text_field :name
 
+  %ul
+  - for photo in @album.photos
+    %li.photo_edit_block= image_tag photo.image.url(:thumb_large)
+
   #submit_block
     = link_to "Cancel", root_path
     or

app/views/groups/_new_group.haml

@@ -1,6 +1,8 @@
+%h1 Add a new group
 = form_for Group.new do |f|
   = f.error_messages
   %p
     = f.label :name
     = f.text_field :name
-  = f.submit 'create', :class => 'button'
+    .right
+      = f.submit 'create', :class => 'button'

app/views/photos/_new_photo.haml

@@ -9,7 +9,7 @@
       },
       onFinish: function(event, total){
         $("#add_photo_button .button").html( "Add Photos" );
-        $("#add_photo_loader").fadeOut(0);
+        $("#add_photo_loader").fadeOut(400);
       },
       onStart: function(event, total){
         $("#add_photo_pane").fadeOut(400);
@@ -20,6 +20,7 @@
     });
   });
 
+%h1= "Add photos to #{album.name}"
 = form_for photo, :html => {:multipart => true} do |f|
   = f.error_messages
   = f.hidden_field :album_id, :value => album.id

app/views/requests/_new_request.haml

@@ -1,10 +1,10 @@
+%h1= "Add a new friend to #{@group.name}"
+
 = form_for Request.new do |f|
   = f.error_messages
 
-
   Enter a Diaspora URL, Diaspora username, or random email address:  
-  .field_with_submit
+  = f.text_field :destination_url
-    = f.text_field :destination_url
+  = f.hidden_field :group, :value => @group.id
-    = f.hidden_field :group, :value => @group.id
+  = f.submit
-    = f.submit
 

app/views/shared/_group_nav.haml

@@ -1,7 +1,8 @@
 #group
   %ul
     - for group in @groups
-      %li= link_to group.name, root_path(:group =>group.id)
+      %li{:class => ("selected" if group.id.to_s == params[:group])}
+        = link_to group.name, root_path(:group =>group.id)
 
     %li#add_group_button.new_group= link_to "NEW GROUP", "#"
 

app/views/users/show.html.haml

@@ -6,6 +6,6 @@
   %p
     = @user.url
   %p
-    %b Key Fingerprint
+    %b Serialized Key
   %p
-    = @user.key_fingerprint
+    = @user.serialized_key

public/stylesheets/application.css

@@ -439,7 +439,6 @@ h1.big_text {
       margin-right: 10px; }
       #group ul > li.selected, #group ul > li.selected a {
         color: white;
-        color: black;
         font-weight: bold;
         font-size: 18px; }
   #group a {

public/stylesheets/sass/application.sass

@@ -548,7 +548,6 @@ h1.big_text
       
       &.selected, &.selected a
         :color #fff
-        :color #000
         :font
           :weight bold
           :size 18px
@@ -582,3 +581,4 @@ h1.big_text
   :display none
   :left -25px
   :top 4px
+

public/stylesheets/sass/ui.sass

@@ -98,33 +98,17 @@ ul.button_set
 
   :display none
 
-  :right 0
   :background
-    :color rgba( 30,30,30,0.95 )
+    :color #fff
 
-  :border 2px solid #999
+  :border 4px solid #000
 
-  :border-radius 5px
+  :border-radius 3px
-  :-moz-border-radius 5px
+  :-moz-border-radius 3px
-  :-webkit-border-radius 5px
+  :-webkit-border-radius 3px
 
-  :color #999
+  :box-shadow 0 0 5px #000
+  :-webkit-box-shadow 0 0 10px #000
 
-  :font
+  :padding 2em
-    :size 12px
-    :weight normal
 
-  :line-height auto
-
-  form
-    :margin 0
-    :padding 10px
-    :color #999
-    
-    input[type='text']
-      :width 80%
-      :display block
-
-    p
-      :padding 10px
-      :display inline

public/stylesheets/ui.css

@@ -64,23 +64,11 @@ ul.button_set {
   z-index: 20;
   position: absolute;
   display: none;
-  right: 0;
+  background-color: white;
-  background-color: rgba(30, 30, 30, 0.95);
+  border: 4px solid black;
-  border: 2px solid #999999;
+  border-radius: 3px;
-  border-radius: 5px;
+  -moz-border-radius: 3px;
-  -moz-border-radius: 5px;
+  -webkit-border-radius: 3px;
-  -webkit-border-radius: 5px;
+  box-shadow: 0 0 5px black;
-  color: #999999;
+  -webkit-box-shadow: 0 0 10px black;
-  font-size: 12px;
+  padding: 2em; }
-  font-weight: normal;
-  line-height: auto; }
-  .contextual_pane form {
-    margin: 0;
-    padding: 10px;
-    color: #999999; }
-    .contextual_pane form input[type='text'] {
-      width: 80%;
-      display: block; }
-    .contextual_pane form p {
-      padding: 10px;
-      display: inline; }