From 0dc47c1e4d71ac90ea5bc863e908f3792ef5960a Mon Sep 17 00:00:00 2001 From: Virgil-Adrian Teaca Date: Wed, 23 May 2018 22:25:36 +0300 Subject: [PATCH 1/2] Overall improvements --- app/Platform/Bootstrap.php | 2 +- app/Views/Layouts/Default.tpl | 9 ++++++++- themes/Bootstrap/Views/Layouts/Content.tpl | 10 ++++++++++ themes/Bootstrap/Views/Layouts/Default.tpl | 12 +++++++++++- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/app/Platform/Bootstrap.php b/app/Platform/Bootstrap.php index 523fb6c37a..7efbc1680c 100644 --- a/app/Platform/Bootstrap.php +++ b/app/Platform/Bootstrap.php @@ -14,7 +14,7 @@ // Define The Application Version //-------------------------------------------------------------------------- -define('VERSION', '4.0.65'); +define('VERSION', '4.0.66'); //-------------------------------------------------------------------------- // Set PHP Error Reporting Options diff --git a/app/Views/Layouts/Default.tpl b/app/Views/Layouts/Default.tpl index b5b0f52733..7927a77086 100644 --- a/app/Views/Layouts/Default.tpl +++ b/app/Views/Layouts/Default.tpl @@ -15,10 +15,17 @@ echo Asset::build('css', array( )); echo Asset::render('css', 'header'); -echo Asset::render('js', 'header'); @endphp + + + + + {{ Asset::render('js', 'header') }} diff --git a/themes/Bootstrap/Views/Layouts/Content.tpl b/themes/Bootstrap/Views/Layouts/Content.tpl index 0ade842165..7d8411ebf5 100644 --- a/themes/Bootstrap/Views/Layouts/Content.tpl +++ b/themes/Bootstrap/Views/Layouts/Content.tpl @@ -19,6 +19,16 @@ echo Asset::build('css', array( echo Asset::render('css', 'header'); +@endphp + + + + +@php + echo Asset::build('js', array( asset_url('js/sprintf.min.js'), 'https://code.jquery.com/jquery-1.12.4.min.js', diff --git a/themes/Bootstrap/Views/Layouts/Default.tpl b/themes/Bootstrap/Views/Layouts/Default.tpl index 8400af581f..6d56c61028 100644 --- a/themes/Bootstrap/Views/Layouts/Default.tpl +++ b/themes/Bootstrap/Views/Layouts/Default.tpl @@ -4,7 +4,6 @@ {{ $title or 'Page' }} - {{ Config::get('app.name') }} - @php echo Asset::build('css', array( @@ -17,6 +16,16 @@ echo Asset::build('css', array( echo Asset::render('css', 'header'); +@endphp + + + + +@php + echo Asset::build('js', array( asset_url('js/sprintf.min.js'), 'https://code.jquery.com/jquery-1.12.4.min.js', @@ -24,6 +33,7 @@ echo Asset::build('js', array( echo Asset::render('js', 'header'); +@endphp From 756b0603ba675b41778c7728d9a010d93b984ed3 Mon Sep 17 00:00:00 2001 From: Virgil-Adrian Teaca Date: Wed, 23 May 2018 22:31:33 +0300 Subject: [PATCH 2/2] Improve the Themes --- themes/Bootstrap/Views/Layouts/Default.tpl | 4 +- themes/Bootstrap/Views/Layouts/Static.tpl | 52 ++++++++++++++++------ 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/themes/Bootstrap/Views/Layouts/Default.tpl b/themes/Bootstrap/Views/Layouts/Default.tpl index 6d56c61028..45b2477263 100644 --- a/themes/Bootstrap/Views/Layouts/Default.tpl +++ b/themes/Bootstrap/Views/Layouts/Default.tpl @@ -27,8 +27,8 @@ echo Asset::render('css', 'header'); @php echo Asset::build('js', array( - asset_url('js/sprintf.min.js'), - 'https://code.jquery.com/jquery-1.12.4.min.js', + asset_url('js/sprintf.min.js'), + 'https://code.jquery.com/jquery-1.12.4.min.js', )); echo Asset::render('js', 'header'); diff --git a/themes/Bootstrap/Views/Layouts/Static.tpl b/themes/Bootstrap/Views/Layouts/Static.tpl index d82bc03804..9ddb1db4e6 100644 --- a/themes/Bootstrap/Views/Layouts/Static.tpl +++ b/themes/Bootstrap/Views/Layouts/Static.tpl @@ -4,19 +4,37 @@ {{ $title or 'Page' }} - {{ Config::get('app.name') }} +@php + +echo Assets::build('css', array( + 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css', + 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css', + 'https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', + asset_url('css/bootstrap-xl-mod.min.css', 'themes/bootstrap'), + asset_url('css/style.css', 'themes/bootstrap'), +)); + +echo Asset::render('css', 'header'); + +@endphp + + + + +@php + +echo Assets::build('js', array( + asset_url('js/sprintf.min.js'), + 'https://code.jquery.com/jquery-1.12.4.min.js', +)); + +echo Asset::render('js', 'header'); + +@endphp - @assets('css', array( - 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css', - 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css', - 'https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', - asset_url('css/bootstrap-xl-mod.min.css', 'themes/bootstrap'), - asset_url('css/style.css', 'themes/bootstrap'), - )) - - @assets('js', array( - asset_url('js/sprintf.min.js'), - 'https://code.jquery.com/jquery-1.12.4.min.js', - )) @@ -31,9 +49,15 @@ @include('Themes/Bootstrap::Partials/Footer') -@assets('js', array( +@php + +echo Asset::build('js', array( 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js' -)) +)); + +echo Asset::render('js', 'footer'); + +@endphp