From bcf07ab537a59c3784baae42e1e7524f80fd0ac9 Mon Sep 17 00:00:00 2001
From: tokihara ukayare <kohei.tokihara@90201682n.intra.emercury.co.jp>
Date: Wed, 27 Aug 2014 20:50:22 +0900
Subject: [PATCH 1/3] Change Admin's menubar tab to selectbox

---
 .../assets/javascripts/model-selector.js       | 13 +++++++++++++
 .../erb/app/layouts/application.erb.tt         | 18 ++++++++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 padrino-admin/lib/padrino-admin/generators/templates/assets/javascripts/model-selector.js

diff --git a/padrino-admin/lib/padrino-admin/generators/templates/assets/javascripts/model-selector.js b/padrino-admin/lib/padrino-admin/generators/templates/assets/javascripts/model-selector.js
new file mode 100644
index 000000000..a6ab0cedc
--- /dev/null
+++ b/padrino-admin/lib/padrino-admin/generators/templates/assets/javascripts/model-selector.js
@@ -0,0 +1,13 @@
+!function($) {
+  'use strict';
+
+  $(function() {
+    var selector = $("#model-selector");
+    selector.change(function(){
+      var path = $(this).children(':selected').val();
+      if(path !== ""){
+        location.href = path;
+      }
+    });
+  });
+}(window.jQuery);
diff --git a/padrino-admin/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt b/padrino-admin/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt
index fd6a8dd20..5f1ed4313 100644
--- a/padrino-admin/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt
+++ b/padrino-admin/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt
@@ -25,15 +25,21 @@
           </ul>
 
           <ul class="nav navbar-nav pull-left">
-            <%% project_modules.each do |project_module| %>
+            <form action"/" method="get">
+            <select name="model" class="navbar-module" id="model-selector"> 
+            <option />
+            <%% project_modules.sort_by{|m| m.human_name}.each do |project_module| %>
+            <option value="<%= url(project_module.path) %>" 
               <%% if request.path_info =~ /^#{project_module.path}/ %>
-                <li class="navbar-module active">
+                selected
               <%% else %>
-                <li class=navbar-module>
               <%% end %>
-                <%%= link_to project_module.human_name, url(project_module.path) %>
-                </li>
+               class="model">
+                <%%= project_module.human_name %>
+            </option>
             <%% end %>
+            </select>
+            </form>
           </ul>
         </div>
       </div>
@@ -59,6 +65,6 @@
       </div>
     </footer>
 
-    <%%= javascript_include_tag 'jquery-1.11.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application %>
+    <%%= javascript_include_tag 'jquery-1.11.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application, 'model-selector'%>
   </body>
 </html>

From 8a9119ead54c69adf9bcb3a7945f5b2a93815f0b Mon Sep 17 00:00:00 2001
From: tokihara ukayare <kohei.tokihara@90201682n.intra.emercury.co.jp>
Date: Wed, 27 Aug 2014 20:58:40 +0900
Subject: [PATCH 2/3] Fix tag percent

---
 .../generators/templates/erb/app/layouts/application.erb.tt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/padrino-admin/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt b/padrino-admin/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt
index 5f1ed4313..400edeabd 100644
--- a/padrino-admin/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt
+++ b/padrino-admin/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt
@@ -29,7 +29,7 @@
             <select name="model" class="navbar-module" id="model-selector"> 
             <option />
             <%% project_modules.sort_by{|m| m.human_name}.each do |project_module| %>
-            <option value="<%= url(project_module.path) %>" 
+            <option value="<%%= url(project_module.path) %>" 
               <%% if request.path_info =~ /^#{project_module.path}/ %>
                 selected
               <%% else %>

From e0535512ec53c5a300f80d306ceb121c611838d1 Mon Sep 17 00:00:00 2001
From: tokihara ukayare <kohei.tokihara@90201682n.intra.emercury.co.jp>
Date: Wed, 27 Aug 2014 21:19:37 +0900
Subject: [PATCH 3/3] Fix selectbox position

---
 .../generators/templates/erb/app/layouts/application.erb.tt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/padrino-admin/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt b/padrino-admin/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt
index 400edeabd..ccf7f2235 100644
--- a/padrino-admin/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt
+++ b/padrino-admin/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt
@@ -24,7 +24,7 @@
             </li>
           </ul>
 
-          <ul class="nav navbar-nav pull-left">
+          <ul class="nav navbar-nav pull-left" style="margin-top:20px">
             <form action"/" method="get">
             <select name="model" class="navbar-module" id="model-selector"> 
             <option />