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

Extract displaying votes into partials

3-1-stable
Riyad Preukschas 2012-09-10 15:27:14 +02:00
parent f7c70eaaed
commit 0bfcc574b6
6 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/views/issues/_show.html.haml
View File

@ -35,11 +35,4 @@
 
- if issue.votes_count > 0
.votes.votes-inline
.upvotes= issue.upvotes
.progress
- up_percent = 100.0/issue.votes_count*issue.upvotes
- down_percent = 100.0-up_percent
.bar.bar-success{style: "width: #{up_percent}%;"}
.bar.bar-danger{style: "width: #{down_percent}%;"}
.downvotes= issue.downvotes
= render 'votes/votes_inline', votable: issue

9
app/views/issues/show.html.haml
View File

@ -17,14 +17,7 @@
Edit
.right
.span3.votes.votes-block#votes
.progress
- up_percent = 100.0/@issue.votes_count*@issue.upvotes
- down_percent = 100.0-up_percent
.bar.bar-success{style: "width: #{up_percent}%;"}
.bar.bar-danger{style: "width: #{down_percent}%;"}
.upvotes= "#{@issue.upvotes} up"
.downvotes= "#{@issue.downvotes} down"
.span3#votes= render 'votes/votes_block', votable: @issue
.back_link
= link_to project_issues_path(@project) do

10
app/views/merge_requests/_merge_request.html.haml
View File

@ -23,12 +23,6 @@
authored by #{merge_request.author_name}
= time_ago_in_words(merge_request.created_at)
ago
- if merge_request.votes_count > 0
.votes.votes-inline
.upvotes= merge_request.upvotes
.progress
- up_percent = 100.0/merge_request.votes_count*merge_request.upvotes
- down_percent = 100.0-up_percent
.bar.bar-success{style: "width: #{up_percent}%;"}
.bar.bar-danger{style: "width: #{down_percent}%;"}
.downvotes= merge_request.downvotes
= render 'votes/votes_inline', votable: merge_request

9
app/views/merge_requests/show/_mr_title.html.haml
View File

@ -24,14 +24,7 @@
Edit
.right
.span3.votes.votes-block#votes
.progress
- up_percent = 100.0/@merge_request.votes_count*@merge_request.upvotes
- down_percent = 100.0-up_percent
.bar.bar-success{style: "width: #{up_percent}%;"}
.bar.bar-danger{style: "width: #{down_percent}%;"}
.upvotes= "#{@merge_request.upvotes} up"
.downvotes= "#{@merge_request.downvotes} down"
.span3#votes= render 'votes/votes_block', votable: @merge_request
.back_link
= link_to project_merge_requests_path(@project) do

6
app/views/votes/_votes_block.html.haml Normal file
View File

@ -0,0 +1,6 @@
.votes.votes-block
.progress
.bar.bar-success{style: "width: #{votable.upvotes_in_percent}%;"}
.bar.bar-danger{style: "width: #{votable.downvotes_in_percent}%;"}
.upvotes= "#{votable.upvotes} up"
.downvotes= "#{votable.downvotes} down"

6
app/views/votes/_votes_inline.html.haml Normal file
View File

@ -0,0 +1,6 @@
.votes.votes-inline
.upvotes= votable.upvotes
.progress
.bar.bar-success{style: "width: #{votable.upvotes_in_percent}%;"}
.bar.bar-danger{style: "width: #{votable.downvotes_in_percent}%;"}
.downvotes= votable.downvotes