Issue restyle

app/views/issues/_form.html.haml

@@ -1,45 +1,56 @@
 %div.issue-form-holder
-  .issue-show-holder.ui-box
+  = form_for [@project, @issue], :remote => request.xhr? do |f|
-    %h3
+    %div
-      = @issue.new_record? ? "New issue" : "Edit Issue ##{@issue.id}"
+      %span.entity-info
+        - if request.xhr? 
+          = link_to "#back", :onclick => "backToIssues();" do 
+            .entity-button
+              Back
+              %i
+        - else 
+          - 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{:colspan => 2}
+            #error_explanation
+              - @issue.errors.full_messages.each do |msg|
+                %span= msg
+                %br
+
+
+      %tr
+        %td= f.label :assignee_id
+        %td= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" })
+
+      %tr
+        %td= f.label :critical, "Critical"
+        %td= f.check_box :critical
+      
+      - unless @issue.new_record?
+        %tr
+          %td= f.label :closed
+          %td= f.check_box :closed
+    
+    = 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 @issue.closed
+          = link_to 'Remove', [@project, @issue], :confirm => 'Are you sure?', :method => :delete, :class => "red-button"
-            %span.tag.high Resolved
-          - else 
-            %span.tag.today Open
-    = form_for [@project, @issue], :remote => "true" do |f|
-      .data
-        %table.no-borders
-          -if @issue.errors.any?
-            %tr 
-              %td Errors
-              %td
-                #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
-            %td= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" })
-
-          %tr
-            %td= f.label :critical, "Critical"
-            %td= f.check_box :critical
-          
-          - unless @issue.new_record?
-            %tr
-              %td= f.label :closed
-              %td= f.check_box :closed
-      .buttons 
-        = f.submit 'Save', :class => "grey-button"
-        .right
-          - if request.xhr? 
-            = link_to_function "Back", "backToIssues();", :class => "grey-button"
-          - else 
-            = link_to "Back", [@project, @issue], :class => "grey-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