diff options
author | friendica <info@friendica.com> | 2014-10-19 16:12:05 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2014-10-19 16:12:05 -0700 |
commit | bae3029c639bf6f9469dd93bfedc3dce0d8510d7 (patch) | |
tree | f892b4bb5bc96c96ebd9df5d6b593b02def2c759 /view/tpl/nav.tpl | |
parent | 6d3619c8b15afdbf228cc0ca71de68efc0557fb1 (diff) | |
download | volse-hubzilla-bae3029c639bf6f9469dd93bfedc3dce0d8510d7.tar.gz volse-hubzilla-bae3029c639bf6f9469dd93bfedc3dce0d8510d7.tar.bz2 volse-hubzilla-bae3029c639bf6f9469dd93bfedc3dce0d8510d7.zip |
merge madness
Diffstat (limited to 'view/tpl/nav.tpl')
-rwxr-xr-x | view/tpl/nav.tpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index ac6cb1a9c..bc9d0ba37 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -47,6 +47,7 @@ </div> <div class="collapse navbar-collapse" id="navbar-collapse-1"> <ul class="nav navbar-nav navbar-left"> + {{if $nav.register}}<li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}} {{if !$userinfo}} {{if $nav.loginmenu}} <li class="{{$nav.loginmenu.0.2}}"><a data-toggle="dropdown" data-target="#" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" >{{$nav.loginmenu.0.1}} <span class="caret" id="usermenu-caret"></span></a> @@ -92,7 +93,6 @@ </li> {{/if}} - {{if $nav.register}}<li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}} {{if $nav.messages}} <li class="{{$sel.messages}} hidden-xs"> |