Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
This commit is contained in:
commit
27cac334e1
@ -358,7 +358,7 @@ class Apps {
|
|||||||
'$undelete' => ((local_channel() && $installed && $mode == 'edit') ? t('Undelete') : ''),
|
'$undelete' => ((local_channel() && $installed && $mode == 'edit') ? t('Undelete') : ''),
|
||||||
'$deleted' => $papp['deleted'],
|
'$deleted' => $papp['deleted'],
|
||||||
'$featured' => ((strpos($papp['categories'], 'nav_featured_app') === false) ? false : true),
|
'$featured' => ((strpos($papp['categories'], 'nav_featured_app') === false) ? false : true),
|
||||||
'$navapps' => ((local_channel() && $installed && $mode == 'nav') ? true : false)
|
'$navapps' => (($mode == 'nav') ? true : false)
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -183,7 +183,13 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="collapse navbar-collapse" id="navbar-collapse-2">
|
<div class="collapse navbar-collapse" id="navbar-collapse-2">
|
||||||
<ul class="nav navbar-nav navbar-left hidden-sm hidden-md hidden-lg">
|
<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>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user