dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5860
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2012-02-05 14:08:51 +0100
message:
  Changed labels to next year and prev year in data set report and reporting rate summary buttons
modified:
  dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.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-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2011-12-23 18:01:04 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2012-02-05 13:08:51 +0000
@@ -280,6 +280,8 @@
 clear=Clear
 next=Next
 prev=Prev
+prev_year = Prev year
+next_year = Next year
 none=None
 facility=Facility
 month=Month

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2011-09-03 18:23:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2012-02-05 13:08:51 +0000
@@ -29,10 +29,10 @@
 <input type="button" value='$i18n.getString( "data" )' style="width:120px" onclick="showCriteria()" />
 </div>
 
-<div id="criteria" class="inputCriteria" style="width:372px;height:434px;">
+<div id="criteria" class="inputCriteria" style="width:360px;height:450px;">
 <div class="inputSection">
 <label>$i18n.getString( "dataset" )</label><br>
-<select id="dataSetId" name="dataSetId" style="width:280px">
+<select id="dataSetId" name="dataSetId" style="width:330px">
   <option value="">[ $i18n.getString( "select" ) ]</option>
   #foreach( $dataSet in $dataSets )
   <option value="$dataSet.id">$encoder.htmlEncode( $dataSet.name )</option>
@@ -48,10 +48,10 @@
   <option value="$type.name">$i18n.getString( $type.name )</option>
   #end
 </select>
-<input type="button" style="width:50px" value="$i18n.getString( 'prev' )" onclick="getAvailablePeriods( 'periodType', 'periodId', 'periodId', '-1' )" />
-<input type="button" style="width:50px" value="$i18n.getString( 'next' )" onclick="getAvailablePeriods( 'periodType', 'periodId', 'periodId', '1' )" /><br>
+<input type="button" style="width:75px" value="$i18n.getString( 'prev_year' )" onclick="getAvailablePeriods( 'periodType', 'periodId', 'periodId', '-1' )" />
+<input type="button" style="width:75px" value="$i18n.getString( 'next_year' )" onclick="getAvailablePeriods( 'periodType', 'periodId', 'periodId', '1' )" /><br>
 
-<select id="periodId" name="periodId" style="width:280px" disabled="disabled">
+<select id="periodId" name="periodId" style="width:330px" disabled="disabled">
 </select>
 </div>
 
@@ -62,7 +62,7 @@
 
 <div class="inputSection">
 <label>$i18n.getString( "report_organisation_unit" )</label><br>
-<div id="selectionTree" style="width:280px;height:200px;overflow:auto;border:1px solid #cccccc"></div>
+<div id="selectionTree" style="width:328px;height:200px;overflow:auto;border:1px solid #cccccc"></div>
 </div>
 
 <div class="inputSection">

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm	2011-11-23 13:30:56 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm	2012-02-05 13:08:51 +0000
@@ -12,7 +12,7 @@
 
 <h3>$i18n.getString( "reporting_rate_summary" )</h3>
 
-<div id="critiera" class="inputCriteria" style="width:620px;height:310px;">
+<div id="critiera" class="inputCriteria" style="width:660px;height:310px;">
 <table>
     <col width="300">
     <col>
@@ -32,7 +32,7 @@
             
             <!-- DataSet -->
             
-        	<select id="dataSetId" name="dataSetId" style="width:280px">
+        	<select id="dataSetId" name="dataSetId" style="width:330px">
 			<option value="0">[ $i18n.getString( "select_dataset_all" ) ]</option>
 			#foreach( $dataSet in $dataSets )
 				<option value="$dataSet.id">$dataSet.name</option>
@@ -48,12 +48,12 @@
 				#end
 			</select>
 
-			<input type="button" style="width:50px" value="$i18n.getString( 'prev' )" onclick="getPeriods( 'periodTypeId', 'periodId', 'periodId', '-1' )" />
-			<input type="button" style="width:50px" value="$i18n.getString( 'next' )" onclick="getPeriods( 'periodTypeId', 'periodId', 'periodId', '1' )" /><br>
+			<input type="button" style="width:75px" value="$i18n.getString( 'prev_year' )" onclick="getPeriods( 'periodTypeId', 'periodId', 'periodId', '-1' )" />
+			<input type="button" style="width:75px" value="$i18n.getString( 'next_year' )" onclick="getPeriods( 'periodTypeId', 'periodId', 'periodId', '1' )" /><br>
 
 			<!-- Period -->
 			
-            <select id="periodId" name="periodId" style="width:280px" disabled="disabled">
+            <select id="periodId" name="periodId" style="width:330px" disabled="disabled">
             </select><br><br>
             
             <input type="button" value="$i18n.getString( 'get_report' )" style="width:135px" onclick="displayCompleteness()"/><br><br>