From 9e1405d2bbce6d93cecd56f84365ad3e1b1345d3 Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Tue, 22 Jul 2014 14:06:57 +0900
Subject: [PATCH] Move language menu to the bottom of sidebar from global
 header

---
 app/views/layouts/application.html.erb | 11 -----------
 app/views/shared/_global_nav.html.erb  | 15 +++++++++++++--
 config/locales/translation_en.yml      |  1 +
 config/locales/translation_ja.yml      |  1 +
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index cab7d16..2cd945a 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -37,17 +37,6 @@
             <!-- /.navbar-header -->
 
             <ul class="nav navbar-top-links navbar-right">
-              <li class="dropdown">
-                <a class="dropdown-toggle " data-toggle="dropdown" href="#">
-                  <%= icon("fa-font") %>
-                  <%= icon("fa-caret-down") %>
-                </a>
-                <ul class="nav dropdown-menu dropdown-alerts">
-                  <%= language_menu %>
-                </ul>
-                <!-- /.dropdown-alerts -->
-              </li>
-
               <!-- vue.js -->
               <li class="dropdown" id="alert">
                 <a
diff --git a/app/views/shared/_global_nav.html.erb b/app/views/shared/_global_nav.html.erb
index 1543996..26f92fc 100644
--- a/app/views/shared/_global_nav.html.erb
+++ b/app/views/shared/_global_nav.html.erb
@@ -20,6 +20,7 @@
     </ul>
     <% end %>
   </li>
+
   <li>
     <a>
       <%= icon("fa-cogs fa-fw") << t('terms.plugins') << icon('pull-right fa-caret-down') %>
@@ -35,8 +36,8 @@
         <%= link_to_other t("plugins.updated.page_title"), updated_plugins_path %>
       </li>
     </ul>
-    <!-- /.nav-second-level -->
   </li>
+
   <li>
     <a>
       <%= icon('fa-coffee fa-fw') << t('terms.misc') << icon('pull-right fa-caret-down') %>
@@ -52,6 +53,16 @@
         <%= link_to_other t('tutorials.index.page_title'), tutorials_path %>
       </li>
     </ul>
-    <!-- /.nav-second-level -->
+  </li>
+
+  <li>
+    <a>
+      <%= icon('fa-font') << t('terms.languages') << icon('pull-right fa-caret-down') %>
+    </a>
+    <ul class="nav nav-second-level">
+      <li>
+        <%= language_menu %>
+      </li>
+    </ul>
   </li>
 </ul>
diff --git a/config/locales/translation_en.yml b/config/locales/translation_en.yml
index aafda0e..f7719ef 100644
--- a/config/locales/translation_en.yml
+++ b/config/locales/translation_en.yml
@@ -44,6 +44,7 @@ en:
     advanced_setting: Advanced Setting
     notice_restart_for_config_edit: "NOTICE: fluentd will restart after update config"
     lines: Lines
+    languages: Language
 
   plugins:
     notice_restart_for_config_edit: "NOTICE: fluentd will restart after update config"
diff --git a/config/locales/translation_ja.yml b/config/locales/translation_ja.yml
index 2ede1e7..deef2a1 100644
--- a/config/locales/translation_ja.yml
+++ b/config/locales/translation_ja.yml
@@ -44,6 +44,7 @@ ja:
     advanced_setting: 高度な設定
     notice_restart_for_config_edit: ※更新するとfluentdが再起動されます
     lines: 行
+    languages: 言語
 
   plugins:
     notice_restart_for_config_edit: ※更新するとfluentdが再起動されます