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

app/controllers/groups_controller.rb

@@ -35,6 +35,7 @@ class GroupsController < ApplicationController
   end
 
   def edit
+    @groups = current_user.groups
     @group = Group.first(:id => params[:id])
   end
 

app/views/groups/edit.html.haml

+- content_for :head do 
+  = javascript_include_tag 'jquery-ui-1.8.4.custom.min.js'
+  = javascript_include_tag 'group-edit.js'
+
+
 %h1.big_text
   .back
     = link_to "⇧ #{@group.name}", @group
 
-  = "Editing #{@group.name}"
+  = "Editing Groups"
+
 
-.sub_header
-  ="updated #{how_long_ago(@group)}"
+%ul
+- for group in @groups
+  %li.group
+    = group.name
+    %ul
+      -for person in group.people
+        %li..person
+          = person.real_name
 
-- form_for @group do |a|
-  = a.error_messages
-  %p
-    = a.text_field :name
 
-  #submit_block
-    = link_to "Cancel", root_path
-    or
-    = a.submit
 
-.button.delete
-  = link_to 'Delete Album', @group, :confirm => 'Are you sure?', :method => :delete
 
 #content_bottom
   .back