deon
/
lnapp
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Syncronise baseadmin and focusbusiness/bootstrap pages

This commit is contained in:
Deon George 2016-07-29 11:18:47 +10:00
parent 28fe999d54
commit c57e166834
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
views/theme/bootstrap/page.php
View File

@ -1,8 +1,8 @@
<!DOCTYPE html>
<html>
<head>
<title><?php echo Site::Appname(); ?></title>
<link rel="shortcut icon" href="<?php echo $meta->shortcut_icon ? $meta->shortcut_icon : '/favicon.ico' ?>" type="image/vnd.microsoft.icon" />
<title><?php echo Site::Appname(); ?><?php echo $meta->title ? ' - '.$meta->title : '' ?></title>
<link rel="shortcut icon" href="<?php echo $meta->shortcut_icon ? $meta->shortcut_icon : '/media/img/favicon.ico' ?>" type="image/vnd.microsoft.icon" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="Content-Language" content="<?php echo $meta->language; ?>" />
@ -14,7 +14,7 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<?php
if (Kohana::$environment >= 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 @@
</div> <!-- /footer -->
<?php
if (Kohana::$environment >= 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');

2
views/theme/focusbusiness/page.php
View File

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title><?php echo Site::Appname(); ?></title>
<title><?php echo Site::Appname(); ?><?php echo $meta->title ? ' - '.$meta->title : '' ?></title>
<link rel="shortcut icon" href="<?php echo $meta->shortcut_icon ? $meta->shortcut_icon : '/media/img/favicon.ico' ?>" type="image/vnd.microsoft.icon" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="Content-Language" content="<?php echo $meta->language; ?>" />