diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php index 779612ccc..d7e792cb8 100644 --- a/resources/views/layouts/admin.blade.php +++ b/resources/views/layouts/admin.blade.php @@ -2,6 +2,8 @@ @include('partials.admin.head') + @stack('body_start') +
@include('partials.admin.header') @@ -12,5 +14,7 @@ @include('partials.admin.footer')
+ + @stack('body_end') diff --git a/resources/views/layouts/auth.blade.php b/resources/views/layouts/auth.blade.php index 6b886d271..da2f5805c 100644 --- a/resources/views/layouts/auth.blade.php +++ b/resources/views/layouts/auth.blade.php @@ -2,7 +2,11 @@ @include('partials.auth.head') + @stack('body_start') +
+ @stack('login_box_start') + @@ -13,7 +17,11 @@ @include('flash::message') + @stack('login_content_start') + @yield('content') + + @stack('login_content_end')
@@ -21,6 +29,10 @@ {{ trans('footer.powered') }}: {{ trans('footer.software') }} + + @stack('login_box_end') + + @stack('body_end') diff --git a/resources/views/layouts/bill.blade.php b/resources/views/layouts/bill.blade.php index 8494bab3e..fdb27abf1 100644 --- a/resources/views/layouts/bill.blade.php +++ b/resources/views/layouts/bill.blade.php @@ -2,10 +2,14 @@ @include('partials.bill.head') + @stack('body_start') +
@yield('content')
+ + @stack('body_end') diff --git a/resources/views/layouts/customer.blade.php b/resources/views/layouts/customer.blade.php index e6b9843fd..508f273f9 100644 --- a/resources/views/layouts/customer.blade.php +++ b/resources/views/layouts/customer.blade.php @@ -2,6 +2,8 @@ @include('partials.customer.head') + @stack('body_start') +
@include('partials.customer.header') @@ -12,5 +14,7 @@ @include('partials.customer.footer')
+ + @stack('body_end') diff --git a/resources/views/layouts/invoice.blade.php b/resources/views/layouts/invoice.blade.php index df937596d..9858a3252 100644 --- a/resources/views/layouts/invoice.blade.php +++ b/resources/views/layouts/invoice.blade.php @@ -2,10 +2,14 @@ @include('partials.invoice.head') + @stack('body_start') +
@yield('content')
+ + @stack('body_end') diff --git a/resources/views/layouts/modules.blade.php b/resources/views/layouts/modules.blade.php index 31399c961..927d517a4 100644 --- a/resources/views/layouts/modules.blade.php +++ b/resources/views/layouts/modules.blade.php @@ -2,6 +2,8 @@ @include('partials.modules.head') + @stack('body_start') +
@include('partials.admin.header') @@ -12,5 +14,7 @@ @include('partials.admin.footer')
+ + @stack('body_end') diff --git a/resources/views/layouts/print.blade.php b/resources/views/layouts/print.blade.php index c3f3ac095..cbcb4ad4b 100644 --- a/resources/views/layouts/print.blade.php +++ b/resources/views/layouts/print.blade.php @@ -7,6 +7,10 @@ @endpush + @stack('body_start') + @yield('content') + + @stack('body_end') diff --git a/resources/views/partials/admin/content.blade.php b/resources/views/partials/admin/content.blade.php index ee91ec608..ea0fcd409 100644 --- a/resources/views/partials/admin/content.blade.php +++ b/resources/views/partials/admin/content.blade.php @@ -1,7 +1,13 @@ +@stack('content_start') +
+ @stack('content_wrapper_start') +
+ @stack('content_header_start') +

@yield('title') @yield('new_button') @@ -13,18 +19,28 @@ @endforeach @endif

+ + @stack('content_header_end')
@include('flash::message') + @stack('content_content_start') + @yield('content') + + @stack('content_content_start')
+ + @stack('content_wrapper_end')
+ +@stack('content_end') \ No newline at end of file diff --git a/resources/views/partials/admin/footer.blade.php b/resources/views/partials/admin/footer.blade.php index 26ab9756b..12597c9b0 100644 --- a/resources/views/partials/admin/footer.blade.php +++ b/resources/views/partials/admin/footer.blade.php @@ -1,6 +1,10 @@ +@stack('footer_start') + + +@stack('footer_end') diff --git a/resources/views/partials/admin/head.blade.php b/resources/views/partials/admin/head.blade.php index 01f80e77f..c3af29438 100644 --- a/resources/views/partials/admin/head.blade.php +++ b/resources/views/partials/admin/head.blade.php @@ -1,4 +1,6 @@ + @stack('head_start') + @@ -63,4 +65,6 @@ @stack('js') @stack('scripts') + + @stack('head_end') diff --git a/resources/views/partials/admin/header.blade.php b/resources/views/partials/admin/header.blade.php index 8ed3c80cb..248e76484 100644 --- a/resources/views/partials/admin/header.blade.php +++ b/resources/views/partials/admin/header.blade.php @@ -1,3 +1,5 @@ +@stack('header_start') +
Toggle navigation - - - + + @stack('header_navbar_left') +
+ +@stack('header_end') diff --git a/resources/views/partials/admin/menu.blade.php b/resources/views/partials/admin/menu.blade.php index 8a03d0f8b..7d9554eae 100644 --- a/resources/views/partials/admin/menu.blade.php +++ b/resources/views/partials/admin/menu.blade.php @@ -1,3 +1,5 @@ +@stack('menu_start') + + +@stack('menu_end') \ No newline at end of file diff --git a/resources/views/partials/admin/pagination.blade.php b/resources/views/partials/admin/pagination.blade.php index 96191dfd4..395807023 100644 --- a/resources/views/partials/admin/pagination.blade.php +++ b/resources/views/partials/admin/pagination.blade.php @@ -1,3 +1,5 @@ +@stack('pagination_start') + @if ($items->firstItem())
{{ trans('pagination.showing', ['first' => $items->firstItem(), 'last' => $items->lastItem(), 'total' => $items->total(), 'type' => strtolower(trans_choice('general.' . $type, 2))]) }} @@ -9,4 +11,6 @@
{{ trans('general.no_records') }}
-@endif \ No newline at end of file +@endif + +@stack('pagination_end') \ No newline at end of file diff --git a/resources/views/partials/auth/head.blade.php b/resources/views/partials/auth/head.blade.php index 96242dae6..a66413a71 100644 --- a/resources/views/partials/auth/head.blade.php +++ b/resources/views/partials/auth/head.blade.php @@ -1,4 +1,6 @@ + @stack('head_start') + @@ -47,4 +49,6 @@ @stack('js') @stack('scripts') + + @stack('head_end') diff --git a/resources/views/partials/bill/head.blade.php b/resources/views/partials/bill/head.blade.php index b97f6c543..95088dddb 100644 --- a/resources/views/partials/bill/head.blade.php +++ b/resources/views/partials/bill/head.blade.php @@ -1,4 +1,6 @@ + @stack('head_start') + @@ -52,4 +54,6 @@ @stack('js') @stack('scripts') + + @stack('head_end') diff --git a/resources/views/partials/customer/content.blade.php b/resources/views/partials/customer/content.blade.php index 83ca278c4..00fcc7570 100644 --- a/resources/views/partials/customer/content.blade.php +++ b/resources/views/partials/customer/content.blade.php @@ -1,23 +1,39 @@ +@stack('content_start') +
+ @stack('content_wrapper_start') +
+ @stack('content_header_start') +

@yield('title') @yield('new_button')

+ + @stack('content_header_end')
@include('flash::message') + @stack('content_content_start') + @yield('content') + + @stack('content_content_start')
+ + @stack('content_wrapper_end')
+ +@stack('content_end') diff --git a/resources/views/partials/customer/footer.blade.php b/resources/views/partials/customer/footer.blade.php index 89a4d175b..f61a1dc1c 100644 --- a/resources/views/partials/customer/footer.blade.php +++ b/resources/views/partials/customer/footer.blade.php @@ -1,3 +1,7 @@ +@stack('footer_start') + + +@stack('footer_end') diff --git a/resources/views/partials/customer/head.blade.php b/resources/views/partials/customer/head.blade.php index f0de984ec..f850f3389 100644 --- a/resources/views/partials/customer/head.blade.php +++ b/resources/views/partials/customer/head.blade.php @@ -1,4 +1,6 @@ + @stack('head_start') + @@ -68,4 +70,6 @@ @stack('js') @stack('scripts') + + @stack('head_end') diff --git a/resources/views/partials/customer/header.blade.php b/resources/views/partials/customer/header.blade.php index 1498d0df5..7f399a093 100644 --- a/resources/views/partials/customer/header.blade.php +++ b/resources/views/partials/customer/header.blade.php @@ -1,3 +1,5 @@ +@stack('header_start') +
Toggle navigation - - - + @stack('header_navbar_left') +
+ +@stack('header_end') diff --git a/resources/views/partials/customer/menu.blade.php b/resources/views/partials/customer/menu.blade.php index 4711c9fd1..ae27d33f9 100644 --- a/resources/views/partials/customer/menu.blade.php +++ b/resources/views/partials/customer/menu.blade.php @@ -1,3 +1,5 @@ +@stack('menu_start') + + +@stack('menu_end') \ No newline at end of file diff --git a/resources/views/partials/customer/pagination.blade.php b/resources/views/partials/customer/pagination.blade.php index 9a5d6fe88..c229e97be 100644 --- a/resources/views/partials/customer/pagination.blade.php +++ b/resources/views/partials/customer/pagination.blade.php @@ -1,3 +1,5 @@ +@stack('pagination_start') + @if ($items->firstItem())
{{ trans('pagination.showing', ['first' => $items->firstItem(), 'last' => $items->lastItem(), 'total' => $items->total(), 'type' => strtolower(trans_choice('general.' . $type, 2))]) }} @@ -10,3 +12,5 @@ {{ trans('general.no_records') }}
@endif + +@stack('pagination_end') diff --git a/resources/views/partials/install/head.blade.php b/resources/views/partials/install/head.blade.php index e8ba28e92..0626e53ac 100644 --- a/resources/views/partials/install/head.blade.php +++ b/resources/views/partials/install/head.blade.php @@ -1,4 +1,6 @@ + @stack('head_start') + @@ -47,4 +49,6 @@ @stack('js') @stack('scripts') + + @stack('head_end') diff --git a/resources/views/partials/invoice/head.blade.php b/resources/views/partials/invoice/head.blade.php index b97f6c543..95088dddb 100644 --- a/resources/views/partials/invoice/head.blade.php +++ b/resources/views/partials/invoice/head.blade.php @@ -1,4 +1,6 @@ + @stack('head_start') + @@ -52,4 +54,6 @@ @stack('js') @stack('scripts') + + @stack('head_end') diff --git a/resources/views/partials/modules/head.blade.php b/resources/views/partials/modules/head.blade.php index 68a46ae1b..ea74110a3 100644 --- a/resources/views/partials/modules/head.blade.php +++ b/resources/views/partials/modules/head.blade.php @@ -1,4 +1,6 @@ + @stack('head_start') + @@ -82,4 +84,6 @@ @stack('js') @stack('scripts') + + @stack('head_end')