more app descriptions and return to the app if installed from the module itself

Zotlabs/Lib/Apps.php

@@ -2,6 +2,7 @@
 
 namespace Zotlabs\Lib;
 
+use App;
 use Zotlabs\Lib\Libsync;
 
 require_once('include/plugin.php');
@@ -538,6 +539,7 @@ class Apps {
 		$icon = ((strpos($papp['photo'],'icon:') === 0) ? substr($papp['photo'],5) : '');
 
 		if (!$installed && $mode === 'module') {
+			$_SESSION['return_url'] = App::$query_string;
 			return replace_macros(get_markup_template('app_install.tpl'), [
 				'$papp' => $papp,
 				'$install' => $install_action

Zotlabs/Module/Cards.php

@@ -47,10 +47,8 @@ class Cards extends Controller {
 		if(! Apps::system_app_installed(App::$profile_uid, 'Cards')) {
 			//Do not display any associated widgets at this point
 			App::$pdl = '';
-
-			$o = '<b>' . t('Cards App') . ' (' . t('Not Installed') . '):</b><br>';
-			$o .= t('Create personal planning cards');
-			return $o;
+			$papp = Apps::get_papp('Cards');
+			return Apps::app_render($papp, 'module');
 		}
 
 		nav_set_selected('Cards');

Zotlabs/Module/Chat.php

@@ -96,10 +96,8 @@ class Chat extends Controller {
 		if(! Apps::system_app_installed(App::$profile_uid, 'Chatrooms')) {
 			//Do not display any associated widgets at this point
 			App::$pdl = '';
-
-			$o = '<b>' . t('Chatrooms App') . ' (' . t('Not Installed') . '):</b><br>';
-			$o .= t('Access Controlled Chatrooms');
-			return $o;
+			$papp = Apps::get_papp('Chatrooms');
+			return Apps::app_render($papp, 'module');
 		}
 
 		if(local_channel()) {
@@ -259,7 +257,7 @@ class Chat extends Controller {
 			'$nickname' => App::$profile['channel_address'],
 			'$rooms' => $rooms,
 			'$norooms' => t('No chatrooms available'),
-			'$newroom' => t('Create New'),
+			'$newroom' => t('Add Room'),
 			'$is_owner' => ((local_channel() && local_channel() == App::$profile['profile_uid']) ? 1 : 0),
 			'$chatroom_new' => $chatroom_new,
 			'$expire' => t('Expiration'),

Zotlabs/Module/Sources.php

@@ -84,10 +84,8 @@ class Sources extends Controller {
 		if(! Apps::system_app_installed(local_channel(), 'Channel Sources')) {
 			//Do not display any associated widgets at this point
 			App::$pdl = '';
-
-			$o = '<b>' . t('Sources App') . ' (' . t('Not Installed') . '):</b><br>';
-			$o .= t('Automatically import channel content from other channels or feeds');
-			return $o;
+			$papp = Apps::get_papp('Channel Sources');
+			return Apps::app_render($papp, 'module');
 		}
 
 		// list sources

Zotlabs/Module/Uexport.php

@@ -58,10 +58,8 @@ class Uexport extends Controller {
 		if(! Apps::system_app_installed(local_channel(), 'Channel Export')) {
 			//Do not display any associated widgets at this point
 			App::$pdl = '';
-
-			$o = '<b>' . t('Channel Export App') . ' (' . t('Not Installed') . '):</b><br>';
-			$o .= t('Export your channel');
-			return $o;
+			$papp = Apps::get_papp('Channel Export');
+			return Apps::app_render($papp, 'module');
 		}
 
 		$y = datetime_convert('UTC',date_default_timezone_get(),'now','Y');

app/cards.apd

@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/cards/$nick
 name: Cards
 requires: local_channel
 photo: icon:list
 categories: nav_featured_app, Productivity
+desc: Create interactive personal planning cards.

app/channel.apd

@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/channel/$nick, $baseurl/settings/channel_home
 requires: local_channel
 name: Channel Home
 photo: icon:home
 categories: nav_featured_app, Personal
+desc: Your channel homepage featuring your personal posts.

app/chat.apd

@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/chat/$nick
 requires: local_channel
 name: Chatrooms
 photo: icon:comments-o
 categories: Productivity
+desc: Access controlled personal chatrooms.

app/sources.apd

@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/sources
 requires: local_channel
 name: Channel Sources
 photo: icon:commenting-o
 categories: Networking
+desc: Import channel content from other channels or feeds.

app/uexport.apd

@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/uexport
 requires: local_channel
 name: Channel Export
 photo: icon:download
 categories: Personal, System
+desc: Export your channel.

view/tpl/app_install.tpl

@@ -6,6 +6,7 @@
 </div>
 <form action="appman" method="post">
 	<input type="hidden" name="papp" value="{{$papp.papp}}" />
+	<input type="hidden" name="return_path" value="{{$return_path}}" />
 	<button type="submit" name="install" value="install" class="btn btn-success">
 		<i class="fa fa-fw fa-arrow-circle-o-down"></i> {{$install}}
 	</button>