diff options
| author | redmatrix <git@macgirvin.com> | 2016-04-23 16:57:32 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-04-23 16:57:32 -0700 |
| commit | ce45a1cf945617f3895fb3e40b13e6f705fbc000 (patch) | |
| tree | 8d407ab11e8c4fdc4560cf67e0fd242f7f1544a0 /view/tpl/nav.tpl | |
| parent | 79c63e3cf44438a7f993b2ea1813b9234ea4d3f3 (diff) | |
| parent | 9d698c08876169228b09e144f80c5311fcb0fa49 (diff) | |
| download | volse-hubzilla-ce45a1cf945617f3895fb3e40b13e6f705fbc000.tar.gz volse-hubzilla-ce45a1cf945617f3895fb3e40b13e6f705fbc000.tar.bz2 volse-hubzilla-ce45a1cf945617f3895fb3e40b13e6f705fbc000.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/tpl/nav.tpl')
| -rwxr-xr-x | view/tpl/nav.tpl | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index ff71c224d..03b48fd00 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -11,9 +11,11 @@ <button id="expand-aside" type="button" class="navbar-toggle" data-toggle="offcanvas" data-target="#region_1"> <i class="icon-circle-arrow-right" id="expand-aside-icon"></i> </button> - <a class="navbar-toggle" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}_collapsed"{{if $nav.help.6}} onclick="return false;"{{/if}}> - {{if $nav.help.6}}<i class="icon-question-sign"></i>{{else}}<i class="icon-question"></i>{{/if}} - </a> + {{if $nav.help.6}} + <button id="context-help-btn"class="navbar-toggle" type="button" onclick="contextualHelp(); return false;"> + <i class="icon-question-sign"></i> + </button> + {{/if}} {{if $userinfo}} <img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret" id="usermenu-caret"></span> {{if $localuser}} @@ -34,6 +36,10 @@ <li role="presentation" class="divider"></li> <li role="presentation"><a href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a></li> {{/if}} + {{if $nav.help.6}} + <li role="presentation" class="divider"></li> + <li role="presentation"><a href="{{$nav.help.0}}" title="{{$nav.help.3}}" role="menuitem" id="{{$nav.help.4}}">{{$nav.help.1}}</a></li> + {{/if}} {{if $nav.logout}} <li role="presentation" class="divider"></li> <li role="presentation"><a href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem" id="{{$nav.logout.4}}">{{$nav.logout.1}}</a></li> @@ -191,16 +197,16 @@ {{/if}} {{if $nav.help}} - <li class="{{$sel.help}} hidden-xs"> - <a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}"{{if $nav.help.6}} onclick="return false;"{{/if}}>{{if $nav.help.6}}<i class="icon-question-sign"></i>{{else}}<i class="icon-question"></i>{{/if}}</a> + <li class="{{$sel.help}}{{if $nav.help.6}} hidden-xs{{/if}}"> + <a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}"{{if $nav.help.6}} onclick="contextualHelp(); return false;"{{/if}}>{{if $nav.help.6}}<i class="icon-question-sign"></i>{{else}}<i class="icon-question"></i>{{/if}}</a> </li> {{/if}} </ul> </div> </div> {{if $nav.help.6}} - <div id="help-content" class="help-content"> + <div id="contextual-help-content" class="contextual-help-content"> {{$nav.help.5}} - <p class="pull-right"><a href="{{$nav.help.0}}">Click here for more documentation...</a></p> + <button type="button" class="close" onclick="contextualHelp();">×</button> </div> {{/if}} |