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

Enabled search, added lodash and other minor improvements

Browse Source
This commit is contained in:
Deon George
2013-05-08 19:42:55 +10:00
parent e3c93e1d38
commit 42059cb0e5
8 changed files with 108 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,15 +21,14 @@
// @todo Work out how to delay this loading until required
echo HTML::style('media/theme/bootstrap/vendor/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5-0.0.2.css');
} else {
// @todo - This protocol should be ommitted so that http/https is used as appropriate
echo HTML::style('http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap.min.css');
echo HTML::style('http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css');
echo HTML::style('http://netdna.bootstrapcdn.com/font-awesome/3.0.2/css/font-awesome.css');
echo HTML::style($meta->secure().'netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap.min.css');
echo HTML::style($meta->secure().'netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css');
echo HTML::style($meta->secure().'netdna.bootstrapcdn.com/font-awesome/3.0.2/css/font-awesome.css');
// @todo Work out how to delay this loading until required
echo HTML::style('http://cdn.jsdelivr.net/bootstrap.wysihtml5/0.0.2/bootstrap-wysihtml5-0.0.2.css');
echo HTML::style($meta->secure().'cdn.jsdelivr.net/bootstrap.wysihtml5/0.0.2/bootstrap-wysihtml5-0.0.2.css');
}
echo HTML::style('http://fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,800italic,400,600,800');
echo HTML::style($meta->secure().'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');
@@ -52,7 +51,7 @@
</ul>
<form class="navbar-search pull-right">
<input type="text" class="search-query" placeholder="Search" disabled>
<input type="text" name="search-query" class="search-query" placeholder="Search" data-provide="typeahead">
</form>
</div><!--/.nav-collapse -->
@@ -104,15 +103,19 @@
// @todo Work out how to delay this loading until required
echo HTML::script('media/theme/bootstrap/vendor/bootstrap-wysihtml5-0.0.2/libs/js/wysihtml5-0.3.0_rc2.min.js');
echo HTML::script('media/theme/bootstrap/vendor/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5-0.0.2.min.js');
echo HTML::script('media/js/lodash/lodash-1.2.1.min.js');
} else {
echo HTML::script('http://code.jquery.com/jquery-1.9.1.min.js');
echo HTML::script('http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/js/bootstrap.min.js');
echo HTML::script($meta->secure().'code.jquery.com/jquery-1.9.1.min.js');
echo HTML::script($meta->secure().'netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/js/bootstrap.min.js');
// @todo Work out how to delay this loading until required
echo HTML::script('http://cdn.jsdelivr.net/wysihtml5/0.3.0/wysihtml5-0.3.0.min.js');
echo HTML::script('http://cdn.jsdelivr.net/bootstrap.wysihtml5/0.0.2/bootstrap-wysihtml5-0.0.2.min.js');
echo HTML::script($meta->secure().'cdn.jsdelivr.net/wysihtml5/0.3.0/wysihtml5-0.3.0.min.js');
echo HTML::script($meta->secure().'cdn.jsdelivr.net/bootstrap.wysihtml5/0.0.2/bootstrap-wysihtml5-0.0.2.min.js');
echo HTML::script($meta->secure().'cdnjs.cloudflare.com/ajax/libs/lodash.js/1.2.1/lodash.min.js');
}
echo HTML::script('media/theme/baseadmin/js/custom.js');
echo HTML::script('media/theme/baseadmin/js/backtotop.js');
echo HTML::script('media/js/search.js');
echo HTML::script('media/js/custom.js');
echo Script::factory()->render_all();
?>
</body>