Commit 02cf241ab283410162f479ebccd686c60ef6bdc6

Date: Tue Apr 29 18:43:53 +0000 2008
Committer: Johan Sørensen (johan@johansorensen.com)
Author: Johan Sørensen (johan@johansorensen.com)
Commit SHA1: 02cf241ab283410162f479ebccd686c60ef6bdc6
Tree SHA1: 89bab4141efe181795bd2d6af2cdb26798e5ab70

Fixed event display of commit message. TODO updated

Commit diff
Comments (0)

public/stylesheets/base.css 3 +++
app/views/events/_event.html.erb 4 -+++
TODO.txt 4 ++++
app/helpers/application_helper.rb 2 -+

Commit diff

Diff rendering mode:
inline
side by side

TODO.txt


1	1	new-ui:
	2	* mandatory project descriptions, at least a sentence or two
	3	* tweak fonts-sizes and line-heights
2	4	* Clone stats graph on repositories#index
3	5	* divergence from mainline in +/-
4	6	* popular & active projects on frontpage
5	7	* make the top-header smaller (move gitorious logo to footer?)
6	8
	9	* commits_by_author graph should use gitorious.org username (if found)
	10
7	11	(in no particular order)
8	12
9	13	two from Yurii:
toggle raw diff
--- a/TODO.txt +++ b/TODO.txt @@ -1,9 +1,13 @@ new-ui: +* mandatory project descriptions, at least a sentence or two +* tweak fonts-sizes and line-heights * Clone stats graph on repositories#index * divergence from mainline in +/- * popular & active projects on frontpage * make the top-header smaller (move gitorious logo to footer?) +* commits_by_author graph should use gitorious.org username (if found) + (in no particular order) two from Yurii:

app/helpers/application_helper.rb


146	146	when Action::COMMIT
147	147	project = target.project
148	148	action = "<strong>committed</strong> #{link_to event.data[0,8], project_repository_commit_path(project, target, event.data)} to #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
149		~~body = "<code>#{truncate(event.body, 150)}</code>"~~
	149	body = truncate(event.body, 150)
150	150	category = "commit"
151	151	when Action::CREATE_BRANCH
152	152	project = target.project
toggle raw diff
--- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -146,7 +146,7 @@ module ApplicationHelper when Action::COMMIT project = target.project action = "<strong>committed</strong> #{link_to event.data[0,8], project_repository_commit_path(project, target, event.data)} to #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}" - body = "<code>#{truncate(event.body, 150)}</code>" + body = truncate(event.body, 150) category = "commit" when Action::CREATE_BRANCH project = target.project

app/views/events/_event.html.erb


10	10	<%= action %>
11	11	<% end %>
12	12	</p>
13		~~<p><%= simple_format(sanitize(body)) %></p>~~
	13	<div class="<%= event.action == Action::COMMIT ? "commit_message" : "" -%>">
	14	<%= simple_format(sanitize(body)) %>
	15	</div>
14	16	</div>
15	17	</li>
toggle raw diff
--- a/app/views/events/_event.html.erb +++ b/app/views/events/_event.html.erb @@ -10,6 +10,8 @@ <%= action %> <% end %> </p> - <p><%= simple_format(sanitize(body)) %></p> + <div class="<%= event.action == Action::COMMIT ? "commit_message" : "" -%>"> + <%= simple_format(sanitize(body)) %> + </div> </div> </li> \ No newline at end of file

public/stylesheets/base.css


548	548	margin-left: 10px;
549	549	font: 95%/105% "Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace;
550	550	}
	551	.event_instance .commit_message, .event_instance .commit_message p {
	552	margin: 2px 0 0 0;
	553	}
551	554
552	555	.commit_list .commit_item .commit_message {
553	556	margin-left: 40px;
toggle raw diff
--- a/public/stylesheets/base.css +++ b/public/stylesheets/base.css @@ -548,6 +548,9 @@ table.listing thead th { margin-left: 10px; font: 95%/105% "Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace; } +.event_instance .commit_message, .event_instance .commit_message p { + margin: 2px 0 0 0; +} .commit_list .commit_item .commit_message { margin-left: 40px;