Merge pull request #2083 from LuckyCyborg/4.0

Overall improvements
nova-framework · May 23, 2018 · 4f99f6e · 4f99f6e
2 parents 36eb208 + 756b060
commit 4f99f6e
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 19 deletions.
diff --git 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
@@ -15,10 +15,17 @@ echo Asset::build('css', array(
 ));
 
 echo Asset::render('css', 'header');
-echo Asset::render('js', 'header');
 
 @endphp
 
+    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    {{ Asset::render('js', 'header') }}
 </head>
 <body>
 

diff --git 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
+
+    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+@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
@@ -4,7 +4,6 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>{{ $title or 'Page' }} - {{ Config::get('app.name') }}</title>
-
 @php
 
 echo Asset::build('css', array(
@@ -17,13 +16,24 @@ echo Asset::build('css', array(
 
 echo Asset::render('css', 'header');
 
+@endphp
+
+    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+@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');
 
+@endphp
 
 </head>
 <body>

diff --git a/themes/Bootstrap/Views/Layouts/Static.tpl b/themes/Bootstrap/Views/Layouts/Static.tpl
@@ -4,19 +4,37 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>{{ $title or 'Page' }} - {{ Config::get('app.name') }}</title>
+@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
+
+    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+@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',
-    ))
 </head>
 <body>
 
@@ -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
 
 </body>
 </html>