diff options
| author | zotlabs <mike@macgirvin.com> | 2017-10-09 15:15:02 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-10-09 15:15:02 -0700 |
| commit | d636ff586d5f7e8d86a05a1e391b4501eb5f29f2 (patch) | |
| tree | 729734bfc3c662b36c4a0a4e1735f5ce87eb2aba /view/tpl/nav.tpl | |
| parent | 623dfa13845e34c85eae2a66c6aa855c3e059c38 (diff) | |
| parent | cc1ffff7cdfe5881636b6d2de3fe16f0094b5d69 (diff) | |
| download | volse-hubzilla-d636ff586d5f7e8d86a05a1e391b4501eb5f29f2.tar.gz volse-hubzilla-d636ff586d5f7e8d86a05a1e391b4501eb5f29f2.tar.bz2 volse-hubzilla-d636ff586d5f7e8d86a05a1e391b4501eb5f29f2.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 | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 1d905d173..d2bd20f8f 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -22,7 +22,7 @@ <a class="dropdown-item{{if $usermenu.2}} active{{/if}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a> {{/foreach}} {{if $nav.manage}} - <a class="dropdown-item{{if $sel.active == Manage}} active{{/if}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a> + <a class="dropdown-item{{if $sel.name == Manage}} active{{/if}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a> {{/if}} {{if $nav.channels}} {{foreach $nav.channels as $chan}} @@ -34,11 +34,11 @@ {{/if}} {{if $nav.settings}} <div class="dropdown-divider"></div> - <a class="dropdown-item{{if $sel.active == Settings}} active{{/if}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a> + <a class="dropdown-item{{if $sel.name == Settings}} active{{/if}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a> {{/if}} {{if $nav.admin}} <div class="dropdown-divider"></div> - <a class="dropdown-item{{if $sel.active == Admin}} active{{/if}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a> + <a class="dropdown-item{{if $sel.name == Admin}} active{{/if}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a> {{/if}} {{if $nav.logout}} <div class="dropdown-divider"></div> @@ -53,6 +53,9 @@ </div> {{/if}} </div> +<div class="navbar-nav mr-auto"> + <div><a id="nav-app-link" href="{{$url}}" class="nav-link">{{$sel.name}}</a></div> +</div> {{/if}} <div class="navbar-toggler-right"> {{if $nav.help.6}} @@ -60,7 +63,7 @@ <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"> + <button id="expand-aside" type="button" class="d-md-none 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 ! $experimental_notif}} @@ -212,9 +215,7 @@ {{/if}} </ul> {{else}} - <div class="navbar-nav mr-auto"> - <div class="text-white">{{$sel.active}}</div> - </div> + <div class="navbar-text mr-auto d-none d-xl-flex"></div> {{/if}} <div id="banner" class="navbar-text d-none d-xl-flex">{{$banner}}</div> |