From 1946734b5881cdcbf2b8f97f2dd40412f24972d0 Mon Sep 17 00:00:00 2001
From: Andy Heathershaw <andy@andys.eu>
Date: Thu, 6 Oct 2016 15:27:51 +0100
Subject: [PATCH] resolves #15: switched the order of the dashboard widgets for
 xs devices. Made the system info table more responsive on xs devices.

---
 public/themes/bootstrap3/theme.css            |   5 +
 .../views/themes/base/admin/index.blade.php   |  10 +-
 .../themes/base/admin/settings.blade.php      | 285 +++++++++---------
 .../partials/admin_sysinfo_widget.blade.php   |   2 +-
 .../themes/base/partials/navbar.blade.php     |   4 +-
 5 files changed, 154 insertions(+), 152 deletions(-)

diff --git a/public/themes/bootstrap3/theme.css b/public/themes/bootstrap3/theme.css
index a0965d5..94c8842 100644
--- a/public/themes/bootstrap3/theme.css
+++ b/public/themes/bootstrap3/theme.css
@@ -70,6 +70,11 @@ ol.breadcrumb {
     font-weight: bold;
 }
 
+#system-info {
+    table-layout: fixed;
+    word-wrap: break-word;
+}
+
 #system-info .meta-label
 {
     width: 30%;
diff --git a/resources/views/themes/base/admin/index.blade.php b/resources/views/themes/base/admin/index.blade.php
index cfa4468..0ebc16c 100644
--- a/resources/views/themes/base/admin/index.blade.php
+++ b/resources/views/themes/base/admin/index.blade.php
@@ -15,15 +15,15 @@
 @section('content')
     <div class="container">
         <div class="row">
-            <div class="col-xs-12 col-sm-8 content-body">
-                @include (Theme::viewName('partials.admin_sysinfo_widget'))
-            </div>
-
-            <div class="col-xs-12 col-sm-4">
+            <div class="col-xs-12 col-sm-4 col-sm-push-8">
                 @include (Theme::viewName('partials.admin_actions_widget'))
                 @include (Theme::viewName('partials.admin_manage_widget'))
                 @include (Theme::viewName('partials.admin_stats_widget'))
             </div>
+
+            <div class="col-xs-12 col-sm-8 col-sm-pull-4 content-body">
+                @include (Theme::viewName('partials.admin_sysinfo_widget'))
+            </div>
         </div>
     </div>
 @endsection
\ No newline at end of file
diff --git a/resources/views/themes/base/admin/settings.blade.php b/resources/views/themes/base/admin/settings.blade.php
index 7b08fa8..0f99686 100644
--- a/resources/views/themes/base/admin/settings.blade.php
+++ b/resources/views/themes/base/admin/settings.blade.php
@@ -22,182 +22,181 @@
 
                 {!! Form::model($config, ['route' => 'admin.saveSettings', 'method' => 'POST']) !!}
 
-                    <div>
-                        {{-- Nav tabs --}}
-                        <ul class="nav nav-tabs" role="tablist">
-                            <li role="presentation" class="active"><a href="#general-tab" aria-controls="general-tab" role="tab" data-toggle="tab"><i class="fa fa-fw fa-info-circle"></i> General</a></li>
-                            <li role="presentation"><a href="#email-tab" aria-controls="email-tab" role="tab" data-toggle="tab"><i class="fa fa-fw fa-envelope"></i> E-mail</a></li>
-                            <li role="presentation"><a href="#security-tab" aria-controls="security-tab" role="tab" data-toggle="tab"><i class="fa fa-fw fa-lock"></i> Security</a></li>
-                        </ul>
+                <div>
+                    {{-- Nav tabs --}}
+                    <ul class="nav nav-tabs" role="tablist">
+                        <li role="presentation" class="active"><a href="#general-tab" aria-controls="general-tab" role="tab" data-toggle="tab"><i class="fa fa-fw fa-info-circle"></i> General</a></li>
+                        <li role="presentation"><a href="#email-tab" aria-controls="email-tab" role="tab" data-toggle="tab"><i class="fa fa-fw fa-envelope"></i> E-mail</a></li>
+                        <li role="presentation"><a href="#security-tab" aria-controls="security-tab" role="tab" data-toggle="tab"><i class="fa fa-fw fa-lock"></i> Security</a></li>
+                    </ul>
 
-                        {{-- Tab panes --}}
-                        <div class="tab-content">
-                            {{-- General --}}
-                            <div role="tabpanel" class="tab-pane active" id="general-tab">
-                                <div class="form-group">
-                                    {!! Form::label('app_name', 'Gallery name:', ['class' => 'control-label']) !!}
-                                    {!! Form::text('app_name', old('app_name'), ['class' => 'form-control']) !!}
-                                </div>
-
-                                <div class="row">
-                                    <div class="col-xs-12 col-sm-4">
-                                        <div class="form-group">
-                                            {!! Form::label('date_format', 'Date format:', ['class' => 'control-label']) !!}
-                                            {!! Form::select('date_format', $date_formats, old('date_format'), ['class' => 'form-control']) !!}
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <div class="row">
-                                    <div class="col-xs-12 col-sm-4">
-                                        <div class="form-group">
-                                            {!! Form::label('theme', 'Theme:', ['class' => 'control-label']) !!}
-                                            {!! Form::select('theme', $theme_names, old('theme'), ['class' => 'form-control']) !!}
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <hr/>
-                                <fieldset>
-                                    <legend>&quot;Powered by&quot; footer link</legend>
-                                    <p>To help spread the word about Blue Twilight, I'd really appreciate it if you left the &quot;Powered by&quot; notice in your gallery's footer.</p>
-                                    <p>This is not compulsory, however, and you may remove it by checking the box below.</p>
-
-                                    <div class="checkbox" style="margin-top: 20px;">
-                                        <label>
-                                            <input type="checkbox" name="remove_copyright" @if (UserConfig::get('remove_copyright'))checked="checked"@endif>
-                                            <strong>Remove &quot;Powered by&quot; notice from the public gallery</strong>
-                                        </label>
-                                    </div>
-                                </fieldset>
+                    {{-- Tab panes --}}
+                    <div class="tab-content">
+                        {{-- General --}}
+                        <div role="tabpanel" class="tab-pane active" id="general-tab">
+                            <div class="form-group">
+                                {!! Form::label('app_name', 'Gallery name:', ['class' => 'control-label']) !!}
+                                {!! Form::text('app_name', old('app_name'), ['class' => 'form-control']) !!}
                             </div>
 
-                            {{-- E-mail --}}
-                            <div role="tabpanel" class="tab-pane" id="email-tab">
-                                <div class="form-group">
-                                    {!! Form::label('sender_name', 'Sender name:', ['class' => 'control-label']) !!}
-                                    {!! Form::text('sender_name', old('sender_name'), ['class' => 'form-control']) !!}
+                            <div class="row">
+                                <div class="col-xs-12 col-sm-4">
+                                    <div class="form-group">
+                                        {!! Form::label('date_format', 'Date format:', ['class' => 'control-label']) !!}
+                                        {!! Form::select('date_format', $date_formats, old('date_format'), ['class' => 'form-control']) !!}
+                                    </div>
                                 </div>
+                            </div>
 
-                                <div class="form-group">
-                                    {!! Form::label('sender_address', 'Sender address:', ['class' => 'control-label']) !!}
-                                    {!! Form::text('sender_address', old('sender_address'), ['class' => 'form-control']) !!}
+                            <div class="row">
+                                <div class="col-xs-12 col-sm-4">
+                                    <div class="form-group">
+                                        {!! Form::label('theme', 'Theme:', ['class' => 'control-label']) !!}
+                                        {!! Form::select('theme', $theme_names, old('theme'), ['class' => 'form-control']) !!}
+                                    </div>
                                 </div>
+                            </div>
 
-                                <hr/>
+                            <hr/>
+                            <fieldset>
+                                <legend>&quot;Powered by&quot; footer link</legend>
+                                <p>To help spread the word about Blue Twilight, I'd really appreciate it if you left the &quot;Powered by&quot; notice in your gallery's footer.</p>
+                                <p>This is not compulsory, however, and you may remove it by checking the box below.</p>
 
-                                <p style="margin-bottom: 15px;">Configure your SMTP server using the settings below. If your server does not require authentication, leave the Username and Password fields empty.</p>
-
-                                <div class="form-group">
-                                    {!! Form::label('smtp_server', 'Hostname:', ['class' => 'control-label']) !!}
-                                    {!! Form::text('smtp_server', old('smtp_server'), ['class' => 'form-control']) !!}
-                                </div>
-
-                                <div class="form-group">
-                                    {!! Form::label('smtp_port', 'Port:', ['class' => 'control-label']) !!}
-                                    {!! Form::text('smtp_port', old('smtp_port'), ['class' => 'form-control']) !!}
-                                </div>
-
-                                <div class="form-group">
-                                    {!! Form::label('smtp_username', 'Username:', ['class' => 'control-label']) !!}
-                                    {!! Form::text('smtp_username', old('smtp_username'), ['class' => 'form-control']) !!}
-                                </div>
-
-                                <div class="form-group">
-                                    {!! Form::label('smtp_password', 'Password:', ['class' => 'control-label']) !!}
-                                    {!! Form::password('smtp_password', ['class' => 'form-control']) !!}
-                                </div>
-
-                                <div class="checkbox">
+                                <div class="checkbox" style="margin-top: 20px;">
                                     <label>
-                                        <input type="checkbox" name="smtp_encryption" @if (UserConfig::get('smtp_encryption'))checked="checked"@endif>
-                                        <strong>Requires encrypted connection</strong>
+                                        <input type="checkbox" name="remove_copyright" @if (UserConfig::get('remove_copyright'))checked="checked"@endif>
+                                        <strong>Remove &quot;Powered by&quot; notice from the public gallery</strong>
                                     </label>
                                 </div>
+                            </fieldset>
+                        </div>
 
-                                <div>
-                                    <button id="test-email-button" type="button" class="btn btn-primary">@lang('admin.settings_test_email_action')</button>
+                        {{-- E-mail --}}
+                        <div role="tabpanel" class="tab-pane" id="email-tab">
+                            <div class="form-group">
+                                {!! Form::label('sender_name', 'Sender name:', ['class' => 'control-label']) !!}
+                                {!! Form::text('sender_name', old('sender_name'), ['class' => 'form-control']) !!}
+                            </div>
 
-                                    <div style="margin-top: 10px;">
-                                        <div class="alert alert-info" id="test-email-status" style="display: none;">
-                                            <img src="{{ asset('ripple.svg') }}"/> Testing e-mail settings...
-                                        </div>
+                            <div class="form-group">
+                                {!! Form::label('sender_address', 'Sender address:', ['class' => 'control-label']) !!}
+                                {!! Form::text('sender_address', old('sender_address'), ['class' => 'form-control']) !!}
+                            </div>
 
-                                        <div class="alert" id="test-email-result" style="display: none;">
-                                            <p><strong id="test-email-result-summary"></strong> <span id="test-email-result-message"></span></p>
-                                        </div>
+                            <hr/>
+
+                            <p style="margin-bottom: 15px;">Configure your SMTP server using the settings below. If your server does not require authentication, leave the Username and Password fields empty.</p>
+
+                            <div class="form-group">
+                                {!! Form::label('smtp_server', 'Hostname:', ['class' => 'control-label']) !!}
+                                {!! Form::text('smtp_server', old('smtp_server'), ['class' => 'form-control']) !!}
+                            </div>
+
+                            <div class="form-group">
+                                {!! Form::label('smtp_port', 'Port:', ['class' => 'control-label']) !!}
+                                {!! Form::text('smtp_port', old('smtp_port'), ['class' => 'form-control']) !!}
+                            </div>
+
+                            <div class="form-group">
+                                {!! Form::label('smtp_username', 'Username:', ['class' => 'control-label']) !!}
+                                {!! Form::text('smtp_username', old('smtp_username'), ['class' => 'form-control']) !!}
+                            </div>
+
+                            <div class="form-group">
+                                {!! Form::label('smtp_password', 'Password:', ['class' => 'control-label']) !!}
+                                {!! Form::password('smtp_password', ['class' => 'form-control']) !!}
+                            </div>
+
+                            <div class="checkbox">
+                                <label>
+                                    <input type="checkbox" name="smtp_encryption" @if (UserConfig::get('smtp_encryption'))checked="checked"@endif>
+                                    <strong>Requires encrypted connection</strong>
+                                </label>
+                            </div>
+
+                            <div>
+                                <button id="test-email-button" type="button" class="btn btn-primary">@lang('admin.settings_test_email_action')</button>
+
+                                <div style="margin-top: 10px;">
+                                    <div class="alert alert-info" id="test-email-status" style="display: none;">
+                                        <img src="{{ asset('ripple.svg') }}"/> Testing e-mail settings...
+                                    </div>
+
+                                    <div class="alert" id="test-email-result" style="display: none;">
+                                        <p><strong id="test-email-result-summary"></strong> <span id="test-email-result-message"></span></p>
                                     </div>
                                 </div>
                             </div>
+                        </div>
+
+                        {{-- Security --}}
+                        <div role="tabpanel" class="tab-pane" id="security-tab">
+                            <div class="checkbox">
+                                <label>
+                                    <input type="checkbox" name="allow_self_registration" @if (UserConfig::get('allow_self_registration'))checked="checked"@endif>
+                                    <strong>Allow self-registration</strong><br/>
+                                    With this option enabled, users can sign up for their own &quot;visitor&quot; accounts to comment on photos.
+                                </label>
+                            </div>
+
+                            <div class="checkbox" style="margin-top: 20px;">
+                                <label>
+                                    <input type="checkbox" name="require_email_verification" @if (UserConfig::get('require_email_verification'))checked="checked"@endif>
+                                    <strong>Require e-mail verification for self-registered accounts</strong><br/>
+                                    <span class="text-danger">It is strongly recommended to enable this option.</span>
+                                </label>
+                            </div>
+
+                            <div class="checkbox" style="margin-top: 20px;">
+                                <label>
+                                    <input type="checkbox" name="recaptcha_enabled_registration" @if (UserConfig::get('recaptcha_enabled_registration'))checked="checked"@endif>
+                                    <strong>Enable <a href="https://www.google.com/recaptcha" target="_blank">reCAPTCHA</a> for self-registrations</strong><br/>
+                                    <span class="text-danger">It is strongly recommended to enable this option.</span>
+                                </label>
+                            </div>
+
+                            <fieldset style="margin-top: 30px;">
+                                <legend>@lang('admin.settings_recaptcha')</legend>
+
+                                <div class="form-group">
+                                    {!! Form::label('recaptcha_site_key', 'Site key:', ['class' => 'control-label']) !!}
+                                    {!! Form::text('recaptcha_site_key', old('recaptcha_site_key'), ['class' => 'form-control']) !!}
+                                </div>
+
+                                <div class="form-group">
+                                    {!! Form::label('recaptcha_secret_key', 'Secret key:', ['class' => 'control-label']) !!}
+                                    {!! Form::text('recaptcha_secret_key', old('recaptcha_secret_key'), ['class' => 'form-control']) !!}
+                                </div>
+                            </fieldset>
+
+                            <fieldset style="margin-top: 20px;">
+                                <legend>@lang('admin.settings_image_protection')</legend>
 
-                            {{-- Security --}}
-                            <fieldset role="tabpanel" class="tab-pane" id="security-tab">
                                 <div class="checkbox">
                                     <label>
-                                        <input type="checkbox" name="allow_self_registration" @if (UserConfig::get('allow_self_registration'))checked="checked"@endif>
-                                        <strong>Allow self-registration</strong><br/>
-                                        With this option enabled, users can sign up for their own &quot;visitor&quot; accounts to comment on photos.
+                                        <input type="checkbox" name="restrict_original_download" @if (UserConfig::get('restrict_original_download'))checked="checked"@endif>
+                                        <strong>@lang('forms.settings_restrict_originals_download')</strong><br/>
+                                        @lang('forms.settings_restrict_originals_download_help')
                                     </label>
                                 </div>
 
                                 <div class="checkbox" style="margin-top: 20px;">
                                     <label>
-                                        <input type="checkbox" name="require_email_verification" @if (UserConfig::get('require_email_verification'))checked="checked"@endif>
-                                        <strong>Require e-mail verification for self-registered accounts</strong><br/>
-                                        <span class="text-danger">It is strongly recommended to enable this option.</span>
+                                        <input type="checkbox" name="hotlink_protection" @if (UserConfig::get('hotlink_protection'))checked="checked"@endif>
+                                        <strong>@lang('forms.settings_hotlink_protection')</strong><br/>
+                                        @lang('forms.settings_hotlink_protection_help')
                                     </label>
                                 </div>
-
-                                <div class="checkbox" style="margin-top: 20px;">
-                                    <label>
-                                        <input type="checkbox" name="recaptcha_enabled_registration" @if (UserConfig::get('recaptcha_enabled_registration'))checked="checked"@endif>
-                                        <strong>Enable <a href="https://www.google.com/recaptcha" target="_blank">reCAPTCHA</a> for self-registrations</strong><br/>
-                                        <span class="text-danger">It is strongly recommended to enable this option.</span>
-                                    </label>
-                                </div>
-
-                                <fieldset style="margin-top: 30px;">
-                                    <legend>@lang('admin.settings_recaptcha')</legend>
-
-                                    <div class="form-group">
-                                        {!! Form::label('recaptcha_site_key', 'Site key:', ['class' => 'control-label']) !!}
-                                        {!! Form::text('recaptcha_site_key', old('recaptcha_site_key'), ['class' => 'form-control']) !!}
-                                    </div>
-
-                                    <div class="form-group">
-                                        {!! Form::label('recaptcha_secret_key', 'Secret key:', ['class' => 'control-label']) !!}
-                                        {!! Form::text('recaptcha_secret_key', old('recaptcha_secret_key'), ['class' => 'form-control']) !!}
-                                    </div>
-                                </fieldset>
-
-                                <fieldset style="margin-top: 20px;">
-                                    <legend>@lang('admin.settings_image_protection')</legend>
-
-                                    <div class="checkbox">
-                                        <label>
-                                            <input type="checkbox" name="restrict_original_download" @if (UserConfig::get('restrict_original_download'))checked="checked"@endif>
-                                            <strong>@lang('forms.settings_restrict_originals_download')</strong><br/>
-                                            @lang('forms.settings_restrict_originals_download_help')
-                                        </label>
-                                    </div>
-
-                                    <div class="checkbox" style="margin-top: 20px;">
-                                        <label>
-                                            <input type="checkbox" name="hotlink_protection" @if (UserConfig::get('hotlink_protection'))checked="checked"@endif>
-                                            <strong>@lang('forms.settings_hotlink_protection')</strong><br/>
-                                            @lang('forms.settings_hotlink_protection_help')
-                                        </label>
-                                    </div>
-                                </fieldset>
-                            </div>
+                            </fieldset>
                         </div>
                     </div>
 
-                    <div class="clearfix"><!-- --></div>
-                    <div class="text-right" style="margin-top: 15px;">
+                    <div class="pull-right" style="margin-top: 15px;">
                         <a href="{{ route('admin') }}" class="btn btn-default">@lang('forms.cancel_action')</a>
                         {!! Form::submit(trans('admin.settings_save_action'), ['class' => 'btn btn-success']) !!}
                     </div>
+                </div>
 
                 {!! Form::close() !!}
             </div>
diff --git a/resources/views/themes/base/partials/admin_sysinfo_widget.blade.php b/resources/views/themes/base/partials/admin_sysinfo_widget.blade.php
index ba11d73..167f473 100644
--- a/resources/views/themes/base/partials/admin_sysinfo_widget.blade.php
+++ b/resources/views/themes/base/partials/admin_sysinfo_widget.blade.php
@@ -1,7 +1,7 @@
 <div class="panel panel-default">
     <div class="panel-heading">@lang('admin.sysinfo_panel')</div>
     <div class="panel-body" style="padding: 0;">
-        <table id="system-info" class="table table-striped" style="margin-bottom: 0;">
+        <table id="system-info" class="table table-striped table-responsive" style="margin-bottom: 0; overflow-x: scroll;">
             <tbody>
                 <tr>
                     <td class="meta-label">@lang('admin.sysinfo_widget.app_version')</td>
diff --git a/resources/views/themes/base/partials/navbar.blade.php b/resources/views/themes/base/partials/navbar.blade.php
index 3b06e71..7e8c0fd 100644
--- a/resources/views/themes/base/partials/navbar.blade.php
+++ b/resources/views/themes/base/partials/navbar.blade.php
@@ -26,9 +26,7 @@
                 @endif
 
                 @can('admin-access')
-                    <li class="dropdown">
-                        <li><a href="{{ route('admin') }}"><i class="fa fa-fw fa-cog"></i> @lang('navigation.navbar.admin')</a></li>
-                    </li>
+                    <li><a href="{{ route('admin') }}"><i class="fa fa-fw fa-cog"></i> @lang('navigation.navbar.admin')</a></li>
                 @endcan
             </ul>