Download as
Browse Code »

Commit e9d8d074a12007ba23b198a2587e31456c3d6a18

Authored by Dmitriy Zaporozhets
1 parent 655e68a0
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

no projects message in group area

Showing 4 changed files with 32 additions and 17 deletions   Show diff stats
app/views/groups/_filter.html.haml
  Diff comments   View file @e9d8d07
@@ -26,6 +26,8 @@ @@ -26,6 +26,8 @@
26 = link_to group_filter_path(entity, project_id: project.id) do 26 = link_to group_filter_path(entity, project_id: project.id) do
27 = project.name_with_namespace 27 = project.name_with_namespace
28 %small.pull-right= entities_per_project(project, entity) 28 %small.pull-right= entities_per_project(project, entity)
  29 + - if @projects.blank?
  30 + %p.nothing_here_message This group has no projects yet
29 31
30 %fieldset 32 %fieldset
31 %hr 33 %hr
app/views/groups/_people_filter.html.haml
  Diff comments   View file @e9d8d07
@@ -7,6 +7,8 @@ @@ -7,6 +7,8 @@
7 = link_to people_group_path(@group, project_id: project.id) do 7 = link_to people_group_path(@group, project_id: project.id) do
8 = project.name_with_namespace 8 = project.name_with_namespace
9 %small.pull-right= project.users.count 9 %small.pull-right= project.users.count
  10 + - if @projects.blank?
  11 + %p.nothing_here_message This group has no projects yet
10 12
11 %fieldset 13 %fieldset
12 %hr 14 %hr
app/views/groups/edit.html.haml
  Diff comments   View file @e9d8d07
@@ -30,6 +30,8 @@ @@ -30,6 +30,8 @@
30 = link_to 'Team', project_team_index_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small" 30 = link_to 'Team', project_team_index_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
31 = link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small" 31 = link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
32 = link_to 'Remove', project, confirm: "REMOVE #{project.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove" 32 = link_to 'Remove', project, confirm: "REMOVE #{project.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove"
  33 + - if @group.projects.blank?
  34 + %p.nothing_here_message This group has no projects yet
33 35
34 .span5 36 .span5
35 .ui-box 37 .ui-box
app/views/teams/edit.html.haml
  Diff comments   View file @e9d8d07
1 %h3.page_title= "Edit Team #{@team.name}" 1 %h3.page_title= "Edit Team #{@team.name}"
2 %hr 2 %hr
3 -= form_for @team, url: team_path(@team) do |f|  
4 - - if @team.errors.any?  
5 - .alert.alert-error  
6 - %span= @team.errors.full_messages.first  
7 - .clearfix  
8 - = f.label :name do  
9 - Team name is  
10 - .input  
11 - = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left" 3 +.row
  4 + .span7
  5 + = form_for @team, url: team_path(@team) do |f|
  6 + - if @team.errors.any?
  7 + .alert.alert-error
  8 + %span= @team.errors.full_messages.first
  9 + .clearfix
  10 + = f.label :name do
  11 + Team name is
  12 + .input
  13 + = f.text_field :name, placeholder: "Ex. OpenSource", class: "xlarge left"
  14 +
  15 + .clearfix
  16 + = f.label :path do
  17 + Team path is
  18 + .input
  19 + = f.text_field :path, placeholder: "opensource", class: "xlarge left"
  20 + .form-actions
  21 + = f.submit 'Save team changes', class: "btn btn-save"
  22 + .span5
  23 + .ui-box
  24 + %h5.title Remove team
  25 + .padded.bgred
  26 + %p
  27 + Removed team can not be restored!
  28 + = link_to 'Remove team', team_path(@team), method: :delete, confirm: "You are sure?", class: "btn btn-remove btn-small"
12 29
13 - .clearfix  
14 - = f.label :path do  
15 - Team path is  
16 - .input  
17 - = f.text_field :path, placeholder: "opensource", class: "xxlarge left"  
18 - .form-actions  
19 - = f.submit 'Save team changes', class: "btn btn-primary"  
20 - = link_to 'Delete team', team_path(@team), method: :delete, confirm: "You are shure?", class: "btn btn-remove pull-right"