Merge pull request #1417 from consul/admin_main_link

Main link in namespaces

app/helpers/admin_helper.rb

@@ -4,6 +4,14 @@ module AdminHelper
     render "/#{namespace}/menu"
   end
 
+  def namespaced_root_path
+    "/#{namespace}"
+  end
+
+  def namespaced_header_title
+    t("#{namespace}.header.title")
+  end
+
   def menu_tags?
     ["tags"].include? controller_name
   end

app/views/layouts/_admin_header.html.erb

@@ -10,7 +10,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'], namespaced_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>
@@ -20,10 +20,10 @@
       <div id="responsive-menu">
         <div class="top-bar-title">
           <h1>
-            <%= link_to admin_root_path, class: "hide-for-small-only" do %>
+            <%= link_to namespaced_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'] %>
-              &nbsp;|&nbsp;<%= t("admin.dashboard.index.title") %>
+              &nbsp;|&nbsp;<%= namespaced_header_title %>
             <% end %>
           </h1>
         </div>