[20997] Improvement: separate version and build 4565:4680

Revision: 20997
          http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=20997
Author:   sigurdne
Date:     2010-01-30 16:33:53 +0000 (Sat, 30 Jan 2010)
Log Message:
-----------
Improvement: separate version and build 4565:4680

Modified Paths:
--------------
    people/sigurdne/modules/phpgwapi/trunk/inc/sso/include_login.inc.php
    people/sigurdne/modules/phpgwapi/trunk/setup/setup.inc.php
    people/sigurdne/modules/phpgwapi/trunk/templates/base/login.tpl
    people/sigurdne/modules/phpgwapi/trunk/templates/portico/navbar.inc.php

Modified: people/sigurdne/modules/phpgwapi/trunk/inc/sso/include_login.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/sso/include_login.inc.php	2010-01-30 16:32:04 UTC (rev 20996)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/sso/include_login.inc.php	2010-01-30 16:33:53 UTC (rev 20997)
@@ -404,7 +404,9 @@
 
 			$this->tmpl->set_var('login_url', $GLOBALS['phpgw_info']['server']['webserver_url'] . '/'.$variables['partial_url'].'?' . http_build_query($extra_vars) );
 			$this->tmpl->set_var('registration_url',$GLOBALS['phpgw_info']['server']['webserver_url'] . '/registration/');
-			$this->tmpl->set_var('version', $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
+			$this->tmpl->set_var('system', 'phpGroupWare');
+			$this->tmpl->set_var('version', isset($GLOBALS['phpgw_info']['server']['versions']['system']) ? $GLOBALS['phpgw_info']['server']['versions']['system'] : $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
+
 			$this->tmpl->set_var('cd', $this->check_logoutcode($cd) );
 			$this->tmpl->set_var('last_loginid', $last_loginid);
 			if(isset($_REQUEST['skip_remote']) && $_REQUEST['skip_remote'])

Modified: people/sigurdne/modules/phpgwapi/trunk/setup/setup.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/setup/setup.inc.php	2010-01-30 16:32:04 UTC (rev 20996)
+++ people/sigurdne/modules/phpgwapi/trunk/setup/setup.inc.php	2010-01-30 16:33:53 UTC (rev 20997)
@@ -14,6 +14,7 @@
 	$setup_info['phpgwapi']['title']     = 'phpgwapi';
 	$setup_info['phpgwapi']['version']   = '0.9.17.525';
 	$setup_info['phpgwapi']['versions']['current_header'] = '1.30';
+	$setup_info['phpgwapi']['versions']['system'] = '1.0';
 	$setup_info['phpgwapi']['enable']    = 3;
 	$setup_info['phpgwapi']['app_order'] = 1;
 

Modified: people/sigurdne/modules/phpgwapi/trunk/templates/base/login.tpl
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/templates/base/login.tpl	2010-01-30 16:32:04 UTC (rev 20996)
+++ people/sigurdne/modules/phpgwapi/trunk/templates/base/login.tpl	2010-01-30 16:33:53 UTC (rev 20997)
@@ -75,7 +75,7 @@
 			<p class="button_group"><input type="submit" value="{lang_login}" name="submitit"></p>
 			<p class="link_group"><a href="{return_sso_login_url}">{lang_return_sso_login}</a></p>
 			<!-- END button_block -->
-			<p id="version">phpGroupWare {version}</p>
+			<p id="version">{system} {version}</p>
 		</div>
 		</form>
 		<div id="testjs">

Modified: people/sigurdne/modules/phpgwapi/trunk/templates/portico/navbar.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/templates/portico/navbar.inc.php	2010-01-30 16:32:04 UTC (rev 20996)
+++ people/sigurdne/modules/phpgwapi/trunk/templates/portico/navbar.inc.php	2010-01-30 16:33:53 UTC (rev 20997)
@@ -185,10 +185,14 @@
 
 		$GLOBALS['phpgw']->template->set_root(PHPGW_TEMPLATE_DIR);
 		$GLOBALS['phpgw']->template->set_file('footer', 'footer.tpl');
+		
+		$version = isset($GLOBALS['phpgw_info']['server']['versions']['system']) ? $GLOBALS['phpgw_info']['server']['versions']['system'] : $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'];
 
+		$powered_by = lang('Powered by phpGroupWare version %1', $version);		
+	
 		$var = array
 		(
-			'powered_by'	=> lang('Powered by phpGroupWare version %1', $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']),
+			'powered_by'	=> $powered_by
 		);
 
 		$GLOBALS['phpgw']->template->set_var($var);