applied patch #280 from Sebastian Ebling: * removed the "About ..." menu entry from top and sidebox menu

* mostly rewritten the about.php page (added application list)
* changed footer eGroupWare link to about.php
* moved manual from application menu to top and sidebox menu preserving its special link target

phpgwapi/inc/class.egw_framework.inc.php

@@ -169,7 +169,7 @@ class egw_framework
 
 			$var['page_generation_time'] = '<div id="divGenTime"><br/><span>'.lang('Page was generated in %1 seconds',$totaltime).'</span></div>';
 		}
-		$var['powered_by'] = lang('Powered by eGroupWare version %1',$GLOBALS['egw_info']['server']['versions']['phpgwapi']);
+		$var['powered_by'] = lang('Powered by').' <a href="'.$GLOBALS['egw_info']['server']['webserver_url'].'/about.php">eGroupWare</a> '.lang('version').' '.$GLOBALS['egw_info']['server']['versions']['phpgwapi'];
 		$var['activate_tooltips'] = '<script src="'.$GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/js/wz_tooltip/wz_tooltip.js" type="text/javascript"></script>';
 		
 		return $var;

phpgwapi/templates/default/about.tpl

@@ -1,29 +1,45 @@
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
-
 <!-- BEGIN egroupware -->
-<tr>
+	<p>
-  <td align="left">
+		<a href="http://www.eGroupWare.org" target="_new"><img src="{phpgw_logo}" border="0" alt="eGroupWare"></a>
-   <a href="http://www.eGroupWare.org" target="_new"><img src="{phpgw_logo}" border="0" alt="eGroupWare"></a>
+	</p>
-  </td>
+	<p>{phpgw_version}</p>
- </tr>
+	<p>{phpgw_message}</p>
- <tr>
+	<img src="phpgwapi/templates/default/images/spacer.gif" alt="spacer" height="3" />
-  <td>&nbsp;</td>
+	<div class="greyLine"></div>
- </tr>
- <tr>
-  <td align="left">{phpgw_version}</td>
- </tr>
- <tr>
-  <td align="left">{phpgw_message}</td>
- </tr>
- <tr>
- <td  height="3"><img src="phpgwapi/templates/default/images/spacer.gif" alt="spacer" height="3" /></td>
-</tr>
-<tr>
-  <td align="center"><div class="greyLine"></div></td>
-</tr>
-
 <!-- END egroupware -->
 
+<!-- BEGIN app_list_tablestart -->
+	<p>{phpgw_app_listinfo}</p>
+	<table border="0" cellpadding="5">
+		<tr>
+			<th>&nbsp;</th>
+			<th align="left">{phpgw_about_th_name}</th>
+			<th align="left">{phpgw_about_th_author}</th>
+			<th align="left">{phpgw_about_th_maintainer}</th>
+			<th align="left">{phpgw_about_th_version}</th>
+			<th align="left">{phpgw_about_th_license}</th>
+			<th>{phpgw_about_th_details}</th>
+		</tr>
+<!-- END app_list_tablestart -->
+
+<!-- BEGIN app_list_tablerow -->
+		<tr>
+			<td><img src="{phpgw_about_td_image}" title="{phpgw_about_td_title}" /></td>
+			<td><strong>{phpgw_about_td_title}</strong></td>
+			<td valign="top">{phpgw_about_td_author}</td>
+			<td valign="top">{phpgw_about_td_maintainer}</td>
+			<td>{phpgw_about_td_version}</td>
+			<td>{phpgw_about_td_license}</td>
+			<td><a href="{phpgw_about_td_details_url}"><img src="{phpgw_about_td_details_img}" /></a></td>
+		</tr>
+<!-- END app_list_tablerow -->
+
+<!-- BEGIN app_list_tablestop -->
+	</table>
+<!-- END app_list_tablestop -->
+
+
+
 <!-- BEGIN application -->
  <tr>
  <td  height="3"><img src="phpgwapi/templates/default/images/spacer.gif" alt="spacer" height="3" /></td>

phpgwapi/templates/idots/class.idots_framework.inc.php

@@ -152,12 +152,19 @@
 			{
 			   $file['Preferences'] = $apps['preferences']['url'];
 			}
