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

Updated font-awesome and bootstrap

Browse Source
This commit is contained in:
Deon George
2014-09-08 23:42:05 +10:00
parent 05d132c4be
commit 85150c655c
166 changed files with 6994 additions and 19909 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,8 @@
<?php foreach (URL::navbar() as $type => $details) :
if ($x = Menu::items($type)) : ?>
<ul class="nav pull-right">
<ul class="nav navbar-nav navbar-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>
<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>

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

@@ -11,86 +11,78 @@
<meta name="copyright" content="<?php echo Config::copywrite(); ?>" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<meta name="apple-mobile-web-app-capable" content="yes">
<?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/theme/bootstrap/css/bootstrap-theme.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('maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css'));
echo HTML::style(Site::Protocol('maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.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 HTML::style('media/theme/baseadmin/css/custom.css');
echo HTML::style('media/theme/bootstrap/css/custom.css');
echo Style::factory()->render_all();
?>
</head>
<body>
<?php if (! empty($shownavbar)) : ?>
<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>
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
<div class="nav-collapse collapse">
<ul class="nav pull-right">
<?php echo $navbar; ?>
</ul>
<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 -->
<?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 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>
<?php endif ?>
</div><!--/.nav-collapse -->
</div> <!-- /container -->
</div> <!-- /navbar-inner -->
</div> <!-- /nvarbar -->
</form>
<?php endif ?>
</div><!-- /.navbar-collapse -->
</div> <!-- /.container -->
</nav>
<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>
<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>
<div class="subnav-collapse collapse">
<div class="collapse subnav-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 ?>
<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>
<?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 -->
<?php endif ?>
<?php endif ?>
<div class="error_container">
<div class="error_details">
<div class="row">
<div class="span10 offset2">
<div class="col-md-8 col-md-offset-2">
<?php echo SystemMessage::factory()->render_all(); ?>
</div>
</div> <!-- /row -->
@@ -105,6 +97,33 @@
</div> <!-- /container -->
</div> <!-- /main -->
<!--
<div class="extra">
<div class="container">
<div class="row">
<div class="col-md-3">
<h4>About</h4>
<ul>
<li><a href="javascript:;">About Us</a></li>
</ul>
</div>
</div>
</div>
</div>
-->
<div class="footer">
<div class="container">
<div class="row">
<div id="footer-copyright" class="col-md-6"><?php echo Config::Copywrite(TRUE); ?>. </div>
<div id="footer-terms" class="col-md-6">
All rights reserved
</div> <!-- /.span6 -->
</div> <!-- /row -->
</div> <!-- /container -->
</div> <!-- /footer -->
<?php
if (Kohana::$environment >= Kohana::TESTING OR Request::current()->secure()) {
echo HTML::script('media/js/jquery/jquery-1.9.1.min.js');
@@ -112,11 +131,11 @@
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('maxcdn.bootstrapcdn.com/bootstrap/3.2.0/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/typeahead.bundle.min.js');
echo HTML::script('media/js/search.js');
echo HTML::script('media/js/custom.js');
echo Script::factory()->render_all();