Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
e5ff189d3e | ||
|
1efdfca55f |
@@ -10,7 +10,7 @@
|
||||
}
|
||||
],
|
||||
"require": {
|
||||
"igaster/laravel-theme": "^2.0",
|
||||
"igaster/laravel-theme": "^2.0.12",
|
||||
"acacha/user": "^0.2.2",
|
||||
"creativeorange/gravatar": "^1.0",
|
||||
"orchestra/asset": "^3.6"
|
||||
|
@@ -1,5 +1,5 @@
|
||||
<!-- Compiled app javascript -->
|
||||
<script src="{{ url (mix('/js/app.js')) }}"></script>
|
||||
<script src="{{ asset('/js/app.js') }}"></script>
|
||||
<!-- iCheck -->
|
||||
<script src="{{ asset('/plugin/iCheck/icheck.min.js') }}"></script>
|
||||
|
||||
|
@@ -12,10 +12,10 @@
|
||||
<link rel="stylesheet" href="{{ asset('/plugin/font-awesome/css/font-awesome.min.css') }}">
|
||||
<!-- IonIcons -->
|
||||
<link rel="stylesheet" href="{{ request()->getScheme() }}://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
|
||||
<!-- Theme style -->
|
||||
<link rel="stylesheet" href="{{ asset('/css/adminlte.min.css') }}">
|
||||
|
||||
<!-- Google Font: Source Sans Pro -->
|
||||
<link href="{{ request()->getScheme() }}://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
|
||||
|
||||
@if(file_exists('css/social.css'))
|
||||
<!-- Social Logins -->
|
||||
<link rel="stylesheet" href="{{ asset('/css/social.css') }}">
|
||||
@@ -32,26 +32,12 @@
|
||||
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
|
||||
<![endif]-->
|
||||
|
||||
<script>
|
||||
//See https://laracasts.com/discuss/channels/vue/use-trans-in-vuejs
|
||||
window.trans =
|
||||
@php
|
||||
// @todo Cache this processing
|
||||
// copy all translations from /resources/lang/CURRENT_LOCALE/* to global JS variable
|
||||
$lang_files = File::files(resource_path() . '/lang/' . App::getLocale());
|
||||
$trans = [];
|
||||
foreach ($lang_files as $f) {
|
||||
$filename = pathinfo($f)['filename'];
|
||||
$trans[$filename] = trans($filename);
|
||||
}
|
||||
$trans['adminlte_lang_message'] = trans('adminlte_lang::message');
|
||||
echo json_encode($trans);
|
||||
@endphp
|
||||
</script>
|
||||
|
||||
<!-- STYLESHEETS -->
|
||||
{!! Asset::styles() !!}
|
||||
|
||||
<!-- Theme style -->
|
||||
<link rel="stylesheet" href="{{ asset('/css/adminlte.min.css') }}">
|
||||
|
||||
@if(file_exists('css/fixes.css'))
|
||||
<!-- CSS Fixes -->
|
||||
<link rel="stylesheet" href="{{ asset('/css/fixes.css') }}">
|
||||
|
@@ -1,7 +1,7 @@
|
||||
<!-- REQUIRED JS SCRIPTS -->
|
||||
<!-- JQuery and bootstrap are required by Laravel 5.7 in resources/js/bootstrap.js-->
|
||||
<!-- Laravel App -->
|
||||
<script src="{{ url(mix('/js/app.js')) }}" type="text/javascript"></script>
|
||||
<script src="{{ asset('/js/app.js') }}" type="text/javascript"></script>
|
||||
<!-- AdminLTE -->
|
||||
<script src="{{ asset('/js/adminlte.min.js') }}"></script>
|
||||
|
||||
@@ -21,6 +21,9 @@
|
||||
NoTransitionAfterReload: false
|
||||
};
|
||||
|
||||
// Work out our timezone.
|
||||
const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
|
||||
|
||||
$(function () {
|
||||
"use strict";
|
||||
|
||||
|
Reference in New Issue
Block a user