dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #14250
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4773: Change class-bold for all STRONG and B tag in Patient module.
------------------------------------------------------------
revno: 4773
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-09-30 15:37:26 +0700
message:
Change class-bold for all STRONG and B tag in Patient module.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dataEntry.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/underage.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/visitPlan.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/loadVisitPlan.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programUnenrollmentSelectForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/resultSearchPatients.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/validationResult.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/viewDataEntryForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewDataEntryForm.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2011-09-29 06:14:57 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2011-09-30 08:37:26 +0000
@@ -429,4 +429,5 @@
choose_this_person = Choose this person
format_date = Format Date
specify_search_criteria = Please specify search criteria
-patient_profile = Beneficiary profile
\ No newline at end of file
+patient_profile = Beneficiary profile
+other_details = Other details
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm 2011-09-14 06:36:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm 2011-09-30 08:37:26 +0000
@@ -22,25 +22,25 @@
<td style="vertical-align:top" bgcolor="#cccccc">
<table>
<tr>
- <td><strong>$i18n.getString( "full_name" ):</strong></td>
+ <td class="bold">$i18n.getString( "full_name" ):</td>
<td>
$encoder.htmlEncode( $patient.getFullName() )
</td>
</tr>
<tr>
- <td><strong>$i18n.getString( "gender" ):</strong></td>
+ <td class="bold">$i18n.getString( "gender" ):</td>
<td>
$encoder.htmlEncode( $patient.gender )
</td>
</tr>
<tr>
- <td><strong>$i18n.getString( "date_of_birth" ):</strong></td>
+ <td class="bold">$i18n.getString( "date_of_birth" ):</td>
<td>
$format.formatDate( $patient.birthDate )
</td>
</tr>
<tr>
- <td><strong>$i18n.getString( "age" ):</strong></td>
+ <td class="bold">$i18n.getString( "age" ):</td>
<td>
$encoder.htmlEncode( $patient.getAge() )
</td>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2011-09-29 06:46:04 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2011-09-30 08:37:26 +0000
@@ -20,7 +20,7 @@
<div id='entryFormContainer'>
<input type='hidden' id='incidentDate' value='$!format.formatDate($programStageInstance.programInstance.dateOfIncident)'>
-<input type='text' name='programStageInstanceId' id='programStageInstanceId' value='$!programStageInstance.id'>
+<input type='hidden' name='programStageInstanceId' id='programStageInstanceId' value='$!programStageInstance.id'>
<hr style="clear:both">
<span id="startMsg" style="font-style:italic; color:blue; display: #if($!programStageInstance.executionDate!='') none #else block #end;">$i18n.getString( "report_date_warning" )</span>
@@ -30,9 +30,9 @@
<div id="customEntryScreenContainer">
<div id="dragDiv">
<table id="listInfo">
- <tr><td style="text-align:left"><strong>$i18n.getString("org_unit_name") :</strong></td> <td id="orgUnitNameField" style="text-align:right"></td></tr>
- <tr><td style="text-align:left"><strong>$i18n.getString("program_stage_name") :</strong></td> <td id="programStageName" style="text-align:right">$programStageInstance.programStage.name</td></tr>
- <tr><td style="text-align:left"><strong>$i18n.getString("datae_element_name") :</strong></td> <td id="dataelementName" style="text-align:right"></td></tr>
+ <tr><td style="text-align:left" class="bold">$i18n.getString("org_unit_name") :</td> <td id="orgUnitNameField" style="text-align:right"></td></tr>
+ <tr><td style="text-align:left" class="bold">$i18n.getString("program_stage_name") :</td> <td id="programStageName" style="text-align:right">$programStageInstance.programStage.name</td></tr>
+ <tr><td style="text-align:left" class="bold">$i18n.getString("datae_element_name") :</td> <td id="dataelementName" style="text-align:right"></td></tr>
</table>
</div>
$customDataEntryFormCode
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm 2011-09-29 05:59:35 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm 2011-09-30 08:37:26 +0000
@@ -5,10 +5,10 @@
<table class="mainPageTable">
<tr>
<td>
- <strong>$i18n.getString( "full_name" ):</strong>$encoder.htmlEncode( $patient.getFullName() )<br>
- <strong>$i18n.getString( "gender" ):</strong>$i18n.getString( $patient.gender )<br>
- <strong>$i18n.getString( "date_of_birth" ):</strong>$format.formatDate( $patient.birthDate )<br>
- <strong>$i18n.getString( "age" ):</strong>$encoder.htmlEncode( $patient.getAge() )
+ <span class="bold">$i18n.getString( "full_name" ):</span>$encoder.htmlEncode( $patient.getFullName() )<br>
+ <span class="bold">$i18n.getString( "gender" ):</span>$i18n.getString( $patient.gender )<br>
+ <span class="bold">$i18n.getString( "date_of_birth" ):</span>$format.formatDate( $patient.birthDate )<br>
+ <span class="bold">$i18n.getString( "age" ):</span>$encoder.htmlEncode( $patient.getAge() )
</td>
<td style="vertical-align:top">
<div id="currentSelection" style="float:right"></div>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2011-09-29 07:43:23 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2011-09-30 08:37:26 +0000
@@ -101,12 +101,12 @@
function showPatientDetails( patientId )
{
$('#detailsArea').load("getPatientDetails.action",
- {
- id:patientId
- }
- , function(){
- showDetails();
- });
+ {
+ id:patientId
+ }
+ , function( ){
+ showDetails();
+ });
}
// -----------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dataEntry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dataEntry.js 2011-09-29 06:46:04 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dataEntry.js 2011-09-30 08:37:26 +0000
@@ -100,7 +100,7 @@
{
history += '<tr>';
history += '<td>';
- history += '<strong>' + json.programStageInstances[i].name + '</strong>';
+ history += '<span class="bold">' + json.programStageInstances[i].name + '</span>';
history += '</td>';
history += '<td style="text-align:center" bgcolor=' + json.programStageInstances[i].colorMap + '>';
history += json.programStageInstances[i].infor;
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js 2011-09-29 04:50:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js 2011-09-30 08:37:26 +0000
@@ -278,22 +278,22 @@
$( patients ).each( function( i, patient )
{
sPatient += "<hr style='margin:5px 0px;'><table>";
- sPatient += "<tr><td><strong>" + i18n_patient_system_id + "</strong></td><td>" + $(patient).find('systemIdentifier').text() + "</td></tr>" ;
- sPatient += "<tr><td><strong>" + i18n_patient_full_name + "</strong></td><td>" + $(patient).find('fullName').text() + "</td></tr>" ;
- sPatient += "<tr><td><strong>" + i18n_patient_gender + "</strong></td><td>" + $(patient).find('gender').text() + "</td></tr>" ;
- sPatient += "<tr><td><strong>" + i18n_patient_date_of_birth + "</strong></td><td>" + $(patient).find('dateOfBirth').text() + "</td></tr>" ;
- sPatient += "<tr><td><strong>" + i18n_patient_age + "</strong></td><td>" + $(patient).find('age').text() + "</td></tr>" ;
- sPatient += "<tr><td><strong>" + i18n_patient_blood_group + "</strong></td><td>" + $(patient).find('bloodGroup').text() + "</td></tr>";
+ sPatient += "<tr><td class='bold'>" + i18n_patient_system_id + "</td><td>" + $(patient).find('systemIdentifier').text() + "</td></tr>" ;
+ sPatient += "<tr><td class='bold'>" + i18n_patient_full_name + "</td><td>" + $(patient).find('fullName').text() + "</td></tr>" ;
+ sPatient += "<tr><td class='bold'>" + i18n_patient_gender + "</td><td>" + $(patient).find('gender').text() + "</td></tr>" ;
+ sPatient += "<tr><td class='bold'>" + i18n_patient_date_of_birth + "</td><td>" + $(patient).find('dateOfBirth').text() + "</td></tr>" ;
+ sPatient += "<tr><td class='bold'>" + i18n_patient_age + "</td><td>" + $(patient).find('age').text() + "</td></tr>" ;
+ sPatient += "<tr><td class='bold'>" + i18n_patient_blood_group + "</td><td>" + $(patient).find('bloodGroup').text() + "</td></tr>";
var identifiers = $(patient).find('identifier');
if( identifiers.length > 0 )
{
- sPatient += "<tr><td colspan='2'><strong>" + i18n_patient_identifiers + "</strong></td></tr>";
+ sPatient += "<tr><td colspan='2' class='bold'>" + i18n_patient_identifiers + "</td></tr>";
$( identifiers ).each( function( i, identifier )
{
sPatient +="<tr class='identifierRow'>"
- +"<td><strong>" + $(identifier).find('name').text() + "</strong></td>"
+ +"<td class='bold'>" + $(identifier).find('name').text() + "</td>"
+"<td>" + $(identifier).find('value').text() + "</td> "
+"</tr>";
});
@@ -302,12 +302,12 @@
var attributes = $(patient).find('attribute');
if( attributes.length > 0 )
{
- sPatient += "<tr><td colspan='2'><strong>" + i18n_patient_attributes + "</strong></td></tr>";
+ sPatient += "<tr><td colspan='2' class='bold'>" + i18n_patient_attributes + "</td></tr>";
$( attributes ).each( function( i, attribute )
{
sPatient +="<tr class='attributeRow'>"
- +"<td><strong>" + $(attribute).find('name').text() + "</strong></td>"
+ +"<td class='bold'>" + $(attribute).find('name').text() + "</td>"
+"<td>" + $(attribute).find('value').text() + "</td> "
+"</tr>";
});
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/underage.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/underage.js 2011-09-27 08:33:08 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/underage.js 2011-09-30 08:37:26 +0000
@@ -100,18 +100,18 @@
$( patients ).each( function( i, patient )
{
sPatient += "<hr style='margin:5px 0px;'><table>";
- sPatient += "<tr><td><strong>" + i18n_patient_system_id + "</strong></td><td>" + $( patient ).find('systemIdentifier').text() + "</td></tr>" ;
- sPatient += "<tr><td><strong>" + i18n_patient_full_name + "</strong></td><td>" + $( patient ).find('fullName').text() + "</td></tr>" ;
- sPatient += "<tr><td><strong>" + i18n_patient_gender + "</strong></td><td>" + $( patient ).find('gender').text() + "</td></tr>" ;
- sPatient += "<tr><td><strong>" + i18n_patient_date_of_birth + "</strong></td><td>" + $( patient ).find('dateOfBirth').text() + "</td></tr>" ;
- sPatient += "<tr><td><strong>" + i18n_patient_age + "</strong></td><td>" + $( patient ).find('age').text() + "</td></tr>" ;
- sPatient += "<tr><td><strong>" + i18n_patient_blood_group + "</strong></td><td>" + $( patient ).find('bloodGroup').text() + "</td></tr>";
+ sPatient += "<tr><td class='bold'>" + i18n_patient_system_id + "</td><td>" + $( patient ).find('systemIdentifier').text() + "</td></tr>" ;
+ sPatient += "<tr><td class='bold'>" + i18n_patient_full_name + "</td><td>" + $( patient ).find('fullName').text() + "</td></tr>" ;
+ sPatient += "<tr><td class='bold'>" + i18n_patient_gender + "</td><td>" + $( patient ).find('gender').text() + "</td></tr>" ;
+ sPatient += "<tr><td class='bold'>" + i18n_patient_date_of_birth + "</td><td>" + $( patient ).find('dateOfBirth').text() + "</td></tr>" ;
+ sPatient += "<tr><td class='bold'>" + i18n_patient_age + "</td><td>" + $( patient ).find('age').text() + "</td></tr>" ;
+ sPatient += "<tr><td class='bold'>" + i18n_patient_blood_group + "</td><td>" + $( patient ).find('bloodGroup').text() + "</td></tr>";
var identifiers = $( patient ).find('identifier');
$( identifiers ).each( function( i, identifier )
{
sPatient +="<tr class='identifierRow" + $(identifier).find('id').text() + "' id='iden" + $(identifier).find('id' ).text() + "'>"
- +"<td><strong>" + $(identifier).find('name').text() + "</strong></td>"
+ +"<td class='bold'>" + $(identifier).find('name').text() + "</td>"
+"<td class='value'>" + $(identifier).find('value').text() + "</td> "
+"</tr>";
});
@@ -120,7 +120,7 @@
$( attributes ).each( function( i, attribute )
{
sPatient += "<tr class='attributeRow'>"
- + "<td><strong>" + $(attribute).find('name').text() + "</strong></td>"
+ + "<td class='bold'>" + $(attribute).find('name').text() + "</td>"
+ "<td>" + $(attribute).find('value').text() + "</td> "
+ "</tr>";
});
@@ -135,7 +135,7 @@
// Will be call after save new person successfully
function autoChoosePerson( xmlElement )
{
- jQuery("#tab-2").html("<center><strong>" + i18n_add_person_successfully + "</strong></center>");
+ jQuery("#tab-2").html("<center><span class='bold'>" + i18n_add_person_successfully + "</span></center>");
var root = jQuery(xmlElement);
jQuery("#addPatientForm [id=representativeId]").val( root.find("id").text() );
jQuery("#addPatientForm [id=relationshipTypeId]").val( root.find("relationshipTypeId").text() );
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/visitPlan.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/visitPlan.js 2011-05-12 09:40:29 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/visitPlan.js 2011-09-30 08:37:26 +0000
@@ -11,7 +11,7 @@
{
var url = "visitplanSortByAttribute.action";
- lockScreen();
+ showLoader();
if ( url.length > 0 )
{
@@ -24,7 +24,7 @@
jQuery( "table.listTable tbody tr:even" ).addClass( "listRow" );
jQuery( "table.listTable tbody" ).trigger( "update" );
- unLockScreen();
+ hideLoader();
}
);
}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/loadVisitPlan.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/loadVisitPlan.vm 2011-09-01 04:50:41 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/loadVisitPlan.vm 2011-09-30 08:37:26 +0000
@@ -3,17 +3,17 @@
<table class="mainPageTable">
<tr>
<td>
- <strong>$i18n.getString( "full_name" ):</strong>$encoder.htmlEncode( $patient.getFullName() )<br>
- <strong>$i18n.getString( "gender" ):</strong>$i18n.getString( $patient.gender )<br>
- <strong>$i18n.getString( "date_of_birth" ):</strong>$format.formatDate( $patient.birthDate )<br>
- <strong>$i18n.getString( "age" ):</strong>$encoder.htmlEncode( $patient.getAge() )
+ <span class='bold'>$i18n.getString( "full_name" ):</span>$encoder.htmlEncode( $patient.getFullName() )<br>
+ <span class='bold'>$i18n.getString( "gender" ):</span>$i18n.getString( $patient.gender )<br>
+ <span class='bold'>$i18n.getString( "date_of_birth" ):</span>$format.formatDate( $patient.birthDate )<br>
+ <span class='bold'>$i18n.getString( "age" ):</span>$encoder.htmlEncode( $patient.getAge() )
</td>
<td style="vertical-align:top">
<div style="float:right">
#set( $attributeValues = false )
#set( $attributeValues = $attributeValueMap.get( $patient.id ) )
#foreach( $attributeValue in $attributeValues )
- <strong>$encoder.htmlEncode( $attributeValue.patientAttribute.name ):</strong>$encoder.htmlEncode( $attributeValue.value )<br>
+ <span class='bold'>$encoder.htmlEncode( $attributeValue.patientAttribute.name ):</span>$encoder.htmlEncode( $attributeValue.value )<br>
#end
</div>
</td>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm 2011-09-14 06:36:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm 2011-09-30 08:37:26 +0000
@@ -11,19 +11,19 @@
<table>
<tr>
- <td><strong>$i18n.getString( "full_name" ):</strong></td>
+ <td class='bold'>$i18n.getString( "full_name" ):</td>
<td>$encoder.htmlEncode( $patient.getFullName() )</td>
</tr>
<tr>
- <td><strong>$i18n.getString( "gender" ):</strong></td>
+ <td class='bold'>$i18n.getString( "gender" ):</td>
<td>$i18n.getString( $patient.gender )</td>
</tr>
<tr>
- <td><strong>$i18n.getString( "date_of_birth" ):</strong></td>
+ <td class='bold'>$i18n.getString( "date_of_birth" ):</td>
<td>$format.formatDate( $patient.birthDate )</td>
</tr>
<tr>
- <td><strong>$i18n.getString( "age" ):</strong></td>
+ <td class='bold'>$i18n.getString( "age" ):</td>
<td>$encoder.htmlEncode( $patient.getAge() )</td>
</tr>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm 2011-09-29 05:59:35 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm 2011-09-30 08:37:26 +0000
@@ -7,11 +7,10 @@
<table class="mainPageTable">
<tr>
<td>
- <strong>$i18n.getString( "full_name" ):</strong>$encoder.htmlEncode( $patient.getFullName() )<br>
- <strong>$i18n.getString( "gender" ):</strong>$i18n.getString( $patient.gender )<br>
- <strong>$i18n.getString( "date_of_birth" ):</strong>
- $format.formatDate( $patient.birthDate )<br>
- <strong>$i18n.getString( "age" ):</strong>$encoder.htmlEncode( $patient.getAge() )
+ <span class='bold'>$i18n.getString( "full_name" ):</span>$encoder.htmlEncode( $patient.getFullName() )<br>
+ <span class='bold'>$i18n.getString( "gender" ):</span>$i18n.getString( $patient.gender )<br>
+ <span class='bold'>$i18n.getString( "date_of_birth" ):</span>$format.formatDate( $patient.birthDate )<br>
+ <span class='bold'>$i18n.getString( "age" ):</span>$encoder.htmlEncode( $patient.getAge() )
</td>
</tr>
</table>
@@ -65,9 +64,9 @@
<div id="dragDiv">
<table id="listInfo">
- <tr><td style="text-align:left"><strong>$i18n.getString("org_unit_name") :</strong></td> <td style="text-align:right">$!patient.organisationUnit.name</td></tr>
- <tr><td style="text-align:left"><strong>$i18n.getString("program_stage_name") :</strong></td> <td style="text-align:right">$!programStageInstance.programStage.name</td></tr>
- <tr><td style="text-align:left"><strong>$i18n.getString("datae_element_name") :</strong></td> <td id="dataelementName" style="text-align:right"></td></tr>
+ <tr><td style="text-align:left" class="bold">$i18n.getString("org_unit_name") :</td> <td style="text-align:right">$!patient.organisationUnit.name</td></tr>
+ <tr><td style="text-align:left" class="bold">$i18n.getString("program_stage_name") :</td> <td style="text-align:right">$!programStageInstance.programStage.name</td></tr>
+ <tr><td style="text-align:left" class="bold">$i18n.getString("datae_element_name") :</td> <td id="dataelementName" style="text-align:right"></td></tr>
</table>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programUnenrollmentSelectForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programUnenrollmentSelectForm.vm 2011-09-14 06:36:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programUnenrollmentSelectForm.vm 2011-09-30 08:37:26 +0000
@@ -30,19 +30,19 @@
<table>
<tr>
- <td><strong>$i18n.getString( "full_name" ):</strong></td>
+ <td class="bold">$i18n.getString( "full_name" ):</td>
<td>$encoder.htmlEncode( $patient.getFullName() )</td>
</tr>
<tr>
- <td><strong>$i18n.getString( "gender" ):</strong></td>
+ <td class="bold">$i18n.getString( "gender" ):</td>
<td>$i18n.getString( $patient.gender )</td>
</tr>
<tr>
- <td><strong>$i18n.getString( "date_of_birth" ):</strong></td>
+ <td class="bold">$i18n.getString( "date_of_birth" ):</td>
<td>$format.formatDate( $patient.birthDate )</td>
</tr>
<tr>
- <td><strong>$i18n.getString( "age" ):</strong></td>
+ <td class="bold">$i18n.getString( "age" ):</td>
<td>$encoder.htmlEncode( $patient.getAge() )</td>
</tr>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm 2011-09-28 04:18:15 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm 2011-09-30 08:37:26 +0000
@@ -1,18 +1,18 @@
<table>
<tr>
- <td><strong>$i18n.getString( "full_name" ):</strong></td>
+ <td class="bold">$i18n.getString( "full_name" ):</td>
<td>$encoder.htmlEncode( $patient.getFullName() )</td>
</tr>
<tr>
- <td><strong>$i18n.getString( "gender" ):</strong></td>
+ <td class="bold">$i18n.getString( "gender" ):</td>
<td>$i18n.getString( $patient.gender )</td>
</tr>
<tr>
- <td><strong>$i18n.getString( "date_of_birth" ):</strong></td>
+ <td class="bold">$i18n.getString( "date_of_birth" ):</td>
<td>$format.formatDate( $patient.birthDate )</td>
</tr>
<tr>
- <td><strong>$i18n.getString( "age" ):</strong></td>
+ <td class="bold">$i18n.getString( "age" ):</td>
<td>$encoder.htmlEncode( $patient.getAge() )</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm 2011-09-14 06:36:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm 2011-09-30 08:37:26 +0000
@@ -9,15 +9,15 @@
<table class="mainPageTable">
<tr>
<td>
- <strong>$i18n.getString( "full_name" ):</strong>$encoder.htmlEncode( $patient.getFullName() )<br>
- <strong>$i18n.getString( "gender" ):</strong>$i18n.getString( $patient.gender )<br>
- <strong>$i18n.getString( "date_of_birth" ):</strong>$format.formatDate( $patient.birthDate )<br>
- <strong>$i18n.getString( "age" ):</strong>$encoder.htmlEncode( $patient.getAge() )
+ <span class="bold">$i18n.getString( "full_name" ):</span>$encoder.htmlEncode( $patient.getFullName() )<br>
+ <span class="bold">$i18n.getString( "gender" ):</span>$i18n.getString( $patient.gender )<br>
+ <span class="bold">$i18n.getString( "date_of_birth" ):</span>$format.formatDate( $patient.birthDate )<br>
+ <span class="bold">$i18n.getString( "age" ):</span>$encoder.htmlEncode( $patient.getAge() )
</td>
<td style="vertical-align:top">
<div style="float:right">
#foreach( $patientAttributeValue in $patientAttributeValues )
- <strong>$encoder.htmlEncode( $patientAttributeValue.patientAttribute.name ):</strong>$encoder.htmlEncode( $patientAttributeValue.value )<br>
+ <span class="bold">$encoder.htmlEncode( $patientAttributeValue.patientAttribute.name ):</span>$encoder.htmlEncode( $patientAttributeValue.value )<br>
#end
</div>
</td>
@@ -95,14 +95,14 @@
</div>
</td>
<td>
- <strong>$i18n.getString( "full_name" ):</strong><span id="fullNameField"></span><br>
- <strong>$i18n.getString( "gender" ):</strong><span id="genderField"></span><br>
- <strong>$i18n.getString( "date_of_birth" ):</strong><span id="dateOfBirthField"></span><br>
- <strong>$i18n.getString( "age" ):</strong><span id="ageField"></span>
+ <span class="bold">$i18n.getString( "full_name" ):</span><span id="fullNameField"></span><br>
+ <span class="bold">$i18n.getString( "gender" ):</span><span id="genderField"></span><br>
+ <span class="bold">$i18n.getString( "date_of_birth" ):</span><span id="dateOfBirthField"></span><br>
+ <span class="bold">$i18n.getString( "age" ):</span><span id="ageField"></span>
</td>
<td style="vertical-align:top">
<div style="float:right">
- <p><strong>$i18n.getString( "attributes" ):</strong><br><span id="attributeField"></span></p>
+ <p><span class="bold">$i18n.getString( "attributes" ):</span><br><span id="attributeField"></span></p>
</div>
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/resultSearchPatients.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/resultSearchPatients.vm 2011-09-14 06:36:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/resultSearchPatients.vm 2011-09-30 08:37:26 +0000
@@ -1,4 +1,4 @@
-<span><strong>$i18n.getString( "total_result" ): $!total $i18n.getString('patients')</strong></span>
+<span class="bold">$i18n.getString( "total_result" ): $!total $i18n.getString('patients')</span>
<p></p>
<table width='100%' id='searchTable' name='searchTable'>
#if($!patients)
@@ -46,7 +46,7 @@
</tr>
#else
<tr>
- <td colspan='6'><strong>i18n_no_patients_found</strong></td>
+ <td colspan='6' class="bold">i18n_no_patients_found</td>
</tr>
#end
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm 2011-09-14 06:36:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm 2011-09-30 08:37:26 +0000
@@ -288,33 +288,33 @@
<div id="representativeInfo" style="display:none">
<table>
<tr>
- <td><strong>$i18n.getString("full_name"):</strong></td>
+ <td class="bold">$i18n.getString("full_name"):</td>
<td>$!representative.getFullName()</td>
</tr>
<tr>
- <td><strong>$i18n.getString("gender"):</strong></td>
+ <td class="bold">$i18n.getString("gender"):</td>
<td> $!representative.gender</td>
</tr>
<tr>
- <td><strong>$i18n.getString("date_of_birth"):</strong></td>
+ <td class="bold">$i18n.getString("date_of_birth"):</td>
<td>$!format.formatDate( $!representative.birthDate )</td>
</tr>
<tr>
- <td><strong>$i18n.getString("age"):</strong></td>
+ <td class="bold">$i18n.getString("age"):</td>
<td> $!representative.getAge() </td>
</tr>
<tr>
- <td><strong>$i18n.getString("blood_group"):</strong></td>
+ <td class="bold">$i18n.getString("blood_group"):</td>
<td>$!representative.getBloodGroup()</td>
</tr>
#foreach( $patientIdentifier in $representative.identifiers )
<tr>
- <td><strong>#if( $patientIdentifier.identifierType )$patientIdentifier.identifierType.name: #else $i18n.getString("system_identifier"): #end</strong></td>
+ <td class="bold">#if( $patientIdentifier.identifierType )$patientIdentifier.identifierType.name: #else $i18n.getString("system_identifier"): #end</td>
<td> $!patientIdentifier.identifier </td>
</tr>
#end
<tr>
- <td><strong>$i18n.getString("programs"):</strong></td>
+ <td class="bold">$i18n.getString("programs"):</td>
<td>
#foreach( $program in $representative.programs )
#if( $velocityCount == 1 )
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/validationResult.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/validationResult.vm 2011-04-29 08:07:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/validationResult.vm 2011-09-30 08:37:26 +0000
@@ -1,11 +1,11 @@
<h3>$encoder.htmlEncode( $i18n.getString( "validation_result" ) )</h3>
#if( $programValidations.size()==0 )
- <p><b>$encoder.htmlEncode( $i18n.getString( "successful_validation" ) )</b></p>
+ <p class="bold">$encoder.htmlEncode( $i18n.getString( "successful_validation" ) )</p>
#else
- <p><b>$encoder.htmlEncode( $i18n.getString( "unsuccessful_validation" ) )</b></p>
+ <p class="bold">$encoder.htmlEncode( $i18n.getString( "unsuccessful_validation" ) )</p>
- <p><b>$encoder.htmlEncode( $i18n.getString( "the_following_dataelements_are_in_multi_stages" ) )</b></p>
+ <p class="bold">$encoder.htmlEncode( $i18n.getString( "the_following_dataelements_are_in_multi_stages" ) )</p>
<table class="listTable" style="width:100%">
<tr>
<th>$i18n.getString( "program_validation_description" )</th>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2011-09-29 04:17:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2011-09-30 08:37:26 +0000
@@ -374,4 +374,5 @@
patient_identifier_type_details = Beneficiary identifier type details
male = Male
female = Female
-transgender = Transgender
\ No newline at end of file
+transgender = Transgender
+alphabet = Alphabet
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/viewDataEntryForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/viewDataEntryForm.js 2011-08-26 05:59:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/viewDataEntryForm.js 2011-09-30 08:37:26 +0000
@@ -164,7 +164,7 @@
if( dataElement == null )
{
- jQuery( source + " #message_").html( "<b>" + i18n_specify_dataelememt + "</b>" );
+ jQuery( source + " #message_").html( "<span class='bold'>" + i18n_specify_dataelememt + "</span>" );
return;
} else {
jQuery( source + " #message_").html( "" );
@@ -225,7 +225,7 @@
if( checkExisted( id ) )
{
- jQuery( source + " #message_").html( "<b>" + i18n_dataelement_is_inserted + "</b>" );
+ jQuery( source + " #message_").html( "<span class='bold'>" + i18n_dataelement_is_inserted + "</span>" );
return;
}else{
jQuery( source + " #message_").html("");
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm 2011-09-29 04:17:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm 2011-09-30 08:37:26 +0000
@@ -47,10 +47,10 @@
<div style="float:right">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
</div>
- <p><label><strong>$i18n.getString( "id" ):</strong></label><br><span id="idField"></span></p>
- <p><label><strong>$i18n.getString( "name" ):</strong></label><br><span id="nameField"></span></p>
- <p><label><strong>$i18n.getString( "description" ):</strong></label><br><span id="descriptionField"></span></p>
- <p><label><strong>$i18n.getString( "value_type" ):</strong></label><br><span id="valueTypeField"></span></p>
+ <p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
+ <p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
+ <p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
+ <p><label class="bold">$i18n.getString( "value_type" ):</label><br><span id="valueTypeField"></span></p>
</div>
</td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm 2011-09-28 08:51:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm 2011-09-30 08:37:26 +0000
@@ -3,7 +3,7 @@
<table class="mainPageTable">
<tr>
<td>
- <label><b>$i18n.getString( "select_program" )</b></label><br>
+ <label class="bold">$i18n.getString( "select_program" )</label><br>
<select id="id" name="id" style="min-width:20em" onchange="getStageByProgram( this.value )">
<option value="" selected="selected" >[ $i18n.getString( "all" ) ]</option>
#foreach ( $program in $programs )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewDataEntryForm.vm 2011-08-26 05:59:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewDataEntryForm.vm 2011-09-30 08:37:26 +0000
@@ -121,7 +121,7 @@
<table>
<tr>
<td>
- <b>$i18n.getString( "dataelement" )</b><br>
+ <span class="bold">$i18n.getString( "dataelement" )</span><br>
<input type="text" style="min-width:290px" onkeyup="filterDataElements( this.value, '#dataElementSelection', '#dataElementIds')"/>
<select id="dataElementIds" name="dataElementIds" style="min-width:300px" multiple="multiple" size="10" onchange="getOptionCombos( this.value, '#dataElementSelection #optionComboIds' )" class="{validate:{required:true}}">
#foreach( $de in $dataElements)
@@ -135,18 +135,12 @@
</select>
</td>
<td>
- <b>$i18n.getString( "optioncombo" )</b><br>
+ <span class="bold">$i18n.getString( "optioncombo" )</span><br>
<select id="optionComboIds" name="optionComboIds" style="min-width:300px" size="10" class="{validate:{required:true}}"/>
</td>
</tr>
<tr>
<td>
- <!-- <b>$i18n.getString( "view_as" )</b><br>
- <select name="viewBySelector" id="viewBySelector" style="width:150px">
- <option value="deid">$i18n.getString( "id" )</option>
- <option value="dename">$i18n.getString( "name" )</option>
- <option value="deshortname" selected>$i18n.getString( "short_name" )</option>
- </select> -->
<input type="button" value="Insert" id="insert" name="insert" onclick="insertDataElement( '#dataElementSelection', '$programStage.id')"/>
</td>
<td>
@@ -160,7 +154,7 @@
<table>
<tr>
<td>
- <b>$i18n.getString( "program_stage" )</b><br>
+ <span class="bold">$i18n.getString( "program_stage" )</span><br>
<select id="programStageIds" style="min-width:300px" onchange="getProgramStageDataElements( this.value )" >
<option value=''>$i18n.getString( "select" )</option>
#foreach( $p in $programStages)
@@ -171,13 +165,13 @@
</tr>
<tr>
<td>
- <b>$i18n.getString( "dataelement" )</b><br>
+ <span class="bold">$i18n.getString( "dataelement" )</span><br>
<input type="text" style="min-width:290px" onkeyup="filterDataElements( this.value, '#otherProgramStageDataElements', '#dataElementIds')"/>
<select id="dataElementIds" name="dataElementIds" style="min-width:300px" multiple="multiple" size="10" onchange="getOptionCombos( this.value, '#otherProgramStageDataElements #optionComboIds' )" class="{validate:{required:true}}"/>
<select id="dataElementIdsStore" style="min-width:300px;display:none" multiple="multiple" size="10"/>
</td>
<td>
- <b>$i18n.getString( "optioncombo" )</b><br>
+ <span class="bold">$i18n.getString( "optioncombo" )</span><br>
<select id="optionComboIds" name="optionComboIds" style="min-width:300px" size="10" class="{validate:{required:true}}"/>
</td>
</tr>
