extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-22 13:58:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

- setting again date format and language from current user, was lost in r27581

Browse Source 
- using current date in users timezone, instead of server timezone
- loading javascript for jscalendar::flat only if not yet loaded
This commit is contained in:
Ralf Becker 2010-06-04 09:01:15 +00:00
parent ffc49a9ec6
commit 4b67a05074
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
phpgwapi/inc/class.jscalendar.inc.php
View File

@ -5,9 +5,9 @@
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de> * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$
* @package api * @package api
* @subpackage html * @subpackage html
* @version $Id$
*/ */
/** /**
@ -64,10 +64,11 @@ class jscalendar
*/ */
function get_javascript() function get_javascript()
{ {
$args = array_intersect_key($GLOBALS['egw_info']['user']['preferences']['common'],array('lang'=>1,'dateformat'=>1));
return return
'<link rel="stylesheet" type="text/css" media="all" href="'.$this->jscalendar_url.'/calendar-blue.css" title="blue" /> '<link rel="stylesheet" type="text/css" media="all" href="'.$this->jscalendar_url.'/calendar-blue.css" title="blue" />
<script type="text/javascript" src="'.$this->jscalendar_url.'/calendar.js"></script> <script type="text/javascript" src="'.$this->jscalendar_url.'/calendar.js"></script>
<script type="text/javascript" src="'.$GLOBALS['egw']->link('/phpgwapi/inc/jscalendar-setup.php',$args).'"></script> <script type="text/javascript" src="'.egw::link('/phpgwapi/inc/jscalendar-setup.php',$args,false).'"></script>
'; ';
} }
@ -161,7 +162,10 @@ Calendar.setup(
*/ */
function flat($url,$date=null,$weekUrl='',$weekTTip='',$monthUrl='',$monthTTip='',$id='calendar-container') function flat($url,$date=null,$weekUrl='',$weekTTip='',$monthUrl='',$monthTTip='',$id='calendar-container')
{ {
$javascript = $this->get_javascript(); if (strpos($GLOBALS['egw_info']['flags']['java_script'],'jscalendar') === false)
{
$javascript = $this->get_javascript();
}
if ($date) // string if format YYYYmmdd or timestamp if ($date) // string if format YYYYmmdd or timestamp
{ {
$date = is_int($date) ? adodb_date('m/d/Y',$date) : $date = is_int($date) ? adodb_date('m/d/Y',$date) :
@ -192,7 +196,7 @@ function todayClicked(calendar) {
{ {
var split = parts[i].split("="); var split = parts[i].split("=");
if (split[0] && split[0] == "date") { if (split[0] && split[0] == "date") {
split[1] = "'.date('Ymd').'"; split[1] = "'.egw_time::to('now','Ymd').'";
hasdate = true; hasdate = true;
} }
@ -211,7 +215,7 @@ function todayClicked(calendar) {
newsearch = "?"; newsearch = "?";
else else
newsearch += "&"; newsearch += "&";
newsearch += "date='.date('Ymd').'"; newsearch += "date='.egw_time::to('now','Ymd').'";
} }
window.location.search = newsearch; window.location.search = newsearch;