aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/nav.tpl
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-10-04 19:37:50 -0700
committerzotlabs <mike@macgirvin.com>2017-10-04 19:37:50 -0700
commit4ab21edba8511eb96b08371424841d6ffb808cf8 (patch)
treefcf56e3e85e6d28d8901ef3a0a638bfb40212b51 /view/tpl/nav.tpl
parent15b9a67c01964b83ac724945fe416dd35f66e914 (diff)
parent6f88d5e92be06ad8fa61f900e8a4fb41ba54135e (diff)
downloadvolse-hubzilla-4ab21edba8511eb96b08371424841d6ffb808cf8.tar.gz
volse-hubzilla-4ab21edba8511eb96b08371424841d6ffb808cf8.tar.bz2
volse-hubzilla-4ab21edba8511eb96b08371424841d6ffb808cf8.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view/tpl/nav.tpl')
-rwxr-xr-xview/tpl/nav.tpl35
1 files changed, 25 insertions, 10 deletions
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 72860aebe..82cdc0dd0 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -128,7 +128,7 @@
{{/if}}
{{if $nav.intros}}
<li class="nav-item dropdown intro-button" style="display: none;">
- <a class="nav-link" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}" data-toggle="dropdown" rel="#nav-intros-menu">
+ <a class="nav-link" href="#" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}" data-toggle="dropdown" rel="#nav-intros-menu">
<i class="fa fa-fw fa-users"></i>
<span class="badge badge-pill badge-danger intro-update"></span>
</a>
@@ -138,9 +138,20 @@
</div>
</li>
{{/if}}
+ {{if $nav.registrations}}
+ <li class="nav-item dropdown register-button" style="display: none;">
+ <a class="nav-link" href="#" title="{{$nav.registrations.3}}" id="{{$nav.registrations.4}}" data-toggle="dropdown" rel="#nav-register-menu">
+ <i class="fa fa-fw fa-user-o"></i>
+ <span class="badge badge-pill badge-danger register-update"></span>
+ </a>
+ <div id="nav-register-menu" class="dropdown-menu" rel="register">
+ {{$emptynotifications}}
+ </div>
+ </li>
+ {{/if}}
{{if $nav.notifications}}
<li class="nav-item dropdown notify-button" style="display: none;">
- <a class="nav-link" href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}" data-toggle="dropdown" rel="#nav-notify-menu">
+ <a class="nav-link" href="#" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}" data-toggle="dropdown" rel="#nav-notify-menu">
<i class="fa fa-fw fa-exclamation"></i>
<span class="badge badge-pill badge-danger notify-update"></span>
</a>
@@ -151,6 +162,17 @@
</div>
</li>
{{/if}}
+ {{if $nav.files}}
+ <li class="nav-item dropdown files-button" style="display: none;">
+ <a class="nav-link" href="#" title="{{$nav.files.3}}" id="{{$nav.files.4}}" data-toggle="dropdown" rel="#nav-files-menu">
+ <i class="fa fa-fw fa-folder"></i>
+ <span class="badge badge-pill badge-danger files-update"></span>
+ </a>
+ <div id="nav-files-menu" class="dropdown-menu" rel="files">
+ {{$emptynotifications}}
+ </div>
+ </li>
+ {{/if}}
{{if $nav.login && !$userinfo}}
<li class="nav-item d-none d-md-flex">
<a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login">{{$nav.loginmenu.1.1}}</a>
@@ -166,14 +188,7 @@
<a class="nav-link" href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a>
</li>
{{/if}}
- {{if $nav.files}}
- <li class="nav-item dropdown files-button" style="display: none;">
- <a class="nav-link" href="{{$nav.files.0}}" title="{{$nav.files.3}}" id="{{$nav.files.4}}" rel="#nav-files-menu">
- <i class="fa fa-fw fa-folder"></i>
- <span class="badge badge-pill badge-primary files-update"></span>
- </a>
- </li>
- {{/if}}
+
{{if $nav.pubs}}
<li class="nav-item dropdown pubs-button" style="display: none;">
<a class="nav-link" href="{{$nav.pubs.0}}" title="{{$nav.pubs.3}}" id="{{$nav.pubs.4}}" rel="#nav-pubs-menu">