dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6036
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-02-17 18:11:51 +0100
message:
  Case entry minor fix
removed:
  dhis-2/dhis-web/dhis-web-caseentry/java.exe.stackdump
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/index.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.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

=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/java.exe.stackdump'
--- dhis-2/dhis-web/dhis-web-caseentry/java.exe.stackdump	2012-02-06 02:56:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/java.exe.stackdump	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-Exception: STATUS_ACCESS_VIOLATION at eip=610C8439
-eax=00000000 ebx=00000001 ecx=00000000 edx=00000234 esi=00000000 edi=1AE5CCB0
-ebp=1AE5CAEC esp=1AE5CAC4 program=\\?\C:\Program Files (x86)\Java\jdk1.6.0_20\bin\java.exe, pid 2896, thread unknown (0x1544)
-cs=0023 ds=002B es=002B fs=0053 gs=002B ss=002B
-Stack trace:
-Frame     Function  Args
-1AE5CAEC  610C8439  (00000000, 00000000, 00000000, 00000000)
-1AE5CBFC  610C8DD5  (00000000, 00000000, 00000000, 00000000)
-1AE5CCBC  610C9B3A  (FFFFFFFF, FFFFFFFF, 74F734F3, FFFFFFFE)
-1AE5CD0C  61028182  (00000002, 44187AF8, 1AE5CE64, 00000002)
-1AE5CD98  763E6B59  (00000002, 1AE5CDD4, 763E69A4, 00000002)
-End of stack trace

=== 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-02-17 14:13:38 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-02-17 17:11:51 +0000
@@ -75,7 +75,7 @@
 program_summary_report=Program Summary Report
 name_based_data_entry=Name-based data entry
 visit_plan=Visit Plans
-intro_name_based=Enter data for beneficiaries and their respective programs and program stages.
+intro_name_based_data_entry=Enter data for beneficiaries and their respective programs and program stages.
 intro_program_summary=View the summary report to get an overview of the services provided for a program.
 intro_visit_plan=View the visit plan to get an overview of outstanding, pending and completed visits.
 use_default_form=Use default form
@@ -294,7 +294,7 @@
 blood_group=Blood group
 some_data_element_not_exist=Some data elements don't exist.
 multiple_dataentry=Multiple Data Entry
-intro_multiple_name_based=Enter data for multiple program stages and beneficiaries for a program. The entry screen gives an overview of the stage status.
+intro_multiple_name_based_data_entry=Enter data for multiple program stages and beneficiaries for a program. The entry screen gives an overview of the stage status.
 in=In
 is_null=is null
 data_value=datavalue
@@ -471,4 +471,6 @@
 of = of
 option_set = Option set
 show_all_items = Show all items
-see_history_plan = See history / plan
\ No newline at end of file
+see_history_plan = See history / plan
+name_based_data_entry = Name-based data entry
+multiple_name_based_data_entry = Multiple name-based data entry
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm	2012-01-15 15:59:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm	2012-02-17 17:11:51 +0000
@@ -3,8 +3,8 @@
 
 <ul id="introList">
 	#introListImgItem( "patient.action" "patient" "patient" )
-    #introListImgItem( "dataEntrySelect.action" "name_based" "dataentry" )
-	#introListImgItem( "multipledataEntrySelect.action" "multiple_name_based" "dataentry" )
+    #introListImgItem( "dataEntrySelect.action" "name_based_data_entry" "dataentry" )
+	#introListImgItem( "multipledataEntrySelect.action" "multiple_name_based_data_entry" "dataentry" )
 	#introListImgItem( "anonymousRegistration.action" "anonymous_events" "dataentry" )
     #introListImgItem( "reportSelect.action" "program_summary" "summaryreport" )
     #introListImgItem( "showSingleEventReportForm.action" "anonymous_event_reports" "summaryreport" )

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm	2012-02-13 07:42:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm	2012-02-17 17:11:51 +0000
@@ -2,7 +2,7 @@
 
 <form id="dataEntryForm" name="dataEntryForm" method="post" action="multipledataEntrySelect.action">
 	<table> 
-		<tr>
+		<tr style="margin-bottom:8px">
 			<td><label>$i18n.getString( "reporting_unit" )</label></td>
 			<td>
 				<input type="text" readonly="readonly" id='orgunitName' name='orgunitName' #if( $organisationUnit ) value="$organisationUnit.name" #else value="[$i18n.getString( "select" )]" #end style="min-width:350px">
@@ -33,7 +33,6 @@
         </tr>
     </table>   
 </form>
-<hr style="clear:both">
 
 #parse( "dhis-web-commons/loader/loader.vm" )
 <input type='hidden' id='orgunitId' value='$organisationUnit.id'>

=== 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	2012-02-13 07:42:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm	2012-02-17 17:11:51 +0000
@@ -33,8 +33,6 @@
 	</tr>
 </table>
 
-<hr style="clear:both">
-
 <table>    
    <tr>
         <td><label for="programId">$i18n.getString( "program" )</label></td>