From 9619c867396de3406e8d1143abb195d686982cf1 Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Sun, 9 Aug 2015 14:52:47 +0100
Subject: Put the language selector in the menu

---
 web/views/layout.erb | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/web/views/layout.erb b/web/views/layout.erb
index c1fa12b..a22f695 100644
--- a/web/views/layout.erb
+++ b/web/views/layout.erb
@@ -29,14 +29,6 @@
 <% end %>
         </div>
         <div id="header_forms" class="no-print">
-            <form id="set_language" action="/switch_locale">
-                <input type="hidden" id="url" name="url" value="<%= request.path %>"/>
-                <select id="locale" name="locale">
-<% r18n.available_locales.sort{ |a,b| a.title <=> b.title }.each do |locale| %>
-                    <option value="<%= locale.code %>"<%= locale.code == r18n.locale.code ? ' selected="selected"' : ''%>><%= h(::Language[locale.code].native_name) %></option>
-<% end %>
-                </select>
-            </form>
         </div>
     </div>
 <% unless @nosearch %>
@@ -60,6 +52,16 @@
             </form>
         </li>
 <% end %>
+        <li>
+            <form id="set_language" action="/switch_locale">
+                <input type="hidden" id="url" name="url" value="<%= request.path %>"/>
+                <select id="locale" name="locale">
+<% r18n.available_locales.sort{ |a,b| a.title <=> b.title }.each do |locale| %>
+                    <option value="<%= locale.code %>"<%= locale.code == r18n.locale.code ? ' selected="selected"' : ''%>><%= h(::Language[locale.code].native_name) %></option>
+<% end %>
+                </select>
+            </form>
+        </li>
     </ul>
     </div>
 <% end %>
-- 
cgit v1.2.3