Standartize how we render group rows
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
e0b4222fa6
commit
5ea5e8f5d6
4 changed files with 30 additions and 38 deletions
|
@ -377,6 +377,7 @@ table {
|
||||||
.center-top-menu {
|
.center-top-menu {
|
||||||
list-style: none;
|
list-style: none;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
margin-top: 5px;
|
||||||
padding-bottom: 15px;
|
padding-bottom: 15px;
|
||||||
margin-bottom: 15px;
|
margin-bottom: 15px;
|
||||||
|
|
||||||
|
|
|
@ -8,32 +8,9 @@
|
||||||
= link_to new_group_path, class: "btn btn-new btn-sm" do
|
= link_to new_group_path, class: "btn btn-new btn-sm" do
|
||||||
%i.fa.fa-plus
|
%i.fa.fa-plus
|
||||||
New Group
|
New Group
|
||||||
.panel.panel-default
|
%ul.bordered-list
|
||||||
.panel-heading
|
- @group_members.each do |group_member|
|
||||||
%strong Groups
|
- group = group_member.group
|
||||||
(#{@group_members.count})
|
= render 'shared/groups/group', group: group, group_member: group_member
|
||||||
%ul.well-list
|
|
||||||
- @group_members.each do |group_member|
|
|
||||||
- group = group_member.group
|
|
||||||
%li
|
|
||||||
.pull-right.hidden-xs
|
|
||||||
- if can?(current_user, :admin_group, group)
|
|
||||||
= link_to edit_group_path(group), class: "btn-sm btn btn-grouped" do
|
|
||||||
%i.fa.fa-cogs
|
|
||||||
Settings
|
|
||||||
|
|
||||||
= link_to leave_group_group_members_path(group), data: { confirm: leave_group_message(group.name) }, method: :delete, class: "btn-sm btn btn-grouped", title: 'Leave this group' do
|
|
||||||
%i.fa.fa-sign-out
|
|
||||||
Leave
|
|
||||||
|
|
||||||
= image_tag group_icon(group), class: "avatar s40 avatar-tile hidden-xs"
|
|
||||||
= link_to group, class: 'group-name' do
|
|
||||||
%strong= group.name
|
|
||||||
|
|
||||||
as
|
|
||||||
%strong #{group_member.human_access}
|
|
||||||
|
|
||||||
%div.light
|
|
||||||
#{pluralize(group.projects.count, "project")}, #{pluralize(group.users.count, "user")}
|
|
||||||
|
|
||||||
= paginate @group_members
|
= paginate @group_members
|
||||||
|
|
|
@ -32,17 +32,7 @@
|
||||||
|
|
||||||
%ul.bordered-list
|
%ul.bordered-list
|
||||||
- @groups.each do |group|
|
- @groups.each do |group|
|
||||||
%li
|
= render 'shared/groups/group', group: group
|
||||||
.clearfix
|
|
||||||
%h4
|
|
||||||
= link_to group_path(id: group.path) do
|
|
||||||
= group.name
|
|
||||||
.clearfix
|
|
||||||
%p
|
|
||||||
= truncate group.description, length: 150
|
|
||||||
.clearfix
|
|
||||||
%p.light
|
|
||||||
#{pluralize(group.members.size, 'member')}, #{pluralize(group.projects.count, 'project')}
|
|
||||||
- unless @groups.present?
|
- unless @groups.present?
|
||||||
.nothing-here-block No public groups
|
.nothing-here-block No public groups
|
||||||
|
|
||||||
|
|
24
app/views/shared/groups/_group.html.haml
Normal file
24
app/views/shared/groups/_group.html.haml
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
- group_member = local_assigns[:group_member]
|
||||||
|
%li
|
||||||
|
- if group_member
|
||||||
|
.pull-right.hidden-xs
|
||||||
|
- if can?(current_user, :admin_group, group)
|
||||||
|
= link_to edit_group_path(group), class: "btn-sm btn btn-grouped" do
|
||||||
|
%i.fa.fa-cogs
|
||||||
|
Settings
|
||||||
|
|
||||||
|
= link_to leave_group_group_members_path(group), data: { confirm: leave_group_message(group.name) }, method: :delete, class: "btn-sm btn btn-grouped", title: 'Leave this group' do
|
||||||
|
%i.fa.fa-sign-out
|
||||||
|
Leave
|
||||||
|
|
||||||
|
= image_tag group_icon(group), class: "avatar s40 avatar-tile hidden-xs"
|
||||||
|
= link_to group, class: 'group-name' do
|
||||||
|
%strong= group.name
|
||||||
|
|
||||||
|
- if group_member
|
||||||
|
as
|
||||||
|
%strong #{group_member.human_access}
|
||||||
|
|
||||||
|
%div.light
|
||||||
|
#{pluralize(group.projects.count, "project")}, #{pluralize(group.users.count, "user")}
|
||||||
|
|
Loading…
Reference in a new issue