+            if($GLOBALS['egw_info']['user']['apps']['manual'] && $apps['manual'])
+            {
+                $file['manual'] = array('text' => 'manual',
+                                    'no_lang' => false,
+                                    'target' => $apps['manual']['target'],
+                                    'link' => $apps['manual']['url']);
+            }
 			$file += array(
-			   array(
+			   /*array(
 				  'text'    => lang('About %1',$GLOBALS['egw_info']['apps'][$GLOBALS['egw_info']['flags']['currentapp']]['title']),
 				  'no_lang' => True,
 				  'link'    => $apps['about']['url']
-			   ),
+			   ),*/
 			   $GLOBALS['egw_info']['user']['userid'] != 'anonymous' ? 'Logout' : 'Login' =>$apps['logout']['url']
 			);
 			$this->sidebox('',$menu_title,$file);
@@ -514,7 +521,7 @@
 		 // not shown in the navbar
 		 foreach($apps as $app => $app_data)
 		 {
-			if ($app != 'preferences' && $app != 'about' && $app != 'logout' &&
+			if ($app != 'preferences' && $app != 'about' && $app != 'logout' && $app != 'manual' &&
 			($app != 'home' || $GLOBALS['egw_info']['user']['preferences']['common']['start_and_logout_icons'] != 'no'))
 			{
 			   $this->tpl->set_var($app_data);
@@ -575,12 +582,14 @@
 	  * 
 	  * @param string $app application name
 	  * @param mixed $alt_label string with alternative menu item label default value = null 
+	  * @param string $urlextra string with alternate additional code inside <a>-tag
 	  * @access protected
 	  * @return void
 	  */
 	  function _add_topmenu_item($app,$alt_label=null)
 	  {
 		 $_item['url'] = $this->apps[$app]['url'];
+		 $_item['urlextra'] = $this->apps[$app]['target'];
 		 $_item['label'] = ($alt_label?$alt_label:$this->apps[$app]['title']);
 		 $this->tplsav2->menuitems[$app] = $_item;
 		 $this->tplsav2->icon_or_star = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/templates/'.$this->template.'/images'.'/orange-ball.png';
@@ -612,17 +621,17 @@
 
 		 $this->_add_topmenu_item('home');
 
-		 /*if($GLOBALS['egw_info']['user']['apps']['manual'])
-		 {
-			$this->_add_topmenu_item('manual');
-		 }
-		 */
 		 if($GLOBALS['egw_info']['user']['apps']['preferences'])
 		 {
 			$this->_add_topmenu_item('preferences');
 		 }
 
-		 $this->_add_topmenu_item('about',lang('About %1',$GLOBALS['egw_info']['apps'][$GLOBALS['egw_info']['flags']['currentapp']]['title']));
+		 if($GLOBALS['egw_info']['user']['apps']['manual'] && $this->apps['manual'])
+         {
+            $this->_add_topmenu_item('manual');
+         }
+
+		 //$this->_add_topmenu_item('about',lang('About %1',$GLOBALS['egw_info']['apps'][$GLOBALS['egw_info']['flags']['currentapp']]['title']));
 		 $this->_add_topmenu_item('logout');
 		
 		 $this->tplsav2->assign('info_icons',$this->topmenu_icon_arr);
@@ -769,7 +778,11 @@ function _sidebox_menu_item($item_link='',$item_text='')
 	  $var['item_link'] = $item_link['link'];
 	  if ($item_link['target'])
 	  {
-		 $var['target'] = ' target="' . $item_link['target'] . '"';
+		 if (strstr($item_link['target'], 'target=')) {
+            $var['target'] = $item_link['target'];
+         } else {
+            $var['target'] = ' target="' . $item_link['target'] . '"';
+         }
 	  }
    }
    else

phpgwapi/templates/idots/topmenu.tpl.php

@@ -41,7 +41,7 @@
 <div id="topmenu">
    <div id="topmenu_items">
 	  <?php foreach($this->menuitems as $mitems):?>
-	  <div style="padding:0px 0px 0px 10px;position:relative;float:left;"><img src="<?=$this->icon_or_star?>" />&nbsp;<a href="<?=$mitems['url']?>"><?=$mitems['label']?></a></div>
+	  <div style="padding:0px 0px 0px 10px;position:relative;float:left;"><img src="<?=$this->icon_or_star?>" />&nbsp;<a href="<?=$mitems['url']?>"<?=$mitems['urlextra']?>><?=$mitems['label']?></a></div>
 	  <?php endforeach?>
    </div>