minor visual tweaks

2 files changed, 23 insertions, 26 deletions

diff --git a/app/views/aspects/edit.html.haml b/app/views/aspects/edit.html.haml
index 70687b326..fda97275a 100644
--- a/app/views/aspects/edit.html.haml
+++ b/app/views/aspects/edit.html.haml
@@ -32,37 +32,38 @@
           = image_tag(request.person.profile.image_url(:thumb_small)) unless request.person.profile.image_url.nil?
           .name
             = request.person.real_name
-
   %h1
     Ignore/Remove
 
   %li.remove
     %ul
 
-%ul#aspect_list
-
+- content_for :publish do
   .new_aspect= link_to("add a new aspect", "#add_aspect_pane", :id => "add_aspect_button", :title => "Add a new relation")
-- for aspect in @aspects
-  
-  %li.aspect
-    %h1{:contenteditable => true}= aspect.name
-    
-    %ul{:id => aspect.id}
-    
-      -if aspect.people.size < 1
-        %li.grey Drag to add people
 
-      -else
-        -for person in aspect.people
 
-          %li.person{:id => person.id, :from_aspect_id => aspect.id}
-            = 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
+
+%ul#aspect_list
+  - for aspect in @aspects
+    %li.aspect
+      %h1{:contenteditable => true}= aspect.name
+      
+      %ul{:id => aspect.id}
+      
+        -if aspect.people.size < 1
+          %li.grey Drag to add people
+
+        -else
+          -for person in aspect.people
+
+            %li.person{:id => person.id, :from_aspect_id => aspect.id}
+              = 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
 
 %p
   %br
diff --git a/app/views/shared/_aspect_nav.haml b/app/views/shared/_aspect_nav.haml
index 306f3e801..72378b84d 100644
--- a/app/views/shared/_aspect_nav.haml
+++ b/app/views/shared/_aspect_nav.haml
@@ -23,10 +23,6 @@
       %li{:id => aspect.id, :class => ("selected" if current_aspect?(aspect))}
         = link_for_aspect aspect
 
-    %li.new_aspect= link_to("+", "#add_aspect_pane", :id => "add_aspect_button", :title => "Add a new aspect")
-
-    #aspect_manage_button
-
   %ul{ :style => "position:absolute;right:0;bottom:0;"}
     %li{:class => ("selected" if @aspect == :all)}
       = link_to "All Aspects", root_url