Revision: 6468
http://care2002.svn.sourceforge.net/care2002/?rev=6468&view=rev
Author: mizuko
Date: 2010-06-30 11:22:45 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
see #54
Modified Paths:
--------------
care2x/branches/gettext/modules/or_logbook/op-care-log-pass.php
care2x/branches/gettext/modules/or_logbook/op-nursing-select-dept.php
Added Paths:
-----------
care2x/branches/gettext/modules/or_logbook/op-care-log-search-javastart.php
Removed Paths:
-------------
care2x/branches/gettext/modules/or_logbook/op-care-log-such-javastart.php
Modified: care2x/branches/gettext/modules/or_logbook/op-care-log-pass.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/op-care-log-pass.php
2010-06-30 11:21:51 UTC (rev 6467)
+++ care2x/branches/gettext/modules/or_logbook/op-care-log-pass.php
2010-06-30 11:22:45 UTC (rev 6468)
@@ -22,7 +22,7 @@
switch($target)
{
- case
'search':$fileforward="op-care-log-such-javastart.php".URL_REDIRECT_APPEND."&dept_nr=$dept_nr";
+ case
'search':$fileforward="op-care-log-search-javastart.php".URL_REDIRECT_APPEND."&dept_nr=$dept_nr";
$title=$LDSearch;
break;
case
'archiv':$fileforward="op-care-log-arch-javastart.php".URL_REDIRECT_APPEND."&dept_nr=$dept_nr";
Copied:
care2x/branches/gettext/modules/or_logbook/op-care-log-search-javastart.php
(from rev 6467,
care2x/branches/gettext/modules/or_logbook/op-care-log-such-javastart.php)
===================================================================
--- care2x/branches/gettext/modules/or_logbook/op-care-log-search-javastart.php
(rev 0)
+++ care2x/branches/gettext/modules/or_logbook/op-care-log-search-javastart.php
2010-06-30 11:22:45 UTC (rev 6468)
@@ -0,0 +1,55 @@
+<?php
+error_reporting(E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR);
+require('./roots.php');
+require($root_path.'include/helpers/inc_environment_global.php');
+/**
+* CARE2X Integrated Hospital Information System Deployment 2.1 - 2004-10-02
+* GNU General Public License
+* Copyright 2002,2003,2004,2005 Elpidio Latorilla
+* elpi...@care2x.org,
+*
+* See the file "copy_notice.txt" for the licence notice
+*/
+define('LANG_FILE','or.php');
+define('NO_2LEVEL_CHK',1);
+require_once($root_path.'include/helpers/inc_front_chain_lang.php');
+require_once($root_path.'include/helpers/inc_config_color.php'); // this is
important for determining to expand the window
+/*if(!isset($dept_nr)||!$dept_nr){
+
header('Location:op-nursing-select-dept.php'.URL_REDIRECT_APPEND.'&target=search&retpath='.$retpath);
+ exit;
+}*/
+
+?>
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN" "html.dtd">
+<?php html_rtl($lang); ?>
+<HEAD>
+<?php echo setCharSet(); ?><TITLE></TITLE>
+
+<script language="javascript">
+
+function makelogbuch()
+{
+<?php if($cfg['dhtml'])
+ echo '
+ w=window.parent.screen.width;
+ h=window.parent.screen.height;';
+ else
+ echo '
+ w=800;
+ h=650;';
+?>
+ logbuchwin<?php echo $sid
?>=window.open("op-care-log-xtsuch-start.php?sid=<?php echo
"$sid&lang=$lang&dept_nr=$dept_nr";?>&user=<?php echo str_replace("
","+",$op_pflegelogbuch_user);?>","logbuchwin<?php echo $sid
?>","menubar=no,resizable=yes,scrollbars=yes, width=" + (w-15) + ", height=" +
(h-60));
+ window.logbuchwin<?php echo $sid ?>.moveTo(0,0);
+ window.location.replace('<?php if($retpath=="calendar_opt") echo
$root_path."calendar/calendar-options.php?sid=$sid&lang=$lang&day=$pday&month=$pmonth&year=$pyear";
else echo
$root_path."main/op-docu.php?sid=".$sid."&lang=".$lang;?>&forcestation=1&nofocus=1');
+
+}
+</script>
+
+</HEAD>
+
+
+<BODY BACKGROUND="#ffffff" onLoad="makelogbuch()">
+
+
+</BODY>
+</HTML>
Deleted:
care2x/branches/gettext/modules/or_logbook/op-care-log-such-javastart.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/op-care-log-such-javastart.php
2010-06-30 11:21:51 UTC (rev 6467)
+++ care2x/branches/gettext/modules/or_logbook/op-care-log-such-javastart.php
2010-06-30 11:22:45 UTC (rev 6468)
@@ -1,55 +0,0 @@
-<?php
-error_reporting(E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR);
-require('./roots.php');
-require($root_path.'include/helpers/inc_environment_global.php');
-/**
-* CARE2X Integrated Hospital Information System Deployment 2.1 - 2004-10-02
-* GNU General Public License
-* Copyright 2002,2003,2004,2005 Elpidio Latorilla
-* elpi...@care2x.org,
-*
-* See the file "copy_notice.txt" for the licence notice
-*/
-define('LANG_FILE','or.php');
-define('NO_2LEVEL_CHK',1);
-require_once($root_path.'include/helpers/inc_front_chain_lang.php');
-require_once($root_path.'include/helpers/inc_config_color.php'); // this is
important for determining to expand the window
-/*if(!isset($dept_nr)||!$dept_nr){
-
header('Location:op-nursing-select-dept.php'.URL_REDIRECT_APPEND.'&target=search&retpath='.$retpath);
- exit;
-}*/
-
-?>
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN" "html.dtd">
-<?php html_rtl($lang); ?>
-<HEAD>
-<?php echo setCharSet(); ?><TITLE></TITLE>
-
-<script language="javascript">
-
-function makelogbuch()
-{
-<?php if($cfg['dhtml'])
- echo '
- w=window.parent.screen.width;
- h=window.parent.screen.height;';
- else
- echo '
- w=800;
- h=650;';
-?>
- logbuchwin<?php echo $sid
?>=window.open("op-care-log-xtsuch-start.php?sid=<?php echo
"$sid&lang=$lang&dept_nr=$dept_nr";?>&user=<?php echo str_replace("
","+",$op_pflegelogbuch_user);?>","logbuchwin<?php echo $sid
?>","menubar=no,resizable=yes,scrollbars=yes, width=" + (w-15) + ", height=" +
(h-60));
- window.logbuchwin<?php echo $sid ?>.moveTo(0,0);
- window.location.replace('<?php if($retpath=="calendar_opt") echo
$root_path."calendar/calendar-options.php?sid=$sid&lang=$lang&day=$pday&month=$pmonth&year=$pyear";
else echo
$root_path."main/op-docu.php?sid=".$sid."&lang=".$lang;?>&forcestation=1&nofocus=1');
-
-}
-</script>
-
-</HEAD>
-
-
-<BODY BACKGROUND="#ffffff" onLoad="makelogbuch()">
-
-
-</BODY>
-</HTML>
Modified: care2x/branches/gettext/modules/or_logbook/op-nursing-select-dept.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/op-nursing-select-dept.php
2010-06-30 11:21:51 UTC (rev 6467)
+++ care2x/branches/gettext/modules/or_logbook/op-nursing-select-dept.php
2010-06-30 11:22:45 UTC (rev 6468)
@@ -20,8 +20,8 @@
switch($target){
case 'search': $title="$LDOrLogBook :: $LDSearch";
-
//$fileforward='op-care-log-such-javastart.php'.URL_APPEND.'&retpath='.$retpath;
-
$targetfile='op-care-log-such-javastart.php';
+
//$fileforward='op-care-log-search-javastart.php'.URL_APPEND.'&retpath='.$retpath;
+
$targetfile='op-care-log-search-javastart.php';
break;
case 'archiv': $title="$LDOrLogBook :: $LDArchive";
//$fileforward='op-care-log-arch-javastart.php'.URL_APPEND.'&retpath='.$retpath;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Care2002-developers mailing list
Care2002-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/care2002-developers
