issues table header

diff --git a/app/views/issues/_issues.html.haml b/app/views/issues/_issues.html.haml
index 5651883..eb0cae6 100644 (file)
--- a/app/views/issues/_issues.html.haml
+++ b/app/views/issues/_issues.html.haml
@@ -1,9 +1,5 @@
-%table.round-borders#issues-table
-  %thead
-    %th Issues
+- @issues.critical.each do |issue|
+  = render(:partial => 'show', :locals => {:issue => issue})
 
-  - @issues.critical.each do |issue|
-    = render(:partial => 'show', :locals => {:issue => issue})
-
-  - @issues.non_critical.each do |issue|
-    = render(:partial => 'show', :locals => {:issue => issue})
+- @issues.non_critical.each do |issue|
+  = render(:partial => 'show', :locals => {:issue => issue})

diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml
index 9f2e90e..94df0f5 100644 (file)
--- a/app/views/issues/_show.html.haml
+++ b/app/views/issues/_show.html.haml
@@ -27,23 +27,3 @@
           = link_to 'Edit', edit_project_issue_path(@project, issue), :class => "cgray", :remote => true
         - if can?(current_user, :admin_issue, @project) || issue.author == current_user
           = link_to 'Destroy', [@project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-issue negative", :id => "destroy_issue_#{issue.id}"
-  -#%td ##{issue.id}
-  -#%td
-    = truncate(html_escape(issue.title), :length => 200)
-    %br
-    %br
-
-
-    -#- if issue.author == current_user
-      -#%span.tag.yours yours
-    -#- if issue.notes.count > 0
-      -#%span.tag.notes
-        -#= issue.notes.count
-        -#notes
-  -#%td
-    - if can? current_user, :write_issue, @project
-      = form_for([@project, issue], :remote => true) do |f|
-        = f.check_box :closed, :onclick => "$(this).parent().submit();"
-        = hidden_field_tag :status_only, true
-    - else
-      = check_box_tag "closed", 1, issue.closed, :disabled => true

diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml
index 21e455b..355429c 100644 (file)
--- a/app/views/issues/index.html.haml
+++ b/app/views/issues/index.html.haml
@@ -1,28 +1,31 @@
-%div
-  .top_panel_issues
-    - if can? current_user, :write_issue, @project
-      %div{:class => "left", :style => "margin-right: 10px;" }
-        = link_to 'New Issue', new_project_issue_path(@project), :remote => true, :class => "lbutton vm"
-    = form_tag search_project_issues_path(@project), :method => :get, :remote => true, :class => :left, :id => "issue_search_form" do
-      = hidden_field_tag :project_id, @project.id, { :id => 'project_id' }
-      = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' }
+%div#issues-table-holder
+  %table.round-borders#issues-table
+    %thead
+      %th
+        .top_panel_issues
+          - if can? current_user, :write_issue, @project
+            %div{:class => "left", :style => "margin-right: 10px;" }
+              = link_to 'New Issue', new_project_issue_path(@project), :remote => true, :class => "lbutton vm"
+          = form_tag search_project_issues_path(@project), :method => :get, :remote => true, :class => :left, :id => "issue_search_form" do
+            = hidden_field_tag :project_id, @project.id, { :id => 'project_id' }
+            = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' }
 
-    .right.issues_filter
-      = form_tag project_issues_path(@project), :method => :get do
-        .left
-          = radio_button_tag :f, 0, (params[:f] || "0") == "0", :onclick => "this.form.submit()", :id => "open_issues", :class => "status"
-          = label_tag "open_issues","Open"
-        .left
-          = radio_button_tag :f, 2, params[:f] == "2", :onclick => "this.form.submit()", :id => "closed_issues", :class => "status"
-          = label_tag "closed_issues","Closed"
-        .left
-          = radio_button_tag :f, 3, params[:f] == "3", :onclick => "this.form.submit()", :id => "my_issues", :class => "status"
-          = label_tag "my_issues","To Me"
-        .left
-          = radio_button_tag :f, 1, params[:f] == "1", :onclick => "this.form.submit()", :id => "all_issues", :class => "status"
-          = label_tag "all_issues","All"
+          .right.issues_filter
+            = form_tag project_issues_path(@project), :method => :get do
+              .left
+                = radio_button_tag :f, 0, (params[:f] || "0") == "0", :onclick => "this.form.submit()", :id => "open_issues", :class => "status"
+                = label_tag "open_issues","Open"
+              .left
+                = radio_button_tag :f, 2, params[:f] == "2", :onclick => "this.form.submit()", :id => "closed_issues", :class => "status"
+                = label_tag "closed_issues","Closed"
+              .left
+                = radio_button_tag :f, 3, params[:f] == "3", :onclick => "this.form.submit()", :id => "my_issues", :class => "status"
+                = label_tag "my_issues","To Me"
+              .left
+                = radio_button_tag :f, 1, params[:f] == "1", :onclick => "this.form.submit()", :id => "all_issues", :class => "status"
+                = label_tag "all_issues","All"
 
-  #issues-table-holder= render "issues"
+    = render "issues"
   %br
 :javascript
   var href       = $('.issue_search').parent().attr('action');
@@ -37,7 +40,7 @@
 
       if (terms.length >= 2 || terms.length == 0) {
         $.get(href, { 'status': status, 'terms': terms, project: project_id  }, function(response) {
-          $('#issues-table').html(response);
+          $('#issues-table tbody').html(response);
           setSortable();
         });
       }

diff --git a/app/views/issues/index.js.haml b/app/views/issues/index.js.haml
index bc18ac1..a08ffe5 100644 (file)
--- a/app/views/issues/index.js.haml
+++ b/app/views/issues/index.js.haml
@@ -1,3 +1,3 @@
 :plain
-  $('#issues-table-holder').html("#{escape_javascript(render('issues'))}");
+  $('#issues-table tbody').html("#{escape_javascript(render('issues'))}");
   setSortable();