decidim-proposals/app/views/decidim/proposals/proposals/show.html.erb in decidim-0.0.1 vs decidim-proposals/app/views/decidim/proposals/proposals/show.html.erb in decidim-0.0.2

- old
+ new

@@ -1,5 +1,10 @@ +<% content_for :meta_description, @proposal.body %> +<% content_for :meta_title, @proposal.title %> +<% content_for :meta_url, proposal_url(@proposal.id) %> +<% content_for :twitter_handler, current_organization.twitter_handler %> + <div class="row column view-header"> <h2 class="heading2"><%= @proposal.title %></h2> <div class="author-data"> <div class="author-data__main"> <div class="author author--inline"> @@ -14,24 +19,46 @@ </div> </div> </div> <div class="row"> <div class="columns section view-side mediumlarge-4 mediumlarge-push-8 large-3 large-push-9"> + <% if current_settings.votes_enabled? %> + <div class="card extra"> + <div class="card__content"> + <div id="proposal-<%= @proposal.id %>-votes-count"> + <%= render partial: "votes_count", locals: { proposal: @proposal, from_proposals_list: false } %> + </div> + <div id="proposal-<%= @proposal.id %>-vote-button"> + <%= render partial: "vote_button", locals: { proposal: @proposal, from_proposals_list: false } %> + </div> + </div> + </div> + <% end %> + <%= render partial: "share", locals: { proposal: @proposal } %> </div> <div class="columns mediumlarge-8 mediumlarge-pull-4"> <div class="section"> <p><%= @proposal.body %></p> - <% if @proposal.category %> + <% if @proposal.category || @proposal.scope %> <ul class="tags tags--proposal"> - <li><a href=""><%= translated_attribute(@proposal.category.name) %></a></li> + <% if @proposal.category %> + <li><a href=""><%= translated_attribute(@proposal.category.name) %></a></li> + <% end %> + <% if @proposal.scope %> + <li><a href=""><%= @proposal.scope.name %></a></li> + <% end %> </ul> <% end %> </div> </div> </div> - <%= content_for :expanded do %> <% if @proposal.commentable? %> - <%= comments_for @proposal, arguable: true %> + <%= comments_for @proposal, arguable: true, votable: true %> <% end %> <% end %> + +<%= render partial: "decidim/shared/login_modal" %> + +<%= javascript_include_tag "decidim/proposals/social_share" %> +<%= stylesheet_link_tag "decidim/proposals/social_share" %>