add extra info about the current template set in the about screen

about.php

@@ -12,12 +12,20 @@
    /* $Id$ */
 
    $GLOBALS['phpgw_info'] = array();
+   $app = $_GET['app'];
+   if(isset($app) && $_GET['app'] != "eGroupWare") 
+   {
+   	$GLOBALS['phpgw_info']['flags']['currentapp'] = $app;	
+   }
+   else {
    	$GLOBALS['phpgw_info']['flags']['currentapp'] = 'about';
+   }
+	
    $GLOBALS['phpgw_info']['flags']['disable_Template_class'] = True;
    $GLOBALS['phpgw_info']['flags']['noheader'] = True;
    include('header.inc.php');
 
-   $app = $_GET['app'];
+   
    if ($app)
    {
 	  if (!($included = $GLOBALS['phpgw']->hooks->single('about',$app)))
@@ -29,18 +37,97 @@
 			include (PHPGW_INCLUDE_ROOT . "/$app/setup/setup.inc.php");
 			$info = $setup_info[$app];
 			$info['title'] = $GLOBALS['phpgw_info']['apps'][$app]['title'];
+			return about_display($info);
+		 }		 
+		 $api_only = !($included = file_exists(PHPGW_INCLUDE_ROOT . "/$app/setup/setup.inc.php"));
+	  }
+   }
+   else
+   {
+	  $api_only = True;
+   }
+
+   $tpl = CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi'));
+   $tpl->set_file(array(
+	  'phpgw_about'         => 'about.tpl',
+	  'phpgw_about_unknown' => 'about_unknown.tpl'
+   ));
+   
+    $title = isset($GLOBALS['phpgw_info']['apps'][$app]) ? $GLOBALS['phpgw_info']['apps'][$app]['title'] : 'eGroupWare';
+   $GLOBALS['phpgw_info']['flags']['app_header'] = lang('About %1',$title);
+   $GLOBALS['phpgw']->common->phpgw_header();
+   
+   $tpl->set_block('phpgw_about', 'egroupware','egroupware');
+   $tpl->set_block('phpgw_about', 'application','application');
+   
+
+  if ($included)
+   {
+	  $tpl->set_var('phpgw_app_about', about_app());
+	  $tpl->pparse('phpgw_about', 'application', True);
+   }
+   else
+   {
+	  if ($api_only)
+	  {
+ 		$tpl->set_var('phpgw_logo',$GLOBALS['phpgw']->common->image('phpgwapi','logo.gif'));
+		$tpl->set_var('phpgw_version',lang('eGroupWare API version %1',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']));
+		$tpl->set_var('phpgw_message',lang('%1eGroupWare%2 is a multi-user, web-based groupware suite written in %3PHP%4.',
+		'<a href="http://www.eGroupWare.org" target="_blank">','</a>','<a href="http://www.php.net" target="_blank">','</a>'));
+		 $tpl->pparse('out', 'egroupware');
+		 
+		$tpl->set_var('phpgw_app_about',about_template());
+		$tpl->pparse('phpgw_about', 'application', True);
+
+	  }
+	  else
+	  {
+		 $tpl->set_var('app_header',$app);
+		 
+		 $tpl->pparse('out','phpgw_about_unknown');
+	  }
+   }
+
+   $GLOBALS['phpgw']->common->phpgw_footer();
+
+   
+function about_template()
+{
+	$template = $GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi');
+	
+	include ($template . "/settings/settings.inc.php");
+	$s = "";
+	foreach($template_info as $info)
+	{
+		$s .= about_display($info);
+	}
+	return $s;
+}   
+   
+   
+function about_display($info)
+{
 	$other_infos = array(
 		'author'     => lang('Author'),
 		'maintainer' => lang('Maintainer'),
 		'version'    => lang('Version'),
-			   'license'    => lang('License')
+		'license'    => lang('License'),
 	);
-
+	if($info[icon])
-			$applink=$GLOBALS['phpgw']->link('/'.$app);
+	{
-			
+	   $icon = $info[icon];
-			$s = "<table width='70%' cellpadding='4'>\n<tr>
+	}
-				  <td align='left'><a href=\"$applink\" title=\"".lang('Go back to the application %1',$info['title'])."\"><img src=\"$icon\" alt=\"$info[title]\" border=\"0\" /></a></td><td align=\"left\"><h2>$info[title]</h2></td></tr>"; 
+	$s = "<table width='70%' cellpadding='4'>\n";
-
+	   if(trim($icon) != "")
+	   {
+	   		$s.= "<tr>
+		  <td align='left'><img src='$icon' alt=\"$info[title]\" /></td><td align='left'><h2>$info[title]</h2></td></tr>"; 
+		}
+		else
+		{
+		   $s .= "<tr>
+			            <td align='left'></td><td align='left'><h2>$info[title]</h2></td></tr>";
+		}
 	if ($info['description'])
 	{
 		$info['description'] = lang($info['description']);
@@ -52,8 +139,6 @@
 		}
 
 	}
-			   
-
 	foreach ($other_infos as $key => $val)
 	{
 		if (isset($info[$key]))
@@ -98,46 +183,4 @@
 
 	return $s; 
 }
-		 $api_only = !($included = file_exists(PHPGW_INCLUDE_ROOT . "/$app/setup/setup.inc.php"));
-	  }
-   }
-   else
-   {
-	  $api_only = True;
-   }
-
-   $tpl = CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi'));
-   $tpl->set_file(array(
-	  'phpgw_about'         => 'about.tpl',
-	  'phpgw_about_unknown' => 'about_unknown.tpl'
-   ));
-
-   $tpl->set_var('phpgw_logo',$GLOBALS['phpgw']->common->image('phpgwapi','logo.gif'));
-   $tpl->set_var('phpgw_version',lang('eGroupWare API version %1',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']));
-   $tpl->set_var('phpgw_message',lang('%1eGroupWare%2 is a multi-user, web-based groupware suite written in %3PHP%4.',
-   '<a href="http://www.eGroupWare.org" target="_blank">','</a>','<a href="http://www.php.net" target="_blank">','</a>'));
-
-   if ($included)
-   {
-	  $tpl->set_var('phpgw_app_about',about_app('',''));
-	  //about_app($tpl,"phpgw_app_about");
-   }
-   else
-   {
-	  if ($api_only)
-	  {
-		 $tpl->set_var('phpgw_app_about','');
-	  }
-	  else
-	  {
-		 $tpl->set_var('app_header',$app);
-		 $tpl->parse('phpgw_app_about','phpgw_about_unknown');
-	  }
-   }
-
-   $title = isset($GLOBALS['phpgw_info']['apps'][$app]) ? $GLOBALS['phpgw_info']['apps'][$app]['title'] : 'eGroupWare';
-   $GLOBALS['phpgw_info']['flags']['app_header'] = lang('About %1',$title);
-   $GLOBALS['phpgw']->common->phpgw_header();
-   $tpl->pparse('out','phpgw_about');
-   $GLOBALS['phpgw']->common->phpgw_footer();
 ?>

phpgwapi/templates/default/about.tpl

@@ -1,26 +1,41 @@
-<table border="0" width="100%">
+<table border="0" width="100%" cellspacing="0" cellpadding="0">
-<!-- <tr>
+
+<!-- BEGIN egroupware -->
+<tr>
   <td align="left">
-   <a href="http://www.eGroupWare.org" target="_new"><img src="{phpgw_logo}" border="0" alt="logo"></a>
+   <a href="http://www.eGroupWare.org" target="_new"><img src="{phpgw_logo}" border="0" alt="eGroupWare"></a>
   </td>
  </tr>
  <tr>
   <td>&nbsp;</td>
  </tr>
  <tr>
-  <td align="center">{phpgw_version}</td>
+  <td align="left">{phpgw_version}</td>
  </tr>
  <tr>
-  <td align="center">{phpgw_message}</td>
+  <td align="left">{phpgw_message}</td>
  </tr>
  <tr>
-  <td><hr></td>
+ <td  height="3"><img src="phpgwapi/templates/default/images/spacer.gif" alt="spacer" height="3" /></td>
- </tr>-->
+</tr>
 <tr>
-  <td align="center">
+  <td align="center"><div class="greyLine"></div></td>
+</tr>
+
+<!-- END egroupware -->
+
+<!-- BEGIN application -->
+ <tr>
+ <td  height="3"><img src="phpgwapi/templates/default/images/spacer.gif" alt="spacer" height="3" /></td>
+</tr>
+ <tr>
+  <td align="left">
 
 {phpgw_app_about}
 
   </td>
  </tr>
+<!-- END application --> 
+ 
+ 
 </table>

phpgwapi/templates/edge-it/about.tpl

@@ -1,5 +1,7 @@
 <table border="0" width="100%" cellspacing="0" cellpadding="0">
-<!-- <tr>
+
+<!-- BEGIN egroupware -->
+<tr>
   <td align="left">
    <a href="http://www.eGroupWare.org" target="_new"><img src="{phpgw_logo}" border="0" alt="eGroupWare"></a>
   </td>
@@ -19,7 +21,10 @@
 <tr>
   <td align="center"><div class="greyLine"></div></td>
 </tr>
- -->
+
+<!-- END egroupware -->
+
+<!-- BEGIN application -->
  <tr>
  <td  height="3"><img src="phpgwapi/templates/default/images/spacer.gif" alt="spacer" height="3" /></td>
 </tr>
@@ -30,4 +35,7 @@
 
   </td>
  </tr>
+<!-- END application --> 
+ 
+ 
 </table>

phpgwapi/templates/idots/about.tpl

@@ -1,5 +1,7 @@
 <table border="0" width="100%" cellspacing="0" cellpadding="0">
-<!-- <tr>
+
+<!-- BEGIN egroupware -->
+<tr>
   <td align="left">
    <a href="http://www.eGroupWare.org" target="_new"><img src="{phpgw_logo}" border="0" alt="eGroupWare"></a>
   </td>
@@ -19,7 +21,10 @@
 <tr>
   <td align="center"><div class="greyLine"></div></td>
 </tr>
- -->
+
+<!-- END egroupware -->
+
+<!-- BEGIN application -->
  <tr>
  <td  height="3"><img src="phpgwapi/templates/default/images/spacer.gif" alt="spacer" height="3" /></td>
 </tr>
@@ -30,4 +35,7 @@
 
   </td>
  </tr>
+<!-- END application --> 
+ 
+ 
 </table>

phpgwapi/templates/idsociety/about.tpl

@@ -1,26 +1,41 @@
-<table border="0" width="100%">
+<table border="0" width="100%" cellspacing="0" cellpadding="0">
+
+<!-- BEGIN egroupware -->
 <tr>
   <td align="left">
-   <a href="http://www.egroupware.org" target="_new"><img src="{webserver_url}/logo.gif" border="0"></a>
+   <a href="http://www.eGroupWare.org" target="_new"><img src="{phpgw_logo}" border="0" alt="eGroupWare"></a>
   </td>
  </tr>
  <tr>
   <td>&nbsp;</td>
  </tr>
  <tr>
-  <td align="center">{phpgw_version}</td>
+  <td align="left">{phpgw_version}</td>
  </tr>
  <tr>
-  <td align="center"><a href="http://www.egroupware.org" target="_new">eGroupWare</a> is a multi-user, web-based groupware suite written in <a href="http://www.php.net" target="_new">PHP</a>.</td>
+  <td align="left">{phpgw_message}</td>
  </tr>
  <tr>
-  <td><hr></td>
+ <td  height="3"><img src="phpgwapi/templates/default/images/spacer.gif" alt="spacer" height="3" /></td>
 </tr>
 <tr>
-  <td align="center">
+  <td align="center"><div class="greyLine"></div></td>
+</tr>
+
+<!-- END egroupware -->
+
+<!-- BEGIN application -->
+ <tr>
+ <td  height="3"><img src="phpgwapi/templates/default/images/spacer.gif" alt="spacer" height="3" /></td>
+</tr>
+ <tr>
+  <td align="left">
 
 {phpgw_app_about}
 
   </td>
  </tr>
+<!-- END application --> 
+ 
+ 
 </table>

phpgwapi/templates/jerryr/about.tpl

@@ -1,5 +1,7 @@
 <table border="0" width="100%" cellspacing="0" cellpadding="0">
-<!-- <tr>
+
+<!-- BEGIN egroupware -->
+<tr>
   <td align="left">
    <a href="http://www.eGroupWare.org" target="_new"><img src="{phpgw_logo}" border="0" alt="eGroupWare"></a>
   </td>
@@ -19,7 +21,10 @@
 <tr>
   <td align="center"><div class="greyLine"></div></td>
 </tr>
- -->
+
+<!-- END egroupware -->
+
+<!-- BEGIN application -->
  <tr>
  <td  height="3"><img src="phpgwapi/templates/default/images/spacer.gif" alt="spacer" height="3" /></td>
 </tr>
@@ -30,4 +35,7 @@
 
   </td>
  </tr>
+<!-- END application --> 
+ 
+ 
 </table>