provide a fresh new look and cleaner layout and more relevant information to siteinfo

Zotlabs/Lib/System.php

@@ -42,6 +42,20 @@ class System {
 	}
 
 
+	static public function get_project_link() {
+		if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['project_link'])
+			return \App::$config['system']['project_link'];
+		return 'https://hubzilla.org';
+	}
+
+	static public function get_project_srclink() {
+		if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['project_srclink'])
+			return \App::$config['system']['project_srclink'];
+		return 'https://github.org/redmatrix/hubzilla';
+	}
+
+
+
 	static public function get_server_role() {
 		if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['server_role'])
 			return \App::$config['system']['server_role'];

Zotlabs/Module/Admin/Site.php

@@ -22,6 +22,7 @@ class Site {
 		$banner				=	((x($_POST,'banner'))			? trim($_POST['banner'])				: false);
 
 		$admininfo			=	((x($_POST,'admininfo'))		? trim($_POST['admininfo'])				: false);
+		$siteinfo			=	((x($_POST,'siteinfo'))		    ? trim($_POST['siteinfo'])				: '');
 		$language			=	((x($_POST,'language'))			? notags(trim($_POST['language']))			: '');
 		$theme				=	((x($_POST,'theme'))			? notags(trim($_POST['theme']))				: '');
 		$theme_mobile			=	((x($_POST,'theme_mobile'))		? notags(trim($_POST['theme_mobile']))			: '');
@@ -97,6 +98,7 @@ class Site {
 			linkify_tags($a, $admininfo, local_channel());
 			set_config('system', 'admininfo', $admininfo);
 		}
+		set_config('system','siteinfo',$siteinfo);
 		set_config('system', 'language', $language);
 		set_config('system', 'theme', $theme);
 		if ( $theme_mobile === '---' ) {
@@ -273,6 +275,7 @@ class Site {
 
 			'$banner'			=> array('banner', t("Banner/Logo"), $banner, ""),
 			'$admininfo'		=> array('admininfo', t("Administrator Information"), $admininfo, t("Contact information for site administrators.  Displayed on siteinfo page.  BBCode can be used here")),
+			'$siteinfo'		=> array('siteinfo', t('Site Information'), get_config('system','siteinfo'), t("Publicly visible description of this site.  Displayed on siteinfo page.  BBCode can be used here")),
 			'$language' 		=> array('language', t("System language"), get_config('system','language'), "", $lang_choices),
 			'$theme' 			=> array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),
 			'$theme_mobile' 	=> array('theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile),

Zotlabs/Module/Siteinfo.php

@@ -15,63 +15,33 @@ class Siteinfo extends \Zotlabs\Web\Controller {
 	
 	function get() {
 	
-		if(! get_config('system','hidden_version_siteinfo')) {
+		$siteinfo = replace_macros(get_markup_template('siteinfo.tpl'),
-			$version = sprintf( t('Version %s'), \Zotlabs\Lib\System::get_project_version());
+			[ 
-			if(@is_dir('.git') && function_exists('shell_exec')) {
+				'$title' => t('About this site'),
-				$commit = @shell_exec('git log -1 --format="%h"');
+				'$sitenametxt' => t('Site Name'),
-				$tag = \Zotlabs\Lib\System::get_std_version(); // @shell_exec('git describe --tags --abbrev=0');
+				'$sitename' => \Zotlabs\Lib\System::get_site_name(),
-			}
+				'$headline' => t('Site Information'),
-			if(! isset($commit) || strlen($commit) > 16)
+				'$site_about' => bbcode(get_config('system','siteinfo')),
-				$commit = '';
+				'$admin_headline' => t('Administrator'),
-		}
+				'$admin_about' => bbcode(get_config('system','admininfo')),
-		else {
+				'$terms' => t('Terms of Service'),
-		        $version = $commit = '';
+				'$prj_header' => t('Software and Project information'),
-		}
+				'$prj_name' => t('This site is powered by $Projectname'),
+				'$prj_transport' => t('Federated and decentralised networking and identity services provided by Zot'),
+				'$transport_link' => 'http://zotlabs.com',
+				'$prj_version' => ((get_config('system','hidden_version_siteinfo')) ? '' : sprintf( t('Version %s'), \Zotlabs\Lib\System::get_project_version())),
+				'$prj_linktxt' => t('Project homepage'),
+				'$prj_srctxt' => t('Developer homepage'),
+				'$prj_link' => \Zotlabs\Lib\System::get_project_link(),
+				'$prj_src' => \Zotlabs\Lib\System::get_project_srclink(),
+			]
+		);
 
-		$plugins_list = implode(', ',visible_plugin_list());
+		call_hooks('about_hook', $siteinfo); 	
+
+		return $siteinfo;
 
-		if($plugins_list)
-	        $plugins_text = t('Installed plugins/addons/apps:');
-		else
-			$plugins_text = t('No installed plugins/addons/apps');
-	
-		$txt = get_config('system','admininfo');
-		$admininfo = bbcode($txt);
-	
-		if(file_exists('doc/site_donate.html'))
-			$donate .= file_get_contents('doc/site_donate.html');
-	
-		if(function_exists('sys_getloadavg'))
-			$loadavg = sys_getloadavg();
-	
-		$o = replace_macros(get_markup_template('siteinfo.tpl'), array(
-			'$title' => t('$Projectname'),
-			'$description' => t('This is a hub of $Projectname - a global cooperative network of decentralized privacy enhanced websites.'),
-			'$version' => $version,
-			'$tag_txt' => t('Tag: '),
-			'$tag' => $tag,
-			'$polled' => t('Last background fetch: '),
-			'$lastpoll' => get_poller_runtime(),
-			'$load_average' => t('Current load average: '),
-			'$loadavg_all' => $loadavg[0] . ', ' . $loadavg[1] . ', ' . $loadavg[2],		
-			'$commit' => $commit,
-			'$web_location' => t('Running at web location') . ' ' . z_root(),
-			'$visit' => t('Please visit <a href="http://hubzilla.org">hubzilla.org</a> to learn more about $Projectname.'),
-			'$bug_text' => t('Bug reports and issues: please visit'),
-			'$bug_link_url' => 'https://github.com/redmatrix/hubzilla/issues',
-			'$bug_link_text' => t('$projectname issues'),
-			'$contact' => t('Suggestions, praise, etc. - please email "redmatrix" at librelist - dot com'),
-			'$donate' => $donate,
-			'$adminlabel' => t('Site Administrators'),
-			'$admininfo' => $admininfo,
-			'$plugins_text' => $plugins_text,
-			'$plugins_list' => $plugins_list
-	        ));
-	
-		call_hooks('about_hook', $o); 	
-	
-		return $o;
-	
 	}
+
 	
 }

view/tpl/admin_site.tpl

@@ -49,6 +49,7 @@
 	{{/if}}
 
 	{{include file="field_textarea.tpl" field=$banner}}
+	{{include file="field_textarea.tpl" field=$siteinfo}}
 	{{include file="field_textarea.tpl" field=$admininfo}}
 	{{include file="field_select.tpl" field=$language}}
 	{{include file="field_select.tpl" field=$theme}}

view/tpl/siteinfo.tpl

@@ -1,26 +1,41 @@
 <div class="generic-content-wrapper-styled">
-<h3>{{$title}}</h3>
+<h2>{{$title}}</h2>
-<p></p>
+
-<p>{{$description}}</p>
+<h3>{{$sitenametxt}}</h3>
-{{if $version}}
+
-<p>{{$version}}{{if $commit}}+{{$commit}}{{/if}}</p>
+<div>{{$sitename}}</div>
+
+<h3>{{$headline}}</h3>
+
+<div>{{if $site_about}}{{$site_about}}{{else}}--{{/if}}</div>
+
+<h3>{{$admin_headline}}</h3>
+
+<div>{{if $admin_about}}{{$admin_about}}{{else}}--{{/if}}</div>
+
+<br><br>
+<div><a href="help/TermsOfService">{{$terms}}</a></div>
+
+<hr>
+
+<h2>{{$prj_header}}</h2>
+
+<div>{{$prj_name}}</div>
+
+{{if $prj_version}}
+<div>{{$prj_version}}</div>
 {{/if}}
-{{if $tag}}
+
-<p>{{$tag_txt}} {{$tag}}</p>
+
-{{/if}}
+<h3>{{$prj_linktxt}}</h3>
-{{if $polled}}
+
-<p>{{$polled}} {{$lastpoll}}</p>
+<div>{{$prj_link}}</div>
-{{/if}}
+
-<p>{{$load_average}} {{$loadavg_all}}</p>
+<h3>{{$prj_srctxt}}</h3>
-<p>{{$web_location}}</p>
+
-<p>{{$visit}}</p>
+<div>{{$prj_src}}</div>
-<p>{{$bug_text}} <a href="{{$bug_link_url}}">{{$bug_link_text}}</a></p>
+
-<p>{{$adminlabel}}</p>
+<br><br>
-<p>{{$admininfo}}</p>
+<div>{{$prj_transport}} ({{$transport_link}})</div>
-<p>{{$contact}}</p>
+
-<p>{{$plugins_text}}</p>
-{{if $plugins_list}}
-   <div style="margin-left: 25px; margin-right: 25px;">{{$plugins_list}}</div>
-{{/if}}
-<p>{{$donate}}</p>
 </div>