diff options
| author | Andrew Manning <tamanning@zoho.com> | 2018-06-08 05:22:01 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2018-06-08 05:22:01 -0400 |
| commit | df2d18160212ec546ec640dd1d2152fecada5557 (patch) | |
| tree | 126504df4e5ab2d42defbee153a748fe40253b38 /view/tpl/navbar_default.tpl | |
| parent | ed17e8a6499e48b032393be351c39f31a0edcbf3 (diff) | |
| parent | 7bf1c5f27b8b8f0eea226e81a5db99585c5a56b3 (diff) | |
| download | volse-hubzilla-df2d18160212ec546ec640dd1d2152fecada5557.tar.gz volse-hubzilla-df2d18160212ec546ec640dd1d2152fecada5557.tar.bz2 volse-hubzilla-df2d18160212ec546ec640dd1d2152fecada5557.zip | |
Merge branch 'dev' of framagit.org:hubzilla/core into dev
Diffstat (limited to 'view/tpl/navbar_default.tpl')
| -rwxr-xr-x | view/tpl/navbar_default.tpl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index 7bc8df8d5..0eb0a964c 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -27,6 +27,9 @@ {{foreach $nav.usermenu as $usermenu}} <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.group}} + <a class="dropdown-item" href="{{$nav.group.0}}" title="{{$nav.group.3}}" role="menuitem" id="{{$nav.group.4}}">{{$nav.group.1}}</a> + {{/if}} {{if $nav.manage}} <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}} @@ -119,7 +122,7 @@ <ul id="nav-right" class="navbar-nav ml-auto"> <li class="nav-item collapse clearfix" id="nav-search"> - <form class="form-inline" method="get" action="search" role="search"> + <form class="form-inline" method="get" action="{{$nav.search.4}}" role="search"> <input class="form-control form-control-sm mt-1 mr-2" id="nav-search-text" type="text" value="" placeholder="{{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" onblur="closeMenu('nav-search'); openMenu('nav-search-btn');"/> </form> <div id="nav-search-spinner" class="spinner-wrapper"> |