Commit 746ffcfcbdd28a0965ab7d15860aa07977bc4c2f
1 parent
8fb84104
Exists in
master
and in
4 other branches
Make group settings menu looks similar to project settings menu
Showing
2 changed files
with
41 additions
and
26 deletions
Show diff stats
app/views/groups/edit.html.haml
| 1 | 1 | .row |
| 2 | - .span3 | |
| 3 | - %ul.nav.nav-pills.nav-stacked | |
| 2 | + .span2 | |
| 3 | + %ul.nav.nav-pills.nav-stacked.nav-stacked-menu | |
| 4 | 4 | %li.active |
| 5 | - = link_to 'Projects', '#tab-projects', 'data-toggle' => 'tab' | |
| 5 | + = link_to '#tab-edit', 'data-toggle' => 'tab' do | |
| 6 | + %i.icon-edit | |
| 7 | + Edit Group | |
| 6 | 8 | %li |
| 7 | - = link_to 'Edit Group', '#tab-edit', 'data-toggle' => 'tab' | |
| 9 | + = link_to '#tab-projects', 'data-toggle' => 'tab' do | |
| 10 | + %i.icon-folder-close | |
| 11 | + Projects | |
| 8 | 12 | %li |
| 9 | 13 | = link_to 'Transfer', '#tab-transfer', 'data-toggle' => 'tab' |
| 10 | 14 | %li |
| 11 | 15 | = link_to 'Remove', '#tab-remove', 'data-toggle' => 'tab' |
| 12 | 16 | |
| 13 | - .span9 | |
| 17 | + .span10 | |
| 14 | 18 | .tab-content |
| 15 | - .tab-pane.active#tab-projects | |
| 19 | + .tab-pane.active#tab-edit | |
| 16 | 20 | .ui-box |
| 17 | - %h5.title Projects | |
| 18 | - %ul.well-list | |
| 19 | - - @group.projects.each do |project| | |
| 20 | - %li | |
| 21 | - - if project.public | |
| 22 | - = public_icon | |
| 23 | - - else | |
| 24 | - = private_icon | |
| 25 | - = link_to project.name_with_namespace, project | |
| 26 | - .pull-right | |
| 27 | - = link_to 'Team', project_team_index_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small" | |
| 28 | - = link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small" | |
| 29 | - = link_to 'Remove', project, confirm: remove_project_message(project), method: :delete, class: "btn btn-small btn-remove" | |
| 30 | - - if @group.projects.blank? | |
| 31 | - %p.nothing_here_message This group has no projects yet | |
| 32 | - | |
| 33 | - .tab-pane#tab-edit | |
| 34 | - .ui-box | |
| 35 | - %h5.title Edit Group | |
| 21 | + %h5.title | |
| 22 | + %strong= @group.name | |
| 23 | + Group Settings: | |
| 36 | 24 | %div.form-holder |
| 37 | 25 | = form_for @group do |f| |
| 38 | 26 | - if @group.errors.any? |
| ... | ... | @@ -52,6 +40,31 @@ |
| 52 | 40 | .form-actions |
| 53 | 41 | = f.submit 'Save group', class: "btn btn-save" |
| 54 | 42 | |
| 43 | + .tab-pane#tab-projects | |
| 44 | + .ui-box | |
| 45 | + %h5.title | |
| 46 | + %strong= @group.name | |
| 47 | + Projects: | |
| 48 | + - if can? current_user, :manage_group, @group | |
| 49 | + %span.pull-right | |
| 50 | + = link_to new_project_path(namespace_id: @group.id), class: "btn btn-tiny" do | |
| 51 | + %i.icon-plus | |
| 52 | + New Project | |
| 53 | + %ul.well-list | |
| 54 | + - @group.projects.each do |project| | |
| 55 | + %li | |
| 56 | + - if project.public | |
| 57 | + = public_icon | |
| 58 | + - else | |
| 59 | + = private_icon | |
| 60 | + = link_to project.name_with_namespace, project | |
| 61 | + .pull-right | |
| 62 | + = link_to 'Team', project_team_index_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small" | |
| 63 | + = link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small" | |
| 64 | + = link_to 'Remove', project, confirm: remove_project_message(project), method: :delete, class: "btn btn-small btn-remove" | |
| 65 | + - if @group.projects.blank? | |
| 66 | + %p.nothing_here_message This group has no projects yet | |
| 67 | + | |
| 55 | 68 | .tab-pane#tab-transfer |
| 56 | 69 | .ui-box.ui-box-danger |
| 57 | 70 | %h5.title Transfer group | ... | ... |
app/views/projects/edit.html.haml