nav_set_selected() for apps and apporder. restrict apporder to local_channel() and whitespace

This commit is contained in:
Mario Vavti 2017-10-11 11:58:09 +02:00
parent ba55400f14
commit 24d1d752fe
2 changed files with 26 additions and 19 deletions

View File

@ -11,30 +11,35 @@ class Apporder extends \Zotlabs\Web\Controller {
} }
function get() { function get() {
$syslist = array();
$list = Zlib\Apps::app_list(local_channel(), false, 'nav_featured_app');
if($list) {
foreach($list as $li) {
$syslist[] = Zlib\Apps::app_encode($li);
}
}
Zlib\Apps::translate_system_apps($syslist);
usort($syslist,'Zotlabs\\Lib\\Apps::app_name_compare'); if(! local_channel())
return;
$syslist = Zlib\Apps::app_order(local_channel(),$syslist); nav_set_selected('Order Apps');
foreach($syslist as $app) { $syslist = array();
$nav_apps[] = Zlib\Apps::app_render($app,'nav-order'); $list = Zlib\Apps::app_list(local_channel(), false, 'nav_featured_app');
if($list) {
foreach($list as $li) {
$syslist[] = Zlib\Apps::app_encode($li);
}
}
Zlib\Apps::translate_system_apps($syslist);
usort($syslist,'Zotlabs\\Lib\\Apps::app_name_compare');
$syslist = Zlib\Apps::app_order(local_channel(),$syslist);
foreach($syslist as $app) {
$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 Navigation 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 up or down in the display list'),
'$nav_apps' => $nav_apps '$nav_apps' => $nav_apps
] ]
); );
} }
} }

View File

@ -7,6 +7,8 @@ use \Zotlabs\Lib as Zlib;
class Apps extends \Zotlabs\Web\Controller { class Apps extends \Zotlabs\Web\Controller {
function get() { function get() {
nav_set_selected('Apps');
if(argc() == 2 && argv(1) == 'edit') if(argc() == 2 && argv(1) == 'edit')
$mode = 'edit'; $mode = 'edit';