extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix for jscalendar in sitemgr (was not displayed) provided by H.J.Tappe

Browse Source
This commit is contained in:
Klaus Leithoff 2009-07-31 12:56:39 +00:00
parent 79b1279028
commit 8f378da6c9
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,9 +5,9 @@
* @link http://www.egroupware.org
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$
* @package api
* @subpackage html
* @version $Id$
*/
/**
@ -42,6 +42,15 @@ class jscalendar
$this->jscalendar_url = $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/js/'.$path;
$this->dateformat = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
$args = array_intersect_key($GLOBALS['egw_info']['user']['preferences']['common'],array('lang'=>1,'dateformat'=>1));
if (isset($GLOBALS['egw_info']['flags']['currentapp']))
{
$args['app'] = $GLOBALS['egw_info']['flags']['currentapp'];
}
else
{
$args['app'] = 'home'; // home can be granted to anyone.
}
if ($do_header && (strpos($GLOBALS['egw_info']['flags']['java_script'],'jscalendar')===false))
{
$GLOBALS['egw_info']['flags']['java_script'] .= $this->get_javascript();
@ -58,8 +67,7 @@ class jscalendar
return
'<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="'.$GLOBALS['egw']->link('/phpgwapi/inc/jscalendar-setup.php',
array_intersect_key($GLOBALS['egw_info']['user']['preferences']['common'],array('lang'=>1,'dateformat'=>1))).'"></script>
<script type="text/javascript" src="'.$GLOBALS['egw']->link('/phpgwapi/inc/jscalendar-setup.php',$args).'"></script>
';
}
@ -114,7 +122,7 @@ class jscalendar
if ($jsreturn)
{
$return_array = array(
'html' => '<input type="text" id="'.$name.'" name="'.$name.'" size="10" value="'.$date.'"'.$options.'/><img id="'.$name.'-trigger" src="'.common::find_image('phpgwapi','datepopup').'" title="'.lang('Select date').'" style="cursor:pointer; cursor:hand;"/>',
'html' => '<input type="text" id="'.$name.'" name="'.$name.'" size="10" value="'.$date.'"'.$options.'/><img id="'.$name.'-trigger" src="'.common::find_image('phpgwpai','datepopup').'" title="'.lang('Select date').'" style="cursor:pointer; cursor:hand;"/>',
'js' => 'Calendar.setup({inputField : "'.$name.'",button: "'.$name.'-trigger" });'
);
@ -123,7 +131,7 @@ class jscalendar
return
'<input type="text" id="'.$name.'" name="'.$name.'" size="10" value="'.$date.'"'.$options.'/>
<script type="text/javascript">
document.writeln(\'<img id="'.$name.'-trigger" src="'.common::find_image('phpgwapi','datepopup').'" title="'.lang('Select date').'" style="cursor:pointer; cursor:hand;"/>\');
document.writeln(\'<img id="'.$name.'-trigger" src="'.common::find_image('phpgwpai','datepopup').'" title="'.lang('Select date').'" style="cursor:pointer; cursor:hand;"/>\');
Calendar.setup(
{
inputField : "'.$name.'",

14
phpgwapi/inc/jscalendar-setup.php
View File

@ -10,9 +10,19 @@
* @version $Id$
*/
$app = 'home'; // home can be granted to anyone. Can't be phpgwapi, nor jscalendar (no own directory)
if (isset($_GET['app']))
{
$app = $_GET['app'];
}
elseif (isset($_POST['app']))
{
$app = $_POST['app'];
}
$GLOBALS['egw_info'] = array(
'flags' => Array(
'currentapp' => 'home', // can't be phpgwapi, nor jscalendar (no own directory)
'flags' => array(
'currentapp' => $app,
'noheader' => True,
'nonavbar' => True,
'noappheader' => True,