Issues, MR, Wall can be enabled/disabled per project

4 files changed, 79 insertions, 23 deletions

diff --git a/app/views/layouts/_project_side.html.haml b/app/views/layouts/_project_side.html.haml
index 1e553788f85..cc3174fe604 100644
--- a/app/views/layouts/_project_side.html.haml
+++ b/app/views/layouts/_project_side.html.haml
@@ -9,11 +9,15 @@
         = link_to "Code", tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class
         = link_to "Commits", project_commits_path(@project), :class => (controller.controller_name == "commits") ? "current" : nil
         = link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil
-        = link_to  project_issues_filter_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
-          Issues
-        = link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do
-          Merge Requests
-        = link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
-          @Wall
-          - if @project.common_notes.today.count > 0
-            %span.label= @project.common_notes.today.count
+        - if @project.issues_enabled
+          = link_to  project_issues_filter_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
+            Issues
+        - if @project.merge_requests_enabled
+          = link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do
+            Merge Requests
+
+        - if @project.wall_enabled
+          = link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
+            @Wall
+            - if @project.common_notes.today.count > 0
+              %span.label= @project.common_notes.today.count
diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml
index 44b72336051..37446585d9b 100644
--- a/app/views/projects/_form.html.haml
+++ b/app/views/projects/_form.html.haml
@@ -23,10 +23,24 @@
       = f.label :default_branch, "Default Branch"
       .input= f.select(:default_branch, @project.heads.map(&:name), {}, :style => "width:210px;")
 
+    .well
+      %h5 Features
+
+      .clearfix
+        = f.label :issues_enabled, "Issues"
+        .input= f.check_box :issues_enabled
+
+      .clearfix
+        = f.label :merge_requests_enabled, "Merge Requests"
+        .input= f.check_box :merge_requests_enabled
+
+      .clearfix
+        = f.label :wall_enabled, "Wall"
+        .input= f.check_box :wall_enabled
     
   .clearfix
     = f.label :description
-    .input= f.text_area :description, :placeholder => "project description", :style => "height:50px"
+    .input= f.text_area :description, :placeholder => "project description", :class => "xlarge", :rows => 4
 
   %br
   
diff --git a/app/views/projects/info.html.haml b/app/views/projects/info.html.haml
index 513b2ab2cd4..d1196873619 100644
--- a/app/views/projects/info.html.haml
+++ b/app/views/projects/info.html.haml
@@ -1,12 +1,17 @@
 = render "project_head"
-%h3= @project.name
-%br
 
-  
+.entry
+  %h3= @project.name
+  %br
+
+    
+
+  %pre
+    = "git clone #{@project.url_to_repo}"
+
 
-%pre
-  = "git clone #{@project.url_to_repo}"
 
+%h4 Details:
 
 %table
   %tr
@@ -54,6 +59,38 @@
   %tr
     %td{:colspan => 2}= simple_format @project.description
 
+
+%h4 Features:
+
+%table
+  %tr
+    %td Issues
+    %td
+      - if @project.issues_enabled
+        .alert-message.success
+          Enabled
+      - else 
+        .alert-message.error
+          Disabled
+  
+  %tr
+    %td Merge Requests
+    %td
+      - if @project.merge_requests_enabled
+        .alert-message.success
+          Enabled
+      - else 
+        .alert-message.error
+          Disabled
+  %tr
+    %td Wall
+    %td
+      - if @project.wall_enabled
+        .alert-message.success
+          Enabled
+      - else 
+        .alert-message.error
+          Disabled
 .actions
   = link_to "Edit", edit_project_path(@project), :class => "btn"
 
diff --git a/app/views/widgets/_project_member.html.haml b/app/views/widgets/_project_member.html.haml
index 1af911120de..0380033d1d7 100644
--- a/app/views/widgets/_project_member.html.haml
+++ b/app/views/widgets/_project_member.html.haml
@@ -16,13 +16,14 @@
       %span.label= member.repo_access_human
 
   - if can? current_user, :write_project, @project
-    %hr 
-    .span3
-      %p You have access to create new issue or merge request.
-      %div
-        = link_to new_project_issue_path(@project), :title => "New Issue", :class => "" do 
-          New Issue »
-      %div
-        = link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "" do 
-          New Merge Request »
+    - if @project.issues_enabled && @project.merge_requests_enabled
+      %hr 
+      .span3
+        %p You have access to create new issue or merge request.
+        %div
+          = link_to new_project_issue_path(@project), :title => "New Issue", :class => "" do 
+            New Issue »
+        %div
+          = link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "" do 
+            New Merge Request »