Merge branch 'zap'

Zotlabs/Module/Admin.php

@@ -129,12 +129,17 @@ class Admin extends \Zotlabs\Web\Controller {
 			sort($plugins);
 
 		// Could be extended to provide also other alerts to the admin
+
 		$alertmsg = '';
 
-		$vmaster = get_repository_version('master');
-		$vdev = get_repository_version('dev');
+		$upgrade = EMPTY_STR;
 
-		$upgrade = ((version_compare(STD_VERSION,$vmaster) < 0) ? t('Your software should be updated') : '');
+		if((! defined('PLATFORM_ARCHITECTURE')) || (PLATFORM_ARCHITECTURE === 'red')) {
+			$vmaster = get_repository_version('master');
+			$vdev = get_repository_version('dev');
+
+			$upgrade = ((version_compare(STD_VERSION,$vmaster) < 0) ? t('Your software should be updated') : '');
+		}
 
 		$t = get_markup_template('admin_summary.tpl');
 		return replace_macros($t, array(

boot.php

@@ -31,7 +31,10 @@ require_once('include/attach.php');
 require_once('include/bbcode.php');
 require_once('include/items.php');
 
+
 define ( 'PLATFORM_NAME',           'osada' );
+define ( 'PLATFORM_ARCHITECTURE',   'osada' );
+
 define ( 'STD_VERSION',             '0.0.1' );
 define ( 'ZOT_REVISION',            '6.0' );
 

install/INSTALL.txt

@@ -143,11 +143,13 @@ web server platforms.
             cd mywebsite
 
     - Then you should clone the addon repository (separately). We'll give this repository
-         a nickname of 'hzaddons'. You can pull in other hubzilla addon repositories by 
+         a nickname of 'zaddons'. You can pull in other addon repositories by 
          giving them different nicknames.
 
+
             util/add_addon_repo https://framagit.org/macgirvin/osada-addons zaddons
 
+
     - For keeping the addon tree updated, you should be on your top level website 
 		directory and issue an update command for that repository.
 

view/tpl/admin_summary.tpl

@@ -22,22 +22,28 @@
 		<dt>{{$channels.0}}</dt>
 		<dd>{{foreach from=$channels.1 item=ch name=chan}}<span title="{{$ch.label}}">{{$ch.val}} {{$ch.label}}</span>{{if !$smarty.foreach.chan.last}} / {{/if}}{{/foreach}}</dd>
 	</dl>
+	{{if $plugins.1}}
 	<dl>
 		<dt>{{$plugins.0}}</dt>
 		<dd>
 		{{foreach $plugins.1 as $p}} {{$p}} {{/foreach}}
 		</dd>
 	</dl>
+	{{/if}}
 	<dl>
 		<dt>{{$version.0}}</dt>
 		<dd>{{$version.1}} - {{$build}}</dd>
 	</dl>
+	{{if $vmaster.1}}
 	<dl>
 		<dt>{{$vmaster.0}}</dt>
 		<dd>{{$vmaster.1}}</dd>
 	</dl>
+	{{/if}}
+	{{if $vdev.1}}
 	<dl>
 		<dt>{{$vdev.0}}</dt>
 		<dd>{{$vdev.1}}</dd>
 	</dl>
+	{{/if}}
 </div>