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

fix issues with apporder related to recent pinned apps changes

Browse Source
This commit is contained in:
Mario Vavti 2017-11-19 22:42:16 +01:00
parent 66a0b4790e
commit 241a0829dc
3 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Lib/Apps.php
View File

@ -633,7 +633,7 @@ class Apps {
static function moveup($uid,$guid) { static function moveup($uid,$guid) {
$syslist = array(); $syslist = array();
$list = self::app_list($uid, false, 'nav_featured_app'); $list = self::app_list($uid, false, ['nav_featured_app', 'nav_pinned_app']);
if($list) { if($list) {
foreach($list as $li) { foreach($list as $li) {
$syslist[] = self::app_encode($li); $syslist[] = self::app_encode($li);
@ -674,7 +674,7 @@ class Apps {
static function movedown($uid,$guid) { static function movedown($uid,$guid) {
$syslist = array(); $syslist = array();
$list = self::app_list($uid, false, 'nav_featured_app'); $list = self::app_list($uid, false, ['nav_featured_app', 'nav_pinned_app']);
if($list) { if($list) {
foreach($list as $li) { foreach($list as $li) {
$syslist[] = self::app_encode($li); $syslist[] = self::app_encode($li);

16
Zotlabs/Module/Apporder.php
View File

@ -18,7 +18,7 @@ class Apporder extends \Zotlabs\Web\Controller {
nav_set_selected('Order Apps'); nav_set_selected('Order Apps');
$syslist = array(); $syslist = array();
$list = Zlib\Apps::app_list(local_channel(), false, 'nav_featured_app'); $list = Zlib\Apps::app_list(local_channel(), false, ['nav_featured_app', 'nav_pinned_app']);
if($list) { if($list) {
foreach($list as $li) { foreach($list as $li) {
$syslist[] = Zlib\Apps::app_encode($li); $syslist[] = Zlib\Apps::app_encode($li);
@ -31,14 +31,20 @@ class Apporder extends \Zotlabs\Web\Controller {
$syslist = Zlib\Apps::app_order(local_channel(),$syslist); $syslist = Zlib\Apps::app_order(local_channel(),$syslist);
foreach($syslist as $app) { foreach($syslist as $app) {
$nav_apps[] = Zlib\Apps::app_render($app,'nav-order'); if(strpos($app['categories'],'nav_pinned_app') !== false) {
$navbar_apps[] = Zlib\Apps::app_render($app,'nav-order');
}
else {
$nav_apps[] = Zlib\Apps::app_render($app,'nav-order');
}
} }
return replace_macros(get_markup_template('apporder.tpl'), return replace_macros(get_markup_template('apporder.tpl'),
[ [
'$header' => t('Change Order of Navigation Apps'), '$header' => [t('Change Order of Pinned Navbar Apps'), t('Change Order of App Tray Apps')],
'$desc' => t('Use arrows to move the corresponding app up or down in the display list'), '$desc' => [t('Use arrows to move the corresponding app left (top) or right (bottom) in the navbar'), t('Use arrows to move the corresponding app up or down in the app tray')],
'$nav_apps' => $nav_apps '$nav_apps' => $nav_apps,
'$navbar_apps' => $navbar_apps
] ]
); );
} }

16
view/tpl/apporder.tpl
View File

@ -1,7 +1,15 @@
<h2>{{$header}}</h2> {{if $navbar_apps}}
<h2>{{$header.0}}</h2>
<div class="descriptive-text">{{$desc}}</div> <div class="descriptive-text">{{$desc.0}}</div>
<br><br><br> <br><br>
{{foreach $navbar_apps as $navbar_app}}
{{$navbar_app}}
{{/foreach}}
<br><br>
{{/if}}
<h2>{{$header.1}}</h2>
<div class="descriptive-text">{{$desc.1}}</div>
<br><br>
{{foreach $nav_apps as $nav_app}} {{foreach $nav_apps as $nav_app}}
{{$nav_app}} {{$nav_app}}
{{/foreach}} {{/foreach}}