aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-10-11 11:49:03 +0200
committerMario Vavti <mario@mariovavti.com>2017-10-11 11:49:03 +0200
commitba55400f14c7930786785db13a18a6333c20ee7d (patch)
treeb1d36f67fd81ece8783b5a42524914b0b0054a94 /view
parent0c5918f29096f173f3dcacd572916611d9ca7558 (diff)
downloadvolse-hubzilla-ba55400f14c7930786785db13a18a6333c20ee7d.tar.gz
volse-hubzilla-ba55400f14c7930786785db13a18a6333c20ee7d.tar.bz2
volse-hubzilla-ba55400f14c7930786785db13a18a6333c20ee7d.zip
bring nav pinned apps to navbar_default
Diffstat (limited to 'view')
-rw-r--r--view/tpl/app_nav.tpl2
-rwxr-xr-xview/tpl/navbar_default.tpl7
2 files changed, 8 insertions, 1 deletions
diff --git a/view/tpl/app_nav.tpl b/view/tpl/app_nav.tpl
index 1ee5adb70..046cd7237 100644
--- a/view/tpl/app_nav.tpl
+++ b/view/tpl/app_nav.tpl
@@ -1 +1 @@
-<a class="navbar-app nav-link{{if $app.active}} active{{/if}}" href="{{$app.url}}" title="{{$app.name}}" >{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" />{{/if}}</a>
+<a class="navbar-app nav-link{{if $app.active}} active{{/if}}" href="{{$app.url}}" title="{{$app.name}}" >{{if $icon}}<i class="fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" />{{/if}}</a>
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
index b6faad0c2..9495ea7a4 100755
--- a/view/tpl/navbar_default.tpl
+++ b/view/tpl/navbar_default.tpl
@@ -107,6 +107,13 @@
</div>
</li>
{{/if}}
+ {{if $navbar_apps}}
+ {{foreach $navbar_apps as $navbar_app}}
+ <li>
+ {{$navbar_app}}
+ </li>
+ {{/foreach}}
+ {{/if}}
<li class="nav-item dropdown" id="app-menu">
<a class="nav-link" href="#" data-toggle="dropdown"><i class="fa fa-fw fa-bars"></i></a>
<div id="dropdown-menu" class="dropdown-menu dropdown-menu-right">