commit.short_id as model method. Styled inline comment form

randx
1 parent 67ef96ea
Showing 7 changed files with 46 additions and 23 deletions Show diff stats
app/assets/javascripts/note.js
app/assets/stylesheets/notes.scss
app/decorators/commit_decorator.rb
app/models/commit.rb
app/views/commits/_commit_box.html.haml
app/views/notes/_form.html.haml
app/views/notes/_per_line_form.html.haml
@@ -33,7 +33,7 @@ init:
     })
     $("#note_note").live("focus", function(){
-      $(this).css("height", "100px");
+      $(this).css("height", "80px");
       $('.note_advanced_opts').show();
     });
@@ -24,8 +24,8 @@
 /* Note textare */
 #note_note {
-  height:100px;
-  width:97%;
+  height:80px;
+  width:99%;
   font-size:14px;
 }
@@ -100,8 +100,25 @@ tr.line_notes_row {
   td { 
     border-bottom:1px solid #ddd;
   }
-  .actions { 
+  .note_actions { 
     margin:0;
+    padding-top: 10px;
+
+    .buttons { 
+      float:left;
+      width:300px;
+    }
+    .options { 
+      .labels { 
+        float:left;
+        padding-left:10px;
+        label { 
+          padding: 6px 0;
+          margin: 0;
+          width:120px;
+        }
+      }
+    }
   }
 }
 class CommitDecorator < ApplicationDecorator
   decorates :commit
-  def short_id(length = 10)
-    id.to_s[0..length]
-  end
-
   # Returns the commits title.
   #
   # Usually, the commit title is the first line of the commit message.
@@ -114,6 +114,10 @@ class Commit
     @head = head
   end
+  def short_id(length = 10)
+    id.to_s[0..length]
+  end
+
   def safe_message
     utf8 message
   end
@@ -150,4 +154,8 @@ class Commit
   def prev_commit_id
     prev_commit.try :id
   end
+
+  def parents_count 
+    parents && parents.count || 0
+  end
 end
-.commit-box{class: @commit.parents.count > 1 ? "merge-commit" : ""}
+.commit-box{class: @commit.parents_count > 1 ? "merge-commit" : ""}
   .commit-head
     .right
       - if @notes_count > 0
 = form_for [@project, @note], :remote => "true", :multipart => true do |f|
-  %h3 Leave a comment
+  %h3.page_title Leave a comment
   -if @note.errors.any?
     .alert-message.block-message.error
       - @note.errors.full_messages.each do |msg|
@@ -2,7 +2,7 @@
   %tr.per_line_form
     %td{:colspan => 3 }
       = form_for [@project, @note], :remote => "true", :multipart => true do |f|
-        %h3 Leave a note
+        %h3.page_title Leave a note
         %div.span10
           -if @note.errors.any?
             .alert-message.block-message.error
@@ -13,19 +13,21 @@
           = f.hidden_field :noteable_type
           = f.hidden_field :line_code
           = f.text_area :note,  :size => 255
-          %h5 Notify via email:
-          .clearfix
-            = label_tag :notify do
-              = check_box_tag :notify, 1, @note.noteable_type != "Commit"
-              %span Project team
+          .note_actions
+            .buttons
+              = f.submit 'Add note', :class => "btn primary submit_note", :id => "submit_note"
+              = link_to "Cancel", "#", :class => "btn hide-button"
+            .options
+              %h6.left Notify via email:
+              .labels
+                = label_tag :notify do
+                  = check_box_tag :notify, 1, @note.noteable_type != "Commit"
+                  %span Project team
-            - if @note.notify_only_author?(current_user)
-              = label_tag :notify_author do
-                = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit"
-                %span Commit author
-          .actions
-            = f.submit 'Add note', :class => "btn primary submit_note", :id => "submit_note"
-            = link_to "Close", "#", :class => "btn hide-button"
+                - if @note.notify_only_author?(current_user)
+                  = label_tag :notify_author do
+                    = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit"
+                    %span Commit author
 :javascript
   $(function(){
	@@ -33,7 +33,7 @@ init:		@@ -33,7 +33,7 @@ init:
33	})	33	})
34		34
35	$("#note_note").live("focus", function(){	35	$("#note_note").live("focus", function(){
36	- $(this).css("height", "100px");	36	+ $(this).css("height", "80px");
37	$('.note_advanced_opts').show();	37	$('.note_advanced_opts').show();
38	});	38	});
39		39
	@@ -24,8 +24,8 @@		@@ -24,8 +24,8 @@
24		24
25	/* Note textare */	25	/* Note textare */
26	#note_note {	26	#note_note {
27	- height:100px;
28	- width:97%;	27	+ height:80px;
		28	+ width:99%;
29	font-size:14px;	29	font-size:14px;
30	}	30	}
31		31
	@@ -100,8 +100,25 @@ tr.line_notes_row {		@@ -100,8 +100,25 @@ tr.line_notes_row {
100	td {	100	td {
101	border-bottom:1px solid #ddd;	101	border-bottom:1px solid #ddd;
102	}	102	}
103	- .actions {	103	+ .note_actions {
104	margin:0;	104	margin:0;
		105	+ padding-top: 10px;
		106	+
		107	+ .buttons {
		108	+ float:left;
		109	+ width:300px;
		110	+ }
		111	+ .options {
		112	+ .labels {
		113	+ float:left;
		114	+ padding-left:10px;
		115	+ label {
		116	+ padding: 6px 0;
		117	+ margin: 0;
		118	+ width:120px;
		119	+ }
		120	+ }
		121	+ }
105	}	122	}
106	}	123	}
107		124
1	-.commit-box{class: @commit.parents.count > 1 ? "merge-commit" : ""}	1	+.commit-box{class: @commit.parents_count > 1 ? "merge-commit" : ""}
2	.commit-head	2	.commit-head
3	.right	3	.right
4	- if @notes_count > 0	4	- if @notes_count > 0
1	= form_for [@project, @note], :remote => "true", :multipart => true do \|f\|	1	= form_for [@project, @note], :remote => "true", :multipart => true do \|f\|
2	- %h3 Leave a comment	2	+ %h3.page_title Leave a comment
3	-if @note.errors.any?	3	-if @note.errors.any?
4	.alert-message.block-message.error	4	.alert-message.block-message.error
5	- @note.errors.full_messages.each do \|msg\|	5	- @note.errors.full_messages.each do \|msg\|