aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-10-20 08:54:15 +1100
committerRedMatrix <info@friendica.com>2014-10-20 08:54:15 +1100
commitcfd59a9c1b3e5d06c274c4e854c330c8cd411edb (patch)
tree7b73b9516cff9dd787a65e67b2f4d549756c1200
parent281e1fbf6a34f6e475f203fe27f9d633f1d672a1 (diff)
parent6ee514579f85927e60fa5ebd2b89f97cbfe6544d (diff)
downloadvolse-hubzilla-cfd59a9c1b3e5d06c274c4e854c330c8cd411edb.tar.gz
volse-hubzilla-cfd59a9c1b3e5d06c274c4e854c330c8cd411edb.tar.bz2
volse-hubzilla-cfd59a9c1b3e5d06c274c4e854c330c8cd411edb.zip
Merge pull request #650 from pafcu/master
Move registration button to before login in nav to avoid problems with m...
-rwxr-xr-xview/tpl/nav.tpl2
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">