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

Highlight voting notes for issues and merge requests

Browse source
This commit is contained in:
Riyad Preukschas 2012-09-15 11:54:46 +02:00
parent 0546b9c65f
commit b8113334a8
5 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/assets/stylesheets/sections/notes.scss
View file

@ -81,6 +81,19 @@
border-top: 1px solid #eee;
}
/* mark vote notes */
.voting_notes .note {
padding: 8px 0 8px 12px;
&.upvote {
padding-left: 8px;
border-left: 4px solid #468847;
}
&.downvote {
padding-left: 8px;
border-left: 4px solid #B94A48;
}
}
.notes-status {
margin: 18px;
}

8
app/helpers/notes_helper.rb
View file

@ -6,4 +6,12 @@ module NotesHelper
def loading_new_notes?
params[:loading_new].present?
end
def note_vote_class(note)
if note.upvote?
"vote upvote"
elsif note.downvote?
"vote downvote"
end
end
end

2
app/views/issues/show.html.haml
View file

@ -61,4 +61,4 @@
= markdown @issue.description
.issue_notes#notes= render "notes/notes_with_form", tid: @issue.id, tt: "issue"
.issue_notes.voting_notes#notes= render "notes/notes_with_form", tid: @issue.id, tt: "issue"

2
app/views/merge_requests/_show.html.haml
View file

@ -15,7 +15,7 @@
%i.icon-list-alt
Diff
.merge_request_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
.merge_request_notes.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
= render("notes/notes_with_form", tid: @merge_request.id, tt: "merge_request")
.merge-request-diffs
= render "merge_requests/show/diffs" if @diffs

2
app/views/notes/_note.html.haml
View file

@ -1,4 +1,4 @@
%li{id: dom_id(note), class: "note"}
%li{id: dom_id(note), class: "note #{note_vote_class(note)}"}
= image_tag gravatar_icon(note.author.email), class: "avatar s32"
%div.note-author
%strong= note.author_name