Commit cde7fd7c30aa62f5f1aa4a3c390c69f10b4b49ba
Exists in
theme-brasil-digital-from-staging
and in
9 other branches
Merge branch 'AI2942-pairwise_plugin' into stable
Showing
1 changed file
with
3 additions
and
3 deletions
Show diff stats
plugins/pairwise/views/content_viewer/_result.html.erb
@@ -19,7 +19,7 @@ | @@ -19,7 +19,7 @@ | ||
19 | 19 | ||
20 | <% cache_timeout("pairwise-result-#{pairwise_content.id}", 1.hours) do %> | 20 | <% cache_timeout("pairwise-result-#{pairwise_content.id}", 1.hours) do %> |
21 | <div class="pairwise_content"> | 21 | <div class="pairwise_content"> |
22 | -<%= pairwise_spinner(pairwise_content) %> | 22 | + <%= pairwise_spinner(pairwise_content) %> |
23 | 23 | ||
24 | <div class="total_votes"> | 24 | <div class="total_votes"> |
25 | <span class="label"><%= _('Total votes:') %></span> | 25 | <span class="label"><%= _('Total votes:') %></span> |
@@ -46,6 +46,8 @@ | @@ -46,6 +46,8 @@ | ||
46 | </tbody> | 46 | </tbody> |
47 | </table> | 47 | </table> |
48 | </div> | 48 | </div> |
49 | + <% end %> | ||
50 | + | ||
49 | <% if @page.allow_edit?(user) %> | 51 | <% if @page.allow_edit?(user) %> |
50 | <div class="embeded_code"> | 52 | <div class="embeded_code"> |
51 | <span class="embeded_code_link"><a href="javascript:;"><%= _("Show/Hide Embeded Code") %></a></span> | 53 | <span class="embeded_code_link"><a href="javascript:;"><%= _("Show/Hide Embeded Code") %></a></span> |
@@ -54,8 +56,6 @@ | @@ -54,8 +56,6 @@ | ||
54 | </div> | 56 | </div> |
55 | </div> | 57 | </div> |
56 | <% end %> | 58 | <% end %> |
57 | - <%#= link_to _('Vote'), @page.url, :class=>"button with-text icon-edit" %> | ||
58 | -<% end %> | ||
59 | <% end %> | 59 | <% end %> |
60 | 60 | ||
61 | </div> | 61 | </div> |