aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-02-02 20:10:35 +0100
committerMario Vavti <mario@mariovavti.com>2017-02-02 20:10:35 +0100
commitfd52cefe090a3801c3f170d4bea8cf17b57f7558 (patch)
tree172e3318ef432d5be2bf83fee085452ff2175a5d
parent0e0dee43ab5ca2ad7331e2554a159a78b7f8720f (diff)
downloadvolse-hubzilla-fd52cefe090a3801c3f170d4bea8cf17b57f7558.tar.gz
volse-hubzilla-fd52cefe090a3801c3f170d4bea8cf17b57f7558.tar.bz2
volse-hubzilla-fd52cefe090a3801c3f170d4bea8cf17b57f7558.zip
provide separate collased menus for apps and notifications
-rw-r--r--view/theme/redbasic/css/style.css3
-rwxr-xr-xview/tpl/nav.tpl28
-rw-r--r--view/tpl/navapps.tpl6
3 files changed, 26 insertions, 11 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index ec05a6b33..a3eaf67ae 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1818,7 +1818,8 @@ nav .badge.mail-update {
#expand-aside,
#expand-tabs,
#doco-return-to-top-btn,
-#context-help-btn {
+#context-help-btn,
+#notifications-btn {
color: $nav_active_icon_colour;
padding: 7px 10px;
}
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 933a33745..b42b615df 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -1,11 +1,15 @@
<div class="container-fluid">
<div class="navbar-header">
- <div>
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-2">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
+ {{if $localuser}}
+ <button id="notifications-btn" type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
+ <i class="fa fa-exclamation-circle"></i>
+ </button>
+ {{/if}}
<button id="expand-tabs" type="button" class="navbar-toggle" data-toggle="collapse" data-target="#tabs-collapse-1">
<i class="fa fa-arrow-circle-down" id="expand-tabs-icon"></i>
</button>
@@ -17,7 +21,7 @@
<i class="fa fa-question-circle"></i>
</button>
{{/if}}
- </div>
+
{{if $userinfo}}
<div class="usermenu-head dropdown-toggle fakelink" data-toggle="dropdown">
<img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">
@@ -57,8 +61,10 @@
{{/if}}
{{/if}}
</div>
+
<div class="collapse navbar-collapse" id="navbar-collapse-1">
<ul class="nav navbar-nav navbar-left">
+ {{if $localuser}}
{{if $nav.network}}
<li class="{{$sel.network}} net-button" style="display: none;">
<a href="#" title="{{$nav.network.3}}" id="{{$nav.network.4}}" data-toggle="dropdown" rel="#nav-network-menu">
@@ -141,9 +147,10 @@
</ul>
</li>
{{/if}}
+ {{/if}}
{{if $nav.login && !$userinfo}}
- <li class="">
+ <li class="hidden-xs">
<a href="#" class="dropdown-toggle" title="{{$nav.loginmenu.0.3}}" id="{{$nav.loginmenu.0.4}}" data-toggle="dropdown">{{$nav.loginmenu.0.1}} <span class="caret" id="loginmenu-caret"></span></a>
<div id="nav-login" class="dropdown-menu">
<div class="form-group">
@@ -155,11 +162,11 @@
{{/if}}
{{if $nav.register}}
- <li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a></li>
+ <li class="{{$nav.register.2}} hidden-xs"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a></li>
{{/if}}
{{if $nav.alogout}}
- <li class="{{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a></li>
+ <li class="{{$nav}}-alogout.2 hidden-xs"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a></li>
{{/if}}
</ul>
@@ -175,15 +182,22 @@
<a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="contextualHelp(); return false;"><i class="fa fa-question-circle"></i></a>
</li>
{{/if}}
- <li>
+ <li class="hidden-xs">
<a href="#" data-toggle="dropdown"><i class="fa fa-bars"></i></a>
+ <ul class="dropdown-menu">
{{$navapps}}
+ </ul>
</li>
</ul>
</div>
</div>
+ <div class="collapse navbar-collapse" id="navbar-collapse-2">
+ <ul class="nav navbar-nav navbar-left hidden-sm hidden-md hidden-lg">
+ {{$navapps}}
+ </ul>
+ </div>
{{if $nav.help.6}}
<div id="contextual-help-content" class="contextual-help-content">
{{$nav.help.5}}
diff --git a/view/tpl/navapps.tpl b/view/tpl/navapps.tpl
index a90fdbaf2..db5c7ae17 100644
--- a/view/tpl/navapps.tpl
+++ b/view/tpl/navapps.tpl
@@ -1,9 +1,9 @@
-<ul class="dropdown-menu">
+
{{foreach $apps as $app}}
<li><a href="{{$app.url}}">{{if $icon}}<i class="app-icon fa fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" />{{/if}}&nbsp;{{$app.name}}</a></li>
{{/foreach}}
{{if $localuser}}
<li class="divider"></li>
- <li><a href="/apps/edit"><i class="app-icon fa fa-plus-circle"></i>&nbsp;Add Apps</a></li>
+ <li><a href="/apps/edit"><i class="generic-icons fa fa-plus-circle"></i>Add Apps</a></li>
{{/if}}
-</ul>
+