From 82a31228fa5876aab3ceecdb8c47cd18bce1b7cc Mon Sep 17 00:00:00 2001
From: Daniel Vincent Grippi <Dan@speedracer.(none)>
Date: Fri, 10 Sep 2010 15:07:55 -0700
Subject: [PATCH] DG IZ; requests bar added to group/edit

---
 app/controllers/groups_controller.rb     |  1 +
 app/views/groups/edit.html.haml          | 16 ++++++++--
 public/stylesheets/application.css       | 36 ++++++++++-----------
 public/stylesheets/sass/application.sass | 40 ++++++++++++------------
 4 files changed, 53 insertions(+), 40 deletions(-)

diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 0d1cecf6b7..1e47b7a8bb 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -34,6 +34,7 @@ class GroupsController < ApplicationController
 
   def edit
     @groups = current_user.groups
+    @remote_requests = Request.for_user current_user
   end
 
   def update
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index c59157f481..342e9786c3 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -3,10 +3,22 @@
   = javascript_include_tag 'group-edit.js'
 
 - content_for :left_pane do
+  %h1{:id => 'group_title'}
+    Requests
+
+  - for request in @remote_requests
+    .person{:id => request.person.id}
+      = image_tag(request.person.profile.image_url(:thumb_small)) unless request.person.profile.image_url.nil?
+      .name
+        = request.person.real_name
+
+
+
+
   requests
 
-%h1{:class => 'big_text', :id => 'group_title'}
-  = "Managing Relations"
+%h1{:id => 'group_title'}
+  Relations
 
 %ul#group_list
 
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 9e2777f401..73d991f77f 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -600,23 +600,23 @@ h1.big_text {
     border-radius: 3px;
     list-style: none;
     padding: 15px; }
-    .group ul li.person {
-      display: inline-block;
-      margin-left: 0;
-      padding: 5px;
-      cursor: move;
-      margin: 5px;
-      background-color: #cccccc;
-      -webkit-border-radius: 3px;
-      text-align: center;
-      width: 75px;
-      height: 75px;
-      padding: 5px;
-      border: 1px solid #999999; }
-      .group ul li.person img {
-        height: 50px;
-        width: 50px;
-        display: inline-block; }
-    .group ul .grey {
+  .group .person {
+    display: inline-block;
+    margin-left: 0;
+    padding: 5px;
+    cursor: move;
+    margin: 5px;
+    background-color: #cccccc;
+    -webkit-border-radius: 3px;
+    text-align: center;
+    width: 75px;
+    height: 75px;
+    padding: 5px;
+    border: 1px solid #999999; }
+    .group .person img {
+      height: 50px;
+      width: 50px;
+      display: inline-block; }
+    .group .person .grey {
       font-style: italic;
       color: #666666; }
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 2c6c4be5a6..912f428152 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -788,31 +788,31 @@ h1.big_text
       :style none
     :padding 15px
 
-    li.person
-      :display inline-block
-      :margin
-        :left 0
-      :padding 5px 
-      :cursor move
-      :margin 5px
+  .person
+    :display inline-block
+    :margin
+      :left 0
+    :padding 5px 
+    :cursor move
+    :margin 5px
 
-      :background
-        :color #ccc
-      :-webkit-border-radius 3px
+    :background
+      :color #ccc
+    :-webkit-border-radius 3px
 
-      :text
-        :align center
+    :text
+      :align center
 
-      :width 75px
-      :height 75px
-      :padding 5px
+    :width 75px
+    :height 75px
+    :padding 5px
 
-      :border 1px solid #999
+    :border 1px solid #999
 
-      img
-        :height 50px
-        :width 50px
-        :display inline-block
+    img
+      :height 50px
+      :width 50px
+      :display inline-block
 
 
     .grey
-- 
GitLab