5 files changed, 35 insertions, 28 deletions

diff --git a/include/apps.php b/include/apps.php
index 777664c7f..df62ba774 100644
--- a/include/apps.php
+++ b/include/apps.php
@@ -62,18 +62,21 @@ function parse_app_description($f) {
 	}
 
 
-
 	if(! $ret['photo'])
 		$ret['photo'] = $baseurl . '/' . get_default_profile_photo(80);
 
+	$ret['type'] = 'system';
 
 	foreach($ret as $k => $v) {
 		if(strpos($v,'http') === 0)
 			$ret[$k] = zid($v);
 	}
 
-	if(array_key_exists('hover',$ret))
-		$ret['hover'] = str_replace(array('\'','"'),array(''','&dquot;'),$ret['hover']);
+	if(array_key_exists('desc',$ret))
+		$ret['desc'] = str_replace(array('\'','"'),array(''','&dquot;'),$ret['desc']);
+
+	if(array_key_exists('target',$ret))
+		$ret['target'] = str_replace(array('\'','"'),array(''','&dquot;'),$ret['target']);
 
 	if(array_key_exists('requires',$ret)) {
 		$require = trim(strtolower($ret['requires']));
@@ -270,6 +273,11 @@ function app_list($uid) {
 	$r = q("select * from app where app_channel = %d order by app_name asc",
 		intval($uid)
 	);
+	if($r) {
+		for($x = 0; $x < count($r); $x ++) {
+			$r[$x]['type'] = 'personal';
+		}
+	}
 	return($r);
 }
 
@@ -391,6 +399,8 @@ function app_encode($app,$embed = false) {
 
 	$ret = array();
 
+	$ret['type'] = 'personal';
+
 	if($app['app_id'])
 		$ret['guid'] = $app['app_id'];
 
diff --git a/mod/apps.php b/mod/apps.php
index e88c54c66..5cbf67b1f 100644
--- a/mod/apps.php
+++ b/mod/apps.php
@@ -4,33 +4,30 @@ require_once('include/apps.php');
 
 function apps_content(&$a) {
 
-
-	if(argc() == 1 || (! local_user())) {
-
-		$apps = get_system_apps();
-
-		//	$o .= print_r($apps,true);
-
-		//	return $o;
-
-		return replace_macros(get_markup_template('apps.tpl'), array(
-			'$title' => t('Apps'),
-			'$apps' => $apps,
-		));
-	}
-
-	if(argc() == 3 && argv(2) == 'edit')
+	if(argc() == 2 && argv(1) == 'edit')
 		$mode = 'edit';
 	else
 		$mode = 'list';
 
 	$apps = array();
-	$list = app_list(local_user());
-	if($list) {
-		foreach($list as $app) {
-			$apps[] = app_render(app_encode($app),$mode);
+
+	$syslist = get_system_apps();
+
+	if(local_user()) {
+		$list = app_list(local_user());
+		if($list) {
+			foreach($list as $x) {
+				$syslist[] = app_encode($x);
+			}
 		}
 	}
+	usort($syslist,'app_name_compare');
+
+	logger('apps: ' . print_r($syslist,true));
+
+	foreach($syslist as $app) {
+		$apps[] = app_render($app,$mode);
+	}
 
 	return replace_macros(get_markup_template('myapps.tpl'), array(
 		'$title' => t('Apps'),
diff --git a/view/css/mod_apps.css b/view/css/mod_apps.css
index 2788817d9..5e98a6a18 100644
--- a/view/css/mod_apps.css
+++ b/view/css/mod_apps.css
@@ -1,5 +1,6 @@
 .app-container {
 	float: left;
 	width: 125px;
+	height: 160px;
 	padding: 20px;
 }
diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl
index 09894c3d8..4719f7f96 100644
--- a/view/tpl/app.tpl
+++ b/view/tpl/app.tpl
@@ -1,7 +1,8 @@
 <div class="app-container">
-<a href="{{if $app.alt_url}}{{$app.alt_url}}{{else}}{{$app.url}}{{/if}}" {{if $app.desc}}title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{/if}}><img src="{{$app.photo}}" width="80" height="80" />
+<a href="{{$app.url}}" {{if $ap.target}}target="{{$ap.target}}" {{/if}}{{if $app.desc}}title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{else}}title="{{$app.name}}"{{/if}}><img src="{{$app.photo}}" width="80" height="80" />
 <div class="app-name">{{$app.name}}</div>
 </a>
+{{if $app.type !== 'system'}}
 {{if $purchase}}
 <a href="{{$app.page}}" class="btn btn-default" title="{{$purchase}}" ><i class="icon-external"></i></a>
 {{/if}}
@@ -13,5 +14,6 @@
 {{if $delete}}<button type="submit" name="delete" value="{{$delete}}" class="btn btn-default" title="{{$delete}}" ><i class="icon-remove drop-icons"></i></button>{{/if}}
 </form>
 {{/if}}
+{{/if}}
 </div>
 
diff --git a/view/tpl/app_select.tpl b/view/tpl/app_select.tpl
index 05f527371..5cf3f40d6 100644
--- a/view/tpl/app_select.tpl
+++ b/view/tpl/app_select.tpl
@@ -2,11 +2,8 @@
 <div class="widget">
 <h3>{{$title}}</h3>
 <ul>
-<li><a href="apps">{{$system}}</a></li>
-<li><a href="apps/personal">{{$personal}}</a></li>
-<br />
 <li><a href="appman">{{$new}}</a></li>
-<li><a href="apps/personal/edit">{{$edit}}</a></li>
+<li><a href="apps/edit">{{$edit}}</a></li>
 </ul>
 </div>
 {{/if}}