consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3577 from consul/proposal-show

Browse Source 
Extract partial with mobile sticky content
This commit is contained in:
Alberto
2019-06-05 09:51:45 +02:00
committed by GitHub
parent 90c1d681d0 19867836f8
commit a6f8969728
2 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/views/proposals/_support_status.html.erb Normal file
View File

@@ -0,0 +1,43 @@
<% if proposal.selected? %>
<div class="callout success">
<strong><%= t("proposals.proposal.selected") %></strong>
</div>
<% else %>
<div id="proposal_sticky" data-sticky-container>
<div class="sticky fixed-mobile-content"
data-sticky
data-stick-to="bottom"
data-sticky-on="small"
data-top-anchor="0"
data-btm-anchor="sticky_stop"
data-check-every="0">
<div class="fixed-mobile-content">
<div class="sidebar-divider"></div>
<h2><%= t("votes.supports") %></h2>
<div id="<%= dom_id(proposal) %>_votes">
<% if proposal.draft? %>
<div class="callout primary">
<p class="text-center small"><strong><%= t("proposals.show.draft") %></strong></p>
</div>
<% elsif proposal.successful? %>
<div class="supports text-center">
<%= render "supports", proposal: proposal %>
</div>
<% elsif proposal.archived? %>
<div class="padding text-center">
<p>
<strong><%= t("proposals.proposal.supports", count: proposal.total_votes) %></strong>
</p>
<p><%= t("proposals.proposal.archived") %></p>
</div>
<% else %>
<%= render "votes", { proposal: proposal, vote_url: vote_proposal_path(proposal, value: "yes") } %>
<% end %>
</div>
</div>
</div>
</div>
<div id="sticky_stop"></div>
<% end %>

57
app/views/proposals/show.html.erb
View File

@@ -2,12 +2,12 @@
<% provide :title do %><%= @proposal.title %><% end %> <% provide :title do %><%= @proposal.title %><% end %>
<% content_for :meta_description do %><%= @proposal.summary %><% end %> <% content_for :meta_description do %><%= @proposal.summary %><% end %>
<% provide :social_media_meta_tags do %> <% provide :social_media_meta_tags do %>
<%= render "shared/social_media_meta_tags", <%= render "shared/social_media_meta_tags",
social_url: proposal_url(@proposal), social_url: proposal_url(@proposal),
social_title: @proposal.title, social_title: @proposal.title,
social_description: @proposal.summary, social_description: @proposal.summary,
twitter_image_url: (@proposal.image.present? ? @proposal.image_url(:thumb) : nil), twitter_image_url: (@proposal.image.present? ? @proposal.image_url(:thumb) : nil),
og_image_url: (@proposal.image.present? ? @proposal.image_url(:thumb) : nil) %> og_image_url: (@proposal.image.present? ? @proposal.image_url(:thumb) : nil) %>
<% end %> <% end %>
<% content_for :canonical do %> <% content_for :canonical do %>
<%= render "shared/canonical", href: proposal_url(@proposal) %> <%= render "shared/canonical", href: proposal_url(@proposal) %>
@@ -62,50 +62,7 @@
</div> </div>
<% end %> <% end %>
<% if @proposal.selected? %> <%= render "proposals/support_status", proposal: @proposal %>
<div class="callout success">
<strong><%= t("proposals.proposal.selected") %></strong>
</div>
<% else %>
<div id="proposal_sticky" data-sticky-container>
<div class="sticky fixed-mobile-content"
data-sticky
data-stick-to="bottom"
data-sticky-on="small"
data-top-anchor="0"
data-btm-anchor="sticky_stop"
data-check-every="0">
<div class="fixed-mobile-content">
<div class="sidebar-divider"></div>
<h2><%= t("votes.supports") %></h2>
<div id="<%= dom_id(@proposal) %>_votes">
<% if @proposal.draft? %>
<div class="callout primary">
<p class=text-center><strong><%= t(".draft") %></strong></p>
</div>
<% elsif @proposal.successful? %>
<div class="supports text-center">
<%= render "supports", proposal: @proposal %>
</div>
<% elsif @proposal.archived? %>
<div class="padding text-center">
<p>
<strong><%= t("proposals.proposal.supports", count: @proposal.total_votes) %></strong>
</p>
<p><%= t("proposals.proposal.archived") %></p>
</div>
<% else %>
<%= render "votes",
{ proposal: @proposal, vote_url: vote_proposal_path(@proposal, value: "yes") } %>
<% end %>
</div>
</div>
</div>
</div>
<div id="sticky_stop"></div>
<% end %>
<%= render "proposals/social_share", proposal: @proposal, share_title: t("proposals.show.share") %> <%= render "proposals/social_share", proposal: @proposal, share_title: t("proposals.show.share") %>