Fixed code in issue details, changed form description to details.

Steven Verbeek
1 parent 2228f1b1
Showing 2 changed files with 18 additions and 3 deletions Show diff stats
app/assets/stylesheets/common.scss
app/views/issues/_form.html.haml
@@ -945,6 +945,18 @@ p.time {
     .alert-message {
       width:34px;
       margin: 0 0 0 auto;
+      
+      .error {
+        width: 40px;
+      }
+    }
+  }
+  
+  pre {
+    background: white !important;
+    
+    code {
+      background: none !important;
     }
   }
 }
@@ -13,9 +13,9 @@
       .input= f.text_field :title, :maxlength => 255
  
     .clearfix
-      = f.label :description, "Issue Description"
+      = f.label :description, "Issue Details"
       .input= f.text_area :description, :maxlength => 2000, :class => "xxlarge"
-      %p.hint Markdown is enabled.
+        %p.hint Markdown is enabled.
  
     .clearfix
       = f.label :assignee_id
@@ -31,7 +31,10 @@
         .input= f.check_box :closed
  
     .actions
-      = f.submit 'Submit new issue', :class => "primary btn"
+      - if @issue.new_record?
+        = f.submit 'Submit new issue', :class => "primary btn"
+      -else
+        = f.submit 'Save changes', :class => "primary btn"
  
       - if request.xhr?
         = link_to "Cancel", "#back", :onclick => "backToIssues();", :class => "btn"
...	...	@@ -945,6 +945,18 @@ p.time {
945	945	.alert-message {
946	946	width:34px;
947	947	margin: 0 0 0 auto;
	948	+
	949	+ .error {
	950	+ width: 40px;
	951	+ }
	952	+ }
	953	+ }
	954	+
	955	+ pre {
	956	+ background: white !important;
	957	+
	958	+ code {
	959	+ background: none !important;
948	960	}
949	961	}
950	962	}
...	...
...	...	@@ -13,9 +13,9 @@
13	13	.input= f.text_field :title, :maxlength => 255
14	14
15	15	.clearfix
16		- = f.label :description, "Issue Description"
	16	+ = f.label :description, "Issue Details"
17	17	.input= f.text_area :description, :maxlength => 2000, :class => "xxlarge"
18		- %p.hint Markdown is enabled.
	18	+ %p.hint Markdown is enabled.
19	19
20	20	.clearfix
21	21	= f.label :assignee_id
...	...	@@ -31,7 +31,10 @@
31	31	.input= f.check_box :closed
32	32
33	33	.actions
34		- = f.submit 'Submit new issue', :class => "primary btn"
	34	+ - if @issue.new_record?
	35	+ = f.submit 'Submit new issue', :class => "primary btn"
	36	+ -else
	37	+ = f.submit 'Save changes', :class => "primary btn"
35	38
36	39	- if request.xhr?
37	40	= link_to "Cancel", "#back", :onclick => "backToIssues();", :class => "btn"
...	...