Updated font-awesome and bootstrap
This commit is contained in:
Deon George
@@ -1,45 +1,48 @@
|
||||
<div class="account-container stacked">
|
||||
<div class="center-block" style="width: 350px;">
|
||||
<div class="content clearfix">
|
||||
<form method="post" action="<?php echo URL::site('login'); ?>">
|
||||
<h1>Sign In</h1>
|
||||
|
||||
<div class="login-fields">
|
||||
<p>Sign in using your registered account:</p>
|
||||
<div class="field">
|
||||
<label for="username">Username:</label>
|
||||
<input type="text" id="username" name="username" value="" placeholder="Username" class="login username-field" />
|
||||
</div> <!-- /field -->
|
||||
|
||||
<div class="field">
|
||||
<label for="password">Password:</label>
|
||||
<input type="password" id="password" name="password" value="" placeholder="Password" class="login password-field"/>
|
||||
</div> <!-- /password -->
|
||||
</div> <!-- /login-fields -->
|
||||
|
||||
<div class="login-actions">
|
||||
Forgot your <a href="<?php echo URL::site('login/reset'); ?>" data-toggle="modal" data-target="#modal-reset">Password</a>?
|
||||
<!--
|
||||
<span class="login-checkbox">
|
||||
<input id="Field" name="Field" type="checkbox" class="field login-checkbox" value="First Choice" tabindex="4" />
|
||||
<label class="choice" for="Field">Keep me signed in</label>
|
||||
</span>
|
||||
-->
|
||||
<button class="button btn btn-warning btn-large">Sign In</button>
|
||||
</div> <!-- .actions -->
|
||||
|
||||
<?php if ($oauth) : ?>
|
||||
<div class="login-social">
|
||||
<p>Sign in using social network:</p>
|
||||
<?php foreach (ORM::factory('Oauth')->list_active() as $oo) : ?>
|
||||
<div class="social-btn">
|
||||
<?php echo HTML::anchor('oauth/login/'.$oo->name,'Login with <b>'.ucfirst($oo->name).'</b>',array('class'=>'btn-auth btn-'.$oo->name)); ?>
|
||||
<br>
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<div class="panel-title">Sign In</div>
|
||||
</div>
|
||||
<?php endforeach ?>
|
||||
</div>
|
||||
<?php endif ?>
|
||||
|
||||
<div class="panel-body">
|
||||
<div class="form-group">
|
||||
<p class="text-center">Sign in using your registered account:</p>
|
||||
<div class="input-group">
|
||||
<span class="input-group-addon"><i class="fa fa-user fa-fw"></i></span>
|
||||
<input type="text" id="username" name="username" value="" placeholder="Username" class="form-control" />
|
||||
</div>
|
||||
|
||||
<div class="input-group">
|
||||
<span class="input-group-addon"><i class="fa fa-lock fa-fw"></i></span>
|
||||
<input type="password" id="password" name="password" value="" placeholder="Password" class="form-control" />
|
||||
</div>
|
||||
</div> <!-- /form-group -->
|
||||
|
||||
<div class="form-group">
|
||||
<p class="text-center">Forgot your <a href="<?php echo URL::site('login/reset'); ?>" data-toggle="modal" data-target="#modal-reset">Password</a>?</p>
|
||||
<div class="btn-group">
|
||||
<button class="btn btn-default btn-large">Sign In</button>
|
||||
</div> <!-- /btn-group -->
|
||||
</div> <!-- form-group -->
|
||||
|
||||
<?php if ($oauth) : ?>
|
||||
<div class="login-social">
|
||||
<p>Sign in using social network:</p>
|
||||
<?php foreach (ORM::factory('Oauth')->list_active() as $oo) : ?>
|
||||
<div class="social-btn">
|
||||
<?php echo HTML::anchor('oauth/login/'.$oo->name,'Login with <b>'.ucfirst($oo->name).'</b>',array('class'=>'btn-auth btn-'.$oo->name)); ?>
|
||||
</div>
|
||||
<?php endforeach ?>
|
||||
</div>
|
||||
<?php endif ?>
|
||||
</div> <!-- /panel-body -->
|
||||
</div> <!-- /panel -->
|
||||
</form>
|
||||
</div> <!-- /content -->
|
||||
</div> <!-- /account-container -->
|
||||
</div> <!-- /content -->
|
||||
|
||||
<!-- Text Under Box -->
|
||||
<div class="login-extra">
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -16,18 +16,15 @@
|
||||
<?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('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/base-admin-2.css');
|
||||
echo HTML::style('media/theme/baseadmin/css/base-admin-2-responsive.css');
|
||||
echo HTML::style('media/theme/baseadmin/css/base-admin-3.css');
|
||||
echo HTML::style('media/theme/baseadmin/css/base-admin-3-responsive.css');
|
||||
echo HTML::style('media/theme/baseadmin/css/custom.css');
|
||||
echo Style::factory()->render_all();
|
||||
?>
|
||||
@@ -35,65 +32,58 @@
|
||||
|
||||
<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 -->
|
||||
@@ -108,6 +98,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');
|
||||
@@ -115,11 +132,12 @@
|
||||
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();
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -3,13 +3,17 @@
|
||||
<?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()) : ?>
|
||||
<?php if (array_key_exists('auth',Kohana::modules()) 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>
|
||||
<?php endif ?>
|
||||
</ul>
|
||||
|
||||
<div class="modal hide fade" id="modal-login" role="dialog" aria-hidden="true">
|
||||
<div class="modal-body"></div>
|
||||
<div class="modal fade" id="modal-login" role="dialog" aria-hidden="true" aria-labelledby="myModalLabel">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
<div class="modal-body"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user