Merge branch 'archived-proposals' of github.com:consul/consul into archived-proposals

2016-09-12 17:59:51 +02:00
parent aa05b0259e d5af06da5d
commit fa8458576c
2 changed files with 4 additions and 0 deletions
--- a/app/views/proposals/_proposal.html.erb
+++ b/app/views/proposals/_proposal.html.erb
@@ -53,6 +53,7 @@
      <div id="<%= dom_id(proposal) %>_votes" class="small-12 medium-3 column">
        <% if proposal.archived? %>
          <div class="message">
+            <strong><%= t("proposals.proposal.supports", count: proposal.total_votes) %></strong>
            <p><%= t("proposals.proposal.archived") %></p>
          </div>
        <% else %>
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -103,6 +103,9 @@
        <div class="sidebar-divider"></div>
        <h3><%= t("votes.supports") %></h3>
        <% if @proposal.archived? %>
+          <p class="text-center">
+            <strong><%= t("proposals.proposal.supports", count: @proposal.total_votes) %></strong>
+          </p>
          <p><%= t("proposals.proposal.archived") %></p>
        <% else %>
          <div class="text-center">