From c57e16683499491a56ff177a10896a531e4ae8d0 Mon Sep 17 00:00:00 2001 From: Deon George Date: Fri, 29 Jul 2016 11:18:47 +1000 Subject: [PATCH] Syncronise baseadmin and focusbusiness/bootstrap pages --- views/theme/bootstrap/page.php | 8 ++++---- views/theme/focusbusiness/page.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/views/theme/bootstrap/page.php b/views/theme/bootstrap/page.php index 35123ec..c1c5181 100644 --- a/views/theme/bootstrap/page.php +++ b/views/theme/bootstrap/page.php @@ -1,8 +1,8 @@ - <?php echo Site::Appname(); ?> - + <?php echo Site::Appname(); ?><?php echo $meta->title ? ' - '.$meta->title : '' ?> + @@ -14,7 +14,7 @@ = Kohana::TESTING OR Request::current()->secure()) { + if (Kohana::$environment >= Kohana::TESTING OR (Request::current() AND Request::current()->secure())) { echo HTML::style('media/theme/bootstrap/css/bootstrap.min.css'); echo HTML::style('media/theme/bootstrap/css/bootstrap-theme.min.css'); echo HTML::style('media/vendor/font-awesome/css/font-awesome.min.css'); @@ -103,7 +103,7 @@ = Kohana::TESTING OR Request::current()->secure()) { + if (Kohana::$environment >= Kohana::TESTING OR (Request::current() AND Request::current()->secure())) { echo HTML::script('media/js/jquery/jquery-1.9.1.min.js'); echo HTML::script('media/theme/bootstrap/js/bootstrap.min.js'); echo HTML::script('media/js/lodash/lodash-1.2.1.min.js'); diff --git a/views/theme/focusbusiness/page.php b/views/theme/focusbusiness/page.php index 6542126..8325e86 100644 --- a/views/theme/focusbusiness/page.php +++ b/views/theme/focusbusiness/page.php @@ -1,7 +1,7 @@ - <?php echo Site::Appname(); ?> + <?php echo Site::Appname(); ?><?php echo $meta->title ? ' - '.$meta->title : '' ?>