aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Parviainen <saparvia@caterva.eu>2014-12-27 14:06:09 +0100
committerStefan Parviainen <saparvia@caterva.eu>2014-12-27 14:06:09 +0100
commit40a327b68fe1bb37bbc2fc6bc1c6d761ee564898 (patch)
treeb34f6132fd6a3060edc30d781bdd0f4e8fcd4f7c
parent6a679d26ce1c2947e49c74f3b6a98a7ad770b325 (diff)
downloadvolse-hubzilla-40a327b68fe1bb37bbc2fc6bc1c6d761ee564898.tar.gz
volse-hubzilla-40a327b68fe1bb37bbc2fc6bc1c6d761ee564898.tar.bz2
volse-hubzilla-40a327b68fe1bb37bbc2fc6bc1c6d761ee564898.zip
Allow quick access to mail and connections from Channel Manager
-rw-r--r--mod/manage.php9
-rwxr-xr-xview/tpl/channel.tpl2
2 files changed, 8 insertions, 3 deletions
diff --git a/mod/manage.php b/mod/manage.php
index 28fa8e658..21327a120 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -28,8 +28,13 @@ function manage_content(&$a) {
if($change_channel) {
$r = change_channel($change_channel);
- if($r && $r['channel_startpage'])
- goaway(z_root() . '/' . $r['channel_startpage']);
+ if((argc() > 2) && !(argv(2) === 'default')) {
+ goaway(z_root() . '/' . implode('/',array_slice($a->argv,2))); // Go to whatever is after /manage/, but with the new channel
+ }
+ else {
+ if($r && $r['channel_startpage'])
+ goaway(z_root() . '/' . $r['channel_startpage']); // If nothing extra is specified, go to the default page
+ }
goaway(z_root());
}
diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl
index 984421eec..c151ba8b2 100755
--- a/view/tpl/channel.tpl
+++ b/view/tpl/channel.tpl
@@ -7,7 +7,7 @@
{{/if}}
{{/if}}
<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>
-<div class="channels-notifications-wrapper"><span style="{{if $channel.mail != 0}}color:#c60032;{{/if}}" title='{{$channel.mail|string_format:$mail_format}}'><i class="icon-envelope"></i> {{$channel.mail}}&nbsp;</span><span style="{{if $channel.intros != 0}}color:#c60032;{{/if}}" title='{{$channel.intros|string_format:$intros_format}}'><i class="icon-user"></i> {{$channel.intros}}</span></div>
+<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>