From 5dd501e0ea0c6d1021bb1fd5a1c1a61bcb44d168 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 5 May 2017 12:57:41 +0200
Subject: css fix

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

(limited to 'view/tpl')

diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index f490483b8..bd5176c83 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -64,4 +64,4 @@
 				<div class="clear"></div>
 			</form>
 		</div>
-		<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview"></div>
+		<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview mt-4"></div>
-- 
cgit v1.2.3


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')

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