lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Updated chartjs

Browse source
This commit is contained in:
snipe 2020-04-06 21:17:26 -07:00
parent fb903b2fda
commit 320d660e83
No known key found for this signature in database
GPG key ID: 10BFFDA3ED34B5AC
3 changed files with 12252 additions and 3461 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15692
resources/assets/js/plugins/chartjs/Chart.js vendored
View file

File diff suppressed because it is too large Load diff

7
resources/views/dashboard.blade.php
View file

@ -217,7 +217,7 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="chart-responsive"> <div class="chart-responsive">
<canvas id="statusPieChart" height="120"></canvas> <canvas id="statusPieChart" height="216"></canvas>
</div> <!-- ./chart-responsive --> </div> <!-- ./chart-responsive -->
</div> <!-- /.col --> </div> <!-- /.col -->
</div> <!-- /.row --> </div> <!-- /.row -->
@ -301,11 +301,8 @@
@section('moar_scripts') @section('moar_scripts')
@include ('partials.bootstrap-table', ['simple_view' => true, 'nopages' => true]) @include ('partials.bootstrap-table', ['simple_view' => true, 'nopages' => true])
@if ($snipeSettings->load_remote=='1')
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.5.0/Chart.min.js"></script>
@else
<script src="{{ asset('js/plugins/chartjs/Chart.min.js') }}"></script> <script src="{{ asset('js/plugins/chartjs/Chart.min.js') }}"></script>
@endif
<script nonce="{{ csrf_token() }}"> <script nonce="{{ csrf_token() }}">

14
resources/views/settings/index.blade.php
View file

@ -302,8 +302,9 @@
<h2 class="box-title">{{ trans('admin/settings/general.system') }}</h2> <h2 class="box-title">{{ trans('admin/settings/general.system') }}</h2>
</div> </div>
<div class="box-body"> <div class="box-body">
<div class="container row-striped col-md-11">
<div class="container row-striped"> <!-- row -->
<div class="row"> <div class="row">
<div class="col-md-2"> <div class="col-md-2">
<strong>{{ trans('admin/settings/general.snipe_version') }}</strong> <strong>{{ trans('admin/settings/general.snipe_version') }}</strong>
@ -311,9 +312,7 @@
<div class="col-md-4"> <div class="col-md-4">
{{ config('version.app_version') }} build {{ config('version.build_version') }} ({{ config('version.hash_version') }}) {{ config('version.app_version') }} build {{ config('version.build_version') }} ({{ config('version.hash_version') }})
</div> </div>
</div>
<div class="row">
<div class="col-md-2"> <div class="col-md-2">
<strong>{{ trans('admin/settings/general.license') }}</strong> <strong>{{ trans('admin/settings/general.license') }}</strong>
</div> </div>
@ -321,24 +320,27 @@
<a href="https://www.gnu.org/licenses/agpl-3.0.en.html" rel="noopener">AGPL3</a> <a href="https://www.gnu.org/licenses/agpl-3.0.en.html" rel="noopener">AGPL3</a>
</div> </div>
</div> </div>
<!-- / row -->
<!-- row -->
<div class="row"> <div class="row">
<div class="col-md-2"> <div class="col-md-2">
<strong>{{ trans('admin/settings/general.php') }}</strong> <strong>{{ trans('admin/settings/general.php') }}</strong>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
{{ phpversion() }} {{ phpversion() }}
</div> </div>
</div>
<div class="row">
<div class="col-md-2"> <div class="col-md-2">
<strong>{{ trans('admin/settings/general.laravel') }}</strong> <strong>{{ trans('admin/settings/general.laravel') }}</strong>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
{{ $snipeSettings->lar_ver() }} {{ $snipeSettings->lar_ver() }}
</div> </div>
</div> </div>
<!--/ row -->
</div>
</div> <!-- /box-body--> </div> <!-- /box-body-->
</div> <!--/box-default--> </div> <!--/box-default-->
</div><!--/col-md-8--> </div><!--/col-md-8-->