aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-02-06 14:12:43 -0800
committerzotlabs <mike@macgirvin.com>2017-02-06 14:12:43 -0800
commit27cac334e199db13d899c00866ca9bc3cf9fc39f (patch)
treea31a12f644a0effd10df7d4c1e0ddd87d3f5277f
parent947478ca760d8a59753d9139592ea623a49a3f08 (diff)
parentc75357faa33c0dcc7e45ad0abe79de2fbba3e3a6 (diff)
downloadvolse-hubzilla-27cac334e199db13d899c00866ca9bc3cf9fc39f.tar.gz
volse-hubzilla-27cac334e199db13d899c00866ca9bc3cf9fc39f.tar.bz2
volse-hubzilla-27cac334e199db13d899c00866ca9bc3cf9fc39f.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
-rw-r--r--Zotlabs/Lib/Apps.php2
-rwxr-xr-xview/tpl/nav.tpl8
2 files changed, 8 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index ee1458aba..6f23b83ee 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -358,7 +358,7 @@ class Apps {
'$undelete' => ((local_channel() && $installed && $mode == 'edit') ? t('Undelete') : ''),
'$deleted' => $papp['deleted'],
'$featured' => ((strpos($papp['categories'], 'nav_featured_app') === false) ? false : true),
- '$navapps' => ((local_channel() && $installed && $mode == 'nav') ? true : false)
+ '$navapps' => (($mode == 'nav') ? true : false)
));
}
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 236cde230..f101393a4 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -183,7 +183,13 @@
</div>
<div class="collapse navbar-collapse" id="navbar-collapse-2">
<ul class="nav navbar-nav navbar-left hidden-sm hidden-md hidden-lg">
- {{$navapps}}
+ {{foreach $navapps as $navapp}}
+ {{$navapp}}
+ {{/foreach}}
+ {{if $localuser}}
+ <li class="divider"></li>
+ <li><a href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>Add Apps</a></li>
+ {{/if}}
</ul>
</div>