[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi inc/class.common.inc.php templates/ido...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] phpgwapi inc/class.common.inc.php templates/ido... |
|
Date: |
Tue, 06 Mar 2007 13:37:33 +0000 |
CVSROOT: /sources/phpgwapi
Module name: phpgwapi
Changes by: Sigurd Nes <sigurdne> 07/03/06 13:37:33
Modified files:
inc : class.common.inc.php
templates/idots: navbar.inc.php navbar.tpl
templates/verdilak: navbar.inc.php
Log message:
new manual
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.common.inc.php?cvsroot=phpgwapi&r1=1.253&r2=1.254
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/idots/navbar.inc.php?cvsroot=phpgwapi&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/idots/navbar.tpl?cvsroot=phpgwapi&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/verdilak/navbar.inc.php?cvsroot=phpgwapi&r1=1.38&r2=1.39
Patches:
Index: inc/class.common.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -b -r1.253 -r1.254
--- inc/class.common.inc.php 7 Jan 2007 01:07:46 -0000 1.253
+++ inc/class.common.inc.php 6 Mar 2007 13:37:32 -0000 1.254
@@ -8,7 +8,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage utilities
- * @version $Id: class.common.inc.php,v 1.253 2007/01/07 01:07:46
skwashd Exp $
+ * @version $Id: class.common.inc.php,v 1.254 2007/03/06 13:37:32
sigurdne Exp $
*/
/**
@@ -1064,6 +1064,8 @@
}
// We handle this here becuase its special
+ $GLOBALS['phpgw_info']['navbar']['manual']['url'] =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
'manual.uimanual.help', 'app' => $app, 'section' =>
isset($GLOBALS['phpgw_info']['apps']['manual']['section'])?$GLOBALS['phpgw_info']['apps']['manual']['section']:''));
+ $GLOBALS['phpgw_info']['navbar']['manual']['target']
= '_blank';
$GLOBALS['phpgw_info']['navbar']['about']['title'] =
lang('About %1', $app_title);
$GLOBALS['phpgw_info']['navbar']['about']['url'] =
$GLOBALS['phpgw']->link('/about.php', array('app' => $app) );
Index: templates/idots/navbar.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/templates/idots/navbar.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- templates/idots/navbar.inc.php 24 Jan 2007 16:04:52 -0000 1.18
+++ templates/idots/navbar.inc.php 6 Mar 2007 13:37:33 -0000 1.19
@@ -5,7 +5,7 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage gui
- * @version $Id: navbar.inc.php,v 1.18 2007/01/24 16:04:52 Caeies Exp $
+ * @version $Id: navbar.inc.php,v 1.19 2007/03/06 13:37:33 sigurdne Exp $
*/
@@ -45,7 +45,8 @@
'app_name' => '',
'alt_img_app' => lang($app),
'img_app' =>
"{$var['img_root']}/noimage_nav.png",
- 'url_app' =>
$app_data['url']
+ 'url_app' =>
$app_data['url'],
+ 'target' =>
isset($app_data['target'])?$app_data['target']:''
);
switch($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'])
@@ -120,11 +121,12 @@
. '#' .
$GLOBALS['phpgw_info']['flags']['currentapp']);
}
$file[] = array ('text' => 'About %1', 'url' =>
$GLOBALS['phpgw_info']['navbar']['about']['url']);
+ $file[] = array ('text' => 'Manual', 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'manual.uimanual.index','app' =>
$GLOBALS['phpgw_info']['flags']['currentapp'])));
$file[] = array ('text' => 'Logout', 'url' =>
$GLOBALS['phpgw_info']['navbar']['logout']['url']);
display_sidebox('',$menu_title,$file);
-
$GLOBALS['phpgw']->hooks->single('sidebox_menu',$GLOBALS['phpgw_info']['flags']['currentapp']);
+ $GLOBALS['phpgw']->hooks->single('sidebox_menu','manual');
$GLOBALS['phpgw']->template->pparse('out','navbar_footer');
Index: templates/idots/navbar.tpl
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/templates/idots/navbar.tpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- templates/idots/navbar.tpl 6 Aug 2006 12:49:48 -0000 1.11
+++ templates/idots/navbar.tpl 6 Mar 2007 13:37:33 -0000 1.12
@@ -7,7 +7,7 @@
</li>
<!-- BEGIN navbar_item -->
<li>
- <a href="{url_app}">
+ <a href="{url_app}" target = "{target}">
<img src="{img_app}"
alt="{alt_img_app}"><br>
{app_name}
</a>
Index: templates/verdilak/navbar.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/templates/verdilak/navbar.inc.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- templates/verdilak/navbar.inc.php 19 Feb 2007 20:40:22 -0000 1.38
+++ templates/verdilak/navbar.inc.php 6 Mar 2007 13:37:33 -0000 1.39
@@ -5,7 +5,7 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage gui
- * @version $Id: navbar.inc.php,v 1.38 2007/02/19 20:40:22 sigurdne Exp $
+ * @version $Id: navbar.inc.php,v 1.39 2007/03/06 13:37:33 sigurdne Exp $
*/
@@ -74,10 +74,9 @@
$title .= '<br>' . $app_data['title'];
}
$applications .= '<br><a href="' .
$app_data['url'] . '"';
- if
(isset($GLOBALS['phpgw_info']['flags']['navbar_target']) &&
-
$GLOBALS['phpgw_info']['flags']['navbar_target'])
+ if (isset($app_data['target']) &&
$app_data['target'])
{
- $applications .= ' target="' .
$GLOBALS['phpgw_info']['flags']['navbar_target'] . '"';
+ $applications .= ' target="' .
$app_data['target'] . '"';
}
$applications .= '>' . $title . '</a>';
unset($title);
- [Phpgroupware-cvs] phpgwapi inc/class.common.inc.php templates/ido...,
Sigurd Nes <=