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

Merge pull request #4004 from consul/shared-banner

Browse Source 
Move conditional into shared banner partial
This commit is contained in:
Javier Martín
2020-06-18 23:39:32 +02:00
committed by GitHub
parent 3261a0c02f 8e01b11569
commit e7d557a95c
6 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/budgets/index.html.erb
View File

@@ -1,6 +1,4 @@
<% if has_banners? %> <%= render "shared/banner" %>
<%= render "shared/banner" %>
<% end %>
<% provide :title do %><%= t("budgets.index.title") %><% end %> <% provide :title do %><%= t("budgets.index.title") %><% end %>

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

@@ -40,9 +40,7 @@
<div class="row"> <div class="row">
<div id="debates" class="debates-list small-12 medium-9 column"> <div id="debates" class="debates-list small-12 medium-9 column">
<% if has_banners? %>
<%= render "shared/banner" %> <%= render "shared/banner" %>
<% end %>
<% unless @search_terms || !has_featured? %> <% unless @search_terms || !has_featured? %>
<%= render "featured_debates" %> <%= render "featured_debates" %>

4
app/views/pages/help/index.html.erb
View File

@@ -3,9 +3,7 @@
<%= render "shared/canonical", href: help_url %> <%= render "shared/canonical", href: help_url %>
<% end %> <% end %>
<% if has_banners? %> <%= render "shared/banner" %>
<%= render "shared/banner" %>
<% end %>
<div class="jumbo light"> <div class="jumbo light">
<div class="row"> <div class="row">

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

@@ -49,9 +49,7 @@
<div class="row"> <div class="row">
<div id="proposals" class="proposals-list small-12 medium-9 column"> <div id="proposals" class="proposals-list small-12 medium-9 column">
<% if has_banners? %>
<%= render "shared/banner" %> <%= render "shared/banner" %>
<% end %>
<% if show_featured_proposals? %> <% if show_featured_proposals? %>
<div id="featured-proposals" class="row featured-proposals"> <div id="featured-proposals" class="row featured-proposals">

8
app/views/shared/_banner.html.erb
View File

@@ -1,4 +1,6 @@
<% banner ||= @banners.sample %> <% if has_banners? || controller.class == Admin::BannersController %>
<div class="banner" style="background-color:<%= banner.background_color %>;"> <% banner ||= @banners.sample %>
<div class="banner" style="background-color:<%= banner.background_color %>;">
<%= sanitize banner_target_link(banner), attributes: %w[href style] %> <%= sanitize banner_target_link(banner), attributes: %w[href style] %>
</div> </div>
<% end %>

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

@@ -4,9 +4,7 @@
<%= render "shared/canonical", href: root_url %> <%= render "shared/canonical", href: root_url %>
<% end %> <% end %>
<% if has_banners? %> <%= render "shared/banner" %>
<%= render "shared/banner" %>
<% 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",