diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php
index 1889928807..938bee1537 100644
--- a/phpgwapi/inc/class.egw_framework.inc.php
+++ b/phpgwapi/inc/class.egw_framework.inc.php
@@ -169,7 +169,7 @@ class egw_framework
$var['page_generation_time'] = '
'.lang('Page was generated in %1 seconds',$totaltime).'
';
}
- $var['powered_by'] = lang('Powered by eGroupWare version %1',$GLOBALS['egw_info']['server']['versions']['phpgwapi']);
+ $var['powered_by'] = lang('Powered by').' eGroupWare '.lang('version').' '.$GLOBALS['egw_info']['server']['versions']['phpgwapi'];
$var['activate_tooltips'] = '';
return $var;
diff --git a/phpgwapi/templates/default/about.tpl b/phpgwapi/templates/default/about.tpl
index 9a6c7d2ef3..921408e6f6 100644
--- a/phpgwapi/templates/default/about.tpl
+++ b/phpgwapi/templates/default/about.tpl
@@ -1,29 +1,45 @@
-
-
-
-
- 
- |
-
-
- | |
-
-
- | {phpgw_version} |
-
-
- | {phpgw_message} |
-
-
-  |
-
-
- |
-
-
+
+
+
+ {phpgw_version}
+ {phpgw_message}
+
+
+
+ {phpgw_app_listinfo}
+
+
+ | |
+ {phpgw_about_th_name} |
+ {phpgw_about_th_author} |
+ {phpgw_about_th_maintainer} |
+ {phpgw_about_th_version} |
+ {phpgw_about_th_license} |
+ {phpgw_about_th_details} |
+
+
+
+
+
+  |
+ {phpgw_about_td_title} |
+ {phpgw_about_td_author} |
+ {phpgw_about_td_maintainer} |
+ {phpgw_about_td_version} |
+ {phpgw_about_td_license} |
+  |
+
+
+
+
+
+
+
+
+
|
diff --git a/phpgwapi/templates/idots/class.idots_framework.inc.php b/phpgwapi/templates/idots/class.idots_framework.inc.php
index 82ab596c3f..2789664e0e 100644
--- a/phpgwapi/templates/idots/class.idots_framework.inc.php
+++ b/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 -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
diff --git a/phpgwapi/templates/idots/topmenu.tpl.php b/phpgwapi/templates/idots/topmenu.tpl.php
index b6a0922d8a..fbc7bbab0a 100644
--- a/phpgwapi/templates/idots/topmenu.tpl.php
+++ b/phpgwapi/templates/idots/topmenu.tpl.php
@@ -41,7 +41,7 @@