Merge pull request #12502 from annando/no-gs-import

[friendica.git] / view / theme / frio / templates / nav.tpl

diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl
index 53176fe92cf0770a230933f0349cd712e09c23ac..f151ce8d2d87e21a2ebac737c339b1b1430252c8 100644 (file)
--- a/view/theme/frio/templates/nav.tpl
+++ b/view/theme/frio/templates/nav.tpl
@@ -81,10 +81,10 @@
                                                        </li>
                                                {{/if}}
 
-                                               {{if $nav.events}}
+                                               {{if $nav.calendar}}
                                                        <li class="nav-segment hidden-xs">
-                                                               <a accesskey="e" id="nav-events-link" href="{{$nav.events.0}}" data-toggle="tooltip"
-                                                                       aria-label="{{$nav.events.1}}" title="{{$nav.events.1}}" class="nav-menu"><i
+                                                               <a accesskey="e" id="nav-calendar-link" href="{{$nav.calendar.0}}" data-toggle="tooltip"
+                                                                       aria-label="{{$nav.calendar.1}}" title="{{$nav.calendar.1}}" class="nav-menu"><i
                                                                                class="fa fa-lg fa-calendar fa-fw"></i></a>
                                                        </li>
                                                {{/if}}
@@ -265,6 +265,15 @@
                                                                                        </a>
                                                                                </li>
                                                                        {{/if}}
+                                                                       {{if $nav.moderation}}
+                                                                               <li role="presentation">
+                                                                                       <a accesskey="m" role="menuitem" id="nav-moderation-link"
+                                                                                               class="nav-link {{$nav.moderation.2}}" href="{{$nav.moderation.0}}"
+                                                                                               title="{{$nav.moderation.3}}"><i class="fa fa-gavel fa-fw" aria-hidden="true"></i>
+                                                                                               {{$nav.moderation.1}}
+                                                                                       </a>
+                                                                               </li>
+                                                                       {{/if}}
                                                                        {{if $nav.tos}}
                                                                                <li role="presentation" class="divider"></li>
                                                                                <li role="presentation">
@@ -383,6 +392,15 @@
                                                                        </a>
                                                                </li>
                                                        {{/if}}
+                                                       {{if $nav.moderation}}
+                                                               <li role="presentation" class="list-group-item">
+                                                                       <a role="menuitem"
+                                                                               class="nav-link {{$nav.moderation.2}}" href="{{$nav.moderation.0}}" title="{{$nav.moderation.3}}"><i
+                                                                                       class="fa fa-gavel fa-fw" aria-hidden="true"></i>
+                                                                               {{$nav.moderation.1}}
+                                                                       </a>
+                                                               </li>
+                                                       {{/if}}
                                                        {{if $nav.logout}}
                                                                <li role="presentation" class="list-group-item">
                                                                        <a role="menuitem"
@@ -412,6 +430,11 @@
        <nav class="navbar navbar-fixed-top">
                <div class="container">
                        <div class="navbar-header pull-left">
+                               <button type="button" class="navbar-toggle collapsed pull-left visible-sm visible-xs"
+                                       data-toggle="offcanvas" data-target="aside" aria-haspopup="true">
+                                       <span class="sr-only">Toggle navigation</span>
+                                       <i class="fa fa-ellipsis-v fa-fw fa-lg" aria-hidden="true"></i>
+                               </button>
                                <a class="navbar-brand" href="#">
                                        <div id="navbrand-container">
                                                <div id="logo-img"></div>
@@ -461,22 +484,6 @@
        </div>
 </div>
 
-{{*The second part of the notifications dropdown menu. It handles the notifications *}}
-{{if $nav.notifications}}
-       <ul id="nav-notifications-template" class="media-list" style="display:none;" rel="template">
-               <li class="{4} notif-entry">
-                       <div class="notif-entry-wrapper media">
-                               <div class="notif-photo-wrapper media-object pull-left" aria-hidden="true"><a href="{6}"
-                                               class="userinfo click-card" tabIndex="-1"><img data-src="{1}"></a></div>
-                               <a href="{0}" class="notif-desc-wrapper media-body">
-                                       {2}
-                                       <div><time class="notif-when time" data-toggle="tooltip" title="{5}">{3}</time></div>
-                               </a>
-                       </div>
-               </li>
-       </ul>
-{{/if}}
-
 {{* This is the mask of the firefox logo. We set the background of #logo-img to the user icon color and apply this mask to it
 The result is a friendica logo in the user icon color.*}}
 <svg id="friendica-logo-mask" x="0px" y="0px" width="0px" height="0px" viewBox="0 0 250 250">