Download as
Browse Code »

Commit 9c747fbb95ed795b7159db79cea76ab8e4bd3da0

Authored by Andrew8xx8
1 parent cf6d9a22
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Missing descriptions added

Showing 8 changed files with 48 additions and 10 deletions   Show diff stats
app/views/admin/teams/edit.html.haml
  Diff comments   View file @9c747fb
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 .input 10 .input
11 = f.text_field :name, placeholder: "Example Team", class: "xxlarge" 11 = f.text_field :name, placeholder: "Example Team", class: "xxlarge"
12 12
13 - .clearfix.team_description_holder 13 + .clearfix.team-description-holder
14 = f.label :description, "Details" 14 = f.label :description, "Details"
15 .input 15 .input
16 = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4 16 = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
app/views/admin/teams/new.html.haml
  Diff comments   View file @9c747fb
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 .input 10 .input
11 = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left" 11 = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
12 12
13 - .clearfix.team_description_holder 13 + .clearfix.team-description-holder
14 = f.label :description, "Details" 14 = f.label :description, "Details"
15 .input 15 .input
16 = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4 16 = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
app/views/groups/edit.html.haml
  Diff comments   View file @9c747fb
@@ -9,8 +9,15 @@ @@ -9,8 +9,15 @@
9 Group name is 9 Group name is
10 .input 10 .input
11 = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left" 11 = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
12 -    
13 - = f.submit 'Save group', class: "btn btn-save" 12 +
  13 + .clearfix.group_description_holder
  14 + = f.label :description, "Details"
  15 + .input
  16 + = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
  17 +
  18 + .form-actions
  19 + = f.submit 'Save group', class: "btn btn-save"
  20 +
14 %hr 21 %hr
15 22
16 23
app/views/groups/new.html.haml
  Diff comments   View file @9c747fb
@@ -9,8 +9,16 @@ @@ -9,8 +9,16 @@
9 Group name is 9 Group name is
10 .input 10 .input
11 = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left" 11 = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
12 -    
13 - = f.submit 'Create group', class: "btn btn-create" 12 +
  13 + .clearfix.group_description_holder
  14 + = f.label :description, "Details"
  15 + .input
  16 + = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
  17 +
  18 + .form-actions
  19 + = f.submit 'Create group', class: "btn btn-primary"
  20 +
  21 +
14 %hr 22 %hr
15 .padded 23 .padded
16 %ul 24 %ul
app/views/groups/show.html.haml
  Diff comments   View file @9c747fb
  1 +- if @group.description.present?
  2 + .description
  3 + = @group.description
  4 + %hr
  5 +
1 .projects 6 .projects
2 .activities.span8 7 .activities.span8
3 = render "events/event_last_push", event: @last_push 8 = render "events/event_last_push", event: @last_push
app/views/teams/edit.html.haml
  Diff comments   View file @9c747fb
@@ -12,13 +12,20 @@ @@ -12,13 +12,20 @@
12 .input 12 .input
13 = f.text_field :name, placeholder: "Ex. OpenSource", class: "xlarge left" 13 = f.text_field :name, placeholder: "Ex. OpenSource", class: "xlarge left"
14 14
  15 + .clearfix.team-description-holder
  16 + = f.label :description, "Details"
  17 + .input
  18 + = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
  19 +
15 .clearfix 20 .clearfix
16 = f.label :path do 21 = f.label :path do
17 Team path is 22 Team path is
18 .input 23 .input
19 = f.text_field :path, placeholder: "opensource", class: "xlarge left" 24 = f.text_field :path, placeholder: "opensource", class: "xlarge left"
  25 +
20 .form-actions 26 .form-actions
21 - = f.submit 'Save team changes', class: "btn btn-save" 27 + = f.submit 'Save team changes', class: "btn btn-primary"
  28 + = link_to 'Delete team', team_path(@team), method: :delete, confirm: "You are shure?", class: "btn btn-remove pull-right"
22 .span5 29 .span5
23 .ui-box 30 .ui-box
24 %h5.title Remove team 31 %h5.title Remove team
@@ -26,4 +33,3 @@ @@ -26,4 +33,3 @@
26 %p 33 %p
27 Removed team can not be restored! 34 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" 35 = link_to 'Remove team', team_path(@team), method: :delete, confirm: "You are sure?", class: "btn btn-remove btn-small"
29 -  
app/views/teams/new.html.haml
  Diff comments   View file @9c747fb
@@ -9,8 +9,15 @@ @@ -9,8 +9,15 @@
9 Team name is 9 Team name is
10 .input 10 .input
11 = f.text_field :name, placeholder: "Ex. Ruby Developers", class: "xxlarge left" 11 = f.text_field :name, placeholder: "Ex. Ruby Developers", class: "xxlarge left"
12 -    
13 - = f.submit 'Create team', class: "btn btn-create" 12 +
  13 + .clearfix.team-description-holder
  14 + = f.label :description, "Details"
  15 + .input
  16 + = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
  17 +
  18 + .form-actions
  19 + = f.submit 'Create team', class: "btn btn-create"
  20 +
14 %hr 21 %hr
15 .padded 22 .padded
16 %ul 23 %ul
app/views/teams/show.html.haml
  Diff comments   View file @9c747fb
  1 +- if @group.description.present?
  2 + .description
  3 + = @group.description
  4 + %hr
  5 +
1 .projects 6 .projects
2 .activities.span8 7 .activities.span8
3 = link_to dashboard_path, class: 'btn btn-tiny' do 8 = link_to dashboard_path, class: 'btn btn-tiny' do