the app menu takes form

3 files changed, 59 insertions, 15 deletions

diff --git a/include/apps.php b/include/apps.php
index 244c2adb7..f6c09d803 100644
--- a/include/apps.php
+++ b/include/apps.php
@@ -46,10 +46,9 @@ function parse_app_description($f) {
 		
 	//future expansion
 
-	$observer = get_observer();
+	$observer = get_app()->get_observer();
 	
 
-
 	$lines = @file($f);
 	if($lines) {
 		foreach($lines as $x) {
@@ -62,5 +61,46 @@ function parse_app_description($f) {
 	if(! $ret['photo'])
 		$ret['photo'] = $baseurl . '/' . get_default_profile_photo(80);
 
-	return $ret;
+
+	foreach($ret as $k => $v) {
+		if(strpos($v,'http') === 0)
+			$ret[$k] = zid($v);
+	}
+
+	if(array_key_exists('requires',$ret)) {
+		$require = trim(strtolower($ret['requires']));
+		switch($require) {
+			case 'local_user':
+				if(! local_user())
+					unset($ret);
+				break;
+			case 'observer':
+				if(! $observer)
+					unset($ret);
+				break;
+			default:
+				if(! local_user() && feature_enabled(local_user(),$require))
+					unset($ret);
+				break;
+
+		}
+		logger('require: ' . print_r($ret,true));
+	}
+	if($ret) {
+		translate_system_apps($ret);
+		return $ret;
+	}
+	return false;
 }	
+
+
+function translate_system_apps(&$arr) {
+	$apps = array( 'Matrix' => t('Matrix'), 'Channel Home' => t('Channel Home'), 'Profile' => t('Profile'),
+		'Photos' => t('Photos')
+
+	);
+
+	if(array_key_exists($arr['name'],$apps))
+		$arr['name'] = $apps[$arr['name']];
+
+}
\ No newline at end of file
diff --git a/mod/apps.php b/mod/apps.php
index 678af74e7..51d610703 100644
--- a/mod/apps.php
+++ b/mod/apps.php
@@ -8,14 +8,14 @@ function apps_content(&$a) {
 
 	$apps = get_system_apps();
 
-	$o .= print_r($apps,true);
+//	$o .= print_r($apps,true);
 
-	return $o;
+//	return $o;
 
-//	$tpl = get_markup_template("apps.tpl");
-//	return replace_macros($tpl, array(
-//		'$title' => t('Applications'),
-//		'$apps' => $apps,
-//	));
+
+	return replace_macros(get_markup_template('apps.tpl'), array(
+		'$title' => t('Applications'),
+		'$apps' => $apps,
+	));
 
 }
diff --git a/view/tpl/apps.tpl b/view/tpl/apps.tpl
index 335e0ca97..4a5ddfbcb 100755
--- a/view/tpl/apps.tpl
+++ b/view/tpl/apps.tpl
@@ -1,7 +1,11 @@
 <h3>{{$title}}</h3>
 
-<ul>
-	{{foreach $apps as $ap}}
-	<li>{{$ap}}</li>
-	{{/foreach}}
-</ul>
+{{foreach $apps as $ap}}
+<div class="app-container">
+<a href="{{$ap.url}}"><img src="{{$ap.photo}}" width="80" height="80" />
+<div class="app-name">{{$ap.name}}</div>
+</a>
+</div>
+{{/foreach}}
+<div class="clear"></div>
+