=== modified file 'dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetExportStatusAction.java'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetExportStatusAction.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetExportStatusAction.java	2010-09-25 20:13:04 +0000
@@ -85,23 +85,19 @@
 
     public String execute() 
         throws Exception
-    {
-    	
-    	
+    {    	
         if ( processIsRunning( PROCESS_KEY_DATAMART ) )
         {
             String id = getCurrentRunningProcess( PROCESS_KEY_DATAMART );
             
             ProcessExecutor executor = processCoordinator.getProcess( id );  
             
-            
             if ( executor != null && executor.getProcess() != null && executor.getState() != null && executor.getState() instanceof MessageState )
             {
                 MessageState state = (MessageState) executor.getState();         
                              
                 message = i18n.getString( state.getMessage() );              
                 
-                
                 if ( state.isEnded() || state.isCancelled() )
                 {
                     processCoordinator.removeCancelledOrEndedProcess( id );

=== modified file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/exportStatus.vm'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/exportStatus.vm	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/exportStatus.vm	2010-09-25 20:13:04 +0000
@@ -5,7 +5,7 @@
 
 <h3>$i18n.getString( "export_to_datamart" )</h3>
 
-<p><input type="button" value='$i18n.getString( "cancel" )' onclick="cancelExport()" style="width:100px"><input
-          type="button" value='$i18n.getString( "back" )' onclick="javascript:window.location.href='getDataMartExports.action'" style="width:100px"></p>
+<p><input type="button" value='$i18n.getString( "cancel" )' onclick="cancelExport()" style="width:100px"/><input
+          type="button" value='$i18n.getString( "back" )' onclick="javascript:window.location.href='getDataMartExports.action'" style="width:100px"/></p>
 
-<span id="message"></span>
+<span id="message"/>

=== modified file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/viewExportForm.vm'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/viewExportForm.vm	2010-09-13 08:15:46 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/viewExportForm.vm	2010-09-25 20:13:04 +0000
@@ -6,18 +6,18 @@
         <td style="vertical-align:top">
 			<table width="100%">
 				<tr>
-                    <td colspan="6" style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='getOptions.action'"></td>
+                    <td colspan="6" style="text-align:right"><input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='getOptions.action'"/></td>
                 </tr>
 			</table>
             <table class="listTable" id="listTable">
-                <col>
-                <col width="20">
-                <col width="20">
-                <col width="20">
-                <col width="20">
-                <col width="20">
+                <col/>
+                <col width="20"/>
+                <col width="20"/>
+                <col width="20"/>
+                <col width="20"/>
+                <col width="20"/>
                 <thead>           
-                           
+                
                 <tr>
                     <th>$i18n.getString( "name" )</th>
                     <th colspan="5" class="{sorter: false}">$i18n.getString( "operations" )</th>
@@ -27,11 +27,11 @@
                 #foreach( $export in $exports )
                 <tr>
                     <td onclick="showDataMartExportDetails( $export.id )">$encoder.htmlEncode( $export.name )</td>
-                    <td style="text-align:center"><a href="exportDataMartExport.action?id=$export.id" title="$i18n.getString( "export" )"><img src="../images/start_process.png" alt="$i18n.getString( "export" )"></a></td>
-                    <td style="text-align:center"><a href="getOptions.action?id=$export.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a></td>
-                    <td style="text-align:center"><a href="javascript:removeDatamartExport( $export.id, '$encoder.jsEncode( $export.name )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a></td>
-                    <td style="text-align:center"><a href="javascript:addToDashboard( '$export.id' )"  title="$i18n.getString( 'add_to_dashboard' )"><img src="../images/add_to_dashboard.png" alt="$i18n.getString( 'add_to_dashboard' )"></a></td>
-                    <td style="text-align:center"><a href="javascript:showDataMartExportDetails( $export.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a></td>
+                    <td style="text-align:center"><a href="exportDataMartExport.action?id=$export.id" title="$i18n.getString( 'export' )"><img src="../images/start_process.png" alt="$i18n.getString( 'export' )"/></a></td>
+                    <td style="text-align:center"><a href="getOptions.action?id=$export.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a></td>
+                    <td style="text-align:center"><a href="javascript:removeDatamartExport( $export.id, '$encoder.jsEncode( $export.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a></td>
+                    <td style="text-align:center"><a href="javascript:addToDashboard( '$export.id' )"  title="$i18n.getString( 'add_to_dashboard' )"><img src="../images/add_to_dashboard.png" alt="$i18n.getString( 'add_to_dashboard' )"/></a></td>
+                    <td style="text-align:center"><a href="javascript:showDataMartExportDetails( $export.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"/></a></td>
                 </tr>
                 #end
                 </tbody>
@@ -42,7 +42,7 @@
 
             <div id="detailsArea" style="display:none">
                 <div style="float:right">
-                    <a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
+                    <a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"/></a>
                 </div>
                 <p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
                 <p><label>$i18n.getString( "number_of_data_elements" ):</label><br><span id="dataElementField"></span></p>
@@ -56,9 +56,12 @@
 </table>
 
 <script type="text/javascript">
+
     var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_mart_export" ) , "'")';
     var i18n_confirm_add_to_dashboard = '$encoder.jsEscape( $i18n.getString( "confirm_add_to_dashboard" ) , "'")';
+	
 	jQuery(document).ready(function(){	
 		tableSorter( 'listTable' );	
 	});
+	
 </script>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addSqlViewForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addSqlViewForm.vm	2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addSqlViewForm.vm	2010-09-25 20:13:04 +0000
@@ -109,7 +109,7 @@
 	<br/>
 </div>
 
-<span id="message"/>
+<span id="message"></span>
 
 <script type="text/javascript">
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataArchiveForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataArchiveForm.vm	2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataArchiveForm.vm	2010-09-25 20:13:04 +0000
@@ -51,7 +51,7 @@
 
 <br/>
 
-<span id="message"/>
+<span id="message"></span>
 
 <script type="text/javascript">
     var i18n_archiving = '$encoder.jsEscape( $i18n.getString( "archiving" ) , "'")';

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addExtendedDataElementForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addExtendedDataElementForm.vm	2010-09-20 10:52:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addExtendedDataElementForm.vm	2010-09-25 20:13:04 +0000
@@ -232,7 +232,7 @@
 
 </form>
 
-<span id="message"/>
+<span id="message"></span>
 
 <script type="text/javascript">
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm	2010-09-20 10:52:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm	2010-09-25 20:13:04 +0000
@@ -67,7 +67,7 @@
 
 </form>
 
-<span id="message"/>
+<span id="message"></span>
 
 <script type="text/javascript">
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm	2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm	2010-09-25 20:13:04 +0000
@@ -119,4 +119,4 @@
   </table>
 </form>
 
-<span id="message"/>
+<span id="message"></span>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm	2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm	2010-09-25 20:13:04 +0000
@@ -103,7 +103,7 @@
 
       <tr>
         <td colspan="3">
-          <span id="message"/>
+          <span id="message"></span>
         </td>
       </tr>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editCustomValues.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editCustomValues.vm	2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editCustomValues.vm	2010-09-25 20:13:04 +0000
@@ -742,5 +742,5 @@
 </tbody>
 </table>                                  
 
-<span id="message"/>
+<span id="message"></span>
 <input type="hidden" name="dataSetIdField" id="dataSetIdField" value="$dataSet.id"/>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm	2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm	2010-09-25 20:13:04 +0000
@@ -128,4 +128,4 @@
   </table>
 </form>
 
-<span id="message"/>
+<span id="message"></span>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm	2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm	2010-09-25 20:13:04 +0000
@@ -111,7 +111,7 @@
 
       <tr>
         <td colspan="3">
-          <p><span id="message"/></p>
+          <p><span id="message"></span></p>
         </td>
       </tr>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm	2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm	2010-09-25 20:13:04 +0000
@@ -113,7 +113,7 @@
 	<p><span id="warningField"></span></p>
 </div>
 
-<span id="message" style="top:100px;right:5px;position:fixed;width:200px;z-index:10002" onclick="hideById(this.id);"/>
+<span id="message" style="top:100px;right:5px;position:fixed;width:200px;z-index:10002" onclick="hideById(this.id);"></span>
 
 <script type="text/javascript">
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/hierarchyOperations.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/hierarchyOperations.vm	2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/hierarchyOperations.vm	2010-09-25 20:13:04 +0000
@@ -44,7 +44,7 @@
 	</tr>
 </table>
 
-<p><span id="message"/></p>
+<p><span id="message"></span></p>
 
 </form>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm	2010-09-23 09:32:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm	2010-09-25 20:13:04 +0000
@@ -81,7 +81,7 @@
   </table>
 </form>
 
-<span id="message"/>
+<span id="message"></span>
 
 <script type="text/javascript">
 	var i18n_adding_role_failed = '$encoder.jsEscape( $i18n.getString( "adding_role_failed" ) , "'")';

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/deleteCurrentUser.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/deleteCurrentUser.vm	2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/deleteCurrentUser.vm	2010-09-25 20:13:04 +0000
@@ -18,7 +18,7 @@
 		
 	<tr>
 		<td colspan="4" height="10">
-			<span id="message"/>
+			<span id="message"></span>
 		</td>
 	</tr>
 	<tr>