diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-08 19:21:20 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-08 19:21:20 -0800 |
| commit | 75471ba10ff0c9ca3dfdc943c6647fc6ab1332f8 (patch) | |
| tree | cf4cc209bec0eb22bafacaa75cdf613a76f42b72 /view/tpl/navbar_default.tpl | |
| parent | 5e47b767ea6ed92f6f7ea0a3368762827937a5d8 (diff) | |
| parent | e7d20efb1b8d579bcb9bdef99205aad19281f6b2 (diff) | |
| download | volse-hubzilla-75471ba10ff0c9ca3dfdc943c6647fc6ab1332f8.tar.gz volse-hubzilla-75471ba10ff0c9ca3dfdc943c6647fc6ab1332f8.tar.bz2 volse-hubzilla-75471ba10ff0c9ca3dfdc943c6647fc6ab1332f8.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/tpl/navbar_default.tpl')
| -rwxr-xr-x | view/tpl/navbar_default.tpl | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index b330993c8..426d32047 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -17,8 +17,8 @@ </div> {{/if}} {{if $userinfo}} -<div class="dropdown usermenu"> - <div class="fakelink" data-toggle="dropdown"> +<div class="dropdown"> + <div class="fakelink usermenu" data-toggle="dropdown"> <img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"> <i class="fa fa-caret-down"></i> </div> @@ -59,10 +59,17 @@ </div> {{/if}} </div> -<div class="navbar-nav mr-auto"> - <div><a id="nav-app-link" href="{{$url}}" class="nav-link">{{$sel.name}}</a></div> +{{if $sel.name}} +<div id="nav-app-link-wrapper" class="navbar-nav mr-auto"> + <a id="nav-app-link" href="{{$url}}" class="nav-link text-truncate"> + {{$sel.name}} + {{if $sitelocation}} + <br><small class="text-muted">{{$sitelocation}}</small> + {{/if}} + </a> </div> {{/if}} +{{/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;"> |