Removed issues,mr delete buttons. Refactored models

app/views/issues/_form.html.haml

@@ -8,6 +8,10 @@
           - @issue.errors.full_messages.each do |msg|
             %li= msg
 
+    .clearfix
+      = f.label :title
+      .input= f.text_area :title, :maxlength => 255, :class => "xxlarge"
+
     .clearfix
       = f.label :assignee_id
       .input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" })
@@ -21,9 +25,6 @@
         = f.label :closed
         .input= f.check_box :closed
 
-    .clearfix
-      = f.label :title
-      .input= f.text_area :title, :maxlength => 255, :class => "xxlarge"
     .actions
       = f.submit 'Save', :class => "primary btn"
 
@@ -34,8 +35,3 @@
           = link_to "Cancel", project_issues_path(@project), :class => "btn"
         - else    
           = link_to "Cancel", project_issue_path(@project, @issue), :class => "btn"
-
-
-      - unless @issue.new_record?
-        .right
-          = link_to 'Remove', [@project, @issue], :confirm => 'Are you sure?', :method => :delete, :class => "danger btn"

app/views/issues/_show.html.haml

@@ -6,8 +6,6 @@
       - else
         = link_to 'Resolve', project_issue_path(issue.project, issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "success btn small", :remote => true
       = link_to 'Edit', edit_project_issue_path(issue.project, issue), :class => "btn small edit-issue-link", :remote => true
-    -#- if can?(current_user, :admin_issue, @project) || issue.author == current_user
-      = link_to 'Remove', [issue.project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "danger btn small delete-issue", :id => "destroy_issue_#{issue.id}"
   = image_tag gravatar_icon(issue.assignee_email), :class => "avatar"
   %span.update-author
     assigned to

app/views/merge_requests/_form.html.haml

@@ -5,6 +5,9 @@
         - @merge_request.errors.full_messages.each do |msg|
           %li= msg
 
+  .clearfix
+    = f.label :title
+    .input= f.text_area :title, :class => "xxlarge", :maxlength => 255, :rows => 5
   .clearfix
     = f.label :source_branch, "From"
     .input= f.select(:source_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
@@ -15,9 +18,6 @@
     = f.label :assignee_id, "Assign to"
     .input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" }, :style => "width:250px")
 
-  .clearfix
-    = f.label :title
-    .input= f.text_area :title, :class => "xlarge", :maxlength => 255, :rows => 5
   .actions
     = f.submit 'Save', :class => "primary btn"
     - if @merge_request.new_record?
@@ -26,11 +26,6 @@
     - else    
       = link_to project_merge_request_path(@project, @merge_request), :class => "btn" do 
         Cancel
-     
-    - unless @merge_request.new_record?
-      .right
-        = link_to 'Remove', [@project, @merge_request], :confirm => 'Are you sure?', :method => :delete, :class => "btn danger"
-
 
 
 

app/views/projects/index.html.haml

@@ -1,25 +1,21 @@
-- unless @projects.empty?
-  .row
-    .span4
-      %div.leftbar.ui-box
-        %h5
-          Projects
-          - if current_user.can_create_project?
-            %span.right
-              = link_to new_project_path, :class => "btn very_small info" do 
-                New Project
-        .content_list
-          - @projects.each do |project|
-            = link_to project_path(project), :remote => true, :class => dom_class(project) do
-              %h4
-                %span.ico.project
-                = truncate(project.name, :length => 22)
-    .span12.right
-      .show_holder.ui-box.padded
-        .loading
-
-- else
-  %h2 Nothing here
+.row
+  .span4
+    %div.leftbar.ui-box
+      %h5
+        Projects
+        - if current_user.can_create_project?
+          %span.right
+            = link_to new_project_path, :class => "btn very_small info" do 
+              New Project
+      .content_list
+        - @projects.each do |project|
+          = link_to project_path(project), :remote => true, :class => dom_class(project) do
+            %h4
+              %span.ico.project
+              = truncate(project.name, :length => 22)
+  .span12.right
+    .show_holder.ui-box.padded
+      .loading
 
 
 :javascript