dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #04471
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1491: Minor fixes to excel reporting to make it look like the rest
------------------------------------------------------------
revno: 1491
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2010-02-24 18:47:59 +0100
message:
Minor fixes to excel reporting to make it look like the rest
modified:
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/addDataStatus.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/advancedReport.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/associateOrgUnitGroupForExcelItemGroup.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/dataStatusShow.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelTemplateList.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelitemgroups.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroup.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroupByExcelItemGroup.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataStatus.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listExcelFile.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/menu.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/organisationUnitAtLevels.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/organisationUnitGroupListingReport.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/periodcolumns.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportItems.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportparams.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reports.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/sortDataElements.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/sortDataElementsForCategory.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/updateDataStatus.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-excel-reporting/src/main/webapp/dhis-web-excel-reporting/addDataStatus.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/addDataStatus.vm 2009-12-04 07:40:29 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/addDataStatus.vm 2010-02-24 17:47:59 +0000
@@ -1,4 +1,4 @@
-<h2>$i18n.getString( "add" ) $i18n.getString( "dataset_completed_report" )</h2>
+<h3>$i18n.getString( "add" ) $i18n.getString( "dataset_completed_report" )</h3>
<table>
<tr>
<td>$i18n.getString( 'dataset' )</td>
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/advancedReport.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/advancedReport.vm 2009-12-09 10:26:46 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/advancedReport.vm 2010-02-24 17:47:59 +0000
@@ -1,4 +1,4 @@
-<h2>$i18n.getString( "generate_advanced_report" )</h2>
+<h3>$i18n.getString( "generate_advanced_report" )</h3>
<table >
<tr>
<td ><label>$i18n.getString('group')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/associateOrgUnitGroupForExcelItemGroup.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/associateOrgUnitGroupForExcelItemGroup.vm 2009-10-29 03:02:42 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/associateOrgUnitGroupForExcelItemGroup.vm 2010-02-24 17:47:59 +0000
@@ -1,4 +1,4 @@
-<h2>$i18n.getString( 'organisation_unit_group' )</h2>
+<h3>$i18n.getString( 'organisation_unit_group' )</h3>
<form name="organisationUnitGroupReport" action="updateOrgnisationUnitGroupForExcelItemGroup.action" method="GET">
<input type="hidden" name="id" id="id" value="$excelItemGroup.id"/>
<table>
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/dataStatusShow.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/dataStatusShow.vm 2009-12-04 05:00:32 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/dataStatusShow.vm 2010-02-24 17:47:59 +0000
@@ -1,9 +1,9 @@
-<h2>$i18n.getString( "dataset_completed_report" )</h2>
+<h3>$i18n.getString( "dataset_completed_report" )</h3>
<table width="100%" class="list">
<tr>
- <th style="background:#DFDFDF">$i18n.getString( 'dataset' )</th>
- <th style="background:#DFDFDF"></th>
+ <th>$i18n.getString( 'dataset' )</th>
+ <th></th>
</tr>
#set( $mark = false )
#foreach($ds in $dataStatus)
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelTemplateList.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelTemplateList.vm 2010-02-24 08:56:35 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelTemplateList.vm 2010-02-24 17:47:59 +0000
@@ -1,4 +1,4 @@
-<h2>$i18n.getString('excel_template_management')</h2>
+<h3>$i18n.getString('excel_template_management')</h3>
<form name="uploadForm" id="uploadForm" action="uploadExcelTemplate.action" onsubmit="return validateUploadExcelTemplate(document.getElementById('upload').value, 1);" method="post" enctype="multipart/form-data">
<table>
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelitemgroups.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelitemgroups.vm 2010-02-23 04:26:05 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelitemgroups.vm 2010-02-24 17:47:59 +0000
@@ -1,4 +1,4 @@
-<h2>$i18n.getString('excelitem_group')</h2>
+<h3>$i18n.getString('excelitem_group')</h3>
<table width=100%>
<tr>
<td>
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroup.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroup.vm 2010-01-08 05:43:53 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroup.vm 2010-02-24 17:47:59 +0000
@@ -1,4 +1,4 @@
-<h2>$i18n.getString('dataelement_groups')</h2>
+<h3>$i18n.getString('dataelement_groups')</h3>
<div id="tooltip"></div>
<p></p>
<table width="800px">
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroupByExcelItemGroup.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroupByExcelItemGroup.vm 2009-12-16 03:37:57 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroupByExcelItemGroup.vm 2010-02-24 17:47:59 +0000
@@ -1,4 +1,4 @@
-<h2>$i18n.getString('dataelement_groups')</h2>
+<h3>$i18n.getString('dataelement_groups')</h3>
<div id="tooltip"></div>
<h4><font color="green">$!encoder.htmlEncode($!excelItemGroup.name)</font></h4>
<p></p>
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataStatus.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataStatus.vm 2009-09-25 06:10:21 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataStatus.vm 2010-02-24 17:47:59 +0000
@@ -1,4 +1,4 @@
-<h2>$i18n.getString( "data_status" )</h2>
+<h3>$i18n.getString( "data_status" )</h3>
<table width="100%">
<tr><td align="right">
<input type="button" value="$i18n.getString( 'add' )" style="width:100px" onclick="window.location='openAddDataEntryStatus.action'"/>
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listExcelFile.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listExcelFile.vm 2009-09-14 03:19:36 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listExcelFile.vm 2010-02-24 17:47:59 +0000
@@ -1,4 +1,4 @@
-<h2>$!encoder.htmlEncode($!organisationUnit.name)</h2>
+<h3>$!encoder.htmlEncode($!organisationUnit.name)</h3>
<table width="100%">
<tr>
<td>
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/menu.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/menu.vm 2009-11-10 06:39:31 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/menu.vm 2010-02-24 17:47:59 +0000
@@ -1,4 +1,4 @@
-<h2><a href="administration.action">$i18n.getString( "administration" ) </a></h2>
+<h2><a href="administration.action">$i18n.getString( "administration" ) </a></h2>
<h2><a href="selectExportReportParam.action">$i18n.getString( "generate_report" ) </a></h2>
<ul>
@@ -7,8 +7,7 @@
<li><a href="getImportingParams.action">$i18n.getString( "import" ) </a></li>
<li><a href="selectDataSetCompletedReport.action">$i18n.getString( "dataset_completed_report" ) </a></li>
<li><a href="viewDataEntryStatus.action">$i18n.getString( "data_status" )</a></li>
- <li><a href="openIndividualReportExcel.action">$i18n.getString( "individual_report" )</a></li>
-
+ <li><a href="openIndividualReportExcel.action">$i18n.getString( "individual_report" )</a></li>
</ul>
<script type="text/javascript">
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/organisationUnitAtLevels.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/organisationUnitAtLevels.vm 2009-12-19 07:02:53 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/organisationUnitAtLevels.vm 2010-02-24 17:47:59 +0000
@@ -1,4 +1,4 @@
-<h2>$encoder.htmlEncode($reportExcel.name)</h2>
+<h3>$encoder.htmlEncode($reportExcel.name)</h3>
<hr>
<table width=100%>
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/organisationUnitGroupListingReport.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/organisationUnitGroupListingReport.vm 2009-09-15 08:36:01 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/organisationUnitGroupListingReport.vm 2010-02-24 17:47:59 +0000
@@ -1,4 +1,4 @@
-<h2>$i18n.getString( 'organisation_unit_group' )</h2>
+<h3>$i18n.getString( 'organisation_unit_group' )</h3>
<form name="organisationUnitGroupReport" action="updateOrgnisationUnitGroupListingReport.action" method="GET">
<input type="hidden" name="id" value="$reportExcelOganiztionGroupListing.id"/>
<table>
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/periodcolumns.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/periodcolumns.vm 2009-11-13 10:28:52 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/periodcolumns.vm 2010-02-24 17:47:59 +0000
@@ -1,1 +1,1 @@
-<h2>$!encoder.htmlEncode($!report.name)</h2>
<table width="100%">
<tr style="vertical-align:bottom;">
<td>
$i18n.getString( "filter_by_name" ): <input type="text" onkeyup="filterValues( this.value , 1)" style="width:300px"/>
</td>
<td align="right">
<input type="button" onclick="openAddPriodColumn()" value="$i18n.getString('add')" style="width:150px"/><br>
<input type="button" onclick="window.location='listReportExcel.action'" value="$i18n.getString('cancel')" style="width:150px"/><br>
</td>
</tr>
</table>
<table width="100%">
<tr>
<th>$i18n.getString('start_date')</th>
<th>$i18n.getString('end_date')</th>
<th>$i18n.getString('period_type')</th>
<th>$i18n.getString('column')</th>
<th width="70px">$i18n.getString('operations')</th>
</tr>
<tbody id="list">
#set( $mark = false )
#foreach($periodColumn in $report.periodColumns)
<tr #alternate( $mark )>
<td>$format.formatDate($periodColumn.startdate)</td>
<td>$format.formatDate($periodColumn.enddate)</td>
<td>$i18n.getString( $periodColumn.periodType )</td>
<td>$encoder.htmlEncode( $periodColumn.column )</td>
<td align="center">
<a href="javascript:deletePeriodColumn($report.id, $periodColumn.id );" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
<a href="javascript:openUpdatePriodColumn( $periodColumn.id );" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>
</td>
</tr>
#if( $mark )
#set( $mark = false )
#else
#set( $mark = true )
#end
#end
</tbody>
</table>
<span id="message" style="top:100px;right:5px;position:absolute;width:200px;z-index:10002" onclick="javascript:hideById(this.id);"></span>
<form name="periodColumn" action="savePeriodColumn.action" method="POST">
<input type="hidden" value="$!encoder.htmlEncode($!report.id)" name="id" id="id"/>
<input type="hidden" value="$!encoder.htmlEncode($!report.id)" name="reportId"/>
<div id="periodColumn" style="position:fixed;display:none;width:450px;z-index:10001;background-color: white;border: medium solid silver;height:150px;padding:20px;">
<div id="close" style="position:absolute;top:2px;right:2px;cursor: pointer;color:red;" onclick="hideById('periodColumn');deleteDivEffect();">[x]</div>
<table width="100%">
<tr>
<td><label>$i18n.getString('period_type')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
<select type="text" id="periodType" name="periodType" style="min-width:20em">
<option value='selected_month'>$i18n.getString('selected_month')</option>
<option value='last_3_month'>$i18n.getString('last_3_month')</option>
<option value='last_6_month'>$i18n.getString('last_6_month')</option>
<option value='so_far_this_year'>$i18n.getString('so_far_this_year')</option>
<option value='quaterly'>$i18n.getString('quaterly')</option>
<option value='6_month'>$i18n.getString('six_monthly')</option>
<option value='yealy'>$i18n.getString('yearly')</option>
</select>
</td>
</tr>
<tr>
<td>$i18n.getString('start_date')</td>
<td>
<input id="startdate" name="startdate" type="text" readonly="readonly" /><em title="$i18n.getString( 'required' )" class="required">*</em>
<script type="text/javascript">
$(document).ready(function(){
$("#startdate").datepicker({
dateFormat:"$encoder.jsEscape($i18n.getString( 'i18n_date_format' ) , "'")"
});
});
</script>
</td>
</tr>
<tr>
<td>$i18n.getString('end_date')</td>
<td>
<input id="enddate" name="enddate" type="text" readonly="readonly"/><em title="$i18n.getString( 'required' )" class="required">*</em>
<script type="text/javascript">
$(document).ready(function(){
$("#enddate").datepicker({
dateFormat:"$encoder.jsEscape($i18n.getString( 'i18n_date_format' ) , "'")"
});
});
</script>
</td>
</tr>
<tr>
<td>$i18n.getString('column')</td>
<td>
<input id="column" name="column" type="text"/><em title="$i18n.getString( 'required' )" class="required">*</em>
</td>
</tr>
<tr style="height:50px">
<td></td>
<td>
<input type="button" id="action" value="$i18n.getString('save')" style="width:100px"/>
<input type="button" value="$i18n.getString('cancel')" style="width:100px" onclick="hideById('periodColumn');deleteDivEffect();"/>
</td>
</tr>
</table>
</div>
</form>
<script>
var i18n_startdate_null = "$encoder.jsEscape($i18n.getString( 'startdate_null' ) , "'")";
var i18n_enddate_null = "$encoder.jsEscape($i18n.getString( 'enddate_null' ) , "'")";
var i18n_column_is_null = "$encoder.jsEscape($i18n.getString( 'column_is_null' ) , "'")";
var i18n_confirm_delete = '$encoder.jsEscape($i18n.getString( 'confirm_delete' ) , "'")';
</script>
\ No newline at end of file
+<h3>$!encoder.htmlEncode($!report.name)</h3>
<table width="100%">
<tr style="vertical-align:bottom;">
<td>
$i18n.getString( "filter_by_name" ): <input type="text" onkeyup="filterValues( this.value , 1)" style="width:300px"/>
</td>
<td align="right">
<input type="button" onclick="openAddPriodColumn()" value="$i18n.getString('add')" style="width:150px"/><br>
<input type="button" onclick="window.location='listReportExcel.action'" value="$i18n.getString('cancel')" style="width:150px"/><br>
</td>
</tr>
</table>
<table width="100%">
<tr>
<th>$i18n.getString('start_date')</th>
<th>$i18n.getString('end_date')</th>
<th>$i18n.getString('period_type')</th>
<th>$i18n.getString('column')</th>
<th width="70px">$i18n.getString('operations')</th>
</tr>
<tbody id="list">
#set( $mark = false )
#foreach($periodColumn in $report.periodColumns)
<tr #alternate( $mark )>
<td>$format.formatDate($periodColumn.startdate)</td>
<td>$format.formatDate($periodColumn.enddate)</td>
<td>$i18n.getString( $periodColumn.periodType )</td>
<td>$encoder.htmlEncode( $periodColumn.column )</td>
<td align="center">
<a href="javascript:deletePeriodColumn($report.id, $periodColumn.id );" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
<a href="javascript:openUpdatePriodColumn( $periodColumn.id );" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>
</td>
</tr>
#if( $mark )
#set( $mark = false )
#else
#set( $mark = true )
#end
#end
</tbody>
</table>
<span id="message" style="top:100px;right:5px;position:absolute;width:200px;z-index:10002" onclick="javascript:hideById(this.id);"></span>
<form name="periodColumn" action="savePeriodColumn.action" method="POST">
<input type="hidden" value="$!encoder.htmlEncode($!report.id)" name="id" id="id"/>
<input type="hidden" value="$!encoder.htmlEncode($!report.id)" name="reportId"/>
<div id="periodColumn" style="position:fixed;display:none;width:450px;z-index:10001;background-color: white;border: medium solid silver;height:150px;padding:20px;">
<div id="close" style="position:absolute;top:2px;right:2px;cursor: pointer;color:red;" onclick="hideById('periodColumn');deleteDivEffect();">[x]</div>
<table width="100%">
<tr>
<td><label>$i18n.getString('period_type')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
<select type="text" id="periodType" name="periodType" style="min-width:20em">
<option value='selected_month'>$i18n.getString('selected_month')</option>
<option value='last_3_month'>$i18n.getString('last_3_month')</option>
<option value='last_6_month'>$i18n.getString('last_6_month')</option>
<option value='so_far_this_year'>$i18n.getString('so_far_this_year')</option>
<option value='quaterly'>$i18n.getString('quaterly')</option>
<option value='6_month'>$i18n.getString('six_monthly')</option>
<option value='yealy'>$i18n.getString('yearly')</option>
</select>
</td>
</tr>
<tr>
<td>$i18n.getString('start_date')</td>
<td>
<input id="startdate" name="startdate" type="text" readonly="readonly" /><em title="$i18n.getString( 'required' )" class="required">*</em>
<script type="text/javascript">
$(document).ready(function(){
$("#startdate").datepicker({
dateFormat:"$encoder.jsEscape($i18n.getString( 'i18n_date_format' ) , "'")"
});
});
</script>
</td>
</tr>
<tr>
<td>$i18n.getString('end_date')</td>
<td>
<input id="enddate" name="enddate" type="text" readonly="readonly"/><em title="$i18n.getString( 'required' )" class="required">*</em>
<script type="text/javascript">
$(document).ready(function(){
$("#enddate").datepicker({
dateFormat:"$encoder.jsEscape($i18n.getString( 'i18n_date_format' ) , "'")"
});
});
</script>
</td>
</tr>
<tr>
<td>$i18n.getString('column')</td>
<td>
<input id="column" name="column" type="text"/><em title="$i18n.getString( 'required' )" class="required">*</em>
</td>
</tr>
<tr style="height:50px">
<td></td>
<td>
<input type="button" id="action" value="$i18n.getString('save')" style="width:100px"/>
<input type="button" value="$i18n.getString('cancel')" style="width:100px" onclick="hideById('periodColumn');deleteDivEffect();"/>
</td>
</tr>
</table>
</div>
</form>
<script>
var i18n_startdate_null = "$encoder.jsEscape($i18n.getString( 'startdate_null' ) , "'")";
var i18n_enddate_null = "$encoder.jsEscape($i18n.getString( 'enddate_null' ) , "'")";
var i18n_column_is_null = "$encoder.jsEscape($i18n.getString( 'column_is_null' ) , "'")";
var i18n_confirm_delete = '$encoder.jsEscape($i18n.getString( 'confirm_delete' ) , "'")';
</script>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportItems.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportItems.vm 2010-02-23 04:26:05 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportItems.vm 2010-02-24 17:47:59 +0000
@@ -1,4 +1,4 @@
-<h2>$!encoder.htmlEncode($!reportExcel.name)</h2>
+<h3>$!encoder.htmlEncode($!reportExcel.name)</h3>
<div id="tooltip"></div>
<table width="100%">
<tr style="vertical-align:bottom;">
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportparams.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportparams.vm 2009-12-17 02:15:50 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportparams.vm 2010-02-24 17:47:59 +0000
@@ -1,4 +1,4 @@
-<h2>$i18n.getString( "generate_report" )</h2>
+<h3>$i18n.getString( "generate_report" )</h3>
<table>
<tr>
<td><label>$i18n.getString('organisation')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reports.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reports.vm 2010-02-23 04:26:05 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reports.vm 2010-02-24 17:47:59 +0000
@@ -1,4 +1,4 @@
-<h2>$i18n.getString('reports')</h2>
+<h3>$i18n.getString('reports')</h3>
<table width=100%>
<tr>
<td>
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/sortDataElements.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/sortDataElements.vm 2009-12-11 04:27:39 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/sortDataElements.vm 2010-02-24 17:47:59 +0000
@@ -1,4 +1,4 @@
-<h2>$i18n.getString( "sort_dataelement" )</h2>
+<h3>$i18n.getString( "sort_dataelement" )</h3>
<form action="updateSortedDataElements.action" method="POST">
<input type="hidden" value="$dataElementGroupOrder.id" name="id"/>
<table>
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/sortDataElementsForCategory.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/sortDataElementsForCategory.vm 2009-11-10 06:39:31 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/sortDataElementsForCategory.vm 2010-02-24 17:47:59 +0000
@@ -1,4 +1,4 @@
- <h2>$i18n.getString( "sort_dataelement" )</h2>
+<h3>$i18n.getString( "sort_dataelement" )</h3>
<input type="hidden" id="dataElementGroupOrderId" name="dataElementGroupOrderId" value="$dataElementGroupOrder.id">
<table>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/updateDataStatus.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/updateDataStatus.vm 2009-12-04 07:40:29 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/updateDataStatus.vm 2010-02-24 17:47:59 +0000
@@ -1,4 +1,4 @@
-<h2>$i18n.getString( "edit" ) $i18n.getString( "dataset_completed_report" )</h2>
+<h3>$i18n.getString( "edit" ) $i18n.getString( "dataset_completed_report" )</h3>
<table>
<tr>
