[Phpgroupware-cvs] phpgwapi inc/class.common.inc.php templates/ido...

[Sigurd Nes]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Changes by:     Sigurd Nes <sigurdne>   07/03/07 22:29:32

Modified files:
        inc            : class.common.inc.php 
        templates/idots: navbar.tpl 
        templates/verdilak: navbar.tpl 

Log message:
        popup for manual

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.common.inc.php?cvsroot=phpgwapi&r1=1.254&r2=1.255
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/idots/navbar.tpl?cvsroot=phpgwapi&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/verdilak/navbar.tpl?cvsroot=phpgwapi&r1=1.16&r2=1.17

Patches:
Index: inc/class.common.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -b -r1.254 -r1.255
--- inc/class.common.inc.php    6 Mar 2007 13:37:32 -0000       1.254
+++ inc/class.common.inc.php    7 Mar 2007 22:29:31 -0000       1.255
@@ -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.254 2007/03/06 13:37:32 
sigurdne Exp $
+       * @version $Id: class.common.inc.php,v 1.255 2007/03/07 22:29:31 
sigurdne Exp $
        */
 
        /**
@@ -1064,10 +1064,9 @@
                        }
 
                        // 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']['manual']['url']   = 
"javascript:openwindow('" . $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']:''))
 . "','700','600')";
 
+                       $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) );
                        $GLOBALS['phpgw_info']['navbar']['about']['icon']  = 
$this->image('phpgwapi',Array('about','nonav'));
                        $GLOBALS['phpgw_info']['navbar']['about']['icon_hover'] 
 = $this->image_on('phpgwapi',Array('about','nonav'),'-over');

Index: templates/idots/navbar.tpl
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/templates/idots/navbar.tpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- templates/idots/navbar.tpl  6 Mar 2007 13:37:33 -0000       1.12
+++ templates/idots/navbar.tpl  7 Mar 2007 22:29:32 -0000       1.13
@@ -1,4 +1,24 @@
 <!-- BEGIN navbar_header -->
+<SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript">
+       var page;
+
+       function openwindow(url)
+       {
+               if (page)
+               {
+                       if (page.closed)
+                       {
+                               page.stop;
+                               page.close;
+                       }
+               }
+               page = window.open(url, 
"pageWindow","width=700,height=600,location=no,menubar=no,directories=no,toolbar=no,scrollbars=yes,resizable=yes,status=no");
+               if (page.opener == null)
+               {
+                       page.opener = window;
+               }
+       }
+</SCRIPT>
 <div id="box">
        <div id="navpanel">
                <ul id="nav">

Index: templates/verdilak/navbar.tpl
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/templates/verdilak/navbar.tpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- templates/verdilak/navbar.tpl       3 Dec 2006 18:31:43 -0000       1.16
+++ templates/verdilak/navbar.tpl       7 Mar 2007 22:29:32 -0000       1.17
@@ -1,4 +1,24 @@
 <!-- BEGIN navbar -->
+<SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript">
+       var page;
+
+       function openwindow(url)
+       {
+               if (page)
+               {
+                       if (page.closed)
+                       {
+                               page.stop;
+                               page.close;
+                       }
+               }
+               page = window.open(url, 
"pageWindow","width=700,height=600,location=no,menubar=no,directories=no,toolbar=no,scrollbars=yes,resizable=yes,status=no");
+               if (page.opener == null)
+               {
+                       page.opener = window;
+               }
+       }
+</SCRIPT>
 
 <table border="0" cellspacing="0" cellpadding="0" width="100%" 
bgcolor="{table_bg_color}">
 <tr background="{img_root}/bg_filler.png">