diff options
-rw-r--r-- | Zotlabs/Module/Affinity.php | 11 | ||||
-rw-r--r-- | Zotlabs/Module/Articles.php | 6 | ||||
-rw-r--r-- | Zotlabs/Module/Cdav.php | 6 | ||||
-rw-r--r-- | app/articles.apd | 3 | ||||
-rw-r--r-- | app/calendar.apd | 3 | ||||
-rw-r--r-- | app/carddav.apd | 3 |
6 files changed, 14 insertions, 18 deletions
diff --git a/Zotlabs/Module/Affinity.php b/Zotlabs/Module/Affinity.php index f0d99f1e7..0e163b89a 100644 --- a/Zotlabs/Module/Affinity.php +++ b/Zotlabs/Module/Affinity.php @@ -44,17 +44,14 @@ class Affinity extends \Zotlabs\Web\Controller { if(! local_channel()) return; - $desc = t('This app presents a slider control in your connection editor and also on your network page. The slider represents your degree of friendship (affinity) with each connection. It allows you to zoom in or out and display conversations from only your closest friends or everybody in your stream.'); - if(! Apps::system_app_installed(local_channel(),'Affinity Tool')) { + if(! Apps::system_app_installed(local_channel(), 'Affinity Tool')) { //Do not display any associated widgets at this point App::$pdl = ''; - - $o = '<b>' . t('Affinity Tool App') . ' (' . t('Not Installed') . '):</b><br>'; - $o .= $desc; - return $o; + $papp = Apps::get_papp('Affinity Tool'); + return Apps::app_render($papp, 'module'); } - $text = t('The numbers below represent the minimum and maximum slider default positions for your network/stream page as a percentage.'); + $text = t('The numbers below represent the minimum and maximum slider default positions for your network/stream page as a percentage.'); $content = '<div class="section-content-info-wrapper">' . $text . '</div>'; diff --git a/Zotlabs/Module/Articles.php b/Zotlabs/Module/Articles.php index 9152f0e0e..0db098a31 100644 --- a/Zotlabs/Module/Articles.php +++ b/Zotlabs/Module/Articles.php @@ -48,10 +48,8 @@ class Articles extends Controller { if(! Apps::system_app_installed(App::$profile_uid, 'Articles')) { //Do not display any associated widgets at this point App::$pdl = ''; - - $o = '<b>' . t('Articles App') . ' (' . t('Not Installed') . '):</b><br>'; - $o .= t('Create interactive articles'); - return $o; + $papp = Apps::get_papp('Articles'); + return Apps::app_render($papp, 'module'); } nav_set_selected('Articles'); diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php index e41772d38..599552545 100644 --- a/Zotlabs/Module/Cdav.php +++ b/Zotlabs/Module/Cdav.php @@ -873,10 +873,8 @@ class Cdav extends Controller { if((argv(1) === 'addressbook') && (! Apps::system_app_installed(local_channel(), 'CardDAV'))) { //Do not display any associated widgets at this point App::$pdl = ''; - - $o = '<b>' . t('CardDAV App') . ' (' . t('Not Installed') . '):</b><br>'; - $o .= t('CalDAV capable addressbook'); - return $o; + $papp = Apps::get_papp('CardDAV'); + return Apps::app_render($papp, 'module'); } App::$profile_uid = local_channel(); diff --git a/app/articles.apd b/app/articles.apd index 525d0443e..5ef849dfb 100644 --- a/app/articles.apd +++ b/app/articles.apd @@ -1,6 +1,7 @@ -version: 2 +version: 3 url: $baseurl/articles/$nick name: Articles requires: local_channel photo: icon:file-text-o categories: nav_featured_app, Productivity +desc: Create interactive articles diff --git a/app/calendar.apd b/app/calendar.apd index 8de046e48..9398e6aa9 100644 --- a/app/calendar.apd +++ b/app/calendar.apd @@ -1,6 +1,7 @@ -version: 1 +version: 2 url: $baseurl/cdav/calendar, $baseurl/settings/calendar requires: local_channel name: Calendar photo: icon:calendar categories: Productivity, nav_featured_app +desc: DAV capable calendar diff --git a/app/carddav.apd b/app/carddav.apd index d32e636b4..c06407d97 100644 --- a/app/carddav.apd +++ b/app/carddav.apd @@ -1,6 +1,7 @@ -version: 2 +version: 3 url: $baseurl/cdav/addressbook requires: local_channel name: CardDAV photo: icon:vcard-o categories: Productivity, Personal +desc: DAV capable addressbook |