aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-23 14:16:14 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-23 14:16:14 +0100
commit7338649fa54a109122deecc743079eab6b9c1251 (patch)
treefcce0bb728f3d7204201ee7f5f182a57cfd5d2c6 /doc
parente60f527cb09dacf7b81af37a15c890c6dfbe1bb0 (diff)
parentae1103c5a3f3f76a0269cbb5de11a7cb96496ad3 (diff)
downloadvolse-hubzilla-7338649fa54a109122deecc743079eab6b9c1251.tar.gz
volse-hubzilla-7338649fa54a109122deecc743079eab6b9c1251.tar.bz2
volse-hubzilla-7338649fa54a109122deecc743079eab6b9c1251.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'doc')
-rw-r--r--doc/hidden_configs.bb3
-rw-r--r--doc/hook/nav.bb27
2 files changed, 29 insertions, 1 deletions
diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb
index 44114967b..1323730aa 100644
--- a/doc/hidden_configs.bb
+++ b/doc/hidden_configs.bb
@@ -152,7 +152,8 @@ This document assumes you're an administrator.
Spam prevention. Limits the number of tagged forums which are recognised in any post. Default is 2. Only the first 'n' tags will be delivered as forums, the others will not cause any delivery.
[b]system > openssl_conf_file[/b]
Needed in some Windows installations to locate the openssl configuration file on the system.
-
+ [b]system > hide_help[/b]
+ Don't display help documentation link in nav bar
[b]Directory config[/b]
[b]Directory search defaults[/b]
diff --git a/doc/hook/nav.bb b/doc/hook/nav.bb
index 847573620..b52f90602 100644
--- a/doc/hook/nav.bb
+++ b/doc/hook/nav.bb
@@ -1 +1,28 @@
[h2]nav[/h2]
+
+Called when generating the main navigation bar and menu for a page
+
+Hook data:
+
+ array(
+ 'usermenu' => array( 'icon' => photo URL, 'name' => channel name )
+ 'nav' => array(
+ 'usermenu' => usermenu (photo menu) link array
+ (channel home, profiles, photos, cloud, chats, webapges ...)
+ 'loginmenu' => login menu link array
+ 'network' => grid link and grid-notify
+ 'home' => home link and home-notify
+ 'intros' => intros link and intros-notify
+ 'notifications' => notifications link and notifications-notify
+ 'messages' => PM link and PM-notify
+ 'all_events' => events link and events notfiy
+ 'manage' => manage channels link
+ 'settings' => settings link
+ 'register' => registration link
+ 'help' => help/doc link
+ 'apps' => apps link
+ 'search' => search link and form
+ 'directory' => directory link
+ )
+
+