Merge pull request #650 from pafcu/master

Move registration button to before login in nav to avoid problems with m...
This commit is contained in:
RedMatrix 2014-10-20 08:54:15 +11:00
commit cfd59a9c1b

View file

@ -47,6 +47,7 @@
</div> </div>
<div class="collapse navbar-collapse" id="navbar-collapse-1"> <div class="collapse navbar-collapse" id="navbar-collapse-1">
<ul class="nav navbar-nav navbar-left"> <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 !$userinfo}}
{{if $nav.loginmenu}} {{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> <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> </li>
{{/if}} {{/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}} {{if $nav.messages}}
<li class="{{$sel.messages}} hidden-xs"> <li class="{{$sel.messages}} hidden-xs">