diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-11-19 22:42:16 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-11-19 22:42:16 +0100 |
| commit | 241a0829dc59c9c4376c10bc2f4ca833510f29eb (patch) | |
| tree | db0d0cbbe86dc11963b2de5cab73b42ca732aa51 | |
| parent | 66a0b4790e97252a93b14c555c5c7fdb6eae5b47 (diff) | |
| download | volse-hubzilla-241a0829dc59c9c4376c10bc2f4ca833510f29eb.tar.gz volse-hubzilla-241a0829dc59c9c4376c10bc2f4ca833510f29eb.tar.bz2 volse-hubzilla-241a0829dc59c9c4376c10bc2f4ca833510f29eb.zip | |
fix issues with apporder related to recent pinned apps changes
| -rw-r--r-- | Zotlabs/Lib/Apps.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Apporder.php | 16 | ||||
| -rw-r--r-- | view/tpl/apporder.tpl | 16 |
3 files changed, 25 insertions, 11 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index bbf777b18..9271cee85 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -633,7 +633,7 @@ class Apps { static function moveup($uid,$guid) { $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) { foreach($list as $li) { $syslist[] = self::app_encode($li); @@ -674,7 +674,7 @@ class Apps { static function movedown($uid,$guid) { $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) { foreach($list as $li) { $syslist[] = self::app_encode($li); diff --git a/Zotlabs/Module/Apporder.php b/Zotlabs/Module/Apporder.php index 956548d1f..a9f66ba69 100644 --- a/Zotlabs/Module/Apporder.php +++ b/Zotlabs/Module/Apporder.php @@ -18,7 +18,7 @@ class Apporder extends \Zotlabs\Web\Controller { nav_set_selected('Order Apps'); $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) { foreach($list as $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); 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'), [ - '$header' => t('Change Order of Navigation Apps'), - '$desc' => t('Use arrows to move the corresponding app up or down in the display list'), - '$nav_apps' => $nav_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 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, + '$navbar_apps' => $navbar_apps ] ); } diff --git a/view/tpl/apporder.tpl b/view/tpl/apporder.tpl index fdb726131..8a247f11d 100644 --- a/view/tpl/apporder.tpl +++ b/view/tpl/apporder.tpl @@ -1,7 +1,15 @@ -<h2>{{$header}}</h2> - -<div class="descriptive-text">{{$desc}}</div> -<br><br><br> +{{if $navbar_apps}} +<h2>{{$header.0}}</h2> +<div class="descriptive-text">{{$desc.0}}</div> +<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}} {{$nav_app}} {{/foreach}} |