harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more work on app-bin

Browse Source
This commit is contained in:
Mario Vavti 2017-01-27 17:51:49 +01:00
parent de668f5999
commit 8b5793e629
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Zotlabs/Module/Apps.php
View File

@ -17,7 +17,6 @@ class Apps extends \Zotlabs\Web\Controller {
$apps = array(); $apps = array();
if(local_channel()) { if(local_channel()) {
Zlib\Apps::import_system_apps(); Zlib\Apps::import_system_apps();
$syslist = array(); $syslist = array();

5
include/nav.php
View File

@ -249,7 +249,7 @@ EOT;
if(local_channel()) { if(local_channel()) {
//Zlib\Apps::import_system_apps(); //Zlib\Apps::import_system_apps();
$syslist = array(); $syslist = array();
$list = Zlib\Apps::app_list(local_channel(), false, $_GET['cat']); $list = Zlib\Apps::app_list(local_channel(), false, 'featured');
if($list) { if($list) {
foreach($list as $li) { foreach($list as $li) {
$syslist[] = Zlib\Apps::app_encode($li); $syslist[] = Zlib\Apps::app_encode($li);
@ -262,7 +262,8 @@ EOT;
} }
$navapps = replace_macros(get_markup_template('navapps.tpl'), array( $navapps = replace_macros(get_markup_template('navapps.tpl'), array(
'$apps' => $syslist '$apps' => $syslist,
'$localuser' => local_channel(),
)); ));
} }

10
view/tpl/nav.tpl
View File

@ -163,13 +163,13 @@
<!-- {{foreach $nav.loginmenu as $loginmenu}} <!-- {{foreach $nav.loginmenu as $loginmenu}}
<li role="presentation"><a class="{{$loginmenu.2}}" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem" id="{{$loginmenu.4}}">{{$loginmenu.1}}</a></li> <li role="presentation"><a class="{{$loginmenu.2}}" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem" id="{{$loginmenu.4}}">{{$loginmenu.1}}</a></li>
{{/foreach}} --!> {{/foreach}} -->
</div> </div>
</li> </li>
<!-- {{foreach $nav.loginmenu as $loginmenu}} <!-- {{foreach $nav.loginmenu as $loginmenu}}
<li role="presentation"><a class="{{$loginmenu.2}} visible-xs" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem">{{$loginmenu.1}}</a></li> <li role="presentation"><a class="{{$loginmenu.2}} visible-xs" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem">{{$loginmenu.1}}</a></li>
{{/foreach}} {{/foreach}}
--!> -->
{{/if}} {{/if}}
{{if $nav.register}} {{if $nav.register}}
@ -194,7 +194,7 @@
{{if $powered_by}} {{if $powered_by}}
<div id="powered-by">{{$powered_by}}</div> <div id="powered-by">{{$powered_by}}</div>
{{/if}} {{/if}}
{{if ! $navapps}}
{{if $nav.directory}} {{if $nav.directory}}
<li class="{{$sel.directory}}"> <li class="{{$sel.directory}}">
<a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" id="{{$nav.directory.4}}"><i class="fa fa-sitemap"></i></a> <a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" id="{{$nav.directory.4}}"><i class="fa fa-sitemap"></i></a>
@ -212,6 +212,7 @@
<a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}"{{if $nav.help.6}} onclick="contextualHelp(); return false;"{{/if}}>{{if $nav.help.6}}<i class="fa fa-question-circle"></i>{{else}}<i class="fa fa-question"></i>{{/if}}</a> <a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}"{{if $nav.help.6}} onclick="contextualHelp(); return false;"{{/if}}>{{if $nav.help.6}}<i class="fa fa-question-circle"></i>{{else}}<i class="fa fa-question"></i>{{/if}}</a>
</li> </li>
{{/if}} {{/if}}
{{/if}}
{{if $navapps}} {{if $navapps}}
<li class="dropdown-toggle" data-toggle="dropdown"> <li class="dropdown-toggle" data-toggle="dropdown">
@ -223,6 +224,9 @@
</ul> </ul>
</div> </div>
<div class="collapse navbar-collapse" id="navbar-collapse-2">
{{$navapps}}
</div>
</div> </div>
{{if $nav.help.6}} {{if $nav.help.6}}
<div id="contextual-help-content" class="contextual-help-content"> <div id="contextual-help-content" class="contextual-help-content">

7
view/tpl/navapps.tpl
View File

@ -1,8 +1,9 @@
<ul class="dropdown-menu"> <ul class="dropdown-menu" style="max-height: 80vh">
{{foreach $apps as $app}} {{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> <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}} {{/foreach}}
{{if $localuser}}
<li class="divider"></li> <li class="divider"></li>
<li><a href="/apps/edit"><i class="app-icon fa fa-pencil"></i>&nbsp;Edit Apps</a></li> <li><a href="/apps/edit"><i class="app-icon fa fa-plus-circle"></i>&nbsp;Add Apps</a></li>
<li><a href="/appman"><i class="app-icon fa fa-plus-circle"></i>&nbsp;Add App</a></li> {{/if}}
</ul> </ul>