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

Expands cards if feed processes is not enabled

Browse Source
This commit is contained in:
decabeza
2018-05-28 18:52:59 +02:00
parent 7732a6704c
commit 316c816836
6 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/stylesheets/layout.scss
View File

@@ -2644,7 +2644,10 @@ table {
} }
.feed-description { .feed-description {
padding-top: $line-height;
@include breakpoint(medium) {
padding-top: $line-height;
}
p { p {
font-size: $small-font-size; font-size: $small-font-size;
@@ -2669,6 +2672,11 @@ table {
margin: 0 0 $line-height; margin: 0 0 $line-height;
position: relative; position: relative;
@include breakpoint(medium) {
max-height: rem-calc(185);
overflow: hidden;
}
a { a {
h3, h3,

4
app/helpers/feeds_helper.rb
View File

@@ -12,4 +12,8 @@ module FeedsHelper
feed.kind == "processes" feed.kind == "processes"
end end
def feed_processes_enabled?
Setting['feature.homepage.widgets.feeds.processes'].present?
end
end end

2
app/views/welcome/_card.html.erb
View File

@@ -1,4 +1,4 @@
<div id="<%= dom_id(card) %>" class="card small-12 medium-6 column margin-bottom end"> <div id="<%= dom_id(card) %>" class="card small-12 medium-6 column margin-bottom end <%= 'large-4' unless feed_processes_enabled? %>">
<%= link_to card.link_url do %> <%= link_to card.link_url do %>
<figure class="figure-card"> <figure class="figure-card">
<% if card.image.present? %> <% if card.image.present? %>

16
app/views/welcome/_feeds.html.erb
View File

@@ -7,14 +7,16 @@
<h3 class="title"><%= t("welcome.feed.most_active.#{feed.kind}") %></h3> <h3 class="title"><%= t("welcome.feed.most_active.#{feed.kind}") %></h3>
<% feed.items.each do |item| %> <% feed.items.each do |item| %>
<div class="<%= item.class.to_s.parameterize('_') %>"> <div class="<%= item.class.to_s.parameterize('_') %> row">
<div class="feed-image small-12 medium-2 column"> <div class="small-12 large-3 column">
<% if feature?(:allow_images) && item.image.present? %> <div class="feed-image">
<%= image_tag item.image_url(:thumb), <% if feature?(:allow_images) && item.image.present? %>
alt: item.image.title.unicode_normalize %> <%= image_tag item.image_url(:thumb),
<% end %> alt: item.image.title.unicode_normalize %>
<% end %>
</div>
</div> </div>
<div class="feed-description small-12 medium-10 column"> <div class="feed-description small-12 large-9 column">
<strong><%= link_to item.title, url_for(item) %></strong><br> <strong><%= link_to item.title, url_for(item) %></strong><br>
<p><%= item.summary %></p> <p><%= item.summary %></p>
</div> </div>

2
app/views/welcome/index.html.erb
View File

@@ -16,7 +16,7 @@
<div class="row"> <div class="row">
<div class="small-12 medium-8 column"> <div class="small-12 column <%= 'medium-8' if feed_processes_enabled? %>">
<%= render "cards" %> <%= render "cards" %>
</div> </div>

2
spec/features/admin/homepage/homepage_spec.rb
View File

@@ -67,7 +67,7 @@ feature 'Homepage' do
visit root_path visit root_path
expect(page).to have_content "Most active processes" expect(page).to have_content "Open processes"
expect(page).to have_css(".legislation_process", count: 3) expect(page).to have_css(".legislation_process", count: 3)
end end