diff options
| author | friendica <info@friendica.com> | 2014-03-03 14:33:49 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-03-03 14:33:49 -0800 |
| commit | 81c439bc7d4cbe355abaddc46954ec400f98774f (patch) | |
| tree | 27dede977aa89dd1284bf7ec4d283073d24dac54 | |
| parent | 002a86fb7160437a8413dfc40a84732c9afa2153 (diff) | |
| download | volse-hubzilla-81c439bc7d4cbe355abaddc46954ec400f98774f.tar.gz volse-hubzilla-81c439bc7d4cbe355abaddc46954ec400f98774f.tar.bz2 volse-hubzilla-81c439bc7d4cbe355abaddc46954ec400f98774f.zip | |
revert the temporary fix for the missing hdr.tpl and add the ability to provide context sensitive help/documentation by passing the current URL path to the help module as $_REQUEST['cmd']. So we could create a special help page for settings/display or whatever. The only issue is whether this should be presented first with a link to the main help page, or if we put a line at the top of the main help page that says "I need help for settings/display". Also edited the help target window name, as "friendika-help" is a bit dated.
| -rw-r--r-- | include/nav.php | 2 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/include/nav.php b/include/nav.php index 4e3d9fbec..ab0eaa855 100644 --- a/include/nav.php +++ b/include/nav.php @@ -134,7 +134,7 @@ EOT; if(($a->config['system']['register_policy'] == REGISTER_OPEN) && (! local_user()) && (! remote_user())) $nav['register'] = array('register',t('Register'), "", t('Create an account')); - $help_url = z_root() . '/help'; + $help_url = z_root() . '/help?f=&cmd=' . $a->cmd; if(! get_config('system','hide_help')) $nav['help'] = array($help_url, t('Help'), "", t('Help and documentation')); diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index da02f86f3..ec9731fef 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -163,7 +163,7 @@ {{if $nav.help}} <li class="{{$sel.help}}"> - <a class="{{$nav.help.2}}" target="friendika-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="icon-question"></i></a> + <a class="{{$nav.help.2}}" target="redmatrix-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="icon-question"></i></a> </li> {{/if}} </ul> @@ -171,6 +171,3 @@ </div> -<ul id="nav-notifications-template" style="display:none;" rel="template"> - <li class="{5}"><a href="{0}" title="{2} {3}"><img src="{1}"><span class='contactname'>{2}</span>{3}<br><span class="notif-when">{4}</span></a></li> -</ul> |