bootstrapify the nav

8 files changed, 308 insertions, 250 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 73c06fd4b..89117ac1c 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -65,3 +65,51 @@ margin-left: 0px;
 float:none;
 margin-left:0px;
 }
+
+/* nav overrides */
+
+nav .badge {
+	position: relative;
+	top: -48px;
+	float: left;
+	font-size: 10px;
+	padding: 2px 6px;
+	cursor: pointer;
+}
+
+nav .dropdown-menu {
+	top: 51px;
+	max-height: 450px;
+	max-width: 300px;
+	overflow-y: auto;
+	margin-top: 0px;
+}
+
+nav .dropdown-menu .contactname {
+	padding-top: 2px;
+	font-weight: bold;
+	display: block;
+}
+
+nav .dropdown-menu img {
+	float: left;
+	margin-right: 5px;
+	width: 32px;
+	height: 32px;
+}
+
+nav .dropdown-menu li a {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	line-height: 1em;
+	padding: 5px 10px;
+}
+
+nav .navbar-collapse {
+	max-height: 450px;
+}
+
+nav .navbar-right li:last-child {
+	padding-right: 20px;
+}
+/* nav overrides end */
diff --git a/view/css/default.css b/view/css/default.css
index 27df38dee..4afcbf1d5 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -1,18 +1,8 @@
-
-nav {
-	height: 24px;
-	display: block;
-	position: fixed;
-	width: 100%;
-	z-index: 100;
-	background-color: #ff0000;
-}
-
 aside#region_1 {
 	display: block;
 	width: 210px;
 	position: absolute;
-	top: 48px;
+	top: 65px;
 	left: 0;
 	margin-left: 10px;
 }
@@ -24,7 +14,7 @@ aside input[type='text'] {
 
 section {
 	position: absolute;
-	top: 48px;
+	top: 65px;
 	left: 250px;
 	display: block;
 	right: 15px;
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 7ad6d79e5..dcda66b81 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -109,6 +109,9 @@
 	opacity: 0;
 }
 
+li:hover .group-edit-icon {
+	opacity: 1;
+}
 /* affinity - slider */
 
 #main-slider {
diff --git a/view/js/main.js b/view/js/main.js
index 44cb79949..fa96596f4 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -197,58 +197,34 @@
 		/* setup field_richtext */
 		setupFieldRichtext();
 
-		/* popup menus */
-		function close_last_popup_menu() {
- 			if(last_popup_menu) {
- 				last_popup_menu.hide();
-/* 				last_popup_button.removeClass("selected"); */
-	 			last_popup_menu = null;
- 				last_popup_button = null;
- 			}	
-		}
 
 		/* Turn elements with one of our special rel tags into popup menus */
+		/* CHANGES: let bootstrap handle popups and only do the loading here */
 	
 		$('a[rel^=#]').click(function(e){
 				manage_popup_menu(this,e);
-				return false;
+				return;
 		});
 
 		$('span[rel^=#]').click(function(e){
 				manage_popup_menu(this,e);
-				return false;
+				return;
 		});
 
 
 		function manage_popup_menu(w,e) {
-			close_last_popup_menu();
 			menu = $( $(w).attr('rel') );
-			e.preventDefault();
-			e.stopPropagation();
-			if (menu.attr('popup')=="false") return false;
-/*			$(w).parent().toggleClass("selected"); */
+
 			/* notification menus are loaded dynamically 
 			 * - here we find a rel tag to figure out what type of notification to load */
+
 			var loader_source = $(menu).attr('rel');
 		
 			if(typeof(loader_source) != 'undefined' && loader_source.length) {	
 				notify_popup_loader(loader_source);
 			}
-			menu.toggle();
-			if (menu.css("display") == "none") {
-				last_popup_menu = null;
-				last_popup_button = null;
-			} else {
-				last_popup_menu = menu;
-				last_popup_button = $(w).parent();
-			}
-			return false;
 		}
-	
-		$('html').click(function() {
-			close_last_popup_menu();
-		});
-		
+
 		// fancyboxes
 		$("a.popupbox").fancybox({
 			'transitionIn' : 'elastic',
@@ -324,46 +300,46 @@
 
 				if(data.network == 0) { 
 					data.network = ''; 
-					$('#net-update').removeClass('show') 
+					$('.net-update').removeClass('show')
 				} 
 				else { 
-					$('#net-update').addClass('show') 
+					$('.net-update').addClass('show')
 				}
-				$('#net-update').html(data.network);
+				$('.net-update').html(data.network);
 
-				if(data.home == 0) { data.home = ''; $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') }
-				$('#home-update').html(data.home);
+				if(data.home == 0) { data.home = ''; $('.home-update').removeClass('show') } else { $('.home-update').addClass('show') }
+				$('.home-update').html(data.home);
 			
 
-				if(data.intros == 0) { data.intros = ''; $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') }
-				$('#intro-update').html(data.intros);
+				if(data.intros == 0) { data.intros = ''; $('.intro-update').removeClass('show') } else { $('.intro-update').addClass('show') }
+				$('.intro-update').html(data.intros);
 
-				if(data.mail == 0) { data.mail = ''; $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') }
-				$('#mail-update').html(data.mail);
+				if(data.mail == 0) { data.mail = ''; $('.mail-update').removeClass('show') } else { $('.mail-update').addClass('show') }
+				$('.mail-update').html(data.mail);
 			
 
-				if(data.notify == 0) { data.notify = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
-				$('#notify-update').html(data.notify);
+				if(data.notify == 0) { data.notify = ''; $('.notify-update').removeClass('show') } else { $('.notify-update').addClass('show') }
+				$('.notify-update').html(data.notify);
 
-				if(data.register == 0) { data.register = ''; $('#register-update').removeClass('show') } else { $('#register-update').addClass('show') }
-				$('#register-update').html(data.register);
+				if(data.register == 0) { data.register = ''; $('.register-update').removeClass('show') } else { $('.register-update').addClass('show') }
+				$('.register-update').html(data.register);
 
-				if(data.events == 0) { data.events = ''; $('#events-update').removeClass('show') } else { $('#events-update').addClass('show') }
-				$('#events-update').html(data.events);
+				if(data.events == 0) { data.events = ''; $('.events-update').removeClass('show') } else { $('.events-update').addClass('show') }
+				$('.events-update').html(data.events);
 
-				if(data.events_today == 0) { data.events_today = ''; $('#events-today-update').removeClass('show') } else { $('#events-today-update').addClass('show') }
-				$('#events-today-update').html(data.events_today);
+				if(data.events_today == 0) { data.events_today = ''; $('.events-today-update').removeClass('show') } else { $('.events-today-update').addClass('show') }
+				$('.events-today-update').html(data.events_today);
 
-				if(data.birthdays == 0) { data.birthdays = ''; $('#birthdays-update').removeClass('show') } else { $('#birthdays-update').addClass('show') }
-				$('#birthdays-update').html(data.birthdays);
+				if(data.birthdays == 0) { data.birthdays = ''; $('.birthdays-update').removeClass('show') } else { $('.birthdays-update').addClass('show') }
+				$('.birthdays-update').html(data.birthdays);
 
-				if(data.birthdays_today == 0) { data.birthdays_today = ''; $('#birthdays-today-update').removeClass('show') } else { $('#birthdays-today-update').addClass('show') }
-				$('#birthdays-today-update').html(data.birthdays_today);
+				if(data.birthdays_today == 0) { data.birthdays_today = ''; $('.birthdays-today-update').removeClass('show') } else { $('.birthdays-today-update').addClass('show') }
+				$('.birthdays-today-update').html(data.birthdays_today);
 
-				if(data.all_events == 0) { data.all_events = ''; $('#all_events-update').removeClass('show') } else { $('#all_events-update').addClass('show') }
-				$('#all_events-update').html(data.all_events);
-				if(data.all_events_today == 0) { data.all_events_today = ''; $('#all_events-today-update').removeClass('show') } else { $('#all_events-today-update').addClass('show') }
-				$('#all_events-today-update').html(data.all_events_today);
+				if(data.all_events == 0) { data.all_events = ''; $('.all_events-update').removeClass('show') } else { $('.all_events-update').addClass('show') }
+				$('.all_events-update').html(data.all_events);
+				if(data.all_events_today == 0) { data.all_events_today = ''; $('.all_events-today-update').removeClass('show') } else { $('.all_events-today-update').addClass('show') }
+				$('.all_events-today-update').html(data.all_events_today);
 
 
 				$(data.notice).each(function() {
@@ -671,8 +647,7 @@ function updateConvItems(mode,data) {
 
 
 				$(data.notify).each(function() {
-					text = "<span class='contactname'>"+this.name+"</span>" + ' ' + this.message + '<br />';
-					html = notifications_tpl.format(this.notify_link,this.photo,text,this.when,this.class);
+					html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.class);
 					$("#nav-" + notifyType + "-menu").append(html);
 				});
 
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 78fdac0cd..127f09683 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -140,6 +140,8 @@ blockquote {
 	filter:alpha(opacity=100);
 }
 
+/* this is not yet supported
+
 nav {
 	background-image: linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
 	background-image: -o-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
@@ -151,8 +153,6 @@ nav {
 
 }
 
-
-
 nav:hover {
 	background-image: linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
 	background-image: -o-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
@@ -163,7 +163,7 @@ nav:hover {
 	filter:alpha(opacity=100);
 
 }
-
+*/
 
 nav #site-location {
 	color: #888a85;
@@ -204,15 +204,15 @@ header #site-location {
 }
 
 header #banner {
-
   overflow: hidden;
   text-align: center;
-  font-size: 1.4em;
+  font-size: 14px;
   font-family: tahoma, "Lucida Sans", sans;
   color: $banner_colour;
   font-weight: bold;
-  margin-top: 1px;
+  margin: 14px;
 }
+
 header #banner a,
 header #banner a:active,
 header #banner a:visited,
@@ -879,8 +879,8 @@ footer {
 }
 
 #nav-search-spinner {
-	float: right;
-	margin: 12px 12px 0px 0px;
+	float: left;
+	margin: 25px 0px 0px 25px;
 	color: #fff;
 }
 
@@ -892,6 +892,7 @@ footer {
 
 #nav-search-text {
 	height: 20px;
+	margin: 15px;
 	padding: 0px 5px 0px 5px;
 	border-radius: 10px;
 	border: none;
@@ -919,11 +920,6 @@ footer {
 	font-family: FontAwesome;
 }
 
-#nav-user-linkmenu img {
-	border-radius: $radiuspx;
-	margin-top: -4px;
-}
-
 .nav-dropdown-indicator {
     opacity: 0.8;
     filter:alpha(opacity=80);
@@ -1548,8 +1544,8 @@ div.jGrowl div.info {
 
 #nav-search-text-ac .autocomplete {
 	position: fixed;
-	top: 24px;
-	border: 1px solid $nav_bg_1;
+	top: 51px;
+	border: 1px solid #222;
 	border-top: none;
 }
 
@@ -1628,26 +1624,6 @@ nav .fakelink:hover { text-decoration: none; }
 	color: #000000;
 }
 
-nav ul {
-  margin: 0px;
-  padding: 0px 20px;
-}
-nav ul li {
-  list-style: none;
-  margin: 0px;
-  padding: 0px;
-  float: left;
-}
-nav ul li .menu-popup {
-  left: 0px;
-  right: auto;
-  top: 33px;
-}
-
-#nav-user-linkmenu {
-	margin-left: 5px;
-}
-
 nav .nav-menu-icon {
   position: relative;
   height: 22px;
@@ -1785,13 +1761,10 @@ header {
   position: fixed;
   left: 43%;
   right: 43%;
-  top: 0px;
   margin: 0px;
   padding: 0px;
-  /*width: 100%; height: 12px; */
-
-  z-index: 110;
-  color: #ffffff;
+  z-index: 1400;
+  color: #fff;
 }
 
 
@@ -2469,3 +2442,38 @@ img.mail-list-sender-photo {
 	border-radius: $radiuspx;
 	background-color: #eee;
 }
+
+/* nav bootstrap */
+nav i {
+	font-size: 14px;
+}
+
+nav img {
+	height: 47px;
+	width: 47px;
+	margin: 2px 0px 1px 10px;
+	border-radius: $radiuspx;
+}
+
+nav ul li {
+	max-height: 50px
+}
+
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link {
+  color: #333;
+}
+
+nav .badge {
+	border-radius: $radiuspx;
+}
+
+nav .dropdown-menu {
+	font-size: $body_font_size;
+	border-top-right-radius: 0px;
+	border-top-left-radius: 0px;
+	border-bottom-right-radius: $radiuspx;
+	border-bottom-left-radius: $radiuspx;
+}
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index ca05986a2..cc573d99e 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -4,7 +4,7 @@
 </div>
 
 {{if $expert}}
-{{include file="field_select.tpl" field=$nav_colour}}
+{{* include file="field_select.tpl" field=$nav_colour *}}
 {{include file="field_input.tpl" field=$banner_colour}}
 {{include file="field_input.tpl" field=$link_colour}}
 {{include file="field_input.tpl" field=$bgcolour}}
@@ -19,7 +19,7 @@
 {{include file="field_input.tpl" field=$radius}}
 {{include file="field_input.tpl" field=$shadow}}
 {{include file="field_input.tpl" field=$converse_width}}
-{{include file="field_input.tpl" field=$nav_min_opacity}}
+{{* include file="field_input.tpl" field=$nav_min_opacity *}}
 {{include file="field_input.tpl" field=$top_photo}}
 {{include file="field_input.tpl" field=$reply_photo}}
 {{include file="field_checkbox.tpl" field=$sloppy_photos}}
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index eb4c6c2ad..b96c46dd7 100755
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -1,5 +1,6 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <base href="{{$baseurl}}/" />
+<meta name="viewport" content="width=device-width, initial-scale=0">
 <meta name="generator" content="{{$generator}}" />
 
 <!--[if IE]>
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 048f53743..ba8d68b13 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -1,151 +1,184 @@
 <header>
-	<div id="site-location">{{$sitelocation}}</div>
-	<div id="banner">{{$banner}}</div>
+<!--	<div id="site-location">{{$sitelocation}}</div> -->
+	<div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div>
 </header>
-<nav>
-	<ul>
 
-	{{if $userinfo}}
-	      <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$userinfo.name}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="nav-dropdown-indicator">&#x25BC;</span></a>
-		{{if $localuser}}
-			<ul id="nav-user-menu" class="menu-popup">
-				{{foreach $nav.usermenu as $usermenu}}
-					<li><a class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li>
-				{{/foreach}}
-				{{if $nav.profiles}}<li><a class="{{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}">{{$nav.profiles.1}}</a></li>{{/if}}
-				{{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}	
-				{{if $nav.contacts}}<li><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}}
-				{{if $nav.settings}}<li><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}
-
-				{{if $nav.admin}}<li><a class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>{{/if}}
-
-				{{if $nav.logout}}<li><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}}
-
-			</ul>
-		{{/if}}
-		</li>
-	{{/if}}
-
-
-	{{if $nav.lock}}
-		<li id="nav-rmagic-link" class="nav-menu-icon" >
-			<i class="{{if $nav.locked}}icon-lock{{else}}icon-unlock{{/if}} fakelink nav-icon" onclick="window.location.href='{{$nav.lock.0}}'; return false;"  title="{{$nav.lock.3}}" ></i>
-		</li>
-	{{/if}}
-
-		
-	{{if $nav.network}}
-		<li id="nav-network-link" class="nav-menu {{$sel.network}}">
-			<a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-th nav-icon"></i></a>
-			<span id="net-update" class="nav-notify fakelink" rel="#nav-network-menu"></span>
-			<ul id="nav-network-menu" class="menu-popup notify-menus" rel="network">
-				{{* <li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li> *}}
-				<li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a></li>
-				<li class="empty">{{$emptynotifications}}</li>
-			</ul>
-			</li>
-	{{/if}}
-
-	{{if $nav.home}}
-		<li id="nav-home-link" class="nav-menu {{$sel.home}}">
-			<a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="icon-home nav-icon"></i></a>
-			<span id="home-update" class="nav-notify fakelink" rel="#nav-home-menu"></span>
-			<ul id="nav-home-menu" class="menu-popup notify-menus" rel="home">
-				{{* <li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li> *}}
-				<li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a></li>
-				<li class="empty">{{$emptynotifications}}</li>
-			</ul>
-		</li>
-	{{/if}}
-
-   {{if $nav.register}}<li id="nav-register-link" class="nav-menu {{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}}
-
-
-	{{if $nav.messages}}
-		<li id="nav-mail-link" class="nav-menu {{$sel.messages}}">
-			<a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="icon-envelope nav-icon"></i></a>
-			<span id="mail-update" class="nav-notify fakelink" rel="#nav-messages-menu"></span>
-			<ul id="nav-messages-menu" class="menu-popup notify-menus" rel="messages">
-				<li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li>
-				<li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a></li>
-				<li class="empty">{{$emptynotifications}}</li>
-			</ul>
-		</li>
-	{{/if}}
-
-	{{if $nav.all_events}}
-		<li id="nav-all_events-link" class="nav-menu {{$sel.all_events}}">
-			<a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><i class="icon-calendar nav-icon"></i></a>
-			<span id="all_events-update" class="nav-notify fakelink" rel="#nav-all_events-menu"></span>
-			<ul id="nav-all_events-menu" class="menu-popup notify-menus" rel="all_events">
-				<li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li>
-				<li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a></li>
-				<li class="empty">{{$emptynotifications}}</li>
-			</ul>
-		</li>
-	{{/if}}
-
-	{{if $nav.intros}}
-		<li id="nav-intros-link" class="nav-menu {{$sel.intros}}">
-			<a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><i class="icon-user nav-icon"></i></a>
-			<span id="intro-update" class="nav-notify fakelink" rel="#nav-intros-menu"></span>
-			<ul id="nav-intros-menu" class="menu-popup notify-menus" rel="intros">
-				<li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li>
-				<li class="empty">{{$emptynotifications}}</li>
-			</ul>
-		</li>
-	{{/if}}
+<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+	<div class="container-fluid">
+		<div class="navbar-header">
+			<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
+				<span class="icon-bar"></span>
+				<span class="icon-bar"></span>
+				<span class="icon-bar"></span>
+			</button>
+			{{if $userinfo}}
+			<img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret"></span>
+				{{if $localuser}}
+				<ul class="dropdown-menu" role="menu" aria-labelledby="avatar">
+					{{foreach $nav.usermenu as $usermenu}}
+					<li role="presentation"><a href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem">{{$usermenu.1}}</a></li>
+					{{/foreach}}
+					{{if $nav.profiles}}<li role="presentation"><a href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem">{{$nav.profiles.1}}</a></li>{{/if}}
+					{{if $nav.manage}}<li role="presentation"><a href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem">{{$nav.manage.1}}</a></li>{{/if}}	
+					{{if $nav.contacts}}<li role="presentation"><a href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" role="menuitem">{{$nav.contacts.1}}</a></li>{{/if}}
+					{{if $nav.settings}}<li role="presentation"><a href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem">{{$nav.settings.1}}</a></li>{{/if}}
+					{{if $nav.admin}}<li role="presentation"><a href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem">{{$nav.admin.1}}</a></li>{{/if}}
+					{{if $nav.logout}}
+					<li role="presentation" class="divider"></li>
+					<li role="presentation"><a href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem">{{$nav.logout.1}}</a></li>
+					{{/if}}
+				</ul>
+				{{/if}}
+			{{/if}}
+		</div>
+		<div class="collapse navbar-collapse" id="navbar-collapse-1">
+			<ul class="nav navbar-nav navbar-left">
+			{{if $nav.lock}}
+				<li>
+					<a class="fakelink" title="{{$nav.lock.3}}" onclick="window.location.href='{{$nav.lock.0}}'; return false;"><i class="{{if $nav.locked}}icon-lock{{else}}icon-unlock{{/if}}"></i></a>
+				</li>
+			{{/if}}
+
+			{{if $nav.network}}
+				<li class="{{$sel.network}} hidden-xs">
+					<a href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-th"></i></a>
+					<span class="net-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-network-menu"></span>
+					<ul id="nav-network-menu" role="menu" class="dropdown-menu" rel="network">
+						{{* <li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li> *}}
+						<li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a></li>
+						<li class="empty">{{$emptynotifications}}</li>
+					</ul>
+				</li>
+				<li class="{{$sel.network}} visible-xs">
+					<a href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-th"></i></a>
+					<span class="net-update badge" rel="#nav-network-menu"></span>
+				</li>
+			{{/if}}
+
+			{{if $nav.home}}
+				<li class="{{$sel.home}} hidden-xs">
+					<a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="icon-home"></i></a>
+					<span class="home-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-home-menu"></span>
+					<ul id="nav-home-menu" class="dropdown-menu" rel="home">
+						{{* <li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li> *}}
+						<li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a></li>
+						<li class="empty">{{$emptynotifications}}</li>
+					</ul>
+				</li>
+				<li class="{{$sel.home}} visible-xs">
+					<a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="icon-home"></i></a>
+					<span class="home-update badge"rel="#nav-home-menu"></span>
+				</li>
+			{{/if}}
+
+			{{if $nav.register}}<li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}}
+
+			{{if $nav.messages}}
+				<li class="{{$sel.messages}} hidden-xs">
+					<a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="icon-envelope"></i></a>
+					<span class="mail-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-messages-menu"></span>
+					<ul id="nav-messages-menu" class="dropdown-menu" rel="messages">
+						<li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li>
+						<li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a></li>
+						<li class="empty">{{$emptynotifications}}</li>
+					</ul>
+				</li>
+				<li class="{{$sel.messages}} visible-xs">
+					<a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="icon-envelope"></i></a>
+					<span class="mail-update badge" rel="#nav-messages-menu"></span>
+				</li>
+			{{/if}}
+
+			{{if $nav.all_events}}
+				<li class="{{$sel.all_events}} hidden-xs">
+					<a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><i class="icon-calendar"></i></a>
+					<span class="all_events-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-all_events-menu"></span>
+					<ul id="nav-all_events-menu" class="dropdown-menu" rel="all_events">
+						<li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li>
+						<li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a></li>
+						<li class="empty">{{$emptynotifications}}</li>
+					</ul>
+				</li>
+				<li class="{{$sel.all_events}} visible-xs">
+					<a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><i class="icon-calendar"></i></a>
+					<span class="all_events-update badge" rel="#nav-all_events-menu"></span>
+				</li>
+			{{/if}}
+
+			{{if $nav.intros}}
+				<li class="{{$sel.intros}} hidden-xs">
+					<a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><i class="icon-user"></i></a>
+					<span class="intro-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-intros-menu"></span>
+					<ul id="nav-intros-menu" class="dropdown-menu" rel="intros">
+						<li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li>
+						<li class="empty">{{$emptynotifications}}</li>
+					</ul>
+				</li>
+				<li class="{{$sel.intros}} visible-xs">
+					<a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><i class="icon-user"></i></a>
+					<span class="intro-update badge" rel="#nav-intros-menu"></span>
+				</li>
+			{{/if}}
 		
-	{{if $nav.notifications}}
-		<li id="nav-notify-linkmenu" class="nav-menu fakelink {{$sel.notifications}}">
-			<a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="icon-exclamation nav-icon"></i></a>
-			<span id="notify-update" class="nav-notify fakelink" rel="#nav-notify-menu"></span>
-			<ul id="nav-notify-menu" class="menu-popup notify-menus" rel="notify">
-				<li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
-				<li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a></li>
-				<li class="empty">{{$emptynotifications}}</li>
+			{{if $nav.notifications}}
+				<li class="{{$sel.notifications}} hidden-xs">
+					<a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="icon-exclamation"></i></a>
+					<span class="notify-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-notify-menu"></span>
+					<ul id="nav-notify-menu" class="dropdown-menu" rel="notify">
+						<li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+						<li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a></li>
+						<li class="empty">{{$emptynotifications}}</li>
+					</ul>
+				</li>
+				<li class="{{$sel.notifications}} visible-xs">
+					<a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="icon-exclamation"></i></a>
+					<span class="notify-update badge" rel="#nav-notify-menu"></span>
+				</li>
+			{{/if}}
 			</ul>
-		</li>
-	{{/if}}		
-	
-	{{if $nav.login}}<li id="nav-login-link" class="nav-menu {{$nav.login.2}}"><a href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}}
-	{{if $nav.alogout}}<li id=nav-alogout-link" class="nav-menu {{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" >{{$nav.alogout.1}}</a></li>{{/if}}
-
-	{{if $nav.directory}}
-		<li id="nav-directory-link" class="nav-menu {{$sel.directory}}">
-			<a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}"><i class="icon-sitemap nav-icon"></i></a>
-		</li>
-	{{/if}}
-
-	{{if $nav.help}} 
-		<li id="nav-help-link" class="nav-menu {{$sel.help}}">
-			<a class="{{$nav.help.2}}" target="friendika-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="icon-question nav-icon"></i></a>
-		</li>
-	{{/if}}
-
-	{{if $nav.apps}}
-		<li id="nav-apps-link" class="nav-menu {{$sel.apps}}">
-			<a class=" {{$nav.apps.2}}" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" ><i class="icon-cogs nav-icon"></i></a>
-			<ul id="nav-apps-menu" class="menu-popup">
-			{{foreach $apps as $ap}}
-				<li>{{$ap}}</li>
-				{{/foreach}}
+			<ul class="nav navbar-nav navbar-right">
+				<li class="hidden-xs">
+					<form method="get" action="search" role="search">
+						<div id="nav-search-spinner"></div><input class="icon-search" id="nav-search-text" type="text" value="" placeholder="&#xf002;" name="search" title="{{$nav.search.3}}" onclick="this.submit();" />
+					</form>
+				</li>
+				<li class="visible-xs">
+					<a href="/search" title="Search"><i class="icon-search"></i></a>
+				</li>
+
+			{{if $nav.login}}<li class="{{$nav.login.2}}"><a href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}}
+
+			{{if $nav.alogout}}<li class="{{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" >{{$nav.alogout.1}}</a></li>{{/if}}
+
+			{{if $nav.directory}}
+				<li class="{{$sel.directory}}">
+					<a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}"><i class="icon-sitemap"></i></a>
+				</li>
+			{{/if}}
+
+			{{if $nav.apps}}
+				<li class="{{$sel.apps}} hidden-xs">
+					<a class="{{$nav.apps.2}} dropdown-toggle" data-toggle="dropdown" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" ><i class="icon-cogs"></i></a>
+					<ul id="nav-apps-menu" class="dropdown-menu">
+					{{foreach $apps as $ap}}
+						<li>{{$ap}}</li>
+					{{/foreach}}
+					</ul>
+				</li>
+			{{/if}}
+
+			{{if $nav.help}}
+				<li class="{{$sel.help}}">
+					<a class="{{$nav.help.2}}" target="friendika-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="icon-question"></i></a>
+				</li>
+			{{/if}}
 			</ul>
-		</li>
-	{{/if}}
-
-		<li id="nav-searchbar">		
-			<form method="get" action="search">
-				<input class="icon-search" id="nav-search-text" type="text" value="" placeholder="&#xf002;" name="search" title="{{$nav.search.3}}" onclick="this.submit();" />
-			</form>
-		</li>
-		<div id="nav-search-spinner"></div>
-
-	</ul>
+		</div>
+	</div>
 </nav>
 
 <ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+	<li class="{5}"><a href="{0}" title="{2} {3}"><img src="{1}"><span class='contactname'>{2}</span>{3}<br><span class="notif-when">{4}</span></a></li>
 </ul>
 
 {{if $langselector}}<div id="langselector" >{{$langselector}}</div>{{/if}}