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

Updated bootstrap and many other items

Browse Source
This commit is contained in:
Deon George
2014-09-29 14:47:51 +10:00
parent 85150c655c
commit 9ae0980221
27 changed files with 999 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
views/pages/login.php → views/login.php
View File

@@ -1,7 +1,7 @@
<div class="center-block" style="width: 350px;">
<div class="content clearfix">
<form method="post" action="<?php echo URL::site('login'); ?>">
<br>
<br/>
<div class="panel panel-default">
<div class="panel-heading">
<div class="panel-title">Sign In</div>
@@ -48,7 +48,11 @@
<div class="login-extra">
<!-- Don't have an account? <a href="./signup.html">Sign Up</a><br/> -->
</div> <!-- /login-extra -->
<div class="modal hide fade" id="modal-reset" role="dialog" aria-hidden="true">
<div class="modal-body"></div>
<div class="modal fade" id="modal-reset" role="dialog" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-body"></div>
</div>
</div>
</div>
<div class="fb-root"></div>

1
views/theme/baseadmin/page.php
View File

@@ -136,6 +136,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/theme/baseadmin/js/backtotop.js');
echo HTML::script('media/js/typeahead.bundle.min.js');
echo HTML::script('media/js/search.js');

5
views/theme/focusbusiness/navbar.php
View File

@@ -1,16 +1,19 @@
<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 (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>
<li><a href="<?php echo URL::site('login/register'); ?>">Register</a></li>
<?php endif ?>
</ul>
<div class="modal fade" id="modal-login" role="dialog" aria-hidden="true" aria-labelledby="myModalLabel">
<div class="modal fade" id="modal-login" role="dialog" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-body"></div>

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

@@ -16,12 +16,10 @@
<?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'));
@@ -53,6 +51,7 @@
<div id="footer">
<div class="container">
<div class="row">
<!--
<div class="grid-4">
<h1 id="footer-logo">Focus Business</h1>
<p></p>
@@ -74,7 +73,8 @@
<a href="javascript:;" class="social-icon social-icon-facebook">Facebook</a>
</li>
</ul>
</div> <!-- /grid-4 -->
</div>
-->
<div class="grid-4">
<h3><span class="slash">//</span> Contact Us</h3>
@@ -98,7 +98,7 @@
echo HTML::script('media/theme/bootstrap/js/bootstrap.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('media/theme/focusbusiness/js/focus.js');