From 206e7e7d1c8cd7e604845cdbb4117dd38a600dea Mon Sep 17 00:00:00 2001
From: printempw <h@prinzeugen.net>
Date: Sun, 25 Sep 2016 10:40:39 +0800
Subject: [PATCH] adjust position of language select

---
 resources/views/index.tpl          | 13 ++++++++-----
 resources/views/skinlib/master.tpl | 21 ++++++++++-----------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/resources/views/index.tpl b/resources/views/index.tpl
index 7e2336de..950ce6c9 100644
--- a/resources/views/index.tpl
+++ b/resources/views/index.tpl
@@ -19,6 +19,9 @@
                 <div class="container">
                     <div class="navbar-header">
                         <a href="{{ option('site_url') }}" class="navbar-brand">{{ option('site_name') }}</a>
+                        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse">
+                            <i class="fa fa-bars"></i>
+                        </button>
                     </div>
 
                     <!-- Collect the nav links, forms, and other content for toggling -->
@@ -26,11 +29,6 @@
                         <ul class="nav navbar-nav">
                             <li class="active"><a href="{{ url('/') }}">{{ trans('general.index') }}</a></li>
                             <li><a href="{{ url('skinlib') }}">{{ trans('general.skinlib') }}</a></li>
-                        </ul>
-                    </div><!-- /.navbar-collapse -->
-                    <!-- Navbar Right Menu -->
-                    <div class="navbar-custom-menu">
-                        <ul class="nav navbar-nav">
                             <!-- Language Menu -->
                             <li class="dropdown">
                                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -42,6 +40,11 @@
                                     @endforeach
                                 </ul>
                             </li>
+                        </ul>
+                    </div><!-- /.navbar-collapse -->
+                    <!-- Navbar Right Menu -->
+                    <div class="navbar-custom-menu">
+                        <ul class="nav navbar-nav">
                             @if (!is_null($user))
                             <!-- User Account Menu -->
                             <li class="dropdown user user-menu">
diff --git a/resources/views/skinlib/master.tpl b/resources/views/skinlib/master.tpl
index 2de54947..70fe28da 100644
--- a/resources/views/skinlib/master.tpl
+++ b/resources/views/skinlib/master.tpl
@@ -59,16 +59,6 @@
                                 </ul>
                             </li>
                             @endunless
-                        </ul>
-                        <form class="navbar-form navbar-left" role="search" action="{{ url('skinlib/search') }}">
-                            <div class="form-group">
-                                <input type="text" class="form-control" id="navbar-search-input" name="q" placeholder="{{ trans('skinlib.master.search-textures') }}" value="{{ $q or '' }}" />
-                            </div>
-                        </form>
-                    </div><!-- /.navbar-collapse -->
-                    <!-- Navbar Right Menu -->
-                    <div class="navbar-custom-menu">
-                        <ul class="nav navbar-nav">
                             <!-- Language Menu -->
                             <li class="dropdown">
                                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -80,7 +70,16 @@
                                     @endforeach
                                 </ul>
                             </li>
-
+                        </ul>
+                        <form class="navbar-form navbar-left" role="search" action="{{ url('skinlib/search') }}">
+                            <div class="form-group">
+                                <input type="text" class="form-control" id="navbar-search-input" name="q" placeholder="{{ trans('skinlib.master.search-textures') }}" value="{{ $q or '' }}" />
+                            </div>
+                        </form>
+                    </div><!-- /.navbar-collapse -->
+                    <!-- Navbar Right Menu -->
+                    <div class="navbar-custom-menu">
+                        <ul class="nav navbar-nav">
                             <li><a href="{{ url('skinlib/upload') }}"><i class="fa fa-upload" aria-hidden="true"></i> {{ trans('skinlib.master.upload-new-skin') }}</a></li>
                             @if (!is_null($user))
                             <!-- User Account Menu -->