harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflict

Browse Source
This commit is contained in:
Mario Vavti
2017-02-02 09:38:07 +01:00
parent 2e0180ba55 23303391e0
commit c3bada3c32
16 changed files with 161 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
view/tpl/nav.tpl
View File

@@ -147,16 +147,8 @@
<div id="nav-login" class="login-dropdown-menu" style="display:none; width:150%;">
{{$nav.login}}
{{$nav.remote_login}}
<!-- {{foreach $nav.loginmenu as $loginmenu}}
<li role="presentation"><a class="{{$loginmenu.2}}" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem" id="{{$loginmenu.4}}">{{$loginmenu.1}}</a></li>
{{/foreach}} -->
</div>
</li>
<!-- {{foreach $nav.loginmenu as $loginmenu}}
<li role="presentation"><a class="{{$loginmenu.2}} visible-xs" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem">{{$loginmenu.1}}</a></li>
{{/foreach}}
-->
{{/if}}
{{if $nav.register}}