laravel/leenooks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No longer using // urls, and fixed sudo rendoring

Browse Source
This commit is contained in:
Deon George 2019-06-17 11:44:56 +10:00
parent 70a7142877
commit 6d876f2c94
No known key found for this signature in database
GPG Key ID: 7670E8DC27415254
7 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/themes/adminlte/views/auth/partials/scripts.blade.php
View File

@ -1,7 +1,7 @@
<!-- Compiled app javascript --> <!-- Compiled app javascript -->
<script src="{{ url (mix('/js/app.js')) }}"></script> <script src="{{ url (mix('/js/app.js')) }}"></script>
<!-- iCheck --> <!-- iCheck -->
<script src="/plugin/iCheck/icheck.min.js"></script> <script src="{{ asset('/plugin/iCheck/icheck.min.js') }}"></script>
<script> <script>
$(document).ready(function() { $(document).ready(function() {

2
resources/themes/adminlte/views/layouts/auth.blade.php
View File

@ -4,7 +4,7 @@
@include('adminlte::layouts.partials.htmlheader') @include('adminlte::layouts.partials.htmlheader')
<!-- iCheck --> <!-- iCheck -->
<link rel="stylesheet" href="/plugin/iCheck/square/blue.css"> <link rel="stylesheet" href="{{ asset('/plugin/iCheck/square/blue.css') }}">
@show @show
<body class="hold-transition login-page"> <body class="hold-transition login-page">

3
resources/themes/adminlte/views/layouts/partials/contentheader.blade.php
View File

@ -1,11 +1,12 @@
<!-- Content Header (Page header) --> <!-- Content Header (Page header) -->
<div class="content-header"> <div class="content-header d-print-none">
<div class="container-fluid"> <div class="container-fluid">
<div class="row mb-2"> <div class="row mb-2">
<div class="col-sm-6"> <div class="col-sm-6">
<h1 class="m-0 text-dark">@yield('contentheader_title', 'Content Title')</h1> <h1 class="m-0 text-dark">@yield('contentheader_title', 'Content Title')</h1>
<small>@yield('contentheader_description','Description')</small> <small>@yield('contentheader_description','Description')</small>
</div><!-- /.col --> </div><!-- /.col -->
<div class="col-sm-6"> <div class="col-sm-6">
<ol class="breadcrumb float-sm-right small"> <ol class="breadcrumb float-sm-right small">
<li class="breadcrumb-item"><a href="{{ url('/home'.(isset($ido) ? '/'.$ido->id : '')) }}">Home</a></li> <li class="breadcrumb-item"><a href="{{ url('/home'.(isset($ido) ? '/'.$ido->id : '')) }}">Home</a></li>

16
resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php
View File

@ -6,23 +6,23 @@
<!-- CSRF Token --> <!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}"> <meta name="csrf-token" content="{{ csrf_token() }}">
<link href="{{ asset('/css/app.css') }}" rel="stylesheet" type="text/css" /> <link rel="stylesheet" href="{{ asset('/css/app.css') }}">
<!-- Font Awesome Icons --> <!-- Font Awesome Icons -->
<link rel="stylesheet" href="/plugin/font-awesome/css/font-awesome.min.css"> <link rel="stylesheet" href="{{ asset('/plugin/font-awesome/css/font-awesome.min.css') }}">
<!-- IonIcons --> <!-- IonIcons -->
<link rel="stylesheet" href="//code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css"> <link rel="stylesheet" href="{{ request()->getScheme() }}://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
<!-- Theme style --> <!-- Theme style -->
<link rel="stylesheet" href="/css/adminlte.min.css"> <link rel="stylesheet" href="{{ asset('/css/adminlte.min.css') }}">
<!-- Google Font: Source Sans Pro --> <!-- Google Font: Source Sans Pro -->
<link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet"> <link href="{{ request()->getScheme() }}://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
@if(file_exists('css/social.css')) @if(file_exists('css/social.css'))
<!-- Social Logins --> <!-- Social Logins -->
<link rel="stylesheet" href="/css/social.css"> <link rel="stylesheet" href="{{ asset('/css/social.css') }}">
@endif @endif
@if(file_exists('css/print.css')) @if(file_exists('css/print.css'))
<!-- Printing Modifications --> <!-- Printing Modifications -->
<link rel="stylesheet" href="/css/print.css"> <link rel="stylesheet" href="{{ asset('/css/print.css') }}">
@endif @endif
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
@ -54,6 +54,6 @@
@if(file_exists('css/fixes.css')) @if(file_exists('css/fixes.css'))
<!-- CSS Fixes --> <!-- CSS Fixes -->
<link rel="stylesheet" href="/css/fixes.css"> <link rel="stylesheet" href="{{ asset('/css/fixes.css') }}">
@endif @endif
</head> </head>

14
resources/themes/adminlte/views/layouts/partials/mainheader.blade.php
View File

@ -33,7 +33,13 @@
<i class="fa fa-cog"></i> <i class="fa fa-cog"></i>
</a> </a>
<div class="dropdown-menu dropdown-menu-lg dropdown-menu-right"> <div class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
<span class="dropdown-item dropdown-header">{{ $user->name ?: 'User Name' }}</span> <span class="dropdown-item dropdown-header @if($user->switched) bg-danger @endif">
@if($user->switched)
SUDO (<small>{{ $user->name ?: 'User Name' }}</small>)
@else
{{ $user->name ?: 'User Name' }}
@endif
</span>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<a href="{{ url('settings') }}" class="dropdown-item"> <a href="{{ url('settings') }}" class="dropdown-item">
@ -41,9 +47,15 @@
</a> </a>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
@if ($user->switched)
<a href="{{ url('/admin/switch/stop') }}" class="dropdown-item" id="switch">
<i class="fa fa-sign-out mr-2"></i> {{ trans('adminlte_lang::message.switchoff') }}
</a>
@else
<a href="{{ url('logout') }}" class="dropdown-item"> <a href="{{ url('logout') }}" class="dropdown-item">
<i class="fa fa-sign-out mr-2"></i> Log Out <i class="fa fa-sign-out mr-2"></i> Log Out
</a> </a>
@endif
</div> </div>
</li> </li>
@else @else

2
resources/themes/adminlte/views/layouts/partials/scripts.blade.php
View File

@ -3,7 +3,7 @@
<!-- Laravel App --> <!-- Laravel App -->
<script src="{{ url(mix('/js/app.js')) }}" type="text/javascript"></script> <script src="{{ url(mix('/js/app.js')) }}" type="text/javascript"></script>
<!-- AdminLTE --> <!-- AdminLTE -->
<script src="/js/adminlte.min.js"></script> <script src="{{ asset('/js/adminlte.min.js') }}"></script>
<script type="text/javascript"> <script type="text/javascript">
// Our CSRF token to each interaction // Our CSRF token to each interaction

4
resources/themes/adminlte/views/layouts/partials/sidebar.blade.php
View File

@ -1,8 +1,8 @@
<!-- Main Sidebar Container --> <!-- Main Sidebar Container -->
<aside class="main-sidebar sidebar-dark-primary elevation-4"> <aside class="main-sidebar sidebar-dark-primary elevation-4 d-print-none">
<!-- Brand Logo --> <!-- Brand Logo -->
<a href="{{ url('home') }}" class="brand-link"> <a href="{{ url('home') }}" class="brand-link">
<img src="/img/logo.png" alt="Logo" class="brand-image img-circle elevation-3" style="opacity: .8"> <img src="{{ asset('/img/logo.png') }}" alt="Logo" class="brand-image img-circle elevation-3" style="opacity: .8">
<span class="brand-text font-weight-light">{!! config('app.name_html_long','<b>App</b>Name') !!}</span> <span class="brand-text font-weight-light">{!! config('app.name_html_long','<b>App</b>Name') !!}</span>
</a> </a>