Download as
Browse Code »

Commit 0530e5baaee07dd518811f21b227a46e99d1dc53

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

Add description to project features on edit project page

Showing 3 changed files with 40 additions and 13 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @0530e5b
@@ -679,3 +679,16 @@ h1.http_status_code { @@ -679,3 +679,16 @@ h1.http_status_code {
679 font-weight: normal; 679 font-weight: normal;
680 color: #456; 680 color: #456;
681 } 681 }
  682 +
  683 +.control-group {
  684 + .controls {
  685 + span {
  686 + &.descr {
  687 + position: relative;
  688 + top: 2px;
  689 + left: 5px;
  690 + color: #666;
  691 + }
  692 + }
  693 + }
  694 +}
app/assets/stylesheets/sections/projects.scss
  Diff comments   View file @0530e5b
@@ -74,6 +74,12 @@ @@ -74,6 +74,12 @@
74 .adv_settings { 74 .adv_settings {
75 h6 { margin-left: 40px; } 75 h6 { margin-left: 40px; }
76 } 76 }
  77 +
  78 + fieldset.features {
  79 + .control-label {
  80 + font-weight: bold;
  81 + }
  82 + }
77 } 83 }
78 84
79 .project_clone_panel { 85 .project_clone_panel {
app/views/projects/_form.html.haml
  Diff comments   View file @0530e5b
@@ -30,24 +30,32 @@ @@ -30,24 +30,32 @@
30 = f.label :default_branch, "Default Branch" 30 = f.label :default_branch, "Default Branch"
31 .input= f.select(:default_branch, @project.heads.map(&:name), {}, style: "width:210px;") 31 .input= f.select(:default_branch, @project.heads.map(&:name), {}, style: "width:210px;")
32 32
33 - %fieldset 33 + %fieldset.features
34 %legend Features: 34 %legend Features:
35 35
36 - .clearfix  
37 - = f.label :issues_enabled, "Issues"  
38 - .input= f.check_box :issues_enabled 36 + .control-group
  37 + = f.label :issues_enabled, "Issues", class: 'control-label'
  38 + .controls
  39 + = f.check_box :issues_enabled
  40 + %span.descr Lightweight issue tracking system for this project
39 41
40 - .clearfix  
41 - = f.label :merge_requests_enabled, "Merge Requests"  
42 - .input= f.check_box :merge_requests_enabled 42 + .control-group
  43 + = f.label :merge_requests_enabled, "Merge Requests", class: 'control-label'
  44 + .controls
  45 + = f.check_box :merge_requests_enabled
  46 + %span.descr Submit changes to be merged upstream.
43 47
44 - .clearfix  
45 - = f.label :wall_enabled, "Wall"  
46 - .input= f.check_box :wall_enabled 48 + .control-group
  49 + = f.label :wall_enabled, "Wall", class: 'control-label'
  50 + .controls
  51 + = f.check_box :wall_enabled
  52 + %span.descr Simple chat system for broadcasting inside project
47 53
48 - .clearfix  
49 - = f.label :wiki_enabled, "Wiki"  
50 - .input= f.check_box :wiki_enabled 54 + .control-group
  55 + = f.label :wiki_enabled, "Wiki", class: 'control-label'
  56 + .controls
  57 + = f.check_box :wiki_enabled
  58 + %span.descr Pages for project documentation
51 59
52 %br 60 %br
53 61