infrastructure to provide an app install widget for modules and make the bookmark app use it

2 files changed, 39 insertions, 5 deletions

diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index 30c108cc1..d7d225e9a 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -575,6 +575,30 @@ class Apps {
 		));
 	}
 
+
+	/**
+	 * @brief Render a simple app install button with app name and description.
+	 *
+	 * @param string $app app name
+	 * @return string
+	 */
+	static public function app_render_install($app) {
+
+		$papp = self::get_papp($app);
+
+		if (!$papp) {
+			return EMPTY_STR;
+		}
+
+		$papp_encoded = self::papp_encode($papp);
+
+		return replace_macros(get_markup_template('app_install.tpl'), [
+			'$papp' => $papp,
+			'$papp_encoded' => $papp_encoded,
+			'$install' => t('Install')
+		]);
+	}
+
 	static public function app_install($uid,$app) {
 
 		if(! is_array($app)) {
@@ -1357,4 +1381,17 @@ class Apps {
 		return chunk_split(base64_encode(json_encode($papp)),72,"\n");
 	}
 
+	static public function get_papp($app) {
+
+		$r = q("select * from app where app_id = '%s' and app_channel = 0 limit 1",
+			dbesc(hash('whirlpool', $app))
+		);
+
+		if ($r) {
+			$papp = self::app_encode($r[0]);
+			return $papp;
+		}
+
+		return false;
+	}
 }
diff --git a/Zotlabs/Module/Bookmarks.php b/Zotlabs/Module/Bookmarks.php
index 000e2893f..ea34754da 100644
--- a/Zotlabs/Module/Bookmarks.php
+++ b/Zotlabs/Module/Bookmarks.php
@@ -74,10 +74,7 @@ class Bookmarks extends \Zotlabs\Web\Controller {
 		if(! Apps::system_app_installed(local_channel(), 'Bookmarks')) {
 			//Do not display any associated widgets at this point
 			App::$pdl = '';
-
-			$o = '<b>' . t('Bookmarks App') . ' (' . t('Not Installed') . '):</b><br>';
-			$o .= t('Bookmark links from posts and manage them');
-			return $o;
+			return Apps::app_render_install('Bookmarks');
 		}
 
 		require_once('include/menu.php');
@@ -89,7 +86,7 @@ class Bookmarks extends \Zotlabs\Web\Controller {
 
 		$o .= '<div class="generic-content-wrapper-styled">';
 
-		$o .= '<h3>' . t('My Bookmarks') . '</h3>';
+		$o .= '<h3>' . t('Bookmarks') . '</h3>';
 
 		$x = menu_list(local_channel(),'',MENU_BOOKMARK);