Revision: 6579
http://care2002.svn.sourceforge.net/care2002/?rev=6579&view=rev
Author: mizuko
Date: 2010-07-21 10:25:17 +0000 (Wed, 21 Jul 2010)
Log Message:
-----------
see #70 - patient register: sex
Modified Paths:
--------------
care2x/branches/gettext/gui/css/themes/default/default.css
care2x/branches/gettext/gui/smarty_template/templates/default/registration_admission/reg_form.tpl
care2x/branches/gettext/js/uniform/css/uniform.default.css
care2x/branches/gettext/modules/registration_admission/model/class_gui_input_person.php
Modified: care2x/branches/gettext/gui/css/themes/default/default.css
===================================================================
--- care2x/branches/gettext/gui/css/themes/default/default.css 2010-07-21
09:06:09 UTC (rev 6578)
+++ care2x/branches/gettext/gui/css/themes/default/default.css 2010-07-21
10:25:17 UTC (rev 6579)
@@ -387,6 +387,7 @@
/* Gjergj Sheldija - new buttons top */
.buttons a, .buttons button{
+ float:right;
display:block;
margin:0 7px 0 0;
background-color:#f5f5f5;
Modified:
care2x/branches/gettext/gui/smarty_template/templates/default/registration_admission/reg_form.tpl
===================================================================
---
care2x/branches/gettext/gui/smarty_template/templates/default/registration_admission/reg_form.tpl
2010-07-21 09:06:09 UTC (rev 6578)
+++
care2x/branches/gettext/gui/smarty_template/templates/default/registration_admission/reg_form.tpl
2010-07-21 10:25:17 UTC (rev 6579)
@@ -71,7 +71,7 @@
{{$sBdayInput}} {{$sCrossImg}} {{$sDeathDate}}
</td>
<td class="reg_input_must">
- {{$LDSex}} {{$sSexM}}
{{$LDMale}} {{$sSexF}} {{$LDFemale}}
+ {{$LDSex}}
<label>{{$sSexM}}{{$LDMale}}</label>
<label>{{$sSexF}}{{$LDFemale}}</label>
</td>
</tr>
@@ -81,7 +81,7 @@
{{$LDBloodGroup}}
</td>
<td colspan=2 class="reg_input">
- {{$sBGAInput}}{{$LDA}}
{{$sBGBInput}}{{$LDB}} {{$sBGABInput}}{{$LDAB}}
{{$sBGOInput}}{{$LDO}}
+ <label>{{$sBGAInput}}{{$LDA}}</label>
<label>{{$sBGBInput}}{{$LDB}}</label>
<label>{{$sBGABInput}}{{$LDAB}}</label>
<label>{{$sBGOInput}}{{$LDO}}</label>
</td>
</tr>
{{/if}}
@@ -92,11 +92,11 @@
{{$LDCivilStatus}}
</td>
<td colspan=2 class="reg_input">
- {{$sCSSingleInput}}{{$LDSingle}}
- {{$sCSMarriedInput}}{{$LDMarried}}
- {{$sCSDivorcedInput}}{{$LDDivorced}}
- {{$sCSWidowedInput}}{{$LDWidowed}}
- {{$sCSSeparatedInput}}{{$LDSeparated}}
+
<label>{{$sCSSingleInput}}{{$LDSingle}}</label>
+
<label>{{$sCSMarriedInput}}{{$LDMarried}}</label>
+
<label>{{$sCSDivorcedInput}}{{$LDDivorced}}</label>
+
<label>{{$sCSWidowedInput}}{{$LDWidowed}}</label>
+
<label>{{$sCSSeparatedInput}}{{$LDSeparated}}</label>
</td>
</tr>
{{/if}}
@@ -140,7 +140,7 @@
<td colspan=2 >
{{$sErrorInsClass}}
{{foreach from=$sInsClasses
item=InsClass}}
- {{$InsClass}}
+ <label>{{$InsClass}}</label>
{{/foreach}}
</td>
Modified: care2x/branches/gettext/js/uniform/css/uniform.default.css
===================================================================
--- care2x/branches/gettext/js/uniform/css/uniform.default.css 2010-07-21
09:06:09 UTC (rev 6578)
+++ care2x/branches/gettext/js/uniform/css/uniform.default.css 2010-07-21
10:25:17 UTC (rev 6579)
@@ -546,12 +546,13 @@
div.radio {
position: relative;
- float: left;
+ display: table-cell;
+ /* float: left;*/
}
div.radio span {
- display: block;
- float: left;
+ display: table-cell;
+ /* float: left;*/
text-align: center;
}
Modified:
care2x/branches/gettext/modules/registration_admission/model/class_gui_input_person.php
===================================================================
---
care2x/branches/gettext/modules/registration_admission/model/class_gui_input_person.php
2010-07-21 09:06:09 UTC (rev 6578)
+++
care2x/branches/gettext/modules/registration_admission/model/class_gui_input_person.php
2010-07-21 10:25:17 UTC (rev 6579)
@@ -623,16 +623,12 @@
if ($errorsex) $this->smarty->assign('LDSex', "<font
color=#ff0000>* $LDSex</font>:");
else $this->smarty->assign('LDSex', "<font
color=#ff0000>*</font> $LDSex:");
-
- $sSexMBuffer='<input name="sex" type="radio" value="m" ';
- if($sex=="m") $sSexMBuffer.=' checked>';
- else $sSexMBuffer.='>';
+
+ $sSexMBuffer='<input name="sex" type="radio" value="m"
';($sex=="m") ? $sSexMBuffer.=' checked>' : $sSexMBuffer.='>';
$this->smarty->assign('sSexM',$sSexMBuffer);
$this->smarty->assign('LDMale',$LDMale);
-
- $sSexFBuffer ='<input name="sex" type="radio" value="f" ';
- if($sex=="f") $sSexFBuffer.='checked>';
- else $sSexFBuffer.='>';
+
+ $sSexFBuffer ='<input name="sex" type="radio" value="f"
';($sex=="f") ? $sSexFBuffer.='checked>' : $sSexFBuffer.='>';
$this->smarty->assign('sSexF',$sSexFBuffer);
$this->smarty->assign('LDFemale',$LDFemale);
@@ -759,13 +755,15 @@
if($insurance_classes!=false){
$sInsClassBuffer='';
while($result=$insurance_classes->FetchRow()) {
-
+
+ $sInsClassBuffer.=
'<label>';
$sInsClassBuffer.='<input class="reg_input_must" name="insurance_class_nr"
type="radio" value="'.$result['class_nr'].'" ';
if($insurance_class_nr==$result['class_nr']) $sInsClassBuffer.='checked';
$sInsClassBuffer.='>';
$LD=$result['LD_var'];
if(isset($$LD)&&!empty($$LD)) $sInsClassBuffer.=$$LD; else
$sInsClassBuffer.=$result['name'];
+ $sInsClassBuffer.=
'</label>';
$sInsClassBuffer.=' ';
}
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
