From ba55400f14c7930786785db13a18a6333c20ee7d Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 11 Oct 2017 11:49:03 +0200
Subject: bring nav pinned apps to navbar_default

---
 view/tpl/navbar_default.tpl | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'view/tpl/navbar_default.tpl')

diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
index b6faad0c2..9495ea7a4 100755
--- a/view/tpl/navbar_default.tpl
+++ b/view/tpl/navbar_default.tpl
@@ -107,6 +107,13 @@
 			</div>
 		</li>
 		{{/if}}
+		{{if $navbar_apps}}
+		{{foreach $navbar_apps as $navbar_app}}
+		<li>
+		{{$navbar_app}}
+		</li>
+		{{/foreach}}
+		{{/if}}
 		<li class="nav-item dropdown" id="app-menu">
 			<a class="nav-link" href="#" data-toggle="dropdown"><i class="fa fa-fw fa-bars"></i></a>
 			<div id="dropdown-menu" class="dropdown-menu dropdown-menu-right">
-- 
cgit v1.2.3


From 56a675f713f3e971b1c9ccb60ab818f583dfc29e Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 11 Oct 2017 21:32:23 +0200
Subject: z-index issue and some icons. rename notifications-btn-1 to
 notifications-btn

---
 view/tpl/navbar_default.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/navbar_default.tpl')

diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
index 9495ea7a4..cf7235b14 100755
--- a/view/tpl/navbar_default.tpl
+++ b/view/tpl/navbar_default.tpl
@@ -67,7 +67,7 @@
 		<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
 	</button>
 	{{if $localuser || $nav.pubs}}
-	<button id="notifications-btn-1" type="button" class="navbar-toggler border-0 text-white">
+	<button id="notifications-btn" type="button" class="navbar-toggler border-0 text-white">
 		<i class="fa fa-exclamation-circle"></i>
 	</button>
 	{{/if}}
-- 
cgit v1.2.3