apply missing requeriments in PR #3043
In this PR https://github.com/consul/consul/pull/3043 there were some change requests. In order to keep moving we decided to merge the PR and do the changes ourselves.
This commit is contained in:
@@ -54,5 +54,5 @@
|
|||||||
<% else %>
|
<% else %>
|
||||||
<div class="callout primary">
|
<div class="callout primary">
|
||||||
<%= t("admin.site_customization.content_blocks.no_blocks") %>
|
<%= t("admin.site_customization.content_blocks.no_blocks") %>
|
||||||
</div-->
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
<% if @heading.allow_custom_content %>
|
<% if @heading.allow_custom_content %>
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
<ul id="content_block" class="no-bullet categories">
|
<ul id="content_block" class="no-bullet categories">
|
||||||
<% @heading_content_blocks.each do |content_block| %>
|
<% @heading_content_blocks.each do |content_block| %>
|
||||||
<%= raw content_block.body %>
|
<%= raw content_block.body %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</ul>
|
</ul>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -28,7 +28,6 @@
|
|||||||
<%= render "shared/tag_cloud", taggable: 'budget/investment' %>
|
<%= render "shared/tag_cloud", taggable: 'budget/investment' %>
|
||||||
<%= render 'budgets/investments/categories' %>
|
<%= render 'budgets/investments/categories' %>
|
||||||
|
|
||||||
|
|
||||||
<% if @heading && can?(:show, @ballot) %>
|
<% if @heading && can?(:show, @ballot) %>
|
||||||
|
|
||||||
<div class="sidebar-divider"></div>
|
<div class="sidebar-divider"></div>
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
en:
|
en:
|
||||||
true_value: 'Yes'
|
|
||||||
false_value: 'No'
|
|
||||||
admin:
|
admin:
|
||||||
header:
|
header:
|
||||||
title: Administration
|
title: Administration
|
||||||
@@ -1088,6 +1086,8 @@ en:
|
|||||||
setting_value: Value
|
setting_value: Value
|
||||||
no_description: "No description"
|
no_description: "No description"
|
||||||
shared:
|
shared:
|
||||||
|
true_value: "Yes"
|
||||||
|
false_value: "No"
|
||||||
booths_search:
|
booths_search:
|
||||||
button: Search
|
button: Search
|
||||||
placeholder: Search booth by name
|
placeholder: Search booth by name
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
es:
|
es:
|
||||||
true_value: 'Si'
|
|
||||||
false_value: 'No'
|
|
||||||
admin:
|
admin:
|
||||||
header:
|
header:
|
||||||
title: Administración
|
title: Administración
|
||||||
@@ -1084,6 +1082,8 @@ es:
|
|||||||
setting_value: Valor
|
setting_value: Valor
|
||||||
no_description: "Sin descripción"
|
no_description: "Sin descripción"
|
||||||
shared:
|
shared:
|
||||||
|
true_value: "Sí"
|
||||||
|
false_value: "No"
|
||||||
booths_search:
|
booths_search:
|
||||||
button: Buscar
|
button: Buscar
|
||||||
placeholder: Buscar urna por nombre
|
placeholder: Buscar urna por nombre
|
||||||
|
|||||||
Reference in New Issue
Block a user