From 7f01dbdca239a9969f8ce09c4d2197b9d9ec87e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Fri, 8 Jul 2016 14:42:28 +0200
Subject: [PATCH] makes sure setting helper is used in views

---
 app/views/admin/dashboard/index.html.erb      | 2 +-
 app/views/layouts/_admin_header.html.erb      | 4 ++--
 app/views/layouts/_header.html.erb            | 2 +-
 app/views/layouts/management.html.erb         | 4 ++--
 app/views/moderation/dashboard/index.html.erb | 2 +-
 app/views/shared/_top_links.html.erb          | 6 +++---
 app/views/welcome/verification.html.erb       | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/views/admin/dashboard/index.html.erb b/app/views/admin/dashboard/index.html.erb
index 0b4fad794..793b4e407 100644
--- a/app/views/admin/dashboard/index.html.erb
+++ b/app/views/admin/dashboard/index.html.erb
@@ -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>
 
diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb
index 2b15faaaa..095e351d6 100644
--- a/app/views/layouts/_admin_header.html.erb
+++ b/app/views/layouts/_admin_header.html.erb
@@ -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>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 16c81fb50..2ad2303f8 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -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>
diff --git a/app/views/layouts/management.html.erb b/app/views/layouts/management.html.erb
index 2607f1b82..8e497bf24 100644
--- a/app/views/layouts/management.html.erb
+++ b/app/views/layouts/management.html.erb
@@ -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>
diff --git a/app/views/moderation/dashboard/index.html.erb b/app/views/moderation/dashboard/index.html.erb
index aa214c561..acdfa954a 100644
--- a/app/views/moderation/dashboard/index.html.erb
+++ b/app/views/moderation/dashboard/index.html.erb
@@ -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>
 
diff --git a/app/views/shared/_top_links.html.erb b/app/views/shared/_top_links.html.erb
index 07973ee60..be6afb0d7 100644
--- a/app/views/shared/_top_links.html.erb
+++ b/app/views/shared/_top_links.html.erb
@@ -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 %>
diff --git a/app/views/welcome/verification.html.erb b/app/views/welcome/verification.html.erb
index 49fccea9c..6642c14e0 100644
--- a/app/views/welcome/verification.html.erb
+++ b/app/views/welcome/verification.html.erb
@@ -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">