aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-10-05 16:59:33 -0700
committerzotlabs <mike@macgirvin.com>2017-10-05 16:59:33 -0700
commita0eb62852606ef0362d3ed07e4bd50aeb5b6f73c (patch)
tree603ec81d2244d9ff099dffa94a6af57c6a2e73e0 /include
parent4ab21edba8511eb96b08371424841d6ffb808cf8 (diff)
downloadvolse-hubzilla-a0eb62852606ef0362d3ed07e4bd50aeb5b6f73c.tar.gz
volse-hubzilla-a0eb62852606ef0362d3ed07e4bd50aeb5b6f73c.tar.bz2
volse-hubzilla-a0eb62852606ef0362d3ed07e4bd50aeb5b6f73c.zip
Experimental alternate channel_menu navigation. To use, "util/config system.channel_menu 1"
Diffstat (limited to 'include')
-rw-r--r--include/channel.php1
-rw-r--r--include/nav.php5
2 files changed, 4 insertions, 2 deletions
diff --git a/include/channel.php b/include/channel.php
index fef933ba7..488bdeef0 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1373,7 +1373,6 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa
? trim(substr($profile['channel_name'],0,strpos($profile['channel_name'],' '))) : $profile['channel_name']);
$lastname = (($firstname === $profile['channel_name']) ? '' : trim(substr($profile['channel_name'],strlen($firstname))));
- // @fixme move this to the diaspora plugin itself
$contact_block = contact_block();
diff --git a/include/nav.php b/include/nav.php
index eccb89764..b51a03c4f 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -280,6 +280,8 @@ EOT;
'$help' => t('@name, #tag, ?doc, content'),
'$pleasewait' => t('Please wait...'),
'$nav_apps' => $nav_apps,
+ '$channel_menu' => get_config('system','channel_menu'),
+ '$channel_thumb' => ((App::$profile) ? App::$profile['thumb'] : ''),
'$channel_apps' => $channel_apps,
'$addapps' => t('Add Apps'),
'$orderapps' => t('Arrange Apps'),
@@ -481,7 +483,8 @@ function channel_apps($is_owner = false, $nickname = null) {
[
'$tabs' => $arr['tabs'],
'$name' => App::$profile['channel_name'],
- '$thumb' => App::$profile['thumb']
+ '$thumb' => App::$profile['thumb'],
+ '$channel_menu' => get_config('system','channel_menu')
]
);
}