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

Major updates from other projects

Browse Source
This commit is contained in:
Deon George
2014-08-22 16:50:01 +10:00
parent 7961e60901
commit b657781a5b
20 changed files with 466 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
views/theme/focusbusiness/pages/navbar.php → views/theme/focusbusiness/navbar.php
View File

@@ -1,9 +1,9 @@
<ul id="main-nav">
<li class="active"><a href="<?php echo URL::site(''); ?>">Home</a></li>
<?php if ($x = Company::instance()->faq()) : ?>
<?php if (class_exists('Company') AND $x=Company::instance()->faq()) : ?>
<li><a href="<?php echo $x; ?>">Faq</a></li>
<?php endif ?>
<?php if (Auth::instance()->logged_in()) : ?>
<?php if (class_exists('Auth') AND Auth::instance()->logged_in()) : ?>
<li><a href="<?php echo URL::site('login'); ?>">Customer Login</a></li>
<?php else : ?>
<li><a href="<?php echo URL::site('login'); ?>" data-toggle="modal" data-target="#modal-login">Customer Login</a></li>

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

@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title><?php echo $meta->title; ?></title>
<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" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="Content-Language" content="<?php echo $meta->language; ?>" />
@@ -14,17 +14,17 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<?php
if (Kohana::$environment >= Kohana::TESTING) {
if (Kohana::$environment >= Kohana::TESTING OR Request::current()->secure()) {
echo HTML::style('media/theme/bootstrap/css/bootstrap.min.css');
echo HTML::style('media/theme/bootstrap/css/bootstrap-responsive.min.css');
echo HTML::style('media/vendor/font-awesome/css/font-awesome.min.css');
} else {
echo HTML::style($meta->secure().'netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap.min.css');
echo HTML::style($meta->secure().'netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css');
echo HTML::style($meta->secure().'netdna.bootstrapcdn.com/font-awesome/3.0.2/css/font-awesome.css');
echo HTML::style(Site::Protocol('netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap.min.css'));
echo HTML::style(Site::Protocol('netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css'));
echo HTML::style(Site::Protocol('netdna.bootstrapcdn.com/font-awesome/3.0.2/css/font-awesome.css'));
}
echo HTML::style($meta->secure().'fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,800italic,400,600,800');
echo HTML::style(Site::Protocol('fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,800italic,400,600,800'));
echo HTML::style('media/theme/focusbusiness/css/focus-1.1.css');
echo HTML::style('media/theme/focusbusiness/css/focus-1.1-responsive.css');
echo HTML::style('media/theme/focusbusiness/css/custom.css');
@@ -35,14 +35,16 @@
<body>
<div id="wrapper" class="clearfix">
<div id="header">
<h1 id="title"><a href="<?php echo URL::site('/'); ?>"><?php echo Config::sitename(); ?><sup>+</sup></a></h1>
<h1 id="title"><a href="<?php echo URL::site('/'); ?>"><?php echo Site::Appname(); ?><sup>+</sup></a></h1>
</div> <!-- /header -->
<?php if (! empty($shownavbar)) : ?>
<div id="nav" class="clearfix">
<div class="container">
<?php echo $navbar; ?>
</div> <!-- /container -->
</div> <!-- /nav -->
<?php endif ?>
<div id="content">
<?php echo $content; ?>
@@ -76,12 +78,14 @@
<div class="grid-4">
<h3><span class="slash">//</span> Contact Us</h3>
<?php if (class_exists('Company')) : ?>
<address>
<strong><?php echo Company::instance()->name(); ?></strong><br/>
<i class="icon-map-marker"></i> <?php echo Company::instance()->address(); ?><br/>
<i class="icon-phone"></i> <?php echo Company::instance()->phone(); ?><br/>
<i class="icon-envelope"></i> <?php echo Company::instance()->email(); ?>
</address>
<?php endif ?>
</div> <!-- /grid-4 -->
</div> <!-- /row -->
@@ -89,12 +93,12 @@
</div> <!-- /footer -->
</div> <!-- /wrapper -->
<?php
if (Kohana::$environment >= Kohana::TESTING) {
if (Kohana::$environment >= Kohana::TESTING OR 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');
} else {
echo HTML::script($meta->secure().'code.jquery.com/jquery-1.9.1.min.js');
echo HTML::script($meta->secure().'netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/js/bootstrap.min.js');
echo HTML::script(Site::Protocol('code.jquery.com/jquery-1.9.1.min.js'));
echo HTML::script(Site::Protocol('netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/js/bootstrap.min.js'));
}
echo HTML::script('media/theme/focusbusiness/js/focus.js');