Updates from lnApp

This commit is contained in:
Deon George
2014-02-23 14:54:35 +11:00
parent e2b84fc063
commit 8301c0f6af
10 changed files with 13 additions and 317 deletions

View File

@@ -46,9 +46,13 @@
<?php echo $navbar; ?>
</ul>
<form class="navbar-search pull-right">
<input type="text" name="search-query" class="search-query" placeholder="Search" data-provide="typeahead">
</form>
<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>
</div><!--/.nav-collapse -->
</div> <!-- /container -->

View File

@@ -1,10 +0,0 @@
<?php foreach (URL::navbar() as $type => $details) : ?>
<?php if ($x = Menu::items($type)) : ?>
<ul class="nav pull-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>
<?php echo Menu::ul($x,$type == 'user' ? array('logout'=>'Logout') : NULL); ?>
</li>
</ul>
<?php endif ?>
<?php endforeach ?>