diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-16 12:41:23 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-16 12:41:23 +0300 |
| commit | ecd0c1757da536c5b522dad563b6621d0d5634b1 (patch) | |
| tree | e6dfe69feb913ba40cf8e491217606b490c946d0 /app/views | |
| parent | 49a70d1e45b4f841379db059177856671c65159c (diff) | |
| parent | 82f9957d466810314b8f3af672bcdd706905007a (diff) | |
Merge branch 'dz-nested-groups-title-ui' into 'master'
UI improvements for nested group feature
See merge request !8062
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/groups/_group.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/groups/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/groups/_group.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/admin/groups/_group.html.haml b/app/views/admin/groups/_group.html.haml index 4efeec0ea4e..cf28f92853e 100644 --- a/app/views/admin/groups/_group.html.haml +++ b/app/views/admin/groups/_group.html.haml @@ -20,7 +20,7 @@ = image_tag group_icon(group), class: "avatar s40 hidden-xs" .title = link_to [:admin, group], class: 'group-name' do - = group.name + = group.full_name - if group.description.present? .description diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index 71a605f33b1..7b0175af214 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -1,6 +1,6 @@ - page_title @group.name, "Groups" %h3.page-title - Group: #{@group.name} + Group: #{@group.full_name} = link_to admin_group_edit_path(@group), class: "btn pull-right" do %i.fa.fa-pencil-square-o diff --git a/app/views/shared/groups/_group.html.haml b/app/views/shared/groups/_group.html.haml index 19221e3391f..8164f61797c 100644 --- a/app/views/shared/groups/_group.html.haml +++ b/app/views/shared/groups/_group.html.haml @@ -28,7 +28,7 @@ = image_tag group_icon(group), class: "avatar s40 hidden-xs" .title = link_to group, class: 'group-name' do - = group.name + = group.full_name - if group_member as |