deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update views to use CommitDecorator

Browse source
This commit is contained in:
Riyad Preukschas 2012-07-22 13:08:24 +02:00
parent ff40b7de7a
commit 34cea1cb63
11 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/commits/_commit.html.haml
View file

@ -4,11 +4,11 @@
%strong= link_to "Browse Code »", tree_project_ref_path(@project, commit.id), :class => "right"
= link_to project_commit_path(@project, :id => commit.id) do
%p
%code.left= commit.id.to_s[0..10]
%code.left= commit.short_id
%strong.cgray= commit.author_name
–
= image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
%span.row_title= truncate(commit.safe_message, :length => 50)
%span.row_title= truncate(commit.title, :length => 50)
%span.committed_ago
= time_ago_in_words(commit.committed_date)

4
app/views/commits/index.atom.builder
View file

@ -10,14 +10,14 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
xml.entry do
xml.id project_commit_url(@project, :id => commit.id)
xml.link :href => project_commit_url(@project, :id => commit.id)
xml.title truncate(commit.safe_message, :length => 80)
xml.title truncate(commit.title, :length => 80)
xml.updated commit.committed_date.strftime("%Y-%m-%dT%H:%M:%SZ")
xml.media :thumbnail, :width => "40", :height => "40", :url => gravatar_icon(commit.author_email)
xml.author do |author|
xml.name commit.author_name
xml.email commit.author_email
end
xml.summary commit.safe_message
xml.summary commit.description
end
end
end

5
app/views/events/_commit.html.haml
View file

@ -1,9 +1,10 @@
- commit = CommitDecorator.decorate(commit)
%li.wll.commit
= link_to project_commit_path(project, :id => commit.id) do
%p
%code.left= commit.id.to_s[0..10]
%code.left= commit.short_id
%strong.cgray= commit.author_name
–
= image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
%span.row_title= truncate(commit.safe_message, :length => 50) rescue "--broken encoding"
%span.row_title= truncate(commit.title, :length => 50) rescue "--broken encoding"

2
app/views/refs/_tree_commit.html.haml
View file

@ -1,3 +1,3 @@
- if tm
%strong= link_to "[#{tm.user_name}]", project_team_member_path(@project, tm)
= link_to truncate(content_commit.safe_message, :length => tm ? 30 : 50), project_commit_path(@project, content_commit.id), :class => "tree-commit-link"
= link_to truncate(content_commit.title, :length => tm ? 30 : 50), project_commit_path(@project, content_commit.id), :class => "tree-commit-link"

5
app/views/refs/blame.html.haml
View file

@ -25,6 +25,7 @@
%table
- @blame.each do |commit, lines|
- commit = Commit.new(commit)
- commit = CommitDecorator.decorate(commit)
%tr
%td.author
= image_tag gravatar_icon(commit.author_email, 16)
@ -32,8 +33,8 @@
%td.blame_commit
 
= link_to project_commit_path(@project, :id => commit.id) do
%code= commit.id.to_s[0..10]
%span.row_title= truncate(commit.safe_message, :length => 30) rescue "--broken encoding"
%code= commit.short_id
%span.row_title= truncate(commit.title, :length => 30) rescue "--broken encoding"
%td.lines
= preserve do
%pre

12
app/views/repositories/_branch.html.haml
View file

@ -1,3 +1,5 @@
- commit = Commit.new(branch.commit)
- commit = CommitDecorator.decorate(commit)
%tr
%td
= link_to project_commits_path(@project, :ref => branch.name) do
@ -5,14 +7,14 @@
- if branch.name == @project.root_ref
%span.label default
%td
= link_to project_commit_path(@project, :id => branch.commit.id) do
%code= branch.commit.id.to_s[0..10]
= link_to project_commit_path(@project, :id => commit.id) do
%code= commit.short_id
= image_tag gravatar_icon(Commit.new(branch.commit).author_email), :class => "", :width => 16
= truncate(Commit.new(branch.commit).safe_message, :length => 40)
= image_tag gravatar_icon(commit.author_email), :class => "", :width => 16
= truncate(commit.title, :length => 40)
%td
%span.update-author.right
= time_ago_in_words(branch.commit.committed_date)
= time_ago_in_words(commit.committed_date)
ago
%td
- if can? current_user, :download_code, @project

5
app/views/repositories/_feed.html.haml
View file

@ -1,4 +1,5 @@
- commit = update
- commit = CommitDecorator.new(commit)
%tr
%td
= link_to project_commits_path(@project, :ref => commit.head.name) do
@ -10,9 +11,9 @@
%td
%div
= link_to project_commits_path(@project, commit.id) do
%code= commit.id.to_s[0..10]
%code= commit.short_id
= image_tag gravatar_icon(commit.author_email), :class => "", :width => 16
= truncate(commit.safe_message, :length => 40)
= truncate(commit.title, :length => 40)
%td
%span.right.cgray
= time_ago_in_words(commit.committed_date)

5
app/views/repositories/tags.html.haml
View file

@ -9,14 +9,15 @@
%th
- @tags.each do |tag|
- commit = Commit.new(tag.commit)
- commit = CommitDecorator.decorate(commit)
%tr
%td
%strong= link_to tag.name, project_commits_path(@project, :ref => tag.name), :class => ""
%td
= link_to project_commit_path(@project, commit.id) do
%code= commit.id.to_s[0..10]
%code= commit.short_id
= image_tag gravatar_icon(commit.author_email), :class => "", :width => 16
= truncate(commit.safe_message, :length => 40)
= truncate(commit.title, :length => 40)
%td
%span.update-author.right
= time_ago_in_words(commit.committed_date)