Responsive updates for menu

anqh · Sep 12, 2012 · b176865 · b176865
1 parent be1bce8
commit b176865
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/classes/anqh/view/page.php b/classes/anqh/view/page.php
@@ -422,15 +422,10 @@ protected function _mainmenu() {
 
 	<nav id="mainmenu" role="navigation">
 		<?= HTML::anchor($this->base, Kohana::$config->load('site.site_name'), array('class' => 'brand')) ?>
-		<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-			<span class="icon-bar"></span>
-			<span class="icon-bar"></span>
-			<span class="icon-bar"></span>
-		</a>
 
-		<ul class="nav nav-collapse" role="menubar">
+		<ul class="nav" role="menubar">
 			<?php foreach (Kohana::$config->load('site.menu') as $id => $item): ?>
-			<li role="menuitem" class="menu-<?= $id ?>"><?= HTML::anchor($item['url'], $item['text']) ?></li>
+			<li role="menuitem" class="menu-<?= $id ?>"><?= HTML::anchor($item['url'], '<i class="' . $item['icon'] . ' icon-white visible-phone"></i><span class="hidden-phone">' . $item['text'] . '</span>') ?></li>
 			<?php endforeach; ?>
 		</ul>
 	</nav><!-- #mainmenu -->
@@ -503,7 +498,7 @@ public function render() {
 	protected function _search() {
 		ob_start();
 
-		echo Form::open(null, array('id' => 'form-search', 'class' => 'navbar-form form-search navbar-search pull-right'));
+		echo Form::open(null, array('id' => 'form-search', 'class' => 'navbar-form form-search navbar-search pull-right hidden-phone'));
 
 		echo Form::input('search-events', null, array('class' => 'input-small search-query', 'placeholder' => __('Search events..'), 'title' => __('Enter at least 3 characters')));
 		echo Form::input('search-users', null, array('class' => 'input-small search-query', 'placeholder' => __('Search users..'), 'title' => __('Enter at least 2 characters')));
@@ -537,7 +532,7 @@ protected function _signin() {
 
 ?>
 
-	<nav id="visitor" class="nav-collapse">
+	<nav id="visitor">
 		<?= Form::open(Route::url('sign', array('action' => 'in')), array('class' => 'navbar-form form-inline')) ?>
 		<?= Form::input('username', null, array('class' => 'input-mini', 'placeholder' => __('Username'), 'title' => __('HOT TIP: You can also use your email'))) ?>
 		<?= Form::password('password', null, array('class' => 'input-mini', 'placeholder' => __('Password'), 'title' => __('Forgot it? Just leave me empty'))) ?>
@@ -686,7 +681,7 @@ protected function _visitor() {
 
 ?>
 
-	<nav id="visitor" class="nav-collapse navbar-text">
+	<nav id="visitor" class="navbar-text">
 		<ul class="nav" role="menubar">
 			<li class="menuitem-notifications"><span><?= implode(' ', Anqh::notifications(self::$_user)) ?></span></li>
 			<li role="menuitem" class="menuitem-profile"><?= HTML::avatar(self::$_user->avatar, self::$_user->username, true) ?></li>

diff --git a/config/site.php b/config/site.php
@@ -56,12 +56,12 @@
 	 */
 	'menu' => array(
 //		'home'      => array('url' => URL::site(),                          'text' => __('Home')),
-		'events'    => array('url' => URL::site(Route::url('events')),      'text' => __('Events')),
-		'forum'     => array('url' => URL::site(Route::url('forum_group')), 'text' => __('Forum')),
-		'galleries' => array('url' => URL::site(Route::url('galleries')),   'text' => __('Galleries')),
-		'venues'    => array('url' => URL::site(Route::url('venues')),      'text' => __('Venues')),
-		'blogs'     => array('url' => URL::site(Route::url('blogs')),       'text' => __('Blogs')),
-		'members'   => array('url' => URL::site(Route::url('users')),       'text' => __('Members')),
+		'events'    => array('url' => URL::site(Route::url('events')),      'text' => __('Events'),    'icon' => 'icon-calendar'),
+		'forum'     => array('url' => URL::site(Route::url('forum_group')), 'text' => __('Forum'),     'icon' => 'icon-comment'),
+		'galleries' => array('url' => URL::site(Route::url('galleries')),   'text' => __('Galleries'), 'icon' => 'icon-picture'),
+		'venues'    => array('url' => URL::site(Route::url('venues')),      'text' => __('Venues'),    'icon' => 'icon-map-marker'),
+		'blogs'     => array('url' => URL::site(Route::url('blogs')),       'text' => __('Blogs'),     'icon' => 'icon-book'),
+		'members'   => array('url' => URL::site(Route::url('users')),       'text' => __('Members'),   'icon' => 'icon-user'),
 	),
 
 	/**