Issue restyle

app/views/issues/_form.html.haml

@@ -1,28 +1,36 @@
 %div.issue-form-holder
-  .issue-show-holder.ui-box
-    %h3
-      = @issue.new_record? ? "New issue" : "Edit Issue ##{@issue.id}"
-      - unless @issue.new_record?
-        .right
-          - if @issue.closed
-            %span.tag.high Resolved
+  = form_for [@project, @issue], :remote => request.xhr? do |f|
+    %div
+      %span.entity-info
+        - if request.xhr? 
+          = link_to "#back", :onclick => "backToIssues();" do 
+            .entity-button
+              Back
+              %i
         - else 
-            %span.tag.today Open
-    = form_for [@project, @issue], :remote => "true" do |f|
-      .data
+          - if @issue.new_record?
+            = link_to project_issues_path(@project) do 
+              .entity-button
+                Back
+                %i
+          - else    
+            = link_to project_issue_path(@project, @issue) do 
+              .entity-button
+                Back
+                %i
+
+      %h2= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
+
+      %hr
     %table.no-borders
       -if @issue.errors.any?
         %tr 
-              %td Errors
-              %td
+          %td{:colspan => 2}
             #error_explanation
               - @issue.errors.full_messages.each do |msg|
                 %span= msg
                 %br
 
-          %tr
-            %td= f.label :title
-            %td= f.text_area :title, :style => "width:450px; height:100px", :maxlength => 255
 
       %tr
         %td= f.label :assignee_id
@@ -36,10 +44,13 @@
         %tr
           %td= f.label :closed
           %td= f.check_box :closed
-      .buttons 
+    
+    = f.text_area :title, :style => "width:718px; height:100px", :maxlength => 255
+    %br
+    %br
+    .merge-tabs
       = f.submit 'Save', :class => "grey-button"
+       
+      - unless @issue.new_record?
         .right
-          - if request.xhr? 
-            = link_to_function "Back", "backToIssues();", :class => "grey-button"
-          - else 
-            = link_to "Back", [@project, @issue], :class => "grey-button"
+          = link_to 'Remove', [@project, @issue], :confirm => 'Are you sure?', :method => :delete, :class => "red-button"

spec/requests/issues_spec.rb

@@ -96,7 +96,7 @@ describe "Issues" do
     end
 
     it "should open new issue form" do
-      page.should have_content("New issue")
+      page.should have_content("New Issue")
     end
 
     describe "fill in" do