dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7370
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-06-25 10:19:12 +0700
message:
  Small change UI for Enrollment form.
modified:
  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/programEnrollmentSelectForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css


--
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/webapp/dhis-web-caseentry/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2012-06-25 02:11:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2012-06-25 03:19:12 +0000
@@ -627,7 +627,7 @@
 	
 	if( statusSearching == 0)
 	{
-		loadAllPatient();
+		listAllPatient();
 	}
 	else if( statusSearching == 1 )
 	{
@@ -639,7 +639,7 @@
 // Load all patients
 // -----------------------------------------------------------------------------
 
-function loadAllPatient()
+function listAllPatient()
 {
 	hideById('listPatientDiv');
 	hideById('editPatientDiv');

=== 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	2012-06-18 04:21:23 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm	2012-06-25 03:19:12 +0000
@@ -46,12 +46,11 @@
 	
 	<p></p>
 	
-	<fieldset>
-		<legend>$i18n.getString( "enroll_for" )</legend>
+	<div class='enrollment-form'>
 		<form id='programEnrollmentSelectDiv' name='programEnrollmentSelectDiv' method='POST'>
 			<input type="hidden" id="patientId" name="patientId" value="$patient.id">    
 
-			<table>  
+			<table>
 				<tr>
 					<td class='text-column'><label for="programId">$i18n.getString( "program" )</label></td>
 					<td class='input-column'>
@@ -67,7 +66,7 @@
 				</tr>   
 				<tr id='enrollmentDateTR' class='hidden'>
 					<td class='text-column'><label for="enrollmentDate"><span id='enrollmentDateDescription'></span><em title="$i18n.getString( "required" )" class="required"> * </em></label></td>
-                    <td colspan='2' class='input-column'><input type="text" id="enrollmentDate" name="enrollmentDate" ></td>
+					<td colspan='2' class='input-column'><input type="text" id="enrollmentDate" name="enrollmentDate" ></td>
 				</tr>
 				
 				<tr id='dateOfIncidentTR' class='hidden'>
@@ -88,11 +87,11 @@
 					</td>
 				</tr>
 				<tr>
-                	<td colspan='3'><span id='message'></span></td>
-                </tr>
+					<td colspan='3'><span id='message'></span></td>
+				</tr>
 			</table>
 		</form>
-	</fieldset>
+	</div>
 	
 	<p></p>
 	<div id='programEnrollmentDiv' class='hidden'></div>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-06-23 15:48:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-06-25 03:19:12 +0000
@@ -44,7 +44,7 @@
 }
 
 td.input-column {
-    width: 280px;
+    width: 300px;
 	padding-left: 5px; 
 	padding-right: 1px; 
 }
@@ -98,6 +98,14 @@
   text-align: right;
 }
 
+div.enrollment-form
+{
+  border:1px solid #c0c0c0; 
+  padding:10px;
+  margin-right:10px;
+  border-radius:3px;
+}
+
 /*----------------------------------------------------------------------------*/
 /* For data entry form                                                        */
 /*----------------------------------------------------------------------------*/