Clean up backend layout

Replace Facade usage with helpers, clean up spacing and style, adjust head items to better match conventions Signed-off-by: Micheal Mand <micheal@kmdwebdesigns.com>

Clean up backend layout
Replace Facade usage with helpers, clean up spacing and style, adjust head items to better match conventions Signed-off-by: Micheal Mand <micheal@kmdwebdesigns.com>
5092f2d3 · Micheal Mand · ce0a3843 · 5092f2d3
Commit 5092f2d3 authored Nov 29, 2018 by Micheal Mand
Show whitespace changes
Inline Side-by-side

Showing with 106 additions and 105 deletions

master.blade.php Themes/Adminlte/views/layouts/master.blade.php +106 -105

No files found.
--- a/Themes/Adminlte/views/layouts/master.blade.php
+++ b/Themes/Adminlte/views/layouts/master.blade.php
 <!DOCTYPE html>
-<html>
-<head>
-    <base src="{{ URL::asset('/') }}" />
+<html lang="{{ locale() }}">
+    <head>
        <meta charset="UTF-8">
        <title>
            @section('title')
                @setting('core::site-name') | Admin
            @show
        </title>
-    <meta id="token" name="token" value="{{ csrf_token() }}" />
        <meta name="csrf-token" content="{{ csrf_token() }}">
        <meta name="user-api-token" content="{{ $currentUser->getFirstApiKey() }}">
        <meta name="current-locale" content="{{ locale() }}">
        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no, viewport-fit=cover">
+        <base href="{{ url('/') }}">
+        <link rel="canonical" href="{{ request()->url() }}">
+
        @foreach($cssFiles as $css)
-        <link media="all" type="text/css" rel="stylesheet" href="{{ URL::asset($css) }}">
+            <link media="all" type="text/css" rel="stylesheet" href="{{ asset($css) }}">
        @endforeach
        <link media="all" type="text/css" rel="stylesheet" href="{{ mix('css/app.css') }}">
        {!! Theme::script('vendor/jquery/jquery.min.js') !!}
@@ -39,9 +40,9 @@
        <![endif]-->
        <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic">
        @routes
-</head>
-<body class="{{ config('asgard.core.core.skin', 'skin-blue') }} sidebar-mini" style="padding-bottom: 0 !important;">
-<div class="wrapper" id="app">
+    </head>
+    <body class="{{ config('asgard.core.core.skin', 'skin-blue') }} sidebar-mini" style="padding-bottom: 0 !important;">
+        <div class="wrapper" id="app">
            <header class="main-header">
                <a href="{{ route('dashboard.index') }}" class="logo">
            <span class="logo-mini">
@@ -70,12 +71,12 @@
            </aside><!-- /.right-side -->
            @include('partials.footer')
            @include('partials.right-sidebar')
-</div><!-- ./wrapper -->
+        </div><!-- ./wrapper -->

-@foreach($jsFiles as $js)
-    <script src="{{ URL::asset($js) }}" type="text/javascript"></script>
-@endforeach
-<script>
+        @foreach($jsFiles as $js)
+            <script src="{{ asset($js) }}" type="text/javascript"></script>
+        @endforeach
+        <script>
            window.AsgardCMS = {
                translations: {!! $staticTranslations !!},
                locales: {!! json_encode(LaravelLocalization::getSupportedLocales()) !!},
@@ -86,13 +87,13 @@
                hideDefaultLocaleInURL: '{{ config('laravellocalization.hideDefaultLocaleInURL') }}',
                filesystem: '{{ config('asgard.media.config.filesystem') }}'
            };
-</script>
+        </script>

-<script src="{{ mix('js/manifest.js') }}"></script>
-<script src="{{ mix('js/vendor.js') }}"></script>
-<script src="{{ mix('js/app.js') }}"></script>
+        <script src="{{ mix('js/manifest.js') }}"></script>
+        <script src="{{ mix('js/vendor.js') }}"></script>
+        <script src="{{ mix('js/app.js') }}"></script>

-<?php if (is_module_enabled('Notification')): ?>
+        @if(is_module_enabled('Notification'))
            <script src="https://js.pusher.com/4.1.0/pusher.min.js" integrity="sha384-e9MoFh6Cw/uluf+NZ6MJwfJ1Dm7UOvJf9oTBxxCYDyStJeeAF0q53ztnEbLLDSQP" crossorigin="anonymous"></script>
            <script src="{{ Module::asset('notification:js/pusherNotifications.js') }}"></script>
            <script>
@@ -100,22 +101,22 @@
                    pusherKey: '{{ config('broadcasting.connections.pusher.key') }}',
                    pusherCluster: '{{ config('broadcasting.connections.pusher.options.cluster') }}',
                    pusherEncrypted: {{ config('broadcasting.connections.pusher.options.encrypted') }},
-            loggedInUserId: {{ $currentUser->id }},
+                    loggedInUserId: {{ $currentUser->id }}
                });
            </script>
-<?php endif; ?>
+        @endif

-<?php if (config('asgard.core.core.ckeditor-config-file-path') !== ''): ?>
+        @if(config('asgard.core.core.ckeditor-config-file-path') !== '')
            <script>
-        $('.ckeditor').each(function() {
+                $('.ckeditor').each(function () {
                    CKEDITOR.replace($(this).attr('name'), {
                        customConfig: '{{ config('asgard.core.core.ckeditor-config-file-path') }}'
                    });
                });
            </script>
-<?php endif; ?>
-@section('scripts')
-@show
-@stack('js-stack')
-</body>
+        @endif
+        @section('scripts')
+        @show
+        @stack('js-stack')
+    </body>
 </html>