dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6217
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-03-08 09:56:27 +0100
message:
  UI fixes
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/listPatient.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/tabularReportSelect.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	2012-03-08 08:39:51 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-03-08 08:56:27 +0000
@@ -111,7 +111,7 @@
 hierachy_orgunit=Hierarchy Organisation Unit
 F=F
 M=M
-view_patient_chart=View Patient chart
+view_patient_chart=View patient chart
 generate_patient_chart=Generate patient chart
 patient_chart_management=Patient Chart Management
 intro_patient=Create, modify and search for beneficiaries. Any type of data can be registered for a beneficiary by including attributes.
@@ -187,7 +187,7 @@
 search_result=Search result
 date_invalid=The date is invalid
 date_less_incident=The date is less than date of incident
-can_not_register_patient_for_orgunit=Cannot register patients for the selected organisation unit
+can_not_register_patient_for_orgunit=Can not register patients for this organisation unit
 search_by_program=Search by Program
 list_patients_by_program=List Beneficiaries by Program
 program_unenrollment_management=Program Un-Enrollment Management

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm	2012-03-08 08:39:51 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm	2012-03-08 08:56:27 +0000
@@ -61,7 +61,7 @@
 								
 				<td>
 					<a href="javascript:showSelectedDataRecoding('$patient.id');" title="$i18n.getString( 'data_entry' )"><img src="images/data_entry.png" alt="$i18n.getString( 'data_entry' )"></a>   
-					<a href="javascript:patientChartList( '$patient.id' )" title="$i18n.getString( 'data_entry' )"><img src="../images/add_to_dashboard.png" alt="$i18n.getString( 'view_patient_chart' )"></a> 
+					<a href="javascript:patientChartList( '$patient.id' )" title="$i18n.getString( 'view_patient_chart' )"><img src="../images/add_to_dashboard.png" alt="$i18n.getString( 'view_patient_chart' )"></a> 
 					<a href="javascript:showPatientHistory( '$patient.id' )" title='$i18n.getString( "show_details" )'><img src="../images/edit_sections.png" alt='$i18n.getString( "show_details" )'></a>
 					<a href="javascript:showPatientDetails( $patient.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"></a>
                 </td>               				

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm	2012-02-13 07:42:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm	2012-03-08 08:56:27 +0000
@@ -3,23 +3,15 @@
 	<h3>$i18n.getString( "patient_management" ) #openHelp( "patient" )</h3>
 	
 	<input type="hidden" id="isShowPatientList" name="isShowPatientList" />
-	<table>
-		
+	<table>		
 		<tr>
 			<td><label>$i18n.getString( "registering_unit" )</label></td>
-			<td><input type="text" id='selectedOrgunitText' readonly style="min-width:22em"></td>
-			<td>&nbsp;</td>
-			<td><input type="button" id='listPatientBtn' value="$i18n.getString( 'list_all_patients' )" onclick='loadAllPatients();'></td>
-		</tr>
-		
-		<tr>
-			<td></td>
-			<td><i><span id='warnmessage' style='color: red;'></span></i> </td>
-		</tr>
-
+			<td style="padding-right:5px"><input type="text" id='selectedOrgunitText' readonly style="min-width:16em"></td>
+			<td style="padding-right:5px"><input type="button" id='listPatientBtn' value="$i18n.getString( 'list_all_patients' )" onclick='loadAllPatients();'></td>
+			<td><span id='warnmessage' style='color:red'></span></td>
+		</tr>
 	</table>
 
-<hr style="clear:both">
 </div>
 
 <div id='searchPatientDiv' style='display:none'>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css	2012-02-01 09:10:08 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css	2012-03-08 08:56:27 +0000
@@ -1,6 +1,6 @@
 table
 {
- margin-bottom:20px; 
+ margin-bottom:10px; 
  font-size: 13px; 
  line-height:18px;
 }
@@ -66,8 +66,7 @@
 .togglePanel.close {height:25px;padding-left:25px;  background-image:  url(../images/close.gif) ; background-repeat: no-repeat; background-position: top left}
 
 .warnmessage {
-	color: red; 
-	font-style: italic;
+	color: red;
 }
 
 #facilityCol

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/tabularReportSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/tabularReportSelect.vm	2012-03-08 06:39:51 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/tabularReportSelect.vm	2012-03-08 08:56:27 +0000
@@ -87,17 +87,13 @@
 		</td>
 		<td>
 			<select id="facilityLB" name="facilityLB" style="width: 30em">
-				<option value="random" selected>$i18n.getString( "selected" )</option>
+				<option value="children" selected="selected">$i18n.getString( "all_children" )</option>
 				<option value="immChildren" >$i18n.getString( "immediate_children" )</option>
-				<option value="children" >$i18n.getString( "all_child" )</option>
+				<option value="random">$i18n.getString( "selected" )</option>
 			</select>
 		</td>
 	</tr>
-	
-	<tr>
-		<td>&nbsp;</td>
-	</tr>
-    
+	    
 	<tr>
     	<td></td>
     	<td><input type="submit" id='generateBtn' name='generateBtn' #if($!programs) #else disabled #end value="$i18n.getString( 'generate' )" />