added more stacks

2018-08-04 18:05:37 +03:00 · 2018-08-04 18:05:37 +03:00 · 40c04128ff
commit 40c04128ff
parent d0dbf23d5a
24 changed files with 138 additions and 7 deletions
--- a/resources/views/layouts/admin.blade.php
+++ b/resources/views/layouts/admin.blade.php
@ -2,6 +2,8 @@
    @include('partials.admin.head')

    <body class="hold-transition {{ setting('general.admin_theme', 'skin-green-light') }} sidebar-mini fixed">
+        @stack('body_start')
+
        <!-- Site wrapper -->
        <div class="wrapper">
            @include('partials.admin.header')
@ -12,5 +14,7 @@

            @include('partials.admin.footer')
        </div>
+
+        @stack('body_end')
    </body>
 </html>
--- a/resources/views/layouts/auth.blade.php
+++ b/resources/views/layouts/auth.blade.php
@ -2,7 +2,11 @@
    @include('partials.auth.head')

    <body class="hold-transition login-page">
+        @stack('body_start')
+
        <div class="login-box">
+            @stack('login_box_start')
+
            <div class="login-logo">
                <img src="{{ asset('public/img/akaunting-logo-white.png') }}" alt="Akaunting" />
            </div>
@ -13,7 +17,11 @@

                @include('flash::message')

+                @stack('login_content_start')
+
                @yield('content')
+
+                @stack('login_content_end')
            </div>
            <!-- /.login-box-body -->

@ -21,6 +29,10 @@
                {{ trans('footer.powered') }}: <a href="https://akaunting.com" target="_blank">{{ trans('footer.software') }}</a>
            </div>
            <!-- /.login-box-footer -->
+
+            @stack('login_box_end')
        </div>
+
+        @stack('body_end')
    </body>
 </html>
--- a/resources/views/layouts/bill.blade.php
+++ b/resources/views/layouts/bill.blade.php
@ -2,10 +2,14 @@
    @include('partials.bill.head')

    <body onload="window.print();">
+        @stack('body_start')
+
        <!-- Content Wrapper. Contains page content -->
        <div class="wrapper" style="margin-left: 0; page-break-after: always;">
            @yield('content')
        </div>
        <!-- /.content-wrapper -->
+
+        @stack('body_end')
    </body>
 </html>
--- a/resources/views/layouts/customer.blade.php
+++ b/resources/views/layouts/customer.blade.php
@ -2,6 +2,8 @@
    @include('partials.customer.head')

    <body class="hold-transition skin-green-light sidebar-mini fixed">
+        @stack('body_start')
+
        <!-- Site wrapper -->
        <div class="wrapper">
            @include('partials.customer.header')
@ -12,5 +14,7 @@

            @include('partials.customer.footer')
        </div>
+
+        @stack('body_end')
    </body>
 </html>
--- a/resources/views/layouts/invoice.blade.php
+++ b/resources/views/layouts/invoice.blade.php
@ -2,10 +2,14 @@
    @include('partials.invoice.head')

    <body onload="window.print();">
+        @stack('body_start')
+
        <!-- Content Wrapper. Contains page content -->
        <div class="wrapper" style="margin-left: 0; page-break-after: always;">
            @yield('content')
        </div>
        <!-- /.content-wrapper -->
+
+        @stack('body_end')
    </body>
 </html>
--- a/resources/views/layouts/modules.blade.php
+++ b/resources/views/layouts/modules.blade.php
@ -2,6 +2,8 @@
    @include('partials.modules.head')

    <body class="hold-transition {{ setting('general.admin_theme', 'skin-green-light') }} sidebar-mini fixed">
+        @stack('body_start')
+
        <!-- Site wrapper -->
        <div class="wrapper">
            @include('partials.admin.header')
@ -12,5 +14,7 @@

            @include('partials.admin.footer')
        </div>
+
+        @stack('body_end')
    </body>
 </html>
--- a/resources/views/layouts/print.blade.php
+++ b/resources/views/layouts/print.blade.php
@ -7,6 +7,10 @@
    @endpush

    <body onload="window.print();" class="print-width">
+        @stack('body_start')
+
        @yield('content')
+
+        @stack('body_end')
    </body>
 </html>
--- a/resources/views/partials/admin/content.blade.php
+++ b/resources/views/partials/admin/content.blade.php
@ -1,7 +1,13 @@
+@stack('content_start')
+
 <!-- Content Wrapper. Contains page content -->
 <div class="content-wrapper">
+    @stack('content_wrapper_start')
+
    <!-- Content Header (Page header) -->
    <section class="content-header content-center">
+        @stack('content_header_start')
+
        <h1>
            @yield('title')
            @yield('new_button')
@ -13,18 +19,28 @@
                @endforeach
            @endif
        </h1>
+
+        @stack('content_header_end')
    </section>

    <!-- Main content -->
    <section class="content content-center">
        @include('flash::message')

+        @stack('content_content_start')
+
        @yield('content')
+
+        @stack('content_content_start')
    </section>
    <!-- /.content -->
+
+    @stack('content_wrapper_end')
 </div>
 <!-- /.content-wrapper -->

 <script type="text/javascript">
    $('div.alert').not('.alert-important').delay(3000).fadeOut(350);
 </script>
+
+@stack('content_end')
--- a/resources/views/partials/admin/footer.blade.php
+++ b/resources/views/partials/admin/footer.blade.php
@ -1,6 +1,10 @@
+@stack('footer_start')
+
 <footer class="main-footer">
    <div class="pull-right hidden-xs">
        <b>{{ trans('footer.version') }}</b> {{ version('short') }}
    </div>
    <strong>{{ trans('footer.powered') }}</strong>: <a href="https://akaunting.com" target="_blank">{{ trans('footer.software') }}</a>
 </footer>
+
+@stack('footer_end')
--- a/resources/views/partials/admin/head.blade.php
+++ b/resources/views/partials/admin/head.blade.php
@ -1,4 +1,6 @@
 <head>
+    @stack('head_start')
+
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <!-- Tell the browser to be responsive to screen width -->
@ -63,4 +65,6 @@
    @stack('js')

    @stack('scripts')
+
+    @stack('head_end')
 </head>
--- a/resources/views/partials/admin/header.blade.php
+++ b/resources/views/partials/admin/header.blade.php
@ -1,3 +1,5 @@
+@stack('header_start')
+
 <header class="main-header">
    <!-- Logo -->
    <a href="{{ url('/') }}" class="logo">
@ -18,10 +20,8 @@
        <!-- Sidebar toggle button-->
        <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
        </a>
+
        <ul class="add-new nav navbar-nav pull-left">
            <!-- Notifications: style can be found in dropdown.less -->
            <li class="dropdown add-new-menu">
@ -86,8 +86,12 @@
            </li>
        </ul>

+        @stack('header_navbar_left')
+
        <div class="navbar-custom-menu">
            <ul class="nav navbar-nav">
+                @stack('header_navbar_right')
+
                @permission('read-notifications')
                <!-- Notifications: style can be found in dropdown.less -->
                <li class="dropdown notifications-menu">
@ -232,3 +236,5 @@
        </div>
    </nav>
 </header>
+
+@stack('header_end')
--- a/resources/views/partials/admin/menu.blade.php
+++ b/resources/views/partials/admin/menu.blade.php
@ -1,3 +1,5 @@
+@stack('menu_start')
+
 <aside class="main-sidebar">
    <!-- sidebar: style can be found in sidebar.less -->
    <section class="sidebar">
@ -37,3 +39,5 @@
    </section>
    <!-- /.sidebar -->
 </aside>
+
+@stack('menu_end')
--- 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())
    <div class="pull-left" style="margin-top: 7px;">
        <small>{{ trans('pagination.showing', ['first' => $items->firstItem(), 'last' => $items->lastItem(), 'total' => $items->total(), 'type' => strtolower(trans_choice('general.' . $type, 2))]) }}</small>
@ -10,3 +12,5 @@
        <small>{{ trans('general.no_records') }}</small>
    </div>
@endif
+
+@stack('pagination_end')
--- a/resources/views/partials/auth/head.blade.php
+++ b/resources/views/partials/auth/head.blade.php
@ -1,4 +1,6 @@
 <head>
+    @stack('head_start')
+
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <!-- Tell the browser to be responsive to screen width -->
@ -47,4 +49,6 @@
    @stack('js')

    @stack('scripts')
+
+    @stack('head_end')
 </head>
--- a/resources/views/partials/bill/head.blade.php
+++ b/resources/views/partials/bill/head.blade.php
@ -1,4 +1,6 @@
 <head>
+    @stack('head_start')
+
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <!-- Tell the browser to be responsive to screen width -->
@ -52,4 +54,6 @@
    @stack('js')

    @stack('scripts')
+
+    @stack('head_end')
 </head>
--- a/resources/views/partials/customer/content.blade.php
+++ b/resources/views/partials/customer/content.blade.php
@ -1,23 +1,39 @@
+@stack('content_start')
+
 <!-- Content Wrapper. Contains page content -->
 <div class="content-wrapper">
+    @stack('content_wrapper_start')
+
    <!-- Content Header (Page header) -->
    <section class="content-header content-center">
+        @stack('content_header_start')
+
        <h1>
            @yield('title')
            @yield('new_button')
        </h1>
+
+        @stack('content_header_end')
    </section>

    <!-- Main content -->
    <section class="content content-center">
        @include('flash::message')

+        @stack('content_content_start')
+
        @yield('content')
+
+        @stack('content_content_start')
    </section>
    <!-- /.content -->
+
+    @stack('content_wrapper_end')
 </div>
 <!-- /.content-wrapper -->

 <script type="text/javascript">
    $('div.alert').not('.alert-important').delay(3000).fadeOut(350);
 </script>
+
+@stack('content_end')
--- a/resources/views/partials/customer/footer.blade.php
+++ b/resources/views/partials/customer/footer.blade.php
@ -1,3 +1,7 @@
+@stack('footer_start')
+
 <footer class="main-footer">
    <strong>{{ trans('footer.powered') }}</strong>: <a href="https://akaunting.com">{{ trans('footer.software') }}</a>
 </footer>
+
+@stack('footer_end')
--- a/resources/views/partials/customer/head.blade.php
+++ b/resources/views/partials/customer/head.blade.php
@ -1,4 +1,6 @@
 <head>
+    @stack('head_start')
+
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <!-- Tell the browser to be responsive to screen width -->
@ -68,4 +70,6 @@
    @stack('js')

    @stack('scripts')
+
+    @stack('head_end')
 </head>
--- a/resources/views/partials/customer/header.blade.php
+++ b/resources/views/partials/customer/header.blade.php
@ -1,3 +1,5 @@
+@stack('header_start')
+
 <header class="main-header">
    <!-- Logo -->
    <a href="{{ url('customers') }}" class="logo">
@ -11,13 +13,14 @@
        <!-- Sidebar toggle button-->
        <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
        </a>

+        @stack('header_navbar_left')
+
        <div class="navbar-custom-menu">
            <ul class="nav navbar-nav">
+                @stack('header_navbar_right')
+
                <!-- Notifications: style can be found in dropdown.less -->
                <li class="dropdown notifications-menu">
                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
@ -100,3 +103,5 @@
        </div>
    </nav>
 </header>
+
+@stack('header_end')
--- a/resources/views/partials/customer/menu.blade.php
+++ b/resources/views/partials/customer/menu.blade.php
@ -1,3 +1,5 @@
+@stack('menu_start')
+
 <aside class="main-sidebar">
    <!-- sidebar: style can be found in sidebar.less -->
    <section class="sidebar">
@ -6,3 +8,5 @@
    </section>
    <!-- /.sidebar -->
 </aside>
+
+@stack('menu_end')
--- 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())
    <div class="pull-left" style="margin-top: 7px;">
        <small>{{ trans('pagination.showing', ['first' => $items->firstItem(), 'last' => $items->lastItem(), 'total' => $items->total(), 'type' => strtolower(trans_choice('general.' . $type, 2))]) }}</small>
@ -10,3 +12,5 @@
        <small>{{ trans('general.no_records') }}</small>
    </div>
@endif
+
+@stack('pagination_end')
--- a/resources/views/partials/install/head.blade.php
+++ b/resources/views/partials/install/head.blade.php
@ -1,4 +1,6 @@
 <head>
+    @stack('head_start')
+
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <!-- Tell the browser to be responsive to screen width -->
@ -47,4 +49,6 @@
    @stack('js')

    @stack('scripts')
+
+    @stack('head_end')
 </head>
--- a/resources/views/partials/invoice/head.blade.php
+++ b/resources/views/partials/invoice/head.blade.php
@ -1,4 +1,6 @@
 <head>
+    @stack('head_start')
+
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <!-- Tell the browser to be responsive to screen width -->
@ -52,4 +54,6 @@
    @stack('js')

    @stack('scripts')
+
+    @stack('head_end')
 </head>
--- a/resources/views/partials/modules/head.blade.php
+++ b/resources/views/partials/modules/head.blade.php
@ -1,4 +1,6 @@
 <head>
+    @stack('head_start')
+
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <!-- Tell the browser to be responsive to screen width -->
@ -82,4 +84,6 @@
    @stack('js')

    @stack('scripts')
+
+    @stack('head_end')
 </head>