Skip to content
Extraits de code Groupes Projets
Valider 82a31228 rédigé par Daniel Vincent Grippi's avatar Daniel Vincent Grippi
Parcourir les fichiers

DG IZ; requests bar added to group/edit

parent 136eb61b
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -34,6 +34,7 @@ class GroupsController < ApplicationController
def edit
@groups = current_user.groups
@remote_requests = Request.for_user current_user
end
def update
......
......@@ -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
......
......@@ -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; }
......@@ -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
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter