From 1021a4d4763974c3c40f40a0ca9682f1fcc3f6ee Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 1 Nov 2012 17:06:34 -0700
Subject: add current selection to channel manager

---
 view/css/mod_manage.css | 17 ++++++++++++++++-
 view/tpl/channel.tpl    |  2 ++
 view/tpl/channels.tpl   |  8 +++++++-
 3 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/css/mod_manage.css b/view/css/mod_manage.css
index 5f06e5064..921ddfc8f 100644
--- a/view/css/mod_manage.css
+++ b/view/css/mod_manage.css
@@ -1,14 +1,29 @@
-
+#channels-selected {
+	margin-top: 20px;
+	margin-bottom: 10px;
+}
 
 #channels-desc {
+	color: #888888;
+	font-size: 1.2em;
 	margin-top: 15px;
 	margin-bottom: 20px;
 }
 
+.channel-selection-primary {
+	font-size: 0.8em;
+	margin-bottom: 10px;
+}
+
 .channel-selection {
 	width: 120px;
 	float: left;
 }
 .channels-end {
 	clear: both;
+}
+
+.channel-selection-name-link {
+	font-size: 1.2em;
+	margin-top: 10px;
 }
\ No newline at end of file
diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl
index 9c8ded1d9..5bae5ba33 100644
--- a/view/tpl/channel.tpl
+++ b/view/tpl/channel.tpl
@@ -1,9 +1,11 @@
 <div class="channel-selection">
+{{ if $channel.primary_links }}
 {{ if $channel.channel_primary }}
 <div class="channel-selection-primary primary">$msg_primary</div>
 {{ else }}
 <div class="channel-selection-primary"><a href="manage/$channel.channel_id/primary">$msg_make_primary</a></div>
 {{ endif }}
+{{ endif }}
 <a href="$channel.link" class="channel-selection-photo-link" title="$channel.channel_name"><img class="channel-photo" src="$channel.xchan_photo_m" alt="$channel.channel_name" /></a>
 <a href="$channel.link" class="channel-selection-name-link" title="$channel.channel_name"><div class="channel-name">$channel.channel_name</div></a>
 </div>
diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl
index 50366efa6..916ba1c75 100644
--- a/view/tpl/channels.tpl
+++ b/view/tpl/channels.tpl
@@ -7,10 +7,16 @@
 {{ endfor }}
 {{ endif }} 
 
+{{ if $selected }}
+<div id="channels-selected">$msg_selected</div>
+{{ inc channel.tpl with $channel=$selected }}{{ endinc }}
+<div class="channels-end selected"></div>
+{{ endif }}
+
 <div id="channels-desc" class="descriptive-text">$desc</div>
 
 {{ for $all_channels as $chn }}
 {{ inc channel.tpl with $channel=$chn }}{{ endinc }}
 {{ endfor }} 
 
-<div class="channels-end"></div>
+<div class="channels-end all"></div>
-- 
cgit v1.2.3