DG IZ; requests bar added to group/edit

This commit is contained in:
Daniel Vincent Grippi 2010-09-10 15:07:55 -07:00
parent 136eb61b02
commit 82a31228fa
4 changed files with 57 additions and 44 deletions

View file

@ -34,6 +34,7 @@ class GroupsController < ApplicationController
def edit def edit
@groups = current_user.groups @groups = current_user.groups
@remote_requests = Request.for_user current_user
end end
def update def update

View file

@ -3,10 +3,22 @@
= javascript_include_tag 'group-edit.js' = javascript_include_tag 'group-edit.js'
- content_for :left_pane do - 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 requests
%h1{:class => 'big_text', :id => 'group_title'} %h1{:id => 'group_title'}
= "Managing Relations" Relations
%ul#group_list %ul#group_list

View file

@ -600,7 +600,7 @@ h1.big_text {
border-radius: 3px; border-radius: 3px;
list-style: none; list-style: none;
padding: 15px; } padding: 15px; }
.group ul li.person { .group .person {
display: inline-block; display: inline-block;
margin-left: 0; margin-left: 0;
padding: 5px; padding: 5px;
@ -613,10 +613,10 @@ h1.big_text {
height: 75px; height: 75px;
padding: 5px; padding: 5px;
border: 1px solid #999999; } border: 1px solid #999999; }
.group ul li.person img { .group .person img {
height: 50px; height: 50px;
width: 50px; width: 50px;
display: inline-block; } display: inline-block; }
.group ul .grey { .group .person .grey {
font-style: italic; font-style: italic;
color: #666666; } color: #666666; }

View file

@ -788,7 +788,7 @@ h1.big_text
:style none :style none
:padding 15px :padding 15px
li.person .person
:display inline-block :display inline-block
:margin :margin
:left 0 :left 0