[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] hrm inc/class.bocommon.inc.php inc/class.uiuser...
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] hrm inc/class.bocommon.inc.php inc/class.uiuser... |
|
Date: |
Thu, 28 Dec 2006 04:55:30 +0000 |
CVSROOT: /sources/phpgroupware
Module name: hrm
Changes by: Dave Hall <skwashd> 06/12/28 04:55:30
Modified files:
inc : class.bocommon.inc.php class.uiuser.inc.php
templates/base : user.xsl
Log message:
switch to jscal class for the jscal, makes maintenance easier
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/hrm/inc/class.bocommon.inc.php?cvsroot=phpgroupware&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/hrm/inc/class.uiuser.inc.php?cvsroot=phpgroupware&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/hrm/templates/base/user.xsl?cvsroot=phpgroupware&r1=1.10&r2=1.11
Patches:
Index: inc/class.bocommon.inc.php
===================================================================
RCS file: /sources/phpgroupware/hrm/inc/class.bocommon.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- inc/class.bocommon.inc.php 27 Dec 2006 10:38:35 -0000 1.11
+++ inc/class.bocommon.inc.php 28 Dec 2006 04:55:30 -0000 1.12
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage core
- * @version $Id: class.bocommon.inc.php,v 1.11 2006/12/27 10:38:35
sigurdne Exp $
+ * @version $Id: class.bocommon.inc.php,v 1.12 2006/12/28 04:55:30
skwashd Exp $
*/
/**
@@ -87,30 +87,14 @@
}
-
-
+ //FIXME Remove the need for this - use the jscal class which
now supports xslt
function jscalendar()
{
- $phpgw_js_url =
$GLOBALS['phpgw_info']['server']['webserver_url'].'/phpgwapi/js';
- $img =
$GLOBALS['phpgw']->common->image('phpgwapi','cal');
-
- $dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
- $jsDateFormat = str_replace(array('d', 'm', 'M', 'Y'),
array('%d', '%m', '%b', '%Y'), $dateformat);
-
- $GLOBALS['phpgw_info']['flags']['java_script']
.='</script>
- <link rel="stylesheet" type="text/css" media="all"
href="'.$phpgw_js_url.'/jscalendar/calendar-win2k-cold-1.css"
title="win2k-cold-1" >
- <script type="text/javascript"
src="'.$phpgw_js_url.'/jscalendar/calendar.js"></script>
- <script type="text/javascript"
src="'.$phpgw_js_url.'/jscalendar/calendar-setup.js"></script>
- <script type="text/javascript"
src="'.$phpgw_js_url.'/jscalendar/lang/calendar-'.substr($GLOBALS['phpgw_info']['user']['preferences']['common']['lang'],0,2)
.'.js"></script>
- ';
-
- $cal_info=array(
- 'jsDateFormat'
=> $jsDateFormat,
- 'img'
=> $img,
- );
- return $cal_info;
+ if ( !isset($GLOBALS['phpgw']->jscal) ||
!is_object($GLOBALS['phpgw']->jscal) )
+ {
+ $GLOBALS['phpgw']->jscal =
createObject('phpgwapi.jscalendar');
+ }
}
-
function check_perms($rights, $required)
{
@@ -675,6 +659,12 @@
}
function new_db()
- {
return $this->socommon->new_db();
+ {
+ if ( isset($GLOBALS['phpgw']->db) &&
is_object($GLOBALS['phpgw']->db) )
+ {
+ return clone($GLOBALS['phpgw']->db);
+ }
+ return $this->socommon->new_db();
}
}
+?>
Index: inc/class.uiuser.inc.php
===================================================================
RCS file: /sources/phpgroupware/hrm/inc/class.uiuser.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- inc/class.uiuser.inc.php 27 Dec 2006 10:38:36 -0000 1.28
+++ inc/class.uiuser.inc.php 28 Dec 2006 04:55:30 -0000 1.29
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage user
- * @version $Id: class.uiuser.inc.php,v 1.28 2006/12/27 10:38:36
sigurdne Exp $
+ * @version $Id: class.uiuser.inc.php,v 1.29 2006/12/28 04:55:30 skwashd
Exp $
*/
/**
@@ -586,11 +586,9 @@
);
//_debug_array($link_data);
-// $jscal = CreateObject('phpgwapi.jscalendar'); //
before phpgw_header() !!!
-
- $cal_info = $this->bocommon->jscalendar();
- $jsDateFormat=$cal_info['jsDateFormat'];
-
+ $jscal = CreateObject('phpgwapi.jscalendar'); //
before phpgw_header() !!!
+ $jscal->add_listener('values_start_date');
+ $jscal->add_listener('values_end_date');
$msgbox_data = $this->bocommon->msgbox_data($receipt);
@@ -634,17 +632,15 @@
'value_new_place_town' =>
$values['new_place_town'],
'value_new_place_remark' =>
$values['new_place_remark'],
- 'date_img' =>
$GLOBALS['phpgw']->common->image('phpgwapi','cal'),
+ 'img_cal' =>
$GLOBALS['phpgw']->common->image('phpgwapi','cal'),
+ 'lang_date_selector' =>
lang('date selector'),
'lang_start_date' =>
lang('start date'),
'lang_end_date' =>
lang('end date'),
'lang_start_date_title' =>
lang('select start date'),
'lang_end_date_title' =>
lang('select end date'),
'lang_start_date_status_text' =>
lang('Select the start date for your training'),
'lang_end_date_status_text' =>
lang('Select the end date for your training'),
-
- 'calendar_setup_start' =>
"Calendar.setup({inputField : 'values[start_date]',ifFormat : '" .
$jsDateFormat . "',button : 'values[start_date]-trigger'});",
- 'calendar_setup_end' =>
"Calendar.setup({inputField : 'values[end_date]',ifFormat : '" .
$jsDateFormat . "',button : 'values[end_date]-trigger'});",
-
+ 'lang_select_date' =>
lang('select date'),
'lang_reference' =>
lang('reference'),
Index: templates/base/user.xsl
===================================================================
RCS file: /sources/phpgroupware/hrm/templates/base/user.xsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- templates/base/user.xsl 27 Dec 2006 11:10:49 -0000 1.10
+++ templates/base/user.xsl 28 Dec 2006 04:55:30 -0000 1.11
@@ -1,4 +1,4 @@
-<!-- $Id: user.xsl,v 1.10 2006/12/27 11:10:49 sigurdne Exp $ -->
+<!-- $Id: user.xsl,v 1.11 2006/12/28 04:55:30 skwashd Exp $ -->
<xsl:template name="app_data">
<xsl:choose>
@@ -340,17 +340,14 @@
<xsl:value-of select="lang_start_date"/>
</td>
<td>
- <input type="text"
id="values[start_date]" name="values[start_date]" size="10"
value="{value_start_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
+ <input type="text"
id="values_start_date" name="values[start_date]" size="10"
value="{value_start_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_start_date_status_text"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
- <script type="text/javascript">
- document.writeln('<img
id="values[start_date]-trigger" src="{date_img}"
title="{lang_start_date_title}" style="cursor:pointer; cursor:hand;"/>');
- <xsl:value-of
select="calendar_setup_start"/>
- </script>
+ <img id="values_start_date-trigger"
src="{img_cal}" alt="lang_date_selector" title="lang_select_date"
style="cursor:pointer; cursor:hand;" />
</td>
</tr>
<tr>
@@ -358,17 +355,14 @@
<xsl:value-of select="lang_end_date"/>
</td>
<td>
- <input type="text"
id="values[end_date]" name="values[end_date]" size="10"
value="{value_end_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
+ <input type="text" id="values_end_date"
name="values[end_date]" size="10" value="{value_end_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_end_date_status_text"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
- <script type="text/javascript">
- document.writeln('<img
id="values[end_date]-trigger" src="{date_img}" title="{lang_end_date_title}"
style="cursor:pointer; cursor:hand;"/>');
- <xsl:value-of
select="calendar_setup_end"/>
- </script>
+ <img id="values_end_date-trigger"
src="{img_cal}" alt="lang_date_selector" title="lang_select_date"
style="cursor:pointer; cursor:hand;" />
</td>
</tr>
<tr>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] hrm inc/class.bocommon.inc.php inc/class.uiuser...,
Dave Hall <=