From 0530e5baaee07dd518811f21b227a46e99d1dc53 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sun, 2 Dec 2012 19:28:23 +0200
Subject: [PATCH] Add description to project features on edit project page

---
 app/assets/stylesheets/common.scss            | 13 ++++++++++
 app/assets/stylesheets/sections/projects.scss |  6 +++++
 app/views/projects/_form.html.haml            | 34 +++++++++++++++++----------
 3 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index d79e97aa4..738ec2bf1 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -679,3 +679,16 @@ h1.http_status_code {
   font-weight: normal;
   color: #456;
 }
+
+.control-group {
+  .controls {
+    span {
+      &.descr {
+        position: relative;
+        top: 2px;
+        left: 5px;
+        color: #666;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss
index 452fbc2bd..a230f2967 100644
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@@ -74,6 +74,12 @@
   .adv_settings {
     h6 { margin-left: 40px; }
   }
+
+  fieldset.features {
+    .control-label {
+      font-weight: bold;
+    }
+  }
 }
 
 .project_clone_panel {
diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml
index 5c60132cc..9bb411ada 100644
--- a/app/views/projects/_form.html.haml
+++ b/app/views/projects/_form.html.haml
@@ -30,24 +30,32 @@
         = f.label :default_branch, "Default Branch"
         .input= f.select(:default_branch, @project.heads.map(&:name), {}, style: "width:210px;")
 
-  %fieldset
+  %fieldset.features
     %legend Features:
 
-    .clearfix
-      = f.label :issues_enabled, "Issues"
-      .input= f.check_box :issues_enabled
+    .control-group
+      = f.label :issues_enabled, "Issues", class: 'control-label'
+      .controls
+        = f.check_box :issues_enabled
+        %span.descr Lightweight issue tracking system for this project
 
-    .clearfix
-      = f.label :merge_requests_enabled, "Merge Requests"
-      .input= f.check_box :merge_requests_enabled
+    .control-group
+      = f.label :merge_requests_enabled, "Merge Requests", class: 'control-label'
+      .controls
+        = f.check_box :merge_requests_enabled
+        %span.descr Submit changes to be merged upstream.
 
-    .clearfix
-      = f.label :wall_enabled, "Wall"
-      .input= f.check_box :wall_enabled
+    .control-group
+      = f.label :wall_enabled, "Wall", class: 'control-label'
+      .controls
+        = f.check_box :wall_enabled
+        %span.descr Simple chat system for broadcasting inside project
 
-    .clearfix
-      = f.label :wiki_enabled, "Wiki"
-      .input= f.check_box :wiki_enabled
+    .control-group
+      = f.label :wiki_enabled, "Wiki", class: 'control-label'
+      .controls
+        = f.check_box :wiki_enabled
+        %span.descr Pages for project documentation
 
   %br
 
-- 
2.11.0