Download as
Browse Code »

Commit 0bfcc574b660108646bd2c99a611163a0c847251

Authored by Riyad Preukschas
1 parent f7c70eaa
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Extract displaying votes into partials

Showing 6 changed files with 17 additions and 32 deletions   Show diff stats
app/views/issues/_show.html.haml
  Diff comments   View file @0bfcc57
... ... @@ -35,11 +35,4 @@
35 35  
36 36  
37 37 - if issue.votes_count > 0
38   - .votes.votes-inline
39   - .upvotes= issue.upvotes
40   - .progress
41   - - up_percent = 100.0/issue.votes_count*issue.upvotes
42   - - down_percent = 100.0-up_percent
43   - .bar.bar-success{style: "width: #{up_percent}%;"}
44   - .bar.bar-danger{style: "width: #{down_percent}%;"}
45   - .downvotes= issue.downvotes
  38 + = render 'votes/votes_inline', votable: issue
... ...
app/views/issues/show.html.haml
  Diff comments   View file @0bfcc57
... ... @@ -17,14 +17,7 @@
17 17 Edit
18 18  
19 19 .right
20   - .span3.votes.votes-block#votes
21   - .progress
22   - - up_percent = 100.0/@issue.votes_count*@issue.upvotes
23   - - down_percent = 100.0-up_percent
24   - .bar.bar-success{style: "width: #{up_percent}%;"}
25   - .bar.bar-danger{style: "width: #{down_percent}%;"}
26   - .upvotes= "#{@issue.upvotes} up"
27   - .downvotes= "#{@issue.downvotes} down"
  20 + .span3#votes= render 'votes/votes_block', votable: @issue
28 21  
29 22 .back_link
30 23 = link_to project_issues_path(@project) do
... ...
app/views/merge_requests/_merge_request.html.haml
  Diff comments   View file @0bfcc57
... ... @@ -23,12 +23,6 @@
23 23 authored by #{merge_request.author_name}
24 24 = time_ago_in_words(merge_request.created_at)
25 25 ago
  26 +
26 27 - if merge_request.votes_count > 0
27   - .votes.votes-inline
28   - .upvotes= merge_request.upvotes
29   - .progress
30   - - up_percent = 100.0/merge_request.votes_count*merge_request.upvotes
31   - - down_percent = 100.0-up_percent
32   - .bar.bar-success{style: "width: #{up_percent}%;"}
33   - .bar.bar-danger{style: "width: #{down_percent}%;"}
34   - .downvotes= merge_request.downvotes
  28 + = render 'votes/votes_inline', votable: merge_request
... ...
app/views/merge_requests/show/_mr_title.html.haml
  Diff comments   View file @0bfcc57
... ... @@ -24,14 +24,7 @@
24 24 Edit
25 25  
26 26 .right
27   - .span3.votes.votes-block#votes
28   - .progress
29   - - up_percent = 100.0/@merge_request.votes_count*@merge_request.upvotes
30   - - down_percent = 100.0-up_percent
31   - .bar.bar-success{style: "width: #{up_percent}%;"}
32   - .bar.bar-danger{style: "width: #{down_percent}%;"}
33   - .upvotes= "#{@merge_request.upvotes} up"
34   - .downvotes= "#{@merge_request.downvotes} down"
  27 + .span3#votes= render 'votes/votes_block', votable: @merge_request
35 28  
36 29 .back_link
37 30 = link_to project_merge_requests_path(@project) do
... ...
app/views/votes/_votes_block.html.haml 0 → 100644
  Diff comments   View file @0bfcc57
... ... @@ -0,0 +1,6 @@
  1 +.votes.votes-block
  2 + .progress
  3 + .bar.bar-success{style: "width: #{votable.upvotes_in_percent}%;"}
  4 + .bar.bar-danger{style: "width: #{votable.downvotes_in_percent}%;"}
  5 + .upvotes= "#{votable.upvotes} up"
  6 + .downvotes= "#{votable.downvotes} down"
... ...
app/views/votes/_votes_inline.html.haml 0 → 100644
  Diff comments   View file @0bfcc57
... ... @@ -0,0 +1,6 @@
  1 +.votes.votes-inline
  2 + .upvotes= votable.upvotes
  3 + .progress
  4 + .bar.bar-success{style: "width: #{votable.upvotes_in_percent}%;"}
  5 + .bar.bar-danger{style: "width: #{votable.downvotes_in_percent}%;"}
  6 + .downvotes= votable.downvotes
... ...