From 3d6bf0358f9b0fe505c4fd74fa91541418cb9af2 Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Tue, 22 Jul 2014 13:52:05 +0900
Subject: [PATCH] Don't be link for first level navigation on sidebar

---
 app/views/fluentd/show.html.haml      | 14 +++++++-------
 app/views/shared/_global_nav.html.erb | 15 ++++++++++++---
 config/locales/translation_en.yml     |  3 +--
 config/locales/translation_ja.yml     |  3 +--
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/app/views/fluentd/show.html.haml b/app/views/fluentd/show.html.haml
index 35c85ee..c003564 100644
--- a/app/views/fluentd/show.html.haml
+++ b/app/views/fluentd/show.html.haml
@@ -1,5 +1,5 @@
 - if @fluentd.present?
-  - page_title t('.page_title', label: @fluentd.label)
+  - page_title t('.page_title')
   .row
     .col-lg-6
       %div{class: "panel panel-#{@fluentd.agent.running? ? "success":"default"}"}
@@ -21,9 +21,9 @@
       .panel.panel-default
         .panel-heading
           .pull-right
-            = link_to t('.edit'), edit_fluentd_path, class: "btn btn-default"
-            = link_to t('.destroy'), "#", class: "btn btn-danger", data: { toggle: "modal", target: "#setting-destroy-modal" }
-          %h4= t('.fluentd_info')
+            = link_to t('terms.edit'), edit_fluentd_path, class: "btn btn-default"
+            = link_to t('terms.destroy'), "#", class: "btn btn-danger", data: { toggle: "modal", target: "#setting-destroy-modal" }
+          %h4= t('fluentd.common.fluentd_info')
           .modal.fade{id: "setting-destroy-modal"}
             .modal-dialog
               .modal-content
@@ -31,14 +31,14 @@
                   %button.close{"data-dismiss" => "modal"}
                     = raw "&times;"
                   %h4.modal-title
-                    = t('.destroy_fluentd_setting')
+                    = t('fluentd.common.destroy_fluentd_setting')
                 .modal-body
-                  = raw t('.destroy_fluentd_setting_warning')
+                  = raw t('fluentd.common.destroy_fluentd_setting_warning')
                 .modal-footer
                   = form_tag(fluentd_path(@fluentd), method: :delete) do
                     %button.btn.btn-default{"data-dismiss" => "modal"}
                       Close
-                    = submit_tag t('.destroy'), class: "btn btn-danger"
+                    = submit_tag t('terms.destroy'), class: "btn btn-danger"
 
         %table.table.table-hover
           %tbody
diff --git a/app/views/shared/_global_nav.html.erb b/app/views/shared/_global_nav.html.erb
index feeba81..1543996 100644
--- a/app/views/shared/_global_nav.html.erb
+++ b/app/views/shared/_global_nav.html.erb
@@ -1,8 +1,13 @@
 <ul class="nav" id="side-menu">
   <li>
-    <%= link_to_other icon("fa-puzzle-piece fa-fw") << " fluentd", fluentd_path %>
+    <a>
+      <%= icon("fa-puzzle-piece fa-fw") << "fluentd" << icon('pull-right fa-caret-down') %>
+    </a>
     <% if fluentd_exists? %>
     <ul class="nav nav-second-level">
+      <li>
+        <%= link_to_other t('fluentd.show.page_title'), fluentd_path %>
+      </li>
       <li>
         <%= link_to_other t('fluentd.settings.source_and_output.page_title'), source_and_output_fluentd_setting_path %>
       </li>
@@ -16,7 +21,9 @@
     <% end %>
   </li>
   <li>
-    <%= link_to_other icon("fa-cogs fa-fw") << " " << t('terms.plugins') << icon('fa pull-right fa-caret-down'), plugins_path %>
+    <a>
+      <%= icon("fa-cogs fa-fw") << t('terms.plugins') << icon('pull-right fa-caret-down') %>
+    </a>
     <ul class="nav nav-second-level">
       <li>
         <%= link_to_other t("plugins.installed.page_title"), installed_plugins_path %>
@@ -31,7 +38,9 @@
     <!-- /.nav-second-level -->
   </li>
   <li>
-    <%= link_to_other icon('fa-coffee fa-fw') << " " << t('terms.misc') << icon('fa pull-right fa-caret-down'), misc_path %>
+    <a>
+      <%= icon('fa-coffee fa-fw') << t('terms.misc') << icon('pull-right fa-caret-down') %>
+    </a>
     <ul class="nav nav-second-level">
       <li>
         <%= link_to_other t("misc.information.page_title"), misc_information_path %>
diff --git a/config/locales/translation_en.yml b/config/locales/translation_en.yml
index 797f70a..aafda0e 100644
--- a/config/locales/translation_en.yml
+++ b/config/locales/translation_en.yml
@@ -111,8 +111,7 @@ en:
     form:
       <<: *fluentd_common
     show:
-      <<: *fluentd_common
-      page_title: fluentd
+      page_title: Dashboard
     new:
       <<: *fluentd_common
       page_title: fluentd | New
diff --git a/config/locales/translation_ja.yml b/config/locales/translation_ja.yml
index 8723d67..2ede1e7 100644
--- a/config/locales/translation_ja.yml
+++ b/config/locales/translation_ja.yml
@@ -110,8 +110,7 @@ ja:
     form:
       <<: *fluentd_common
     show:
-      <<: *fluentd_common
-      page_title: "%{label}"
+      page_title: "ダッシュボード"
     new:
       <<: *fluentd_common
       page_title: fluentd | 追加