diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-28 14:58:48 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-28 14:58:48 -0700 |
| commit | d12b360e926c5df8da1639a5935fcd3e9236e4e3 (patch) | |
| tree | a5eed2bf4fa37183435a39ecbd73a0d75aff0c22 /view/tpl/nav.tpl | |
| parent | 3e6088c6142d1dabbfdbb8b5df276ae942bd3554 (diff) | |
| parent | 5564b47dbc640b30a8090a6138f0c2f841accbe9 (diff) | |
| download | volse-hubzilla-d12b360e926c5df8da1639a5935fcd3e9236e4e3.tar.gz volse-hubzilla-d12b360e926c5df8da1639a5935fcd3e9236e4e3.tar.bz2 volse-hubzilla-d12b360e926c5df8da1639a5935fcd3e9236e4e3.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view/tpl/nav.tpl')
| -rwxr-xr-x | view/tpl/nav.tpl | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 0a9b94758..f7953c5f3 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -10,24 +10,6 @@ {{/if}} </div> {{/if}} -<div class="navbar-toggler-right"> - {{if $nav.help.6}} - <button id="context-help-btn" class="navbar-toggler border-0" type="button" onclick="contextualHelp(); return false;"> - <i class="fa fa-question-circle"></i> - </button> - {{/if}} - <button id="expand-aside" type="button" class="navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1"> - <i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i> - </button> - {{if $localuser}} - <button id="notifications-btn" type="button" class="navbar-toggler border-0 text-white" data-toggle="collapse" data-target="#navbar-collapse-1"> - <i class="fa fa-exclamation-circle"></i> - </button> - {{/if}} - <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-collapse-2"> - <i class="fa fa-bars"></i> - </button> -</div> {{if $userinfo}} <div class="dropdown usermenu"> <div class="fakelink" data-toggle="dropdown"> @@ -73,6 +55,24 @@ {{/if}} </div> {{/if}} +<div class="navbar-toggler-right"> + {{if $nav.help.6}} + <button id="context-help-btn" class="navbar-toggler border-0" type="button" onclick="contextualHelp(); return false;"> + <i class="fa fa-question-circle"></i> + </button> + {{/if}} + <button id="expand-aside" type="button" class="navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1"> + <i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i> + </button> + {{if $localuser}} + <button id="notifications-btn" type="button" class="navbar-toggler border-0 text-white" data-toggle="collapse" data-target="#navbar-collapse-1"> + <i class="fa fa-exclamation-circle"></i> + </button> + {{/if}} + <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-collapse-2"> + <i class="fa fa-bars"></i> + </button> +</div> <div class="collapse navbar-collapse" id="navbar-collapse-1"> <ul class="navbar-nav mr-auto"> {{if $nav.network}} @@ -201,7 +201,7 @@ </ul> </div> <div class="collapse d-md-none" id="navbar-collapse-2"> - <div class="navbar-nav"> + <div class="navbar-nav mr-auto"> {{foreach $navapps as $navapp}} {{$navapp|replace:'dropdown-item':'nav-link'}} {{/foreach}} |