Revision: 6577
http://care2002.svn.sourceforge.net/care2002/?rev=6577&view=rev
Author: mizuko
Date: 2010-07-21 09:04:33 +0000 (Wed, 21 Jul 2010)
Log Message:
-----------
see #74 - patient register says always that data are missing
Modified Paths:
--------------
care2x/branches/gettext/gui/css/themes/default/default.css
care2x/branches/gettext/gui/smarty_template/templates/default/main/passcheck_entry_mask.tpl
care2x/branches/gettext/include/helpers/inc_css_a_hilitebu.php
care2x/branches/gettext/include/helpers/inc_js_gethelp.php
care2x/branches/gettext/include/helpers/inc_passcheck_mask.php
care2x/branches/gettext/main/clock.php
care2x/branches/gettext/modules/registration_admission/patient_register_show.php
care2x/branches/gettext/modules/registration_admission/person_reg_showdetail.php
Added Paths:
-----------
care2x/branches/gettext/gui/img/common/default/accept.png
Modified: care2x/branches/gettext/gui/css/themes/default/default.css
===================================================================
--- care2x/branches/gettext/gui/css/themes/default/default.css 2010-07-21
09:03:52 UTC (rev 6576)
+++ care2x/branches/gettext/gui/css/themes/default/default.css 2010-07-21
09:04:33 UTC (rev 6577)
@@ -388,7 +388,6 @@
/* Gjergj Sheldija - new buttons top */
.buttons a, .buttons button{
display:block;
- float:right;
margin:0 7px 0 0;
background-color:#f5f5f5;
border:1px solid #dedede;
@@ -405,7 +404,7 @@
padding:5px 10px 6px 7px; /* Links */
}
-input[type=button], input[type=submit], input[type=reset]{
+input[type=button], input[type=submit], input[type=reset], input[type=image]{
margin:0 7px 0 0;
background-color:#f5f5f5;
border:1px solid #dedede;
@@ -443,7 +442,8 @@
/* STANDARD */
-button:hover, .buttons a:hover, input[type=button]:hover,
input[type=submit]:hover, input[type=reset]:hover{
+button:hover, .buttons a:hover, input[type=button]:hover,
input[type=submit]:hover,
+input[type=reset]:hover, input[type=image] {
background-color:#dff4ff;
border:1px solid #c2e1ef;
color:#336699;
Added: care2x/branches/gettext/gui/img/common/default/accept.png
===================================================================
--- care2x/branches/gettext/gui/img/common/default/accept.png
(rev 0)
+++ care2x/branches/gettext/gui/img/common/default/accept.png 2010-07-21
09:04:33 UTC (rev 6577)
@@ -0,0 +1,9 @@
+\x89PNG
+
+
+IHDR \xF3\xFFa gAMA \xAF\xC87\x8A\xE9 tEXtSoftware Adobe
ImageReadyq\xC9e< \x9FIDAT8˥\x93\xEBKSa \xC7\xFD;v\xCEvl
dD!\x82\x84P{$;\x9A
+ż,K\xD3ݽ\xD26c\xD8L\x8B2r^\xC6H)-\xB3\xD4jsNm\xEA\xD4\xE6֔2q\xD9QB̽\xE9B\xB5at\xB1o\xE7\xEC\xC5L#z\xE0 \xCF\xE7\xF3{\xAEq \xE2\xFE'
\xF8\x89r\xA7\xEA\xB3=)L\xC6\xE3\xFDa\xE9\x888,u%2Rg\xA2>ݾW\xB4\xAB
ϛJ\xCB<\xC9!\x9DG\x86\x9BA \xFA\x96\xBB\xA2\xE9\lF\x89\xEB$\xBDTH\xD2C\xD1;
+تt\xE6xR\xE4\xEA\x9C\xCE\xD5~\xD8^^\x83i\xAE2\xAE\xEFX\xEDC\xE3L\xD8\xF8\x91d\x9F\xDE&\xC8\xF1\xA43\xDDI\xEB \xCCM\xAC
\x94\xa1\xc2_\xcd\xcc\xe8ؔ\xb3\xa9\xf6\x9d\x85\xfd\xf5=\\x9c\xaa\x80\xd8b\xae\x8b\xaf\x9...@\xe6n2\xa8Ʋ\xa2\x959\x98u\xdesplb1u \xf5t!\xdck\x830x\x95p\xb0\x92ܞ#h\xb8bb\x82\x8c1\xd3l\x865
+_1\x94O\xE4,\x98\xE5$O>\xC6߸\xC0\xB5Pd
+m\xCFa\x9BkD|=\xC9\xC4G\xED
Vn\xA36\xA0\x81\xD6[Įd \x8B 桚(\xC4\xD8\xDAP\xFE\xB1\xF9 m\xCF.\xC10Q\x8C\xBE`'Fb#&\x90ܧ6\xFA\x97\xBBa\xF4\xABP\xEB\xD7\xE2\xD3Q\xE8\xFD\x97\xB71\xD82[\xB5+z\xF7i\xF4;
\xA8\xF9]\xD0C17\xE6\x9Bоp\xBAI9̾jD\xBE}\x8E?7ayze\xCE,hxak\xa0\xed^3\xa8*bk \xa9\xb7\...@\xec+wq=!\x87\xda}u\xd3\xe5xz\xb7\x80\xb6\xd9\x94 \x87\xc2q:g쯺\x91n=
\xAA\x92\xD8:\xC4d+_\xB8\x8F\xBD\xB3G\x83\x87\xCC T\x8E\xE6A;\x9CՐ
J\xCEƣ\xA5.\x87\x8A!P\xF3\xD6)5!\xDC\xF6\x90\x9BH:\xBE\x81\x88\x98\xDCep\xB0\x92ր\xFA\xD1"\x9C\x96\xA3\x95݂\x9D\x85\xF5\xCE"\xF0Ky\xA6w|\xCA{H\x9A2!i\x87\xED~3z_X\xD1;o\x85\xC5kBZK*
+^\x88R\x{12E7C9}:O\x8A(\xA1\xA7jF\xA0\xE5\x85*^\x98\xADȰ\xD1S\xA5\x84诿\xF1_\xF3 gЬ\xE5y\xBA\xD4c IEND\xAEB`\x82
\ No newline at end of file
Modified:
care2x/branches/gettext/gui/smarty_template/templates/default/main/passcheck_entry_mask.tpl
===================================================================
---
care2x/branches/gettext/gui/smarty_template/templates/default/main/passcheck_entry_mask.tpl
2010-07-21 09:03:52 UTC (rev 6576)
+++
care2x/branches/gettext/gui/smarty_template/templates/default/main/passcheck_entry_mask.tpl
2010-07-21 09:04:33 UTC (rev 6577)
@@ -36,21 +36,21 @@
<td>
<p>
-
<FORM {{$sPassFormParams}}>
+
<form {{$sPassFormParams}}>
<div class="prompt">
{{$LDPwNeeded}}!<p>
</div>
-
<nobr>{{$LDUserPrompt}}:</nobr>
-
<br>
-
<INPUT type="text" name="userid" size="14"
maxlength="25"> <p>
-
<nobr>{{$LDPwPrompt}}:<br>
-
<INPUT type="password" name="keyword" size="14"
maxlength="25">
+
<label for="username">{{$LDUserPrompt}}:</label>
+
<input type="text" name="userid" size="14"
maxlength="25" id="username"> <p>
+
<label for="username">{{$LDPwPrompt}}:</label>
+
<input type="password" name="keyword" size="14"
maxlength="25" id="password">
{{* Do not move the sPassHiddenInputs outside of the
<form></form> block *}}
{{$sPassHiddenInputs}}
-
</nobr><p>
-
{{$sPassSubmitButton}} {{$sCancelButton}}
+
<div class="buttons">
+
{{$sPassSubmitButton}} {{$sCancelButton}}
+
</div>
</form>
</td>
Modified: care2x/branches/gettext/include/helpers/inc_css_a_hilitebu.php
===================================================================
--- care2x/branches/gettext/include/helpers/inc_css_a_hilitebu.php
2010-07-21 09:03:52 UTC (rev 6576)
+++ care2x/branches/gettext/include/helpers/inc_css_a_hilitebu.php
2010-07-21 09:04:33 UTC (rev 6577)
@@ -26,4 +26,4 @@
}
// -->
-</script>
+</script>
\ No newline at end of file
Modified: care2x/branches/gettext/include/helpers/inc_js_gethelp.php
===================================================================
--- care2x/branches/gettext/include/helpers/inc_js_gethelp.php 2010-07-21
09:03:52 UTC (rev 6576)
+++ care2x/branches/gettext/include/helpers/inc_js_gethelp.php 2010-07-21
09:04:33 UTC (rev 6577)
@@ -8,4 +8,4 @@
window.helpwin.moveTo(0,0);
}
// -->
-</script>
+</script>
\ No newline at end of file
Modified: care2x/branches/gettext/include/helpers/inc_passcheck_mask.php
===================================================================
--- care2x/branches/gettext/include/helpers/inc_passcheck_mask.php
2010-07-21 09:03:52 UTC (rev 6576)
+++ care2x/branches/gettext/include/helpers/inc_passcheck_mask.php
2010-07-21 09:04:33 UTC (rev 6577)
@@ -93,8 +93,8 @@
$smarty->assign('sPassHiddenInputs',$sHiddenTemp);
-$smarty->assign('sPassSubmitButton','<INPUT type="image"
'.createLDImgSrc(CARE_GUI ,'continue.gif','0').'>');
-$smarty->assign('sCancelButton','<a href="'.$breakfile.'"><img
'.createLDImgSrc(CARE_GUI ,'cancel.gif','0').'></a>');
+$smarty->assign('sPassSubmitButton','<button type="submit"
class="positive"><img '.createComIcon(CARE_GUI
,'accept.png','0').'>'.$LDLogin.'</button>');
+$smarty->assign('sCancelButton','<a href="'.$breakfile.'"
class="negative"><img '.createComIcon(CARE_GUI
,'cross.png','0').'>'.$LDCancel.'</a>');
#
# Display this page if necessary
Modified: care2x/branches/gettext/main/clock.php
===================================================================
--- care2x/branches/gettext/main/clock.php 2010-07-21 09:03:52 UTC (rev
6576)
+++ care2x/branches/gettext/main/clock.php 2010-07-21 09:04:33 UTC (rev
6577)
@@ -45,86 +45,45 @@
</HEAD>
-<BODY topmargin=0 leftmargin=0 marginwidth=0 marginheight=0
- bgcolor="silver" alink="navy" vlink="navy" onLoad=show5()>
+<BODY topmargin=0 leftmargin=0 marginwidth=0 marginheight=0 bgcolor="silver"
alink="navy" vlink="navy" onLoad=show5()>
-
<table width=100% border=0 height=100% cellpadding="0" cellspacing="0">
<tr valign=top>
- <td bgcolor="<?php
- echo $cfg ['top_bgcolor'];
- ?>" height="10"><FONT
- COLOR="<?php
- echo $cfg ['top_txtcolor'];
- ?>" SIZE=+3 FACE="Arial"><STRONG> <?php
- echo $LDClock?></STRONG></FONT></td>
- <td bgcolor="<?php
- echo $cfg ['top_bgcolor'];
- ?>" height="10"
- align=right>
-<?php
-if ($cfg ['dhtml'])
- echo '<a href="javascript:window.history.back()"><img ' .
createLDImgSrc ( CARE_BASE , 'back2.gif', '0' ) . ' class="fadeOut" >';
-?></a>
- <a href="javascript:gethelp('')">
- <img
- <?php
- echo createLDImgSrc ( CARE_BASE , 'hilfe-r.gif', '0' )?>
- <?php
- if ($cfg ['dhtml'])
- echo 'class="fadeOut">';
- ?> /></a><a
- href="<?php
- echo $breakfile;
- ?>" />
- <img
- <?php
- echo createLDImgSrc ( CARE_BASE , 'close2.gif', '0' )?>
- alt="<?php
- echo $LDClose?>"
- <?php
- if ($cfg ['dhtml'])
- echo 'class="fadeOut" >';
- ?> /></a></td>
+ <td bgcolor="<?php echo $cfg ['top_bgcolor']; ?>" height="10">
+ <FONT COLOR="<?php echo $cfg ['top_txtcolor'];?>"
SIZE=+3 FACE="Arial">
+ <STRONG> <?php echo $LDClock?></STRONG>
+ </FONT>
+ </td>
+ <td bgcolor="<?php echo $cfg ['top_bgcolor']; ?>" height="10"
align=right>
+ <div class="buttons">
+ <?php echo '<a
href="javascript:window.history.back()"><img ' . createLDImgSrc ( CARE_BASE ,
'back2.gif', '0' ) . '></a>'; ?>
+ <a href="javascript:gethelp('')">
+ <img <?php echo createLDImgSrc (
CARE_BASE , 'hilfe-r.gif', '0' )?>
+ </a>
+ <a href="<?php echo $breakfile; ?>" />
+ <img <?php echo createLDImgSrc (
CARE_BASE , 'close2.gif', '0' )?> alt="<?php echo $LDClose?>"/>
+ </a>
+ </div>
+ </td>
</tr>
<tr>
- <td bgcolor=<?php
- echo $cfg ['body_bgcolor'];
- ?> valign=top colspan=2>
- <p><br>
-
-
- <p>
-
-
- <CENTER><font face="verdana,arial" size=3>
-<?php
-echo "$LDPresent $LDTime"?>
-</FONT> <span id="liveclock"
- style="position: relative; left: 0; top: 0; font-size:
146"> </span>
- </CENTER>
- <font face="Verdana, Arial, Helvetica" size=2>
-
- <p></td>
+ <td bgcolor=<?php echo $cfg ['body_bgcolor']; ?> valign=top
colspan=2>
+ <CENTER>
+ <font face="verdana,arial" size=3>
+ <?php echo "$LDPresent $LDTime"?>
+ </FONT>
+ <span id="liveclock" style="position: relative;
left: 0; top: 0; font-size: 146"> </span>
+ </CENTER>
+ </td>
</tr>
-
<tr>
- <td bgcolor=<?php
- echo $cfg ['bot_bgcolor'];
- ?> height=70 colspan=2>
-<?php
-require (CARE_BASE .'include/helpers/inc_load_copyrite.php');
-?>
-</td>
+ <td bgcolor=<?php echo $cfg ['bot_bgcolor']; ?> height=70
colspan=2>
+ <?php
+ require (CARE_BASE
.'include/helpers/inc_load_copyrite.php');
+ ?>
+ </td>
</tr>
</table>
-
-
-
-
-</FONT>
-
-
</BODY>
-</HTML>
+</HTML>
\ No newline at end of file
Modified:
care2x/branches/gettext/modules/registration_admission/patient_register_show.php
===================================================================
---
care2x/branches/gettext/modules/registration_admission/patient_register_show.php
2010-07-21 09:03:52 UTC (rev 6576)
+++
care2x/branches/gettext/modules/registration_admission/patient_register_show.php
2010-07-21 09:04:33 UTC (rev 6577)
@@ -38,7 +38,7 @@
$_SESSION['sess_en']=0;
# Create the person show GUI
-require_once($root_path.'include/core/modules/registration_admission/model/class_gui_person_show.php');
+require_once($root_path.'modules/registration_admission/model/class_gui_person_show.php');
$person = & new GuiPersonShow;
# Set PID to load the data
Modified:
care2x/branches/gettext/modules/registration_admission/person_reg_showdetail.php
===================================================================
---
care2x/branches/gettext/modules/registration_admission/person_reg_showdetail.php
2010-07-21 09:03:52 UTC (rev 6576)
+++
care2x/branches/gettext/modules/registration_admission/person_reg_showdetail.php
2010-07-21 09:04:33 UTC (rev 6577)
@@ -71,7 +71,7 @@
# Display the data
-
require_once($root_path.'include/core/modules/registration_admission/model/class_gui_person_show.php');
+
require_once($root_path.'modules/registration_admission/model/class_gui_person_show.php');
$person = & new GuiPersonShow;
$person->setPID($pid);
$person->display();
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/care2002-developers
