aheathershaw/blue-twilight
1
0
Fork 0
Code Issues 32 Pull Requests Releases 15 Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/themes/bootstrap3/theme.css vendored
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%;

10
resources/views/themes/base/admin/index.blade.php
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

7
resources/views/themes/base/admin/settings.blade.php
View File

@ -131,7 +131,7 @@
</div> </div>
{{-- Security --}} {{-- Security --}}
<fieldset role="tabpanel" class="tab-pane" id="security-tab"> <div 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="allow_self_registration" @if (UserConfig::get('allow_self_registration'))checked="checked"@endif>
@ -191,13 +191,12 @@
</fieldset> </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>

2
resources/views/themes/base/partials/admin_sysinfo_widget.blade.php
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>

2
resources/views/themes/base/partials/navbar.blade.php
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>