[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi templates/probusiness/head.inc.php tem...
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] phpgwapi templates/probusiness/head.inc.php tem... |
|
Date: |
Mon, 27 Mar 2006 13:38:10 +0000 |
CVSROOT: /cvsroot/phpgwapi
Module name: phpgwapi
Branch:
Changes by: Dave Hall <address@hidden> 06/03/27 13:38:10
Modified files:
templates/probusiness: head.inc.php head.tpl
templates/idots: head.inc.php head.tpl
templates/justweb: head.inc.php head.tpl
templates/verdilak: head.inc.php head.tpl
templates/linux-at-work.de: head.inc.php head.tpl
templates/idsociety: head.inc.php
inc : class.javascript.inc.php class.common.inc.php
Log message:
better js handling
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/probusiness/head.inc.php.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/probusiness/head.tpl.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/idots/head.inc.php.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/idots/head.tpl.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/justweb/head.inc.php.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/justweb/head.tpl.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/verdilak/head.inc.php.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/verdilak/head.tpl.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/linux-at-work.de/head.inc.php.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/linux-at-work.de/head.tpl.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/idsociety/head.inc.php.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/class.javascript.inc.php.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/class.common.inc.php.diff?tr1=1.232&tr2=1.233&r1=text&r2=text
Patches:
Index: phpgwapi/inc/class.common.inc.php
diff -u phpgwapi/inc/class.common.inc.php:1.232
phpgwapi/inc/class.common.inc.php:1.233
--- phpgwapi/inc/class.common.inc.php:1.232 Tue Feb 21 14:07:19 2006
+++ phpgwapi/inc/class.common.inc.php Mon Mar 27 13:38:10 2006
@@ -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.232 2006/02/21 14:07:19
skwashd Exp $
+ * @version $Id: class.common.inc.php,v 1.233 2006/03/27 13:38:10
skwashd Exp $
*/
$d1 = strtolower(@substr(PHPGW_API_INC,0,3));
@@ -1247,18 +1247,18 @@
}
return $java_script;
}
-
- /**
- * Get on(un)load attributes from javascript class
+
+ /**
+ * Get window.on* events from javascript class
*
* @author Dave Hall skwashd at phpgroupware.org
- * @return string Body attributes or empty
+ * @return string the wndow events to be used or empty
*/
- function get_body_attribs()
+ function get_on_events()
{
if(@is_object($GLOBALS['phpgw']->js))
{
- return
$GLOBALS['phpgw']->js->get_body_attribs();
+ return
$GLOBALS['phpgw']->js->get_win_on_events();
}
else
{
@@ -1266,7 +1266,6 @@
}
}
-
function hex2bin($data)
{
$len = strlen($data);
Index: phpgwapi/inc/class.javascript.inc.php
diff -u phpgwapi/inc/class.javascript.inc.php:1.5
phpgwapi/inc/class.javascript.inc.php:1.6
--- phpgwapi/inc/class.javascript.inc.php:1.5 Tue Feb 14 10:01:05 2006
+++ phpgwapi/inc/class.javascript.inc.php Mon Mar 27 13:38:10 2006
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage gui
- * @version $Id: class.javascript.inc.php,v 1.5 2006/02/14 10:01:05
skwashd Exp $
+ * @version $Id: class.javascript.inc.php,v 1.6 2006/03/27 13:38:10
skwashd Exp $
* @link http://docs.phpgroupware.org/wiki/classJavaScript
*/
@@ -34,12 +34,12 @@
class javascript
{
/**
- * @var array elements to be used for the on(Un)Load attributes
of the body tag
+ * @var array elements to be used for the window.on* events
*/
- var $body = array
+ var $win_events = array
(
- 'onload' => '',
- 'onunload' => ''
+ 'load' => array(),
+ 'unload' => array()
);
/**
@@ -59,10 +59,22 @@
*/
function javascript()
{
- // $this->t = CreateObject('phpgwapi.Template',
'phpgwapi');
- //not currently used, but will be soon - I hope :)
}
+ /**
+ * Set a window.on?? event
+ *
+ * @param string $event the name of the event
+ * @param string $code the code to be called
+ */
+ function add_event($event, $code)
+ {
+ if ( !isset($this->win_events[$event]) )
+ {
+ $this->win_events[$event] = array();
+ }
+ $this->win_events[$event][] = $code;
+ }
/**
* Returns the javascript required for displaying a popup
message box
@@ -76,19 +88,6 @@
}
/**
- * Adds on(un)load= attributes to the body tag of a page
- *
- * FIXME stop using unline event registration! skwashd Feb-2006
- * @returns string the attributes to be used
- */
- function get_body_attribs()
- {
- $js = ($this->body['onload'] ? ' onload="' .
$this->body['onload'] . '"' : '');
- $js .= ($this->body['onunload'] ? ' onunLoad="' .
$this->body['onunload'] . '"': '');
- return $js;
- }
-
- /**
* Returns the javascript required for displaying a confirmation
message box
*
* @param string $msg the message to be displayed to user
@@ -123,9 +122,8 @@
{
foreach($files
as $file => $ignored)
{
- $links
.= '<script type="text/javascript" src="'
- .
$GLOBALS['phpgw_info']['server']['webserver_url']
- .
"/$app/js/$pkg/$file" . '.js">'
+ $links
.= '<script type="text/javascript" '
+ .
"src=\"{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$app}/js/{$pkg}/{$file}.js\">"
.
"</script>\n";
}
}
@@ -137,23 +135,58 @@
}
/**
+ * @deprecated
+ */
+ function get_body_attribs()
+ {
+ return '';
+ }
+
+
+ /**
+ * Creates the javascript for handling window.on* events
+ *
+ * @returns string the attributes to be used
+ */
+ function get_win_on_events()
+ {
+ $ret_str = "\n//<![CDATA[\n// start phpGW javascript
class imported window.on* event handlers\n";
+ foreach ( $this->win_events as $win_event => $actions )
+ {
+ if ( is_array($actions) && count($actions) )
+ {
+ $ret_str .= "window.on{$win_event} =
function()\n{\n";
+ foreach ( $actions as $action )
+ {
+ $ret_str .= "\t$action\n";
+ }
+ $ret_str .= "}\n";
+ }
+ }
+ $ret_str .= "\n// end phpGW javascript class imported
window.on* event handlers\n//]]>\n\n";
+ return $ret_str;
+ }
+
+ /**
* Sets an onLoad action for a page
*
+ * @deprecated
* @param string javascript to be used
*/
function set_onload($code)
{
- $this->body['onload'] = $code;
+ $this->win_events['load'][] = $code;
}
/**
* Sets an onUnload action for a page
*
+ * @deprecated
* @param string javascript to be used
*/
function set_onunload($code)
{
- $this->body['onunload'] = $code;
+ $this->events['unload'][] = $code;
}
/**
Index: phpgwapi/templates/idots/head.inc.php
diff -u phpgwapi/templates/idots/head.inc.php:1.5
phpgwapi/templates/idots/head.inc.php:1.6
--- phpgwapi/templates/idots/head.inc.php:1.5 Thu Apr 28 08:11:59 2005
+++ phpgwapi/templates/idots/head.inc.php Mon Mar 27 13:38:10 2006
@@ -7,9 +7,6 @@
* @subpackage gui
* @version $Id: head.inc.php,v 1.4 2004/12/30 06:47:34 skwashd Exp
*/
-
- $bodyheader = '';
-
if(file_exists(PHPGW_SERVER_ROOT . '/phpgwapi/templates/idots/css/' .
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . '.css'))
{
$theme_css = $GLOBALS['phpgw_info']['server']['webserver_url']
.
'/phpgwapi/templates/idots/css/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'].'.css';
@@ -25,16 +22,17 @@
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
$app = $app ? ' ['.(isset($GLOBALS['phpgw_info']['apps'][$app]) ?
$GLOBALS['phpgw_info']['apps'][$app]['title'] : lang($app)).']':'';
- $var = Array (
+ $var = array
+ (
+ 'css' => $GLOBALS['phpgw']->common->get_css(),
+ 'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico',
'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
- 'charset' => lang('charset'),
'font_family' => $GLOBALS['phpgw_info']['theme']['font'],
+ 'str_base_url' => $GLOBALS['phpgw']->link('/'),
+ 'theme_css' => $theme_css,
'website_title' =>
$GLOBALS['phpgw_info']['server']['site_title'].$app,
- 'body_tags' => $bodyheader .
$GLOBALS['phpgw']->common->get_body_attribs(),
- 'theme_css' => $theme_css,
- 'css' => $GLOBALS['phpgw']->common->get_css(),
- 'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
+ 'win_on_events' => $GLOBALS['phpgw']->common->get_on_events(),
);
$tpl->set_var($var);
$tpl->pfp('out','head');
Index: phpgwapi/templates/idots/head.tpl
diff -u phpgwapi/templates/idots/head.tpl:1.4
phpgwapi/templates/idots/head.tpl:1.5
--- phpgwapi/templates/idots/head.tpl:1.4 Thu Dec 30 06:47:34 2004
+++ phpgwapi/templates/idots/head.tpl Mon Mar 27 13:38:10 2006
@@ -1,18 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<!-- BEGIN head -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset={charset}">
-<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org";>
-<META NAME="description" CONTENT="phpGroupWare">
-<META NAME="keywords" CONTENT="phpGroupWare">
-<meta name="robots" content="none">
-<LINK REL="ICON" href="{img_icon}" type="image/x-ico">
-<LINK REL="SHORTCUT ICON" href="{img_shortcut}">
-<LINK href="{theme_css}" type="text/css" rel="StyleSheet">
-{css}
-<TITLE>{website_title}</TITLE>
-{java_script}
-</HEAD>
-<BODY {body_tags}>
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;
charset=utf-8" />
+ <meta name="AUTHOR" content="phpGroupWare
http://www.phpgroupware.org"; />
+ <meta name="description" content="phpGroupWare" />
+ <meta name="keywords" content="phpGroupWare" />
+ <meta name="robots" content="none" />
+ <link rel="icon" href="{img_icon}" type="image/x-ico" />
+ <link rel="shortcut icon" href="{img_shortcut}" />
+ {css}
+ <link href="{theme_css}" type="text/css" rel="StyleSheet">
+ <title>{website_title}</title>
+ {java_script}
+ <script type="text/javascript">
+ //<![CDATA[
+
+ var strBaseURL = '{str_base_url}';
+
+ {win_on_events}
+ //]]>
+ </script>
+ </head>
+ <body>
<!-- END Head -->
Index: phpgwapi/templates/idsociety/head.inc.php
diff -u phpgwapi/templates/idsociety/head.inc.php:1.17
phpgwapi/templates/idsociety/head.inc.php:1.18
--- phpgwapi/templates/idsociety/head.inc.php:1.17 Thu Apr 28 08:11:59 2005
+++ phpgwapi/templates/idsociety/head.inc.php Mon Mar 27 13:38:10 2006
@@ -22,7 +22,8 @@
'charset' => lang('charset'),
'font_family' => $GLOBALS['phpgw_info']['theme']['font'],
'website_title' =>
$GLOBALS['phpgw_info']['server']['site_title'] . $app,
- 'body_tags' => $bodyheader .
$GLOBALS['phpgw']->common->get_body_attribs(),
+ 'body_tags' => $bodyheader,
+ 'win_on_events' => $GLOBALS['phpgw']->common->get_on_events(),
'css' => $GLOBALS['phpgw']->common->get_css(),
'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
);
Index: phpgwapi/templates/justweb/head.inc.php
diff -u phpgwapi/templates/justweb/head.inc.php:1.18
phpgwapi/templates/justweb/head.inc.php:1.19
--- phpgwapi/templates/justweb/head.inc.php:1.18 Thu Apr 28 08:11:59 2005
+++ phpgwapi/templates/justweb/head.inc.php Mon Mar 27 13:38:10 2006
@@ -7,8 +7,12 @@
* @subpackage gui
* @version $Id: head.inc.php,v 1.13.2.2.2.7 2003/08/28 05:37:31 skwashd
Exp $
*/
-
- $bodyheader =
'BGCOLOR="'.$GLOBALS['phpgw_info']['theme']['bg_color'].'"';
+
+ if ( !is_object($GLOBALS['phpgw']->js) )
+ {
+ $GLOBALS['phpgw']->js =& createObject('phpgwapi.javascript');
+ }
+ $GLOBALS['phpgw']->js->add_event('load', 'init();' );
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
$app = $app ? ' ['.(isset($GLOBALS['phpgw_info']['apps'][$app]) ?
$GLOBALS['phpgw_info']['apps'][$app]['title'] : lang($app)).']':'';
@@ -21,18 +25,18 @@
'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico',
'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
'webserver_url' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
- 'home' => $GLOBALS['phpgw']->link('/index.php'),
- 'appt' =>
$GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.uicalendar.day')),
- 'todo' =>
$GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'todo.uitodo.add')),
- 'prefs' =>
$GLOBALS['phpgw']->link('/preferences/index.php'),
- 'email' =>
$GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'email.uipreferences.preferences')),
- 'calendar' =>
$GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.uipreferences.preferences')),
+ 'home' =>
$GLOBALS['phpgw']->link('/index.php'),
+ 'appt' =>
$GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.uicalendar.day')),
+ 'todo' =>
$GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'todo.uitodo.add')),
+ 'prefs' =>
$GLOBALS['phpgw']->link('/preferences/index.php'),
+ 'email' =>
$GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'email.uipreferences.preferences')),
+ 'calendar' =>
$GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.uipreferences.preferences')),
'addressbook' =>
$GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'addressbook.uiaddressbook.preferences')),
- 'charset' => lang('charset'),
'website_title' =>
$GLOBALS['phpgw_info']['server']['site_title'] . $app,
- 'body_tags' => $bodyheader .
$GLOBALS['phpgw']->common->get_body_attribs(),
- 'css' => $GLOBALS['phpgw']->common->get_css(),
+ 'css' => $GLOBALS['phpgw']->common->get_css(),
'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
+ 'str_base_url' => $GLOBALS['phpgw']->link('/'),
+ 'win_on_events' => $GLOBALS['phpgw']->common->get_on_events()
);
$tpl->set_var($var);
$tpl->pfp('out','head');
Index: phpgwapi/templates/justweb/head.tpl
diff -u phpgwapi/templates/justweb/head.tpl:1.12
phpgwapi/templates/justweb/head.tpl:1.13
--- phpgwapi/templates/justweb/head.tpl:1.12 Thu Dec 30 07:22:20 2004
+++ phpgwapi/templates/justweb/head.tpl Mon Mar 27 13:38:10 2006
@@ -1,72 +1,88 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset={charset}">
-<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org";>
-<META NAME="description" CONTENT="phpGroupWare">
-<META NAME="keywords" CONTENT="phpGroupWare">
-<meta name="robots" content="none">
-<LINK REL="ICON" href="{img_icon}" type="image/x-ico">
-<LINK REL="SHORTCUT ICON" href="{img_shortcut}">
-<STYLE type="text/css">
-{css}
-{java_script}
-<TITLE>{website_title}</TITLE>
-
-<script type="text/javascript" language="javascript"
src="{webserver_url}/phpgwapi/templates/justweb/navcond.js"></script>
-<script type="text/javascript" language="javascript">
-var myNavBar1 = new NavBar(0);
-var dhtmlMenu;
-
-//define menu items (first parameter of NavBarMenu specifies main category
width, second specifies sub category width in pixels)
-//add more menus simply by adding more "blocks" of same code below
-
-dhtmlMenu = new NavBarMenu(60, 120);
-dhtmlMenu.addItem(new NavBarMenuItem("Home", "{home}"));
-myNavBar1.addMenu(dhtmlMenu);
-
-dhtmlMenu = new NavBarMenu(60, 140);
-dhtmlMenu.addItem(new NavBarMenuItem("Edit", ""));
-dhtmlMenu.addItem(new NavBarMenuItem("Add new Appointment", "{appt}"));
-dhtmlMenu.addItem(new NavBarMenuItem("Add new Todo", "{todo}"));
-myNavBar1.addMenu(dhtmlMenu);
-
-dhtmlMenu = new NavBarMenu(125, 140);
-dhtmlMenu.addItem(new NavBarMenuItem("Preferences", ""));
-dhtmlMenu.addItem(new NavBarMenuItem("General", "{prefs}"));
-dhtmlMenu.addItem(new NavBarMenuItem("Email", "{email}"));
-dhtmlMenu.addItem(new NavBarMenuItem("Calendar", "{calendar}"));
-dhtmlMenu.addItem(new NavBarMenuItem("Addressbook", "{addressbook}"));
-myNavBar1.addMenu(dhtmlMenu);
-
-dhtmlMenu = new NavBarMenu(62, 120);
-dhtmlMenu.addItem(new NavBarMenuItem("Help", ""));
-dhtmlMenu.addItem(new NavBarMenuItem("General", ""));
-myNavBar1.addMenu(dhtmlMenu);
-
-//set menu colors
-myNavBar1.setColors("#343434", "#eeeeee", "#60707C", "#ffffff", "#888888",
"#eeeeee", "#60707C", "#ffffff", "#777777")
-myNavBar1.setFonts("Verdana", "Normal", "Normal", "10pt", "Verdana", "Normal",
"Normal", "10pt");
-
-//uncomment below line to center the menu (valid values are "left", "center",
and "right"
-//myNavBar1.setAlign("center")
-
-var fullWidth;
-
-function init() {
-
- // Get width of window, need to account for scrollbar width in Netscape.
-
- fullWidth = getWindowWidth()
- - (isMinNS4 && getWindowHeight() < getPageHeight() ? 16 : 0);
-
- myNavBar1.moveTo(10,36);
- myNavBar1.resize(500 /*fullWidth*/);
- myNavBar1.setSizes(0,1,1);
- myNavBar1.create();
- myNavBar1.setzIndex(2);
-}
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!-- BEGIN head -->
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;
charset={utf-8}" />
+ <meta name="AUTHOR" content="phpGroupWare
http://www.phpgroupware.org"; />
+ <meta name="description" CONTENT="phpGroupWare" />
+ <meta name="keywords" CONTENT="phpGroupWare" />
+ <meta name="robots" content="none" />
+ <link rel="ICON" href="{img_icon}" type="image/x-ico" />
+ <link rel="SHORTCUT ICON" href="{img_shortcut}" />
+ <style type="text/css">
+ {css}
+ </style>
+ <title>{website_title}</title>
+ {java_script}
+ <script type="text/javascript"
src="{webserver_url}/phpgwapi/templates/justweb/navcond.js"></script>
+ <script type="text/javascript">
+ //<![CDATA[
+ var myNavBar1 = new NavBar(0);
+ var dhtmlMenu;
+
+ //define menu items (first parameter of NavBarMenu
specifies main category width, second specifies sub category width in pixels)
+ //add more menus simply by adding more "blocks" of same
code below
+
+ dhtmlMenu = new NavBarMenu(60, 120);
+ dhtmlMenu.addItem(new NavBarMenuItem("Home", "{home}"));
+ myNavBar1.addMenu(dhtmlMenu);
+
+ dhtmlMenu = new NavBarMenu(60, 140);
+ dhtmlMenu.addItem(new NavBarMenuItem("Edit", ""));
+ dhtmlMenu.addItem(new NavBarMenuItem("Add new
Appointment", "{appt}"));
+ dhtmlMenu.addItem(new NavBarMenuItem("Add new Todo",
"{todo}"));
+ myNavBar1.addMenu(dhtmlMenu);
+
+ dhtmlMenu = new NavBarMenu(125, 140);
+ dhtmlMenu.addItem(new NavBarMenuItem("Preferences",
""));
+ dhtmlMenu.addItem(new NavBarMenuItem("General",
"{prefs}"));
+ dhtmlMenu.addItem(new NavBarMenuItem("Email",
"{email}"));
+ dhtmlMenu.addItem(new NavBarMenuItem("Calendar",
"{calendar}"));
+ dhtmlMenu.addItem(new NavBarMenuItem("Addressbook",
"{addressbook}"));
+ myNavBar1.addMenu(dhtmlMenu);
+
+ dhtmlMenu = new NavBarMenu(62, 120);
+ dhtmlMenu.addItem(new NavBarMenuItem("Help", ""));
+ dhtmlMenu.addItem(new NavBarMenuItem("General", ""));
+ myNavBar1.addMenu(dhtmlMenu);
+
+ //set menu colors
+ myNavBar1.setColors("#343434", "#eeeeee", "#60707C",
"#ffffff", "#888888", "#eeeeee", "#60707C", "#ffffff", "#777777")
+ myNavBar1.setFonts("Verdana", "Normal", "Normal",
"10pt", "Verdana", "Normal", "Normal", "10pt");
+
+ //uncomment below line to center the menu (valid values
are "left", "center", and "right"
+ //myNavBar1.setAlign("center")
+
+ var fullWidth;
+
+ function init()
+ {
+ // Get width of window, need to account for
scrollbar width in Netscape.
+ fullWidth = getWindowWidth()
+ - (isMinNS4 && getWindowHeight() <
getPageHeight() ? 16 : 0);
+ myNavBar1.moveTo(10,36);
+ myNavBar1.resize(500 /*fullWidth*/);
+ myNavBar1.setSizes(0,1,1);
+ myNavBar1.create();
+ myNavBar1.setzIndex(2);
+ }
+
+ function checkphpgw()
+ {
+ //window.alert("test");
+ }
+
+ function pageInit()
+ {
+ window.setInterval("checkphpgw()",60000);
+ }
+
+ var strBaseURL = '{str_base_url}';
+
+ {win_on_events}
+ //]]>
</script>
-</HEAD>
-<BODY leftmargin="0" topmargin="0" marginwidth="0" marginheight="0"
onLoad="init();" {body_tags}>
+</head>
+<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
Index: phpgwapi/templates/linux-at-work.de/head.inc.php
diff -u phpgwapi/templates/linux-at-work.de/head.inc.php:1.7
phpgwapi/templates/linux-at-work.de/head.inc.php:1.8
--- phpgwapi/templates/linux-at-work.de/head.inc.php:1.7 Thu Apr 28
08:11:59 2005
+++ phpgwapi/templates/linux-at-work.de/head.inc.php Mon Mar 27 13:38:10 2006
@@ -1,40 +1,48 @@
<?php
- /**
- * Template header
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package phpgwapi
- * @subpackage gui
- * @version $Id: head.inc.php,v 1.7 2005/04/28 08:11:59 powerstat Exp $
- */
-
- $p = createobject('phpgwapi.preferences');
- $preferences = $p->read_repository();
-
if(isset($preferences[$GLOBALS['phpgw_info']['flags']['currentapp']]['refreshTime']))
- {
- $refreshTime =
$preferences[$GLOBALS['phpgw_info']['flags']['currentapp']]['refreshTime']*60;
+/**
+* Template header
+* @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
+* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
+* @package phpgwapi
+* @subpackage gui
+* @version $Id: head.inc.php,v 1.8 2006/03/27 13:38:10 skwashd Exp $
+*/
+ $p = createobject('phpgwapi.preferences');
+ $preferences = $p->read_repository();
+ if (isset
($preferences[$GLOBALS['phpgw_info']['flags']['currentapp']]['refreshTime']))
+ {
+ $refreshTime =
$preferences[$GLOBALS['phpgw_info']['flags']['currentapp']]['refreshTime'] * 60;
+ }
+ if (!is_object($GLOBALS['phpgw']->js))
+ {
+ $GLOBALS['phpgw']->js = & createObject('phpgwapi.javascript');
}
-
+ $GLOBALS['phpgw']->js->add_event('load', 'pageInit();');
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
- $app = $app ? ' ['.(isset($GLOBALS['phpgw_info']['apps'][$app]) ?
$GLOBALS['phpgw_info']['apps'][$app]['title'] : lang($app)).']':'';
+ $app = $app ? ' ['. (isset ($GLOBALS['phpgw_info']['apps'][$app]) ?
$GLOBALS['phpgw_info']['apps'][$app]['title'] : lang($app)).']' : '';
- $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
+ $tpl = CreateObject('phpgwapi.Template', PHPGW_TEMPLATE_DIR);
$tpl->set_unknowns('remove');
- $tpl->set_file(array('head' => 'head.tpl'));
- $var = Array (
- 'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico',
- 'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
- 'charset' => lang('charset'),
- 'website_title' =>
$GLOBALS['phpgw_info']['server']['site_title'],
- 'app_name' => $app,
- 'body_tags' => $bodyheader .
$GLOBALS['phpgw']->common->get_body_attribs(),
- 'bg_color' => $GLOBALS['phpgw_info']['theme']['bg_color'],
- 'refreshTime' => $refreshTime,
- 'css' => $GLOBALS['phpgw']->common->get_css(),
- 'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
- 'webserver_url' =>
$GLOBALS['phpgw_info']['server']['webserver_url']
- );
+ $tpl->set_file(array ('head' => 'head.tpl'));
+
+ $var = array
+ (
+ 'img_icon' => PHPGW_IMAGES_DIR.'/favicon.ico',
+ 'img_shortcut' =>
PHPGW_IMAGES_DIR.'/favicon.ico',
+ 'website_title' =>
$GLOBALS['phpgw_info']['server']['site_title'],
+ 'app_name' => $app,
+ 'bg_color' =>
$GLOBALS['phpgw_info']['theme']['bg_color'],
+ 'refreshTime' => $refreshTime,
+ 'css' => $GLOBALS['phpgw']->common->get_css(),
+ 'java_script' =>
$GLOBALS['phpgw']->common->get_java_script(),
+ 'str_base_url' => $GLOBALS['phpgw']->link('/'),
+ 'webserver_url' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'win_on_events' =>
$GLOBALS['phpgw']->common->get_on_events()
+ );
+
$tpl->set_var($var);
- $tpl->pfp('out','head');
- unset($tpl);
+ $tpl->pfp('out', 'head');
+ unset ($tpl);
?>
+
+
Index: phpgwapi/templates/linux-at-work.de/head.tpl
diff -u phpgwapi/templates/linux-at-work.de/head.tpl:1.8
phpgwapi/templates/linux-at-work.de/head.tpl:1.9
--- phpgwapi/templates/linux-at-work.de/head.tpl:1.8 Sun Jan 16 00:26:01 2005
+++ phpgwapi/templates/linux-at-work.de/head.tpl Mon Mar 27 13:38:10 2006
@@ -1,31 +1,37 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<!-- BEGIN head -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset={charset}">
-<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org";>
-<META NAME="description" CONTENT="phpGroupWare">
-<META NAME="keywords" CONTENT="phpGroupWare">
-<META name="robots" content="none">
-<LINK REL="ICON" href="{img_icon}" type="image/x-ico">
-<LINK REL="SHORTCUT ICON" href="{img_shortcut}">
-<META http-equiv="Refresh" content="{refreshTime}">
-<link rel="stylesheet"
href="{webserver_url}/phpgwapi/templates/linux-at-work.de/css/base.css"
type="text/css" />
-{css}
-<script language="JavaScript">
-<!--
-function checkphpgw()
-{
- //window.alert("test");
-}
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;
charset={utf-8}" />
+ <meta name="AUTHOR" content="phpGroupWare
http://www.phpgroupware.org"; />
+ <meta NAME="description" CONTENT="phpGroupWare" />
+ <meta NAME="keywords" CONTENT="phpGroupWare" />
+ <meta name="robots" content="none" />
+ <link rel="ICON" href="{img_icon}" type="image/x-ico" />
+ <link rel="SHORTCUT ICON" href="{img_shortcut}" />
+ <meta http-equiv="Refresh" content="{refreshTime}" />
+ <link rel="stylesheet"
href="{webserver_url}/phpgwapi/templates/linux-at-work.de/css/base.css"
type="text/css" />
+ {css}
+ <script type="text/javascript">
+ //<![CDATA[
-function pageInit()
-{
- window.setInterval("checkphpgw()",60000);
-}
-//-->
-</script>
-{java_script}
-<TITLE>{website_title} - {app_name}</TITLE>
-</HEAD>
-<BODY onLoad="pageInit()">
+ function checkphpgw()
+ {
+ //window.alert("test");
+ }
+
+ function pageInit()
+ {
+ window.setInterval("checkphpgw()",60000);
+ }
+
+ var strBaseURL = '{str_base_url}';
+
+ {win_on_events}
+ //]]>
+ </script>
+ {java_script}
+ <title>{website_title} - {app_name}</TITLE>
+ </head>
+ <body>
\ No newline at end of file
Index: phpgwapi/templates/probusiness/head.inc.php
diff -u phpgwapi/templates/probusiness/head.inc.php:1.3
phpgwapi/templates/probusiness/head.inc.php:1.4
--- phpgwapi/templates/probusiness/head.inc.php:1.3 Thu Apr 28 08:11:59 2005
+++ phpgwapi/templates/probusiness/head.inc.php Mon Mar 27 13:38:10 2006
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/licenses/gpl.html GNU General Public License
* @package phpgwapi
* @subpackage gui
- * @version $Id: head.inc.php,v 1.3 2005/04/28 08:11:59 powerstat Exp $
+ * @version $Id: head.inc.php,v 1.4 2006/03/27 13:38:10 skwashd Exp $
*/
$app_css = $java_script = '';
@@ -42,7 +42,9 @@
'css' =>
$GLOBALS['phpgw']->common->get_css(),
'java_script' =>
$GLOBALS['phpgw']->common->get_java_script(),
'api_root' =>
$GLOBALS['phpgw_info']['server']['webserver_url'] .
'/phpgwapi/templates/probusiness/',
- 'phpgw_root' =>
$GLOBALS['phpgw_info']['server']['webserver_url'] . '/'
+ 'phpgw_root' =>
$GLOBALS['phpgw_info']['server']['webserver_url'] . '/',
+ 'str_base_url' => $GLOBALS['phpgw']->link('/'),
+ 'win_on_events' =>
$GLOBALS['phpgw']->common->get_on_events()
);
$tpl->set_var($var);
Index: phpgwapi/templates/probusiness/head.tpl
diff -u phpgwapi/templates/probusiness/head.tpl:1.2
phpgwapi/templates/probusiness/head.tpl:1.3
--- phpgwapi/templates/probusiness/head.tpl:1.2 Thu Dec 30 06:47:35 2004
+++ phpgwapi/templates/probusiness/head.tpl Mon Mar 27 13:38:10 2006
@@ -1,6 +1,5 @@
-<!-- BEGIN head -->
-<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!-- BEGIN head -->
<html lang="en" xmlns="http://www.w3.org/1999/xhtml";>
<head>
<meta http-equiv="Content-Type" content="text/html;
charset={charset}" />
@@ -15,14 +14,18 @@
<script language="JavaScript" type="text/javascript"
src="{phpgw_root}folders/phplayersmenu/libjs/layersmenu-browser_detection.js"></script>
<script language="JavaScript" type="text/javascript"
src="{phpgw_root}folders/phplayersmenu/libjs/layersmenu-library.js"></script>
<script language="JavaScript" type="text/javascript"
src="{phpgw_root}folders/phplayersmenu/libjs/layersmenu.js"></script>
- <script language="JavaScript" type="text/javascript"
src="{phpgw_root}phpgwapi/js/jscalendar/calendar.js"></script>
<link href="{theme_css}" type="text/css" rel="StyleSheet" />
- <link rel="stylesheet" type="text/css" media="all"
href="{phpgw_root}phpgwapi/js/jscalendar/calendar-win2k-cold-1.css"
title="win2k-col\d-1" />
-
-
<title>{website_title}</title>
{java_script}
+ <script type="text/javascript">
+ //<![CDATA[
+
+ var strBaseURL = '{str_base_url}';
+
+ {win_on_events}
+ //]]>
+ </script>
</head>
<body>
<!-- END Head -->
Index: phpgwapi/templates/verdilak/head.inc.php
diff -u phpgwapi/templates/verdilak/head.inc.php:1.16
phpgwapi/templates/verdilak/head.inc.php:1.17
--- phpgwapi/templates/verdilak/head.inc.php:1.16 Mon May 9 08:20:27 2005
+++ phpgwapi/templates/verdilak/head.inc.php Mon Mar 27 13:38:10 2006
@@ -5,7 +5,7 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage gui
- * @version $Id: head.inc.php,v 1.16 2005/05/09 08:20:27 fipsfuchs Exp $
+ * @version $Id: head.inc.php,v 1.17 2006/03/27 13:38:10 skwashd Exp $
*/
$bodyheader = ' bgcolor="' .
$GLOBALS['phpgw_info']['theme']['bg_color'] . '" alink="'
@@ -31,14 +31,15 @@
$tpl->set_unknowns('remove');
$tpl->set_file(array('head' => 'head.tpl'));
$var = Array (
+ 'body_tags' => $bodyheader,
+ 'css' => $GLOBALS['phpgw']->common->get_css(),
'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico',
'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
- 'charset' => lang('charset'),
- 'website_title' =>
$GLOBALS['phpgw_info']['server']['site_title'] . $app,
- 'theme_css' => $css_ref,
- 'body_tags' => $bodyheader .
$GLOBALS['phpgw']->common->get_body_attribs(),
- 'css' => $GLOBALS['phpgw']->common->get_css(),
'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
+ 'str_base_url' => $GLOBALS['phpgw']->link('/'),
+ 'theme_css' => $css_ref,
+ 'website_title' =>
$GLOBALS['phpgw_info']['server']['site_title'] . $app,
+ 'win_on_events' => $GLOBALS['phpgw']->common->get_on_events()
);
$tpl->set_var($var);
$tpl->pfp('out','head');
Index: phpgwapi/templates/verdilak/head.tpl
diff -u phpgwapi/templates/verdilak/head.tpl:1.10
phpgwapi/templates/verdilak/head.tpl:1.11
--- phpgwapi/templates/verdilak/head.tpl:1.10 Mon May 9 08:20:27 2005
+++ phpgwapi/templates/verdilak/head.tpl Mon Mar 27 13:38:10 2006
@@ -1,18 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<!-- BEGIN head -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;
charset={charset}" />
+ <meta name="AUTHOR" content="phpGroupWare
http://www.phpgroupware.org"; />
+ <meta NAME="description" CONTENT="phpGroupWare" />
+ <meta NAME="keywords" CONTENT="phpGroupWare" />
+ <meta name="robots" content="none" />
+ <link rel="icon" href="{img_icon}" type="image/x-ico" />
+ <link rel="shortcut icon" href="{img_shortcut}" />
+ <link href="{theme_css}" type="text/css" rel="StyleSheet" />
+ {java_script}
+ <script type="text/javascript">
+ //<![CDATA[
-<META http-equiv="Content-Type" content="text/html; charset={charset}">
-<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org";>
-<META NAME="description" CONTENT="phpGroupWare">
-<META NAME="keywords" CONTENT="phpGroupWare">
-<meta name="robots" content="none">
-<LINK REL="ICON" href="{img_icon}" type="image/x-ico">
-<LINK REL="SHORTCUT ICON" href="{img_shortcut}">
-<link href="{theme_css}" type="text/css" rel="StyleSheet" />
-{java_script}
-<TITLE>{website_title}</TITLE>
-</HEAD>
-<BODY {body_tags}>
+ var strBaseURL = '{str_base_url}';
+
+ {win_on_events}
+ //]]>
+ </script>
+ <title>{website_title}</title>
+ </head>
+ <body>
<!-- END Head -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi templates/probusiness/head.inc.php tem...,
Dave Hall <=