diff --git a/resources/themes/adminlte/views/auth/login.blade.php b/resources/themes/adminlte/views/auth/login.blade.php index 007d3d2..639dba9 100644 --- a/resources/themes/adminlte/views/auth/login.blade.php +++ b/resources/themes/adminlte/views/auth/login.blade.php @@ -5,50 +5,72 @@ @endsection @section('content') - -
-
- +
- - @include('adminlte::layouts.partials.scripts_auth') - - - + @endsection \ No newline at end of file diff --git a/resources/themes/adminlte/views/auth/partials/scripts.blade.php b/resources/themes/adminlte/views/auth/partials/scripts.blade.php new file mode 100644 index 0000000..1dce323 --- /dev/null +++ b/resources/themes/adminlte/views/auth/partials/scripts.blade.php @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/resources/themes/adminlte/views/auth/partials/social_login.blade.php b/resources/themes/adminlte/views/auth/partials/social_login.blade.php index 556f219..5ce12e7 100644 --- a/resources/themes/adminlte/views/auth/partials/social_login.blade.php +++ b/resources/themes/adminlte/views/auth/partials/social_login.blade.php @@ -1,6 +1,9 @@ -
+ +
+ \ No newline at end of file diff --git a/resources/themes/adminlte/views/auth/register.blade.php b/resources/themes/adminlte/views/auth/register.blade.php deleted file mode 100644 index eefe88f..0000000 --- a/resources/themes/adminlte/views/auth/register.blade.php +++ /dev/null @@ -1,44 +0,0 @@ -@extends('adminlte::layouts.auth') - -@section('htmlheader_title') - Register -@endsection - -@section('content') - - -
-
- - - @if (count($errors) > 0) -
- Whoops! {{ trans('adminlte_lang::message.someproblems') }}

-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif - -
- - - - - - I already have an account -
-
-
- - @include('adminlte::layouts.partials.scripts_auth') - - @include('adminlte::auth.terms') - - - -@endsection diff --git a/resources/themes/adminlte/views/errors/403.blade.php b/resources/themes/adminlte/views/errors/403.blade.php deleted file mode 100644 index d973682..0000000 --- a/resources/themes/adminlte/views/errors/403.blade.php +++ /dev/null @@ -1,20 +0,0 @@ -@extends('adminlte::layouts.errors') - -@section('htmlheader_title') - {{ trans('adminlte_lang::message.servererror') }} -@endsection - -@section('main-content') - -
-

403

-
-

Oops! Bad Authentication

-

- Sorry, your authentication failed. - {{ trans('adminlte_lang::message.mainwhile') }} {{ trans('adminlte_lang::message.returndashboard') }}. -

-
-
-
-@endsection diff --git a/resources/themes/adminlte/views/errors/404.blade.php b/resources/themes/adminlte/views/errors/404.blade.php deleted file mode 100644 index b802caf..0000000 --- a/resources/themes/adminlte/views/errors/404.blade.php +++ /dev/null @@ -1,20 +0,0 @@ -@extends('adminlte::layouts.errors') - -@section('htmlheader_title') - {{ trans('adminlte_lang::message.pagenotfound') }} -@endsection - -@section('main-content') - -
-

404

-
-

Oops! {{ trans('adminlte_lang::message.pagenotfound') }}.

-

- {{ trans('adminlte_lang::message.notfindpage') }} - {{ trans('adminlte_lang::message.mainwhile') }} {{ trans('adminlte_lang::message.returndashboard') }}. -

-
-
-
-@endsection \ No newline at end of file diff --git a/resources/themes/adminlte/views/errors/500.blade.php b/resources/themes/adminlte/views/errors/500.blade.php deleted file mode 100644 index cbb2be1..0000000 --- a/resources/themes/adminlte/views/errors/500.blade.php +++ /dev/null @@ -1,20 +0,0 @@ -@extends('adminlte::layouts.errors') - -@section('htmlheader_title') - {{ trans('adminlte_lang::message.servererror') }} -@endsection - -@section('main-content') - -
-

500

-
-

Oops! {{ trans('adminlte_lang::message.somethingwrong') }}

-

{{ trans($msg) }}

-

- {{ trans('adminlte_lang::message.wewillwork') }} - {{ trans('adminlte_lang::message.mainwhile') }} {{ trans('adminlte_lang::message.returndashboard') }}. -

-
-
-@endsection diff --git a/resources/themes/adminlte/views/layouts/app.blade.php b/resources/themes/adminlte/views/layouts/app.blade.php index 0155ff2..e97a6e5 100644 --- a/resources/themes/adminlte/views/layouts/app.blade.php +++ b/resources/themes/adminlte/views/layouts/app.blade.php @@ -1,44 +1,46 @@ - -@section('htmlheader') - @include('adminlte::layouts.partials.htmlheader') -@show - - -
-
- @include('adminlte::layouts.partials.mainheader') - - @include('adminlte::layouts.partials.sidebar') - - -
- - @include('adminlte::layouts.partials.contentheader') - - -
-
- - @yield('main-content') -
-
- -
- - - @include('adminlte::layouts.partials.footer') -
-
- - @section('scripts') - @include('adminlte::layouts.partials.scripts') - {{-- Scripts --}} - {!! Asset::scripts() !!} - - @yield('page-scripts') + @section('htmlheader') + @include('adminlte::layouts.partials.htmlheader') @show - + +
+
+ @include('adminlte::layouts.partials.mainheader') + + @include('adminlte::layouts.partials.sidebar') + + +
+ + @include('adminlte::layouts.partials.contentheader') + + +
+
+ + @yield('main-content') +
+
+ +
+ + @isset($controlsidebar) + @include('adminlte::layouts.partials.controlsidebar') + @endisset + + @include('adminlte::layouts.partials.footer') +
+
+ + @section('scripts') + @include('adminlte::layouts.partials.scripts') + + {{-- Scripts --}} + {!! Asset::scripts() !!} + + @yield('page-scripts') + @show + \ No newline at end of file diff --git a/resources/themes/adminlte/views/layouts/auth.blade.php b/resources/themes/adminlte/views/layouts/auth.blade.php index b54d100..c8d8ed9 100644 --- a/resources/themes/adminlte/views/layouts/auth.blade.php +++ b/resources/themes/adminlte/views/layouts/auth.blade.php @@ -1,8 +1,19 @@ + @section('htmlheader') + @include('adminlte::layouts.partials.htmlheader') -@include('adminlte::layouts.partials.htmlheader') + + + @show -@yield('content') + +
+ @yield('content') +
+ @section('scripts') + @include('adminlte::auth.partials.scripts') + @show + \ No newline at end of file diff --git a/resources/themes/adminlte/views/layouts/errors.blade.php b/resources/themes/adminlte/views/layouts/errors.blade.php deleted file mode 100644 index 35a90d9..0000000 --- a/resources/themes/adminlte/views/layouts/errors.blade.php +++ /dev/null @@ -1,17 +0,0 @@ - - - -@include('adminlte::layouts.partials.htmlheader') - -
- -
- - @yield('main-content') -
-
- @section('scripts') - @include('adminlte::layouts.partials.scripts') - @show - - \ No newline at end of file diff --git a/resources/themes/adminlte/views/layouts/partials/contentheader.blade.php b/resources/themes/adminlte/views/layouts/partials/contentheader.blade.php index 6d580aa..43d797b 100644 --- a/resources/themes/adminlte/views/layouts/partials/contentheader.blade.php +++ b/resources/themes/adminlte/views/layouts/partials/contentheader.blade.php @@ -1,17 +1,23 @@ -
-
-

- @yield('contentheader_title', 'Content Title') - @yield('contentheader_description') -

-
    -
  1. Home
    2. - - @isset($breadcrumb) - @foreach ($breadcrumb as $item => $url) -
  2. {{ $item }}
    3. - @endforeach - @endisset -
-
\ No newline at end of file +
+
+
+
+

@yield('contentheader_title', 'Content Title')

+ @yield('contentheader_description','Description') +
+
+
    +
  1. Home
    2. + @isset($breadcrumb) + @foreach ($breadcrumb as $item => $url) +
  2. {{ $item }}
    3. + @endforeach + @endisset +
  3. @yield('contentheader_title', 'Content Title')
    4. +
+
+
+
+
+ \ No newline at end of file diff --git a/resources/themes/adminlte/views/layouts/partials/controlsidebar.blade.php b/resources/themes/adminlte/views/layouts/partials/controlsidebar.blade.php new file mode 100644 index 0000000..34de1ce --- /dev/null +++ b/resources/themes/adminlte/views/layouts/partials/controlsidebar.blade.php @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/resources/themes/adminlte/views/layouts/partials/footer.blade.php b/resources/themes/adminlte/views/layouts/partials/footer.blade.php index 6ffa108..728092a 100644 --- a/resources/themes/adminlte/views/layouts/partials/footer.blade.php +++ b/resources/themes/adminlte/views/layouts/partials/footer.blade.php @@ -1,8 +1,10 @@ - + \ No newline at end of file diff --git a/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php b/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php index c4000b4..87a4fb8 100644 --- a/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php +++ b/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php @@ -6,47 +6,31 @@ - + + + + + + + + + + + + - - +@append \ No newline at end of file diff --git a/resources/themes/adminlte/views/layouts/partials/scripts.blade.php b/resources/themes/adminlte/views/layouts/partials/scripts.blade.php index 3be157b..93cae96 100644 --- a/resources/themes/adminlte/views/layouts/partials/scripts.blade.php +++ b/resources/themes/adminlte/views/layouts/partials/scripts.blade.php @@ -1,8 +1,9 @@ - - + + + {{-- @todo Test that we are validating this, also axios should be doing this for us? --}} @@ -12,49 +13,4 @@ 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') } }); - - $.AdminLTESidebarTweak = {}; - - $.AdminLTESidebarTweak.options = { - EnableRemember: true, - //Removes the transition after page reload. - NoTransitionAfterReload: false - }; - - $(function () { - "use strict"; - - $("body").on("collapsed.pushMenu", function(){ - if($.AdminLTESidebarTweak.options.EnableRemember){ - document.cookie = "toggleState=closed"; - } - }); - $("body").on("expanded.pushMenu", function(){ - if($.AdminLTESidebarTweak.options.EnableRemember){ - document.cookie = "toggleState=opened"; - } - }); - - if($.AdminLTESidebarTweak.options.EnableRemember){ - var re = new RegExp('toggleState' + "=([^;]+)"); - var value = re.exec(document.cookie); - var toggleState = (value != null) ? unescape(value[1]) : null; - if(toggleState == 'closed'){ - if($.AdminLTESidebarTweak.options.NoTransitionAfterReload){ - $("body").addClass('sidebar-collapse hold-transition').delay(100).queue(function(){ - $(this).removeClass('hold-transition'); - }); - }else{ - $("body").addClass('sidebar-collapse'); - } - } - } - }); - - - -@js('/site/js/jquery.slimscroll.min.js','jq.slimscroll') -@js('/site/js/fastclick.min.js','jq.fastclick') \ No newline at end of file + \ No newline at end of file diff --git a/resources/themes/adminlte/views/layouts/partials/scripts_auth.blade.php b/resources/themes/adminlte/views/layouts/partials/scripts_auth.blade.php deleted file mode 100644 index eba12a1..0000000 --- a/resources/themes/adminlte/views/layouts/partials/scripts_auth.blade.php +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/resources/themes/adminlte/views/layouts/partials/sidebar.blade.php b/resources/themes/adminlte/views/layouts/partials/sidebar.blade.php index 73f8b82..428b64d 100644 --- a/resources/themes/adminlte/views/layouts/partials/sidebar.blade.php +++ b/resources/themes/adminlte/views/layouts/partials/sidebar.blade.php @@ -1,112 +1,31 @@ - -
+ + \ No newline at end of file diff --git a/resources/themes/adminlte/views/layouts/partials/sidebarmenu.blade.php b/resources/themes/adminlte/views/layouts/partials/sidebarmenu.blade.php index 62c635b..34291d6 100644 --- a/resources/themes/adminlte/views/layouts/partials/sidebarmenu.blade.php +++ b/resources/themes/adminlte/views/layouts/partials/sidebarmenu.blade.php @@ -1,5 +1,11 @@ - +
  • MAIN
    • + +
  • + + +

    + My Link Title + New +

    +     +
    • \ No newline at end of file diff --git a/resources/themes/adminlte/views/layouts/partials/topmenu.blade.php b/resources/themes/adminlte/views/layouts/partials/topmenu.blade.php index e69de29..2c65e41 100644 --- a/resources/themes/adminlte/views/layouts/partials/topmenu.blade.php +++ b/resources/themes/adminlte/views/layouts/partials/topmenu.blade.php @@ -0,0 +1,7 @@ +{{-- +@foreach ($topmenu as $url => $title) +
  • + {{ $title }} +
    • +@endforeach +--}} \ No newline at end of file