Merge branch 'nicer_commit_headers' of https://github.com/arthurschreiber/gitlab…

…hq into arthurschreiber-nicer_commit_headers

Merge branch 'nicer_commit_headers' of https://github.com/arthurschreiber/gitlab…
…hq into arthurschreiber-nicer_commit_headers
Dmitriy Zaporozhets
2 parents 86d7b4f1 ad25dac8
Showing 4 changed files with 126 additions and 23 deletions Show diff stats
app/assets/stylesheets/main.scss
app/assets/stylesheets/sections/commits.scss
app/models/commit.rb
app/views/commits/show.html.haml
@@ -94,7 +94,12 @@ $hover: #FDF5D9;
 @import "common.scss";
 /**
- * This scss file redefine chozen selectbox styles for 
+ * Styles related to displaying commits
+ */
+@import "sections/commits.scss";
+
+/**
+ * This scss file redefine chozen selectbox styles for
  * project Branch/Tag select element
  */
 @import "ref_select.scss";
@@ -0,0 +1,58 @@
+.commit-head {
+  @extend .main_box;
+
+  padding: 14px;
+  padding-bottom: 8px;
+  line-height: 24px;
+
+  .browse-button {
+    @extend .btn;
+    @extend .btn-small;
+    float: right;
+  }
+
+  .commit-title {
+    line-height: 26px;
+  }
+
+  .commit-description {
+    font-size: 14px;
+    padding: 0px;
+    padding-bottom: 4px;
+    border: none;
+    background-color: white;
+  }
+
+  .commit-info {
+    @extend .middle_box_content;
+    @extend .clearfix;
+
+    padding-bottom: 8px;
+    padding-top: 8px;
+
+    margin-left: -14px;
+    margin-right: -14px;
+    margin-bottom: -8px;
+
+    .author .name, .committer .name {
+      font-weight: bold;
+    }
+  }
+
+  .sha-block {
+    float: right;
+    margin-left: 10px
+  }
+
+  &.merge-commit .sha-block {
+    clear: right;
+  }
+
+  .committer {
+    padding-left: 32px;
+  }
+
+  .avatar {
+    margin-right: 4px;
+  }
+}
 \ No newline at end of file
@@ -106,6 +106,41 @@ class Commit
     utf8 author.name
   end
+  # Returns the commits title.
+  #
+  # Usually, the commit title is the first line of the commit message.
+  # In case this first line is longer than 80 characters, it is cut off
+  # after 70 characters and ellipses (`&hellp;`) are appended.
+  #
+  # @todo This might be better placed in a view helper.
+  def title
+    title_end = safe_message.index(/\n/)
+    if (!title_end && safe_message.length > 80) || (title_end && title_end > 80)
+      safe_message[0..69] << "&hellip;".html_safe
+    else
+      safe_message.split(/\n/, 2).first
+    end
+  end
+
+  # Returns the commits description
+  #
+  # cut off, ellipses (`&hellp;`) are prepended to the commit message.
+  #
+  # @todo This might be better placed in a view helper.
+  def description
+    title_end = safe_message.index(/\n/)
+    if (!title_end && safe_message.length > 80) || (title_end && title_end > 80)
+      "&hellip;".html_safe << safe_message[70..-1]
+    else
+      safe_message.split(/\n/, 2)[1].try(:chomp)
+    end
+  end
+
+  # Was this commit committed by a different person than the original author?
+  def different_committer?
+    author_name != committer_name || author_email != committer_email
+  end
+
   def committer_name
     utf8 committer.name
   end
-.main_box
-  .top_box_content
-    .right
-      - unless @notes_count.zero?
-        %span.btn.small.disabled.padded= pluralize @notes_count, 'note'
+.commit-head{class: @commit.parents.count > 1 ? "merge-commit" : ""}
+  = link_to "Browse Code »", tree_project_ref_path(@project, @commit.id), :class => "browse-button"
+  %h3.commit-title
+    = commit_msg_with_link_to_issues(@project, @commit.title)
+  - if @commit.description.present?
+    %pre.commit-description
+      = commit_msg_with_link_to_issues(@project, @commit.description)
+  .commit-info
+    %span.sha-block
+      commit
+      %code= @commit.id
+    %span.sha-block
+      = pluralize(@commit.parents.count, "parent")
+      - @commit.parents.each do |parent|
+        %code= link_to parent.id, project_commit_path(@project, parent)
+    .author
+      = image_tag gravatar_icon(@commit.author_email, 24), :class => "avatar", :height => 24, :width => 24
+      %span.name= @commit.author_name
+      authored
+      %time{title: @commit.authored_date.stamp("Aug 21, 2011 9:23pm")}
+        #{time_ago_in_words(@commit.authored_date)} ago
+    - if @commit.different_committer?
+      .committer
+        %span.name= @commit.committer_name
+        committed
+        %time{title: @commit.committed_date.stamp("Aug 21, 2011 9:23pm")}
+          #{time_ago_in_words(@commit.committed_date)} ago
-      = link_to tree_project_ref_path(@project, @commit.id), :class => "btn small" do 
-        Browse Code »
-    = image_tag gravatar_icon(@commit.author_email), :class => "avatar"
-    %code= @commit.id.to_s
-    %h5
-      = @commit.author_name
-      %small= @commit.created_at.stamp("Aug 21, 2011 9:23pm")
-      - if @commit.author_name != @commit.committer_name or @commit.author_email != @commit.committer_email or @commit.authored_date != @commit.committed_date 
-        &ndash;
-        %cite committed by
-        = @commit.committer_name
-        %small= @commit.committed_date.stamp("Aug 21, 2011 9:23pm")
-
-  .middle_box_content
-    %pre.commit_message
-      = commit_msg_with_link_to_issues(@project, @commit.safe_message)
-%br
 = render "commits/diffs", :diffs => @commit.diffs
 = render "notes/notes", :tid => @commit.id, :tt => "commit"
 = render "notes/per_line_form"
	@@ -0,0 +1,58 @@		@@ -0,0 +1,58 @@
		1	+.commit-head {
		2	+ @extend .main_box;
		3	+
		4	+ padding: 14px;
		5	+ padding-bottom: 8px;
		6	+ line-height: 24px;
		7	+
		8	+ .browse-button {
		9	+ @extend .btn;
		10	+ @extend .btn-small;
		11	+ float: right;
		12	+ }
		13	+
		14	+ .commit-title {
		15	+ line-height: 26px;
		16	+ }
		17	+
		18	+ .commit-description {
		19	+ font-size: 14px;
		20	+ padding: 0px;
		21	+ padding-bottom: 4px;
		22	+ border: none;
		23	+ background-color: white;
		24	+ }
		25	+
		26	+ .commit-info {
		27	+ @extend .middle_box_content;
		28	+ @extend .clearfix;
		29	+
		30	+ padding-bottom: 8px;
		31	+ padding-top: 8px;
		32	+
		33	+ margin-left: -14px;
		34	+ margin-right: -14px;
		35	+ margin-bottom: -8px;
		36	+
		37	+ .author .name, .committer .name {
		38	+ font-weight: bold;
		39	+ }
		40	+ }
		41	+
		42	+ .sha-block {
		43	+ float: right;
		44	+ margin-left: 10px
		45	+ }
		46	+
		47	+ &.merge-commit .sha-block {
		48	+ clear: right;
		49	+ }
		50	+
		51	+ .committer {
		52	+ padding-left: 32px;
		53	+ }
		54	+
		55	+ .avatar {
		56	+ margin-right: 4px;
		57	+ }
		58	+}
0	\ No newline at end of file	59	\ No newline at end of file
	@@ -106,6 +106,41 @@ class Commit		@@ -106,6 +106,41 @@ class Commit
106	utf8 author.name	106	utf8 author.name
107	end	107	end
108		108
		109	+ # Returns the commits title.
		110	+ #
		111	+ # Usually, the commit title is the first line of the commit message.
		112	+ # In case this first line is longer than 80 characters, it is cut off
		113	+ # after 70 characters and ellipses (`&hellp;`) are appended.
		114	+ #
		115	+ # @todo This might be better placed in a view helper.
		116	+ def title
		117	+ title_end = safe_message.index(/\n/)
		118	+ if (!title_end && safe_message.length > 80) \|\| (title_end && title_end > 80)
		119	+ safe_message[0..69] << "…".html_safe
		120	+ else
		121	+ safe_message.split(/\n/, 2).first
		122	+ end
		123	+ end
		124	+
		125	+ # Returns the commits description
		126	+ #
		127	+ # cut off, ellipses (`&hellp;`) are prepended to the commit message.
		128	+ #
		129	+ # @todo This might be better placed in a view helper.
		130	+ def description
		131	+ title_end = safe_message.index(/\n/)
		132	+ if (!title_end && safe_message.length > 80) \|\| (title_end && title_end > 80)
		133	+ "…".html_safe << safe_message[70..-1]
		134	+ else
		135	+ safe_message.split(/\n/, 2)[1].try(:chomp)
		136	+ end
		137	+ end
		138	+
		139	+ # Was this commit committed by a different person than the original author?
		140	+ def different_committer?
		141	+ author_name != committer_name \|\| author_email != committer_email
		142	+ end
		143	+
109	def committer_name	144	def committer_name
110	utf8 committer.name	145	utf8 committer.name
111	end	146	end