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

Some internal reorg

Browse Source
This commit is contained in:
Deon George
2014-09-29 22:06:38 +10:00
parent 9ae0980221
commit 037633f084
25 changed files with 710 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
views/theme/bootstrap/navbar.php
View File

@@ -1,10 +1,18 @@
<?php foreach (URL::navbar() as $type => $details) :
if ($x = Menu::items($type)) : ?>
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa <?php echo Arr::get($details,'icon','fa-asterisk'); ?>"></i> <?php echo Arr::get($details,'name','?'); ?> <b class="caret"></b></a>
<?php echo Menu::ul($type,$x,$type == 'user' ? array('logout'=>'Logout') : NULL); ?>
</li>
</ul>
<?php endif;
endforeach ?>
<ul id="main-nav">
<li class="active"><a href="<?php echo URL::site(''); ?>">Home</a></li>
<?php if (class_exists('Company') AND $x=Company::instance()->faq()) : ?>
<li><a href="<?php echo $x; ?>">Faq</a></li>
<?php endif ?>
<?php if (class_exists('Auth') AND Auth::instance()->logged_in()) : ?>
<li><a href="<?php echo URL::site('login'); ?>">Login</a></li>
<?php else : ?>
<li><a href="<?php echo URL::site('login'); ?>" data-toggle="modal" data-target="#modal-login">Login</a></li>
<li><a href="<?php echo URL::site('login/register'); ?>">Register</a></li>
<?php endif ?>
</ul>
<div class="modal hide fade" id="modal-login" role="dialog" aria-hidden="true">
<div class="modal-body"></div>
</div>

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

@@ -31,49 +31,27 @@
<body>
<?php if (! empty($shownavbar)) : ?>
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar navbar-inverse navbar-fixed-top">
<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 Site::Appname(); ?><sup></sup></a>
</div> <!-- /container -->
</div> <!-- /navbar-inner -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-top-collapse">
<span class="sr-only">Toggle navigation</span>
<i class="fa fa-cog"></i>
</button>
<a class="navbar-brand" href="<?php echo URL::site(); ?>"><?php echo Site::Appname(); ?></a>
</div> <!-- /navbar-header -->
<div class="collapse navbar-collapse navbar-top-collapse">
<?php echo $navbar; ?>
<?php if (class_exists('Controller_Search')) : ?>
<form class="navbar-form navbar-right" role="search">
<div class="navbar-search-addon form-group">
<i class="fa fa-search"></i>
<input type="text" class="form-control input-sm search-query" placeholder="Search">
</div>
</form>
<?php endif ?>
</div><!-- /.navbar-collapse -->
</div> <!-- /.container -->
</nav>
</div> <!-- /nvarbar -->
<div class="subnavbar">
<div class="subnavbar-inner">
<div class="container">
<a href="javascript:;" class="subnav-toggle" data-toggle="collapse" data-target=".subnav-collapse"><span class="sr-only">Toggle navigation</span><i class="fa fa-reorder"></i></a>
<a class="btn-subnavbar collapsed" data-toggle="collapse" data-target=".subnav-collapse"><i class="icon-reorder"></i></a>
<div class="collapse subnav-collapse">
<ul class="mainnav">
<li><a href="<?php echo array_key_exists('auth',Kohana::modules()) ? URL::link('user','welcome',TRUE) : URL::site('welcome'); ?>"><i class="fa fa-home"></i><span>Home</span></a></li>
<div id="nav" class="clearfix">
<div class="container">
<?php echo $navbar; ?>
</div> <!-- /container -->
</div> <!-- /nav -->
<?php if (array_key_exists('auth',Kohana::modules()) AND ($ao = Auth::instance()->get_user()) AND $ao->isAdmin()) : ?>
<li><a href="<?php echo URL::link('admin','welcome',TRUE); ?>"><i class="fa fa-tasks"></i><span>Admin</span></a></li>
<?php endif ?>
<?php foreach (Menu::mainnav() as $name => $attributes) : ?>
<li><a href="<?php echo Arr::get($attributes,'url'); ?>"><i class="fa <?php echo Arr::get($attributes,'icon','fa-asterisk'); ?>"></i><span><?php echo $name; ?></span></a></li>
<?php endforeach ?>
</ul>
</div> <!-- /.subnav-collapse -->
</div> <!-- /container -->
</div> <!-- /subnavbar-inner -->
</div> <!-- /subnavbar -->
@@ -135,6 +113,7 @@
echo HTML::script(Site::Protocol('cdnjs.cloudflare.com/ajax/libs/lodash.js/1.2.1/lodash.min.js'));
}
echo HTML::script('media/theme/bootstrap/js/bootstrap.validator.js');
echo HTML::script('media/js/typeahead.bundle.min.js');
echo HTML::script('media/js/search.js');
echo HTML::script('media/js/custom.js');