resolves #15: switched the order of the dashboard widgets for xs devices. Made the system info table more responsive on xs devices.

This commit is contained in:
Andy Heathershaw 2016-10-06 15:27:51 +01:00
parent e81dfcd1fd
commit 1946734b58
5 changed files with 154 additions and 152 deletions

View File

@ -70,6 +70,11 @@ ol.breadcrumb {
font-weight: bold; font-weight: bold;
} }
#system-info {
table-layout: fixed;
word-wrap: break-word;
}
#system-info .meta-label #system-info .meta-label
{ {
width: 30%; width: 30%;

View File

@ -15,15 +15,15 @@
@section('content') @section('content')
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-xs-12 col-sm-8 content-body"> <div class="col-xs-12 col-sm-4 col-sm-push-8">
@include (Theme::viewName('partials.admin_sysinfo_widget'))
</div>
<div class="col-xs-12 col-sm-4">
@include (Theme::viewName('partials.admin_actions_widget')) @include (Theme::viewName('partials.admin_actions_widget'))
@include (Theme::viewName('partials.admin_manage_widget')) @include (Theme::viewName('partials.admin_manage_widget'))
@include (Theme::viewName('partials.admin_stats_widget')) @include (Theme::viewName('partials.admin_stats_widget'))
</div> </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>
</div> </div>
@endsection @endsection

View File

@ -22,182 +22,181 @@
{!! Form::model($config, ['route' => 'admin.saveSettings', 'method' => 'POST']) !!} {!! Form::model($config, ['route' => 'admin.saveSettings', 'method' => 'POST']) !!}
<div> <div>
{{-- Nav tabs --}} {{-- Nav tabs --}}
<ul class="nav nav-tabs" role="tablist"> <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" 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="#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> <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> </ul>
{{-- Tab panes --}} {{-- Tab panes --}}
<div class="tab-content"> <div class="tab-content">
{{-- General --}} {{-- General --}}
<div role="tabpanel" class="tab-pane active" id="general-tab"> <div role="tabpanel" class="tab-pane active" id="general-tab">
<div class="form-group"> <div class="form-group">
{!! Form::label('app_name', 'Gallery name:', ['class' => 'control-label']) !!} {!! Form::label('app_name', 'Gallery name:', ['class' => 'control-label']) !!}
{!! Form::text('app_name', old('app_name'), ['class' => 'form-control']) !!} {!! 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>
</div> </div>
{{-- E-mail --}} <div class="row">
<div role="tabpanel" class="tab-pane" id="email-tab"> <div class="col-xs-12 col-sm-4">
<div class="form-group"> <div class="form-group">
{!! Form::label('sender_name', 'Sender name:', ['class' => 'control-label']) !!} {!! Form::label('date_format', 'Date format:', ['class' => 'control-label']) !!}
{!! Form::text('sender_name', old('sender_name'), ['class' => 'form-control']) !!} {!! Form::select('date_format', $date_formats, old('date_format'), ['class' => 'form-control']) !!}
</div>
</div> </div>
</div>
<div class="form-group"> <div class="row">
{!! Form::label('sender_address', 'Sender address:', ['class' => 'control-label']) !!} <div class="col-xs-12 col-sm-4">
{!! Form::text('sender_address', old('sender_address'), ['class' => 'form-control']) !!} <div class="form-group">
{!! Form::label('theme', 'Theme:', ['class' => 'control-label']) !!}
{!! Form::select('theme', $theme_names, old('theme'), ['class' => 'form-control']) !!}
</div>
</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="checkbox" style="margin-top: 20px;">
<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> <label>
<input type="checkbox" name="smtp_encryption" @if (UserConfig::get('smtp_encryption'))checked="checked"@endif> <input type="checkbox" name="remove_copyright" @if (UserConfig::get('remove_copyright'))checked="checked"@endif>
<strong>Requires encrypted connection</strong> <strong>Remove &quot;Powered by&quot; notice from the public gallery</strong>
</label> </label>
</div> </div>
</fieldset>
</div>
<div> {{-- E-mail --}}
<button id="test-email-button" type="button" class="btn btn-primary">@lang('admin.settings_test_email_action')</button> <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="form-group">
<div class="alert alert-info" id="test-email-status" style="display: none;"> {!! Form::label('sender_address', 'Sender address:', ['class' => 'control-label']) !!}
<img src="{{ asset('ripple.svg') }}"/> Testing e-mail settings... {!! Form::text('sender_address', old('sender_address'), ['class' => 'form-control']) !!}
</div> </div>
<div class="alert" id="test-email-result" style="display: none;"> <hr/>
<p><strong id="test-email-result-summary"></strong> <span id="test-email-result-message"></span></p>
</div> <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>
</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"> <div class="checkbox">
<label> <label>
<input type="checkbox" name="allow_self_registration" @if (UserConfig::get('allow_self_registration'))checked="checked"@endif> <input type="checkbox" name="restrict_original_download" @if (UserConfig::get('restrict_original_download'))checked="checked"@endif>
<strong>Allow self-registration</strong><br/> <strong>@lang('forms.settings_restrict_originals_download')</strong><br/>
With this option enabled, users can sign up for their own &quot;visitor&quot; accounts to comment on photos. @lang('forms.settings_restrict_originals_download_help')
</label> </label>
</div> </div>
<div class="checkbox" style="margin-top: 20px;"> <div class="checkbox" style="margin-top: 20px;">
<label> <label>
<input type="checkbox" name="require_email_verification" @if (UserConfig::get('require_email_verification'))checked="checked"@endif> <input type="checkbox" name="hotlink_protection" @if (UserConfig::get('hotlink_protection'))checked="checked"@endif>
<strong>Require e-mail verification for self-registered accounts</strong><br/> <strong>@lang('forms.settings_hotlink_protection')</strong><br/>
<span class="text-danger">It is strongly recommended to enable this option.</span> @lang('forms.settings_hotlink_protection_help')
</label> </label>
</div> </div>
</fieldset>
<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>
</div> </div>
</div> </div>
<div class="clearfix"><!-- --></div> <div class="pull-right" style="margin-top: 15px;">
<div class="text-right" style="margin-top: 15px;">
<a href="{{ route('admin') }}" class="btn btn-default">@lang('forms.cancel_action')</a> <a href="{{ route('admin') }}" class="btn btn-default">@lang('forms.cancel_action')</a>
{!! Form::submit(trans('admin.settings_save_action'), ['class' => 'btn btn-success']) !!} {!! Form::submit(trans('admin.settings_save_action'), ['class' => 'btn btn-success']) !!}
</div> </div>
</div>
{!! Form::close() !!} {!! Form::close() !!}
</div> </div>

View File

@ -1,7 +1,7 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading">@lang('admin.sysinfo_panel')</div> <div class="panel-heading">@lang('admin.sysinfo_panel')</div>
<div class="panel-body" style="padding: 0;"> <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> <tbody>
<tr> <tr>
<td class="meta-label">@lang('admin.sysinfo_widget.app_version')</td> <td class="meta-label">@lang('admin.sysinfo_widget.app_version')</td>

View File

@ -26,9 +26,7 @@
@endif @endif
@can('admin-access') @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><a href="{{ route('admin') }}"><i class="fa fa-fw fa-cog"></i> @lang('navigation.navbar.admin')</a></li>
</li>
@endcan @endcan
</ul> </ul>