makes sure setting helper is used in views

This commit is contained in:
Juanjo Bazán
2016-07-08 14:42:28 +02:00
parent 37fc96f884
commit 7f01dbdca2
7 changed files with 11 additions and 11 deletions

View File

@@ -1,4 +1,4 @@
<%= link_to t("admin.dashboard.index.back") + " " + Setting['org_name'], root_path, class: "button float-right" %>
<%= link_to t("admin.dashboard.index.back") + " " + setting['org_name'], root_path, class: "button float-right" %>
<h2 class="inline-block"><%= t("admin.dashboard.index.title") %></h2>

View File

@@ -8,7 +8,7 @@
<div class="expanded row">
<div class="top-bar">
<%= link_to Setting['org_name'], admin_root_path, class: "logo show-for-small-only" %>
<%= link_to setting['org_name'], admin_root_path, class: "logo show-for-small-only" %>
<span data-responsive-toggle="responsive-menu" data-hide-for="medium" class="float-right">
<span class="menu-icon dark" data-toggle></span>
@@ -19,7 +19,7 @@
<div class="top-bar-title">
<%= link_to admin_root_path, class: "hide-for-small-only" do %>
<%= image_tag('logo_header.png', class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
<%= Setting['org_name'] %>
<%= setting['org_name'] %>
&nbsp;|&nbsp;<%= t("admin.dashboard.index.title") %>
<% end %>
</div>

View File

@@ -5,7 +5,7 @@
<div class="row">
<div class="top-bar">
<%= link_to Setting['org_name'], root_path, class: "logo show-for-small-only" %>
<%= link_to setting['org_name'], root_path, class: "logo show-for-small-only" %>
<span data-responsive-toggle="responsive-menu" data-hide-for="medium" class="float-right">
<span class="menu-icon dark" data-toggle></span>

View File

@@ -25,7 +25,7 @@
<div class="expanded row">
<div class="top-bar">
<%= link_to Setting['org_name'], management_root_path, class: "logo show-for-small-only" %>
<%= link_to setting['org_name'], management_root_path, class: "logo show-for-small-only" %>
<span data-responsive-toggle="responsive-menu" data-hide-for="medium" class="float-right">
<span class="menu-icon dark" data-toggle></span>
@@ -36,7 +36,7 @@
<div class="top-bar-title">
<%= link_to management_root_path, class: "hide-for-small-only" do %>
<%= image_tag('logo_header.png', class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
<%= Setting['org_name'] %>
<%= setting['org_name'] %>
&nbsp;|&nbsp;<%= t("management.dashboard.index.title") %>
<% end %>
</div>

View File

@@ -1,4 +1,4 @@
<%= link_to t("admin.dashboard.index.back") + " " + Setting['org_name'], root_path, class: "button float-right" %>
<%= link_to t("admin.dashboard.index.back") + " " + setting['org_name'], root_path, class: "button float-right" %>
<h2 class="inline-block"><%= t("moderation.dashboard.index.title") %></h2>

View File

@@ -2,12 +2,12 @@
<div class="row">
<%= render "shared/locale_switcher" %>
<div class="external-links">
<%= link_to Setting['org_name'], root_path, class: ("selected" unless current_page?("/opendata")) %>&nbsp;|
<%= link_to setting['org_name'], root_path, class: ("selected" unless current_page?("/opendata")) %>&nbsp;|
<%= link_to t("layouts.header.external_link_transparency"), t("layouts.header.external_link_transparency_url") %>&nbsp;|
<%= link_to t("layouts.header.external_link_opendata"), "/opendata", class: ("selected" if current_page?("/opendata")) %>
<% if Setting['blog_url'] %>
<% if setting['blog_url'] %>
&nbsp;|
<%= link_to Setting['blog_url'], title: t('shared.target_blank_html'), target: "_blank" do %>
<%= link_to setting['blog_url'], title: t('shared.target_blank_html'), target: "_blank" do %>
<%= t("layouts.header.external_link_blog") %>
<% end %>
<% end %>

View File

@@ -1,7 +1,7 @@
<h2><%= t("welcome.verification.title") %></h2>
<div class="text-center margin-top">
<h3><%= t("welcome.verification.question", org_name: Setting["org_name"]) %></h3>
<h3><%= t("welcome.verification.question", org_name: setting["org_name"]) %></h3>
<br>
<div class="row">
<div class="small-12 medium-6 column">