diff --git a/app/helpers.php b/app/helpers.php
index fb383a22..6cf2b939 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -81,3 +81,52 @@ if (! function_exists('json')) {
}
}
}
+
+if (! function_exists('bs_footer')) {
+
+ function bs_footer($page_identification = "")
+ {
+ $scripts = [
+ assets('js/app.min.js'),
+ assets('lang/'.session('locale', config('app.locale')).'/locale.js'),
+ assets('js/general.js')
+ ];
+
+ if ($page_identification !== "") {
+ $scripts[] = assets("js/$page_identification.js");
+ }
+
+ foreach ($scripts as $script) {
+ echo "";
+ }
+
+ if (Session::has('msg')): ?>
+
+ '.Option::get("custom_js").'';
+ }
+}
+
+if (! function_exists('bs_header')) {
+
+ function bs_header($page_identification = "")
+ {
+ $styles = [
+ assets('css/app.min.css'),
+ assets('vendor/skins/'.Option::get('color_scheme').'.min.css')
+ ];
+
+ if ($page_identification !== "") {
+ $styles[] = assets("css/$page_identification.css");
+ }
+
+ foreach ($styles as $style) {
+ echo "";
+ }
+
+ echo '';
+ }
+}
diff --git a/resources/views/admin/master.tpl b/resources/views/admin/master.tpl
index 6b7f6adc..aeba4fa4 100644
--- a/resources/views/admin/master.tpl
+++ b/resources/views/admin/master.tpl
@@ -8,15 +8,9 @@
-
-
-
-
-
+ {!! bs_header('admin') !!}
@yield('style')
-
-
@@ -138,9 +132,7 @@
-
-
-
+ {!! bs_footer('admin') !!}
@if (Option::get('check_update') == '1')