From 316c81683670c8acfce43ea79ac27d706030f08e Mon Sep 17 00:00:00 2001 From: decabeza Date: Mon, 28 May 2018 18:52:59 +0200 Subject: [PATCH] Expands cards if feed processes is not enabled --- app/assets/stylesheets/layout.scss | 10 +++++++++- app/helpers/feeds_helper.rb | 4 ++++ app/views/welcome/_card.html.erb | 2 +- app/views/welcome/_feeds.html.erb | 16 +++++++++------- app/views/welcome/index.html.erb | 2 +- spec/features/admin/homepage/homepage_spec.rb | 2 +- 6 files changed, 25 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 5ad5e963c..1ada8d1d8 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -2644,7 +2644,10 @@ table { } .feed-description { - padding-top: $line-height; + + @include breakpoint(medium) { + padding-top: $line-height; + } p { font-size: $small-font-size; @@ -2669,6 +2672,11 @@ table { margin: 0 0 $line-height; position: relative; + @include breakpoint(medium) { + max-height: rem-calc(185); + overflow: hidden; + } + a { h3, diff --git a/app/helpers/feeds_helper.rb b/app/helpers/feeds_helper.rb index b83efb70a..3a5ee8f3d 100644 --- a/app/helpers/feeds_helper.rb +++ b/app/helpers/feeds_helper.rb @@ -12,4 +12,8 @@ module FeedsHelper feed.kind == "processes" end + def feed_processes_enabled? + Setting['feature.homepage.widgets.feeds.processes'].present? + end + end diff --git a/app/views/welcome/_card.html.erb b/app/views/welcome/_card.html.erb index dec54b193..365575da4 100644 --- a/app/views/welcome/_card.html.erb +++ b/app/views/welcome/_card.html.erb @@ -1,4 +1,4 @@ -
+
<%= link_to card.link_url do %>
<% if card.image.present? %> diff --git a/app/views/welcome/_feeds.html.erb b/app/views/welcome/_feeds.html.erb index 8a0804705..a71a7dbb1 100644 --- a/app/views/welcome/_feeds.html.erb +++ b/app/views/welcome/_feeds.html.erb @@ -7,14 +7,16 @@

<%= t("welcome.feed.most_active.#{feed.kind}") %>

<% feed.items.each do |item| %> -
-
- <% if feature?(:allow_images) && item.image.present? %> - <%= image_tag item.image_url(:thumb), - alt: item.image.title.unicode_normalize %> - <% end %> +
+
+
+ <% if feature?(:allow_images) && item.image.present? %> + <%= image_tag item.image_url(:thumb), + alt: item.image.title.unicode_normalize %> + <% end %> +
-
+
<%= link_to item.title, url_for(item) %>

<%= item.summary %>

diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index ab4148712..4796a6d47 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -16,7 +16,7 @@
-
+
<%= render "cards" %>
diff --git a/spec/features/admin/homepage/homepage_spec.rb b/spec/features/admin/homepage/homepage_spec.rb index 089b7fd5f..efb5f4a4f 100644 --- a/spec/features/admin/homepage/homepage_spec.rb +++ b/spec/features/admin/homepage/homepage_spec.rb @@ -67,7 +67,7 @@ feature 'Homepage' do 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) end