From 3ccefa20e8b10d0a507c6b002237664e721ca389 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 5 May 2017 16:32:20 +0200
Subject: collapse sysapps if viewing a remote channel

---
 view/tpl/nav.tpl | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

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

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index c5b378b4f..5c301b4d2 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -188,10 +188,22 @@
 		{{/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 class="dropdown-menu dropdown-menu-right">
-				{{foreach $navapps as $navapp}}
-				{{$navapp}}
+			<div id="dropdown-menu" class="dropdown-menu dropdown-menu-right">
+				{{if $channel_apps.0}}
+				{{foreach $channel_apps as $channel_app}}
+				{{$channel_app}}
 				{{/foreach}}
+				<div class="dropdown-header sys-apps-toggle" onclick="$('#dropdown-menu').click(function(e) { e.stopPropagation(); }); openClose('sys_apps');">
+					{{$sysapps_toggle}}
+				</div>
+				<div id="sys_apps" style="display:none;">
+				{{/if}}
+				{{foreach $nav_apps as $nav_app}}
+				{{$nav_app}}
+				{{/foreach}}
+				{{if $channel_apps.0}}
+				</div>
+				{{/if}}
 				{{if $localuser}}
 				<div class="dropdown-divider"></div>
 				<a class="dropdown-item" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
@@ -202,9 +214,21 @@
 </div>
 <div class="collapse d-md-none" id="navbar-collapse-2">
 	<div class="navbar-nav mr-auto">
-		{{foreach $navapps as $navapp}}
-		{{$navapp|replace:'dropdown-item':'nav-link'}}
+		{{if $channel_apps.0}}
+		{{foreach $channel_apps as $channel_app}}
+		{{$channel_app|replace:'dropdown-item':'nav-link'}}
 		{{/foreach}}
+		<div class="dropdown-header sys-apps-toggle" onclick="openClose('sys-apps-collapsed');">
+			{{$sysapps_toggle}}
+		</div>
+		<div id="sys-apps-collapsed" style="display:none;">
+		{{/if}}
+		{{foreach $nav_apps as $nav_app}}
+		{{$nav_app|replace:'dropdown-item':'nav-link'}}
+		{{/foreach}}
+		{{if $channel_apps.0}}
+		</div>
+		{{/if}}
 		{{if $localuser}}
 		<div class="dropdown-divider"></div>
 		<a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
-- 
cgit v1.2.3


From 647b5d098f0985a12acbaf6fc1d3d89c2a758129 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 22 May 2017 17:07:34 -0700
Subject: apporder style improvement and add to nav menu, also add language
 awareness to webpages

---
 view/tpl/nav.tpl | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 5c301b4d2..39fe686a9 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -207,6 +207,7 @@
 				{{if $localuser}}
 				<div class="dropdown-divider"></div>
 				<a class="dropdown-item" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
+				<a class="dropdown-item" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>
 				{{/if}}
 			</div>
 		</li>
@@ -232,6 +233,7 @@
 		{{if $localuser}}
 		<div class="dropdown-divider"></div>
 		<a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
+		<a class="dropdown-item" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>
 		{{/if}}
 	</div>
 </div>
-- 
cgit v1.2.3


From e8a4e9a31f57e53e076b440fc3b728044c42adda Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Sun, 4 Jun 2017 12:52:52 +0200
Subject: class mixup

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

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

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 39fe686a9..4719e1b17 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -233,7 +233,7 @@
 		{{if $localuser}}
 		<div class="dropdown-divider"></div>
 		<a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
-		<a class="dropdown-item" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>
+		<a class="nav-link" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>
 		{{/if}}
 	</div>
 </div>
-- 
cgit v1.2.3


From 34c4775916f824755b4545f8d6f0ec2b8a653a88 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 28 Jun 2017 16:45:48 -0700
Subject: missing space in nav tpl

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

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

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 4719e1b17..e1ee07935 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -83,7 +83,7 @@
 			</a>
 			<div id="nav-network-menu" class="dropdown-menu" rel="network">
 				<a class="dropdown-item" id="nav-network-see-all" href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a>
-				<a class="dropdown-item" id="nav-network-mark-all"href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a>
+				<a class="dropdown-item" id="nav-network-mark-all" href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a>
 				{{$emptynotifications}}
 			</div>
 		</li>
-- 
cgit v1.2.3


From 133292e241f9408ff793aa95aceec00c808fbd68 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sun, 2 Jul 2017 11:24:17 +0200
Subject: update bs-dev and min version bump

---
 view/tpl/nav.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 4719e1b17..f71feafe6 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -79,7 +79,7 @@
 		<li class="nav-item dropdown net-button" style="display: none;">
 			<a class="nav-link" href="#" title="{{$nav.network.3}}" id="{{$nav.network.4}}" data-toggle="dropdown" rel="#nav-network-menu">
 				<i class="fa fa-fw fa-th"></i>
-				<span class="badge badge-pill badge-default net-update"></span>
+				<span class="badge badge-pill badge-secondary net-update"></span>
 			</a>
 			<div id="nav-network-menu" class="dropdown-menu" rel="network">
 				<a class="dropdown-item" id="nav-network-see-all" href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a>
@@ -118,7 +118,7 @@
 		<li class="nav-item dropdown all_events-button" style="display: none;">
 			<a class="nav-link" href="#" title="{{$nav.all_events.3}}" id="{{$nav.all_events.4}}" data-toggle="dropdown" rel="#nav-all_events-menu">
 				<i class="fa fa-fw fa-calendar"></i>
-				<span class="badge badge-pill badge-default all_events-update"></span>
+				<span class="badge badge-pill badge-secondary all_events-update"></span>
 			</a>
 			<div id="nav-all_events-menu" class="dropdown-menu" rel="all_events">
 				<a class="dropdown-item" id="nav-all_events-see-all" href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a>
-- 
cgit v1.2.3


From 77b58ec02f624f8242995f46e720b6783eb59300 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Thu, 20 Jul 2017 11:56:46 +0200
Subject: css fix

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

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

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 051797658..0f2628761 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -4,7 +4,7 @@
 		{{$nav.loginmenu.1.1}}
 	</a>
 	{{if $nav.register}}
-	<a class="btn btn-warning btn-sm text-white" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" >
+	<a class="btn btn-warning btn-sm text-dark" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" >
 		{{$nav.register.1}}
 	</a>
 	{{/if}}
-- 
cgit v1.2.3


From 1bdcfe5219c810758ae255427513a7a0c09ce8e1 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Fri, 21 Jul 2017 10:32:21 +0200
Subject: provide a mechanism to mark apps active in the bin

---
 view/tpl/nav.tpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 0f2628761..93bbe187f 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -19,10 +19,10 @@
 	{{if $localuser}}
 	<div class="dropdown-menu">
 		{{foreach $nav.usermenu as $usermenu}}
-		<a class="dropdown-item"  href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a>
+		<a class="dropdown-item{{if $usermenu.2}} active{{/if}}"  href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a>
 		{{/foreach}}
 		{{if $nav.manage}}
-		<a class="dropdown-item" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a>
+		<a class="dropdown-item{{if $sel.active == Manage}} active{{/if}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a>
 		{{/if}}	
 		{{if $nav.channels}}
 		{{foreach $nav.channels as $chan}}
@@ -34,11 +34,11 @@
 		{{/if}}
 		{{if $nav.settings}}
 		<div class="dropdown-divider"></div>
-		<a class="dropdown-item" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a>
+		<a class="dropdown-item{{if $sel.active == Settings}} active{{/if}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a>
 		{{/if}}
 		{{if $nav.admin}}
 		<div class="dropdown-divider"></div>
-		<a class="dropdown-item" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a>
+		<a class="dropdown-item{{if $sel.active == Admin}} active{{/if}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a>
 		{{/if}}
 		{{if $nav.logout}}
 		<div class="dropdown-divider"></div>
-- 
cgit v1.2.3


From 4335e49381a766bc59b3ccd3df9c4981afab7603 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Sat, 22 Jul 2017 11:04:18 +0200
Subject: more nav_set_selected

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

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

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 93bbe187f..cb0e2af32 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -1,5 +1,5 @@
 {{if $nav.login && !$userinfo}}
-<div class="d-md-none p-1">
+<div class="d-md-none pt-1 pb-1">
 	<a class="btn btn-primary btn-sm text-white" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-toggle="modal" data-target="#nav-login">
 		{{$nav.loginmenu.1.1}}
 	</a>
-- 
cgit v1.2.3


From f4a4d70149b74a73faf5e777350d76946eeefe93 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Sat, 22 Jul 2017 12:01:13 +0200
Subject: indicate the selected channel in the dropdown menu and minor css
 fixes

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

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

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index cb0e2af32..288a15f2c 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -26,7 +26,7 @@
 		{{/if}}	
 		{{if $nav.channels}}
 		{{foreach $nav.channels as $chan}}
-		<a class="dropdown-item" href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem">{{$chan.channel_name}}</a>
+		<a class="dropdown-item" href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem"><i class="fa fa-circle{{if $localuser == $chan.channel_id}} text-success{{else}} invisible{{/if}}"></i> {{$chan.channel_name}}</a>
 		{{/foreach}}
 		{{/if}}
 		{{if $nav.profiles}}
-- 
cgit v1.2.3


From 5cc8837fb6605d18f09693e4ca418b8a5d38f57b Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Tue, 25 Jul 2017 20:06:01 +0200
Subject: make local channel (not our own) nav menus appear similar to what we
 are used from remote channels

---
 view/tpl/nav.tpl | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

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

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 288a15f2c..c0b34bbe8 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -16,7 +16,7 @@
 		<img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">
 		<i class="fa fa-caret-down"></i>
 	</div>
-	{{if $localuser}}
+	{{if $is_owner}}
 	<div class="dropdown-menu">
 		{{foreach $nav.usermenu as $usermenu}}
 		<a class="dropdown-item{{if $usermenu.2}} active{{/if}}"  href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a>
@@ -45,14 +45,13 @@
 		<a class="dropdown-item" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem" id="{{$nav.logout.4}}">{{$nav.logout.1}}</a>
 		{{/if}}
 	</div>
-	{{else}}
-	{{if $nav.rusermenu}}
+	{{/if}}
+	{{if ! $is_owner}}
 	<div class="dropdown-menu" role="menu" aria-labelledby="avatar">
 		<a class="dropdown-item" href="{{$nav.rusermenu.0}}" role="menuitem">{{$nav.rusermenu.1}}</a>
 		<a class="dropdown-item" href="{{$nav.rusermenu.2}}" role="menuitem">{{$nav.rusermenu.3}}</a>
 	</div>
 	{{/if}}
-	{{/if}}
 </div>
 {{/if}}
 <div class="navbar-toggler-right">
@@ -204,7 +203,7 @@
 				{{if $channel_apps.0}}
 				</div>
 				{{/if}}
-				{{if $localuser}}
+				{{if $is_owner}}
 				<div class="dropdown-divider"></div>
 				<a class="dropdown-item" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
 				<a class="dropdown-item" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>
@@ -230,7 +229,7 @@
 		{{if $channel_apps.0}}
 		</div>
 		{{/if}}
-		{{if $localuser}}
+		{{if $is_owner}}
 		<div class="dropdown-divider"></div>
 		<a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
 		<a class="nav-link" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>
-- 
cgit v1.2.3


From 53570de5a3585193089bf00c421e4b9c9059e139 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Thu, 27 Jul 2017 20:47:07 +0200
Subject: remove borders from navbar toggler

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

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

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index c0b34bbe8..b9abf4d48 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -68,7 +68,7 @@
 		<i class="fa fa-exclamation-circle"></i>
 	</button>
 	{{/if}}
-	<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
+	<button class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
 		<i class="fa fa-bars"></i>
 	</button>
 </div>
-- 
cgit v1.2.3


From 280f52f007f00e0a8b2c910445bb54dfbf7275a0 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Sat, 29 Jul 2017 16:06:42 +0200
Subject: close the apps-menu if the notifications-menu is open and vice versa

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

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

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index b9abf4d48..f480ce994 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -68,7 +68,7 @@
 		<i class="fa fa-exclamation-circle"></i>
 	</button>
 	{{/if}}
-	<button class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
+	<button id="menu-btn" class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
 		<i class="fa fa-bars"></i>
 	</button>
 </div>
-- 
cgit v1.2.3