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/css/mod_manage.css | 12 ------------
 view/tpl/channel.tpl    |  6 +++---
 view/tpl/nav.tpl        |  2 +-
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/view/css/mod_manage.css b/view/css/mod_manage.css
index 077b6b838..b08c90b62 100644
--- a/view/css/mod_manage.css
+++ b/view/css/mod_manage.css
@@ -4,10 +4,6 @@
 	text-decoration: none;
 }
 
-.new-notification {
-	color: #c60032;
-}
-
 .channel-photo-wrapper {
 	display: table-cell;
 	table-layout: fixed;
@@ -24,11 +20,3 @@
 	vertical-align: top;
 	padding-left: 10px;
 }
-
-.selected-channel {
-	color: green;
-}
-
-#all-channels-end {
-	margin-bottom: 20px;
-}
diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl
index 1a84f1e66..63e09ec05 100755
--- a/view/tpl/channel.tpl
+++ b/view/tpl/channel.tpl
@@ -17,7 +17,7 @@
 	</div>
 	<h3>
 		{{if $selected == $channel.channel_id}}
-		<i class="selected-channel fa fa-circle" title="{{$msg_selected}}"></i>
+		<i class="fa fa-circle text-success" title="{{$msg_selected}}"></i>
 		{{/if}}
 		{{if $channel.delegate}}
 		<i class="fa fa-arrow-circle-right" title="{{$delegated_desc}}"></i>
@@ -37,11 +37,11 @@
 	<div class="channel-notifications-wrapper">
 		{{if !$channel.delegate}}
 		<div class="channel-notification">
-			<i class="fa fa-envelope{{if $channel.mail != 0}} new-notification{{/if}}"></i>
+			<i class="fa fa-fw fa-envelope{{if $channel.mail != 0}} text-danger{{/if}}"></i>
 			{{if $channel.mail != 0}}<a href="manage/{{$channel.channel_id}}/mail/combined">{{/if}}{{$channel.mail|string_format:$mail_format}}{{if $channel.mail != 0}}</a>{{/if}}
 		</div>
 		<div class="channel-notification">
-			<i class="fa fa-user{{if $channel.intros != 0}} new-notification{{/if}}"></i>
+			<i class="fa fa-fw fa-user{{if $channel.intros != 0}} text-danger{{/if}}"></i>
 			{{if $channel.intros != 0}}<a href='manage/{{$channel.channel_id}}/connections/ifpending'>{{/if}}{{$channel.intros|string_format:$intros_format}}{{if $channel.intros != 0}}</a>{{/if}}
 		</div>
 		{{/if}}
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