aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/nav.tpl
diff options
context:
space:
mode:
Diffstat (limited to 'view/tpl/nav.tpl')
-rwxr-xr-xview/tpl/nav.tpl31
1 files changed, 11 insertions, 20 deletions
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 20600ccd7..a41bd9659 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -1,9 +1,3 @@
-<header>
-<!-- <div id="site-location">{{$sitelocation}}</div> -->
- <div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div>
-</header>
-
-<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
@@ -11,8 +5,11 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
+ <button id="expand-aside" type="button" class="navbar-toggle" data-toggle="show_hide" data-target="#region_1">
+ <i class="icon-circle-arrow-right" id="expand-aside-icon"></i>
+ </button>
{{if $userinfo}}
- <img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret"></span>
+ <img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret" id="usermenu-caret"></span>
{{if $localuser}}
<ul class="dropdown-menu" role="menu" aria-labelledby="avatar">
{{foreach $nav.usermenu as $usermenu}}
@@ -39,6 +36,10 @@
</li>
{{/if}}
+ {{if $nav.login}}<li class="{{$nav.login.2}}"><a href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}}
+
+ {{if $nav.alogout}}<li class="{{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" >{{$nav.alogout.1}}</a></li>{{/if}}
+
{{if $nav.network}}
<li class="{{$sel.network}} hidden-xs">
<a href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-th"></i></a>
@@ -143,13 +144,9 @@
</form>
</li>
<li class="visible-xs">
- <a href="/search" title="Search"><i class="icon-search"></i></a>
+ <a href="/search" title="{{$nav.search.3}}"><i class="icon-search"></i></a>
</li>
- {{if $nav.login}}<li class="{{$nav.login.2}}"><a href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}}
-
- {{if $nav.alogout}}<li class="{{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" >{{$nav.alogout.1}}</a></li>{{/if}}
-
{{if $nav.directory}}
<li class="{{$sel.directory}}">
<a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}"><i class="icon-sitemap"></i></a>
@@ -161,7 +158,7 @@
<a class="{{$nav.apps.2}} dropdown-toggle" data-toggle="dropdown" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" ><i class="icon-cogs"></i></a>
<ul class="dropdown-menu">
{{foreach $apps as $ap}}
- <li>{{$ap}}</li>
+ <li role="presentation">{{$ap}}</li>
{{/foreach}}
</ul>
</li>
@@ -169,17 +166,11 @@
{{if $nav.help}}
<li class="{{$sel.help}}">
- <a class="{{$nav.help.2}}" target="friendika-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="icon-question"></i></a>
+ <a class="{{$nav.help.2}}" target="redmatrix-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="icon-question"></i></a>
</li>
{{/if}}
</ul>
</div>
</div>
-</nav>
-<ul id="nav-notifications-template" style="display:none;" rel="template">
- <li class="{5}"><a href="{0}" title="{2} {3}"><img src="{1}"><span class='contactname'>{2}</span>{3}<br><span class="notif-when">{4}</span></a></li>
-</ul>
-{{if $langselector}}<div id="langselector" >{{$langselector}}</div>{{/if}}
-<div id="panel" style="display: none;"></div>