aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-12-30 08:57:37 +1100
committerRedMatrix <info@friendica.com>2014-12-30 08:57:37 +1100
commit619733e297708f49646bb220658c90223a8648c6 (patch)
tree294d3cdfcae69213aa38b624e9f7982cbde6186b /view/tpl
parentd1d4cec932c23c2b42eb77e2734b71a2e80f6772 (diff)
parente69e59d260c311ceae4cbde3239c33d8caea4553 (diff)
downloadvolse-hubzilla-619733e297708f49646bb220658c90223a8648c6.tar.gz
volse-hubzilla-619733e297708f49646bb220658c90223a8648c6.tar.bz2
volse-hubzilla-619733e297708f49646bb220658c90223a8648c6.zip
Merge pull request #789 from pafcu/chanman
Don't show current channel separately in channel manager, highlight it i...
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/channel.tpl4
-rwxr-xr-xview/tpl/channels.tpl8
2 files changed, 1 insertions, 11 deletions
diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl
index c151ba8b2..af80e7b4d 100755
--- a/view/tpl/channel.tpl
+++ b/view/tpl/channel.tpl
@@ -1,4 +1,4 @@
-<div class="channel-selection">
+<div class='channel-selection {{if $selected == $channel.channel_id}}selected-channel{{/if}}'>
{{if $channel.default_links}}
{{if $channel.default}}
<div class="channel-selection-default default"><i class="icon-check"></i> {{$msg_default}}</div>
@@ -10,5 +10,3 @@
<div class="channels-notifications-wrapper"><a href='manage/{{$channel.channel_id}}/message' style="{{if $channel.mail != 0}}color:#c60032;{{/if}}" title='{{$channel.mail|string_format:$mail_format}}'><i class="icon-envelope"></i> {{$channel.mail}}</a>&nbsp;<a href='manage/{{$channel.channel_id}}/connections/ifpending' style="{{if $channel.intros != 0}}color:#c60032;{{/if}}" title='{{$channel.intros|string_format:$intros_format}}'><i class="icon-user"></i> {{$channel.intros}}</a></div>
<a href="{{$channel.link}}" class="channel-selection-name-link" title="{{$channel.channel_name}}"><div class="channel-name">{{$channel.channel_name}}</div></a>
</div>
-
-<div class="channel-selection-end"></div>
diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl
index 0dec68a53..26d0e14d2 100755
--- a/view/tpl/channels.tpl
+++ b/view/tpl/channels.tpl
@@ -13,14 +13,6 @@
{{$channel_usage_message}}
</div>
{{/if}}
-{{if $selected}}
-<div id="selected-channel">
-<div id="channels-selected">{{$msg_selected}}</div>
-{{include file="channel.tpl" channel=$selected}}
-</div>
-<div class="channels-end selected"></div>
-{{/if}}
-<br />
<div id="channels-desc" class="descriptive-text">{{$desc}}</div>
<div id="all-channels">