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

Minor updates and enhancements to Table()

Browse Source
This commit is contained in:
Deon George
2013-05-14 23:55:30 +10:00
parent b65ddab2d0
commit 783964ee59
9 changed files with 159 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@
<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');
@@ -97,7 +97,7 @@
</div> <!-- /main -->
<?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');
// @todo Work out how to delay this loading until required