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

10
views/theme/baseadmin/navbar.php Normal file
View File

@@ -0,0 +1,10 @@
<?php foreach (URL::navbar() as $type => $details) :
if ($x = Menu::items($type)) : ?>
<ul class="nav pull-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="<?php echo $details['icon']; ?>"></i> <?php echo $details['name']; ?> <b class="caret"></b></a>
<?php echo Menu::ul($type,$x,$type == 'user' ? array('logout'=>'Logout') : NULL); ?>
</li>
</ul>
<?php endif;
endforeach ?>

31
views/theme/baseadmin/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; ?>" />
@@ -19,12 +19,12 @@
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/css/ui-lightness/jquery-ui-1.10.0.custom.min.css');
echo HTML::style('media/theme/baseadmin/css/base-admin-2.css');
echo HTML::style('media/theme/baseadmin/css/base-admin-2-responsive.css');
@@ -39,13 +39,14 @@
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><i class="icon-cog"></i> </a>
<a class="brand" href="<?php echo URL::site(); ?>"><?php echo Config::sitename(); ?><sup></sup></a>
<a class="brand" href="<?php echo URL::site(); ?>"><?php echo Site::Appname(); ?><sup></sup></a>
<div class="nav-collapse collapse">
<ul class="nav pull-right">
<?php echo $navbar; ?>
</ul>
<?php if (class_exists('Controller_Search')) : ?>
<div class="navbar-search pull-right">
<div class="navbar-search-addon">
<i class="icon-search"></i>
@@ -53,6 +54,7 @@
<input type="text" name="search-query" class="search-query" placeholder="Search" data-provide="typeahead">
</div>
</div>
<?php endif ?>
</div><!--/.nav-collapse -->
</div> <!-- /container -->
@@ -69,13 +71,18 @@
<div class="subnav-collapse collapse">
<ul class="mainnav">
<li class="">
<a href="<?php echo URL::link('user','welcome',TRUE); ?>"><i class="icon-home"></i> <span>Home</span></a>
<a href="<?php echo URL::site('welcome'); ?>"><i class="icon-home"></i><span>Home</span></a>
</li>
<?php if (($ao = Auth::instance()->get_user()) AND $ao->isAdmin()) : ?>
<?php if (class_exists('Auth') AND ($ao = Auth::instance()->get_user()) AND $ao->isAdmin()) : ?>
<li class="">
<a href="<?php echo URL::link('admin','welcome',TRUE); ?>"><i class="icon-tasks"></i> <span>Admin</span></a>
<a href="<?php echo URL::link('admin','welcome',TRUE); ?>"><i class="icon-tasks"></i><span>Admin</span></a>
</li>
<?php endif ?>
<?php foreach (Menu::mainnav() as $name => $attributes) : ?>
<li class="">
<a href="<?php echo Arr::get($attributes,'url'); ?>"><i class="<?php echo Arr::get($attributes,'icon','icon-asterisk'); ?>"></i><span><?php echo $name; ?></span></a>
</li>
<?php endforeach ?>
</ul>
</div> <!-- /.subnav-collapse -->
</div> <!-- /container -->
@@ -107,9 +114,9 @@
echo HTML::script('media/theme/bootstrap/js/bootstrap.min.js');
echo HTML::script('media/js/lodash/lodash-1.2.1.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($meta->secure().'cdnjs.cloudflare.com/ajax/libs/lodash.js/1.2.1/lodash.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(Site::Protocol('cdnjs.cloudflare.com/ajax/libs/lodash.js/1.2.1/lodash.min.js'));
}
echo HTML::script('media/theme/baseadmin/js/backtotop.js');

10
views/theme/baseadmin/pages/navbar.php
View File

@@ -1,10 +0,0 @@
<?php foreach (URL::navbar() as $type => $details) : ?>
<?php if ($x = Menu::items($type)) : ?>
<ul class="nav pull-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="<?php echo $details['icon']; ?>"></i> <?php echo $details['name']; ?> <b class="caret"></b></a>
<?php echo Menu::ul($type,$x,$type == 'user' ? array('logout'=>'Logout') : NULL); ?>
</li>
</ul>
<?php endif ?>
<?php endforeach ?>

10
views/theme/bootstrap/navbar.php Normal file
View File

@@ -0,0 +1,10 @@
<?php foreach (URL::navbar() as $type => $details) :
if ($x = Menu::items($type)) : ?>
<ul class="nav pull-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="<?php echo $details['icon']; ?>"></i> <?php echo $details['name']; ?> <b class="caret"></b></a>
<?php echo Menu::ul($type,$x,$type == 'user' ? array('logout'=>'Logout') : NULL); ?>
</li>
</ul>
<?php endif;
endforeach ?>

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

@@ -1,53 +1,128 @@
<!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; ?>" />
<meta name="keywords" content="<?php echo $meta->keywords; ?>" />
<meta name="description" content="<?php echo $meta->description; ?>" />
<meta name="copyright" content="<?php echo Config::copywrite(); ?>" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- Bootstrap -->
<?php echo HTML::style('media/theme/bootstrap/css/bootstrap.min.css',array('media'=>'screen')); ?>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<?php
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(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(Site::Protocol('fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,800italic,400,600,800'));
echo HTML::style('media/css/ui-lightness/jquery-ui-1.10.0.custom.min.css');
echo Style::factory()->render_all();
?>
<style type="text/css">
body { padding-top: 50px; padding-bottom: 10px; }
</style>
<?php #echo Style::factory(); ?>
</head>
<body>
<?php if (! empty($shownavbar)) : ?>
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><i class="icon-cog"></i> </a>
<a class="brand" href="<?php echo URL::site(); ?>"><?php echo Site::Appname(); ?><sup></sup></a>
<a class="brand" href="#"><?php echo $meta->title; ?></a>
</div><!-- container -->
</div><!-- navbar-inner -->
</div><!-- navbar -->
<div class="nav-collapse collapse">
<ul class="nav pull-right">
<?php echo $navbar; ?>
</ul>
<div class="container-fluid">
<div class="row-fluid">
<div class="span9 offset3">
<p><?php echo $content; ?></p>
</div><!-- span12 -->
</div><!-- row -->
<?php if (class_exists('Controller_Search')) : ?>
<div class="navbar-search pull-right">
<div class="navbar-search-addon">
<i class="icon-search"></i>
<?php echo HTML::image('media/img/spinner.gif',array('class'=>'right','name'=>'searching')); ?>
<input type="text" name="search-query" class="search-query" placeholder="Search" data-provide="typeahead">
</div>
</div>
<?php endif ?>
</div><!--/.nav-collapse -->
<hr>
</div> <!-- /container -->
</div> <!-- /navbar-inner -->
</div> <!-- /nvarbar -->
<footer>
<p><?php echo $footer; ?></p>
</footer>
</div><!-- container -->
<script src="http://code.jquery.com/jquery.min.js"></script>
<?php echo HTML::script('media/theme/bootstrap/js/bootstrap.min.js'); ?>
<?php echo Script::factory(); ?>
<div class="subnavbar">
<div class="subnavbar-inner">
<div class="container">
<a class="btn-subnavbar collapsed" data-toggle="collapse" data-target=".subnav-collapse">
<i class="icon-reorder"></i>
</a>
<div class="subnav-collapse collapse">
<ul class="mainnav">
<li class="">
<a href="<?php echo URL::site('welcome'); ?>"><i class="icon-home"></i><span>Home</span></a>
</li>
<?php if (class_exists('Auth') AND ($ao = Auth::instance()->get_user()) AND $ao->isAdmin()) : ?>
<li class="">
<a href="<?php echo URL::link('admin','welcome',TRUE); ?>"><i class="icon-tasks"></i><span>Admin</span></a>
</li>
<?php endif ?>
<?php foreach (Menu::mainnav() as $name => $attributes) : ?>
<li class="">
<a href="<?php echo Arr::get($attributes,'url'); ?>"><i class="<?php echo Arr::get($attributes,'icon','icon-asterisk'); ?>"></i><span><?php echo $name; ?></span></a>
</li>
<?php endforeach ?>
</ul>
</div> <!-- /.subnav-collapse -->
</div> <!-- /container -->
</div> <!-- /subnavbar-inner -->
</div> <!-- /subnavbar -->
<?php endif ?>
<div class="error_container">
<div class="error_details">
<div class="row">
<div class="span10 offset2">
<?php echo SystemMessage::factory()->render_all(); ?>
</div>
</div> <!-- /row -->
</div> <!-- /error_details -->
</div> <!-- /error_container -->
<div class="main">
<div class="container">
<div class="row">
<?php echo $content; ?>
</div> <!-- /row -->
</div> <!-- /container -->
</div> <!-- /main -->
<?php
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');
echo HTML::script('media/js/lodash/lodash-1.2.1.min.js');
} else {
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(Site::Protocol('cdnjs.cloudflare.com/ajax/libs/lodash.js/1.2.1/lodash.min.js'));
}
echo HTML::script('media/theme/baseadmin/js/backtotop.js');
echo HTML::script('media/js/search.js');
echo HTML::script('media/js/custom.js');
echo Script::factory()->render_all();
?>
</body>
</html>

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');