=== removed directory 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/zerovaluestorage'
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/zerovaluestorage/OpenDataElementsZeroIsSignificantManagerAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/zerovaluestorage/OpenDataElementsZeroIsSignificantManagerAction.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/zerovaluestorage/OpenDataElementsZeroIsSignificantManagerAction.java	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-package org.hisp.dhis.dataadmin.action.zerovaluestorage;
-
-/*
- * Copyright (c) 2004-2013, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Tran Thanh Tri
- */
-public class OpenDataElementsZeroIsSignificantManagerAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private DataElementService dataElementService;
-
-    public void setDataElementService( DataElementService dataElementService )
-    {
-        this.dataElementService = dataElementService;
-    }
-
-    // -------------------------------------------------------------------------
-    // Output
-    // -------------------------------------------------------------------------
-
-    private List<DataElement> zeroDataValueElements;
-
-    public List<DataElement> getZeroDataValueElements()
-    {
-        return zeroDataValueElements;
-    }
-
-    @Override
-    public String execute()
-        throws Exception
-    {
-        zeroDataValueElements = new ArrayList<DataElement>( dataElementService
-            .getDataElementsByZeroIsSignificant( true ) );
-
-        Collections.sort( zeroDataValueElements, IdentifiableObjectNameComparator.INSTANCE );
-
-        return SUCCESS;
-    }
-
-}

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/zerovaluestorage/UpdateZeroIsSignificantForDataElementsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/zerovaluestorage/UpdateZeroIsSignificantForDataElementsAction.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/zerovaluestorage/UpdateZeroIsSignificantForDataElementsAction.java	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-package org.hisp.dhis.dataadmin.action.zerovaluestorage;
-
-/*
- * Copyright (c) 2004-2013, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hisp.dhis.dataelement.DataElementService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Tran Thanh Tri
- * @version $Id$
- */
-
-public class UpdateZeroIsSignificantForDataElementsAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private DataElementService dataElementService;
-
-    public void setDataElementService( DataElementService dataElementService )
-    {
-        this.dataElementService = dataElementService;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-
-    private List<Integer> zeroDataValueElements = new ArrayList<Integer>();
-
-    public void setZeroDataValueElements( List<Integer> zeroDataValueElements )
-    {
-        this.zeroDataValueElements = zeroDataValueElements;
-    }
-
-    @Override
-    public String execute()
-        throws Exception
-    {
-        dataElementService.setZeroIsSignificantForDataElements( zeroDataValueElements );
-        
-        
-
-        return SUCCESS;
-    }
-}

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml	2013-10-01 16:44:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml	2013-10-03 09:11:19 +0000
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
+  xsi:schemaLocation="
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!-- Maintenance -->
 
   <bean id="org.hisp.dhis.dataadmin.action.maintenance.PerformMaintenanceAction"
-      class="org.hisp.dhis.dataadmin.action.maintenance.PerformMaintenanceAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.maintenance.PerformMaintenanceAction"
+    scope="prototype">
     <property name="maintenanceService" ref="org.hisp.dhis.maintenance.MaintenanceService" />
     <property name="completenessService" ref="compulsoryDataCompletenessService" />
     <property name="aggregatedDataValueService" ref="org.hisp.dhis.aggregation.AggregatedDataValueService" />
-	<property name="dataMartManager" ref="org.hisp.dhis.datamart.DataMartManager" />
+    <property name="dataMartManager" ref="org.hisp.dhis.datamart.DataMartManager" />
     <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
     <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
     <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
@@ -20,30 +20,30 @@
   <!-- Cache -->
 
   <bean id="org.hisp.dhis.dataadmin.action.cache.ShowCacheAction"
-      class="org.hisp.dhis.dataadmin.action.cache.ShowCacheAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.cache.ShowCacheAction"
+    scope="prototype">
     <property name="cacheManager" ref="cacheManager" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.cache.ClearCacheAction"
-      class="org.hisp.dhis.dataadmin.action.cache.ClearCacheAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.cache.ClearCacheAction"
+    scope="prototype">
     <property name="cacheManager" ref="cacheManager" />
   </bean>
 
   <!-- Data integrity -->
 
   <bean id="org.hisp.dhis.dataadmin.action.dataintegrity.GetDataIntegrityAction"
-      class="org.hisp.dhis.dataadmin.action.dataintegrity.GetDataIntegrityAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.dataintegrity.GetDataIntegrityAction"
+    scope="prototype">
     <property name="dataIntegrityService" ref="org.hisp.dhis.dataintegrity.DataIntegrityService" />
   </bean>
 
   <!-- Statistics -->
 
   <bean id="org.hisp.dhis.dataadmin.action.statistics.GetStatisticsAction"
-      class="org.hisp.dhis.dataadmin.action.statistics.GetStatisticsAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.statistics.GetStatisticsAction"
+    scope="prototype">
     <property name="statisticsProvider" ref="org.hisp.dhis.statistics.StatisticsProvider" />
     <property name="userService" ref="org.hisp.dhis.user.UserService" />
     <property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
@@ -52,8 +52,8 @@
   <!-- Databrowser Grid -->
 
   <bean id="org.hisp.dhis.dataadmin.action.databrowser.DataBrowserAction"
-      class="org.hisp.dhis.dataadmin.action.databrowser.DataBrowserAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.databrowser.DataBrowserAction"
+    scope="prototype">
     <property name="dataBrowserGridService" ref="org.hisp.dhis.databrowser.DataBrowserGridService" />
     <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
     <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
@@ -64,20 +64,20 @@
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.databrowser.GetPeriodTypesAction"
-      class="org.hisp.dhis.dataadmin.action.databrowser.GetPeriodTypesAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.databrowser.GetPeriodTypesAction"
+    scope="prototype">
     <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.databrowser.ExportResultAction"
-      class="org.hisp.dhis.dataadmin.action.databrowser.ExportResultAction"
-      scope="prototype" />
+    class="org.hisp.dhis.dataadmin.action.databrowser.ExportResultAction"
+    scope="prototype" />
 
   <!-- Organisation unit merge -->
 
   <bean id="org.hisp.dhis.dataadmin.action.organisationunitmerge.MergeOrganisationUnitsAction"
-      class="org.hisp.dhis.dataadmin.action.organisationunitmerge.MergeOrganisationUnitsAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.organisationunitmerge.MergeOrganisationUnitsAction"
+    scope="prototype">
     <property name="dataMergeService" ref="org.hisp.dhis.datamerge.DataMergeService" />
     <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
   </bean>
@@ -85,189 +85,176 @@
   <!-- I18nLocale -->
 
   <bean id="org.hisp.dhis.dataadmin.action.locale.GetLocaleListAction"
-      class="org.hisp.dhis.dataadmin.action.locale.GetLocaleListAction"
-      scope="prototype" />
-  
+    class="org.hisp.dhis.dataadmin.action.locale.GetLocaleListAction"
+    scope="prototype" />
+
   <bean id="org.hisp.dhis.dataadmin.action.locale.GetLocaleAction"
-      class="org.hisp.dhis.dataadmin.action.locale.GetLocaleAction" 
-      scope="prototype" />
-	
+    class="org.hisp.dhis.dataadmin.action.locale.GetLocaleAction"
+    scope="prototype" />
+
   <bean id="org.hisp.dhis.dataadmin.action.locale.AddLocaleAction"
-		class="org.hisp.dhis.dataadmin.action.locale.AddLocaleAction"
-	 scope="prototype" />	
-		
+    class="org.hisp.dhis.dataadmin.action.locale.AddLocaleAction"
+    scope="prototype" />
+
   <bean id="org.hisp.dhis.dataadmin.action.locale.RemoveLocaleAction"
-		class="org.hisp.dhis.dataadmin.action.locale.RemoveLocaleAction"
-		scope="prototype" />
-			
+    class="org.hisp.dhis.dataadmin.action.locale.RemoveLocaleAction"
+    scope="prototype" />
+
   <bean id="org.hisp.dhis.dataadmin.action.locale.ShowAddLocaleFormAction"
-		class="org.hisp.dhis.dataadmin.action.locale.ShowAddLocaleFormAction"
-		scope="prototype" />
-		
+    class="org.hisp.dhis.dataadmin.action.locale.ShowAddLocaleFormAction"
+    scope="prototype" />
+
   <bean id="org.hisp.dhis.dataadmin.action.locale.ValidateLocaleAction"
-      class="org.hisp.dhis.dataadmin.action.locale.ValidateLocaleAction"
-      scope="prototype" />  
-  
+    class="org.hisp.dhis.dataadmin.action.locale.ValidateLocaleAction"
+    scope="prototype" />
+
   <!-- Duplicate data elimination -->
 
   <bean id="org.hisp.dhis.dataadmin.action.duplicatedataelimination.EliminateDuplicateDataAction"
-      class="org.hisp.dhis.dataadmin.action.duplicatedataelimination.EliminateDuplicateDataAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.duplicatedataelimination.EliminateDuplicateDataAction"
+    scope="prototype">
     <property name="dataMergeService" ref="org.hisp.dhis.datamerge.DataMergeService" />
     <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
     <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
   </bean>
 
-  <!-- Data Element Zero Value Storage Management -->
-  <bean id="org.hisp.dhis.dataadmin.action.zerovaluestorage.OpenDataElementsZeroIsSignificantManagerAction"
-      class="org.hisp.dhis.dataadmin.action.zerovaluestorage.OpenDataElementsZeroIsSignificantManagerAction"
-      scope="prototype">
-    <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
-  </bean>
-
-  <bean id="org.hisp.dhis.dataadmin.action.zerovaluestorage.UpdateZeroIsSignificantForDataElementsAction"
-      class="org.hisp.dhis.dataadmin.action.zerovaluestorage.UpdateZeroIsSignificantForDataElementsAction"
-      scope="prototype">
-    <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
-  </bean>
-
   <!-- Min/Max validation -->
 
   <bean id="org.hisp.dhis.dataadmin.action.minmaxvalidation.GetMinMaxValidationParamsAction"
-      class="org.hisp.dhis.dataadmin.action.minmaxvalidation.GetMinMaxValidationParamsAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.minmaxvalidation.GetMinMaxValidationParamsAction"
+    scope="prototype">
     <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.minmaxvalidation.GenerateMinMaxValuesAction"
-      class="org.hisp.dhis.dataadmin.action.minmaxvalidation.GenerateMinMaxValuesAction">
+    class="org.hisp.dhis.dataadmin.action.minmaxvalidation.GenerateMinMaxValuesAction">
     <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
     <property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
     <property name="selectionTreeManager" ref="org.hisp.dhis.oust.manager.SelectionTreeManager" />
-	<property name="dataAnalysisService" ref="org.hisp.dhis.dataanalysis.MinMaxOutlierAnalysisService" />
+    <property name="dataAnalysisService" ref="org.hisp.dhis.dataanalysis.MinMaxOutlierAnalysisService" />
     <property name="minMaxDataElementService" ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
-	<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+    <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
   </bean>
 
   <!-- Sql View -->
 
   <bean id="org.hisp.dhis.dataadmin.action.sqlview.GetSqlViewObjectAction"
-      class="org.hisp.dhis.dataadmin.action.sqlview.GetSqlViewObjectAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.sqlview.GetSqlViewObjectAction"
+    scope="prototype">
     <property name="sqlViewService" ref="org.hisp.dhis.sqlview.SqlViewService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.sqlview.GetSqlViewListAction"
-      class="org.hisp.dhis.dataadmin.action.sqlview.GetSqlViewListAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.sqlview.GetSqlViewListAction"
+    scope="prototype">
     <property name="sqlViewService" ref="org.hisp.dhis.sqlview.SqlViewService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.sqlview.ValidateAddUpdateSqlViewAction"
-      class="org.hisp.dhis.dataadmin.action.sqlview.ValidateAddUpdateSqlViewAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.sqlview.ValidateAddUpdateSqlViewAction"
+    scope="prototype">
     <property name="sqlViewService" ref="org.hisp.dhis.sqlview.SqlViewService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.sqlview.AddSqlViewAction"
-      class="org.hisp.dhis.dataadmin.action.sqlview.AddSqlViewAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.sqlview.AddSqlViewAction"
+    scope="prototype">
     <property name="sqlViewService" ref="org.hisp.dhis.sqlview.SqlViewService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.sqlview.UpdateSqlViewAction"
-      class="org.hisp.dhis.dataadmin.action.sqlview.UpdateSqlViewAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.sqlview.UpdateSqlViewAction"
+    scope="prototype">
     <property name="sqlViewService" ref="org.hisp.dhis.sqlview.SqlViewService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.sqlview.RemoveSqlViewAction"
-      class="org.hisp.dhis.dataadmin.action.sqlview.RemoveSqlViewAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.sqlview.RemoveSqlViewAction"
+    scope="prototype">
     <property name="sqlViewService" ref="org.hisp.dhis.sqlview.SqlViewService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.sqlview.ExecuteSqlViewQueryAction"
-      class="org.hisp.dhis.dataadmin.action.sqlview.ExecuteSqlViewQueryAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.sqlview.ExecuteSqlViewQueryAction"
+    scope="prototype">
     <property name="sqlViewService" ref="org.hisp.dhis.sqlview.SqlViewService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.sqlview.CheckViewTableExistenceAction"
-      class="org.hisp.dhis.dataadmin.action.sqlview.CheckViewTableExistenceAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.sqlview.CheckViewTableExistenceAction"
+    scope="prototype">
     <property name="sqlViewService" ref="org.hisp.dhis.sqlview.SqlViewService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.sqlview.ExportSqlViewResultAction"
-      class="org.hisp.dhis.dataadmin.action.sqlview.ExportSqlViewResultAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.sqlview.ExportSqlViewResultAction"
+    scope="prototype">
     <property name="sqlViewService" ref="org.hisp.dhis.sqlview.SqlViewService" />
   </bean>
 
   <!-- Constant Name -->
 
   <bean id="org.hisp.dhis.dataadmin.action.constant.AddConstantAction"
-      class="org.hisp.dhis.dataadmin.action.constant.AddConstantAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.constant.AddConstantAction"
+    scope="prototype">
     <property name="constantService" ref="org.hisp.dhis.constant.ConstantService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.constant.UpdateConstantAction"
-      class="org.hisp.dhis.dataadmin.action.constant.UpdateConstantAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.constant.UpdateConstantAction"
+    scope="prototype">
     <property name="constantService" ref="org.hisp.dhis.constant.ConstantService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.constant.ValidateConstantAction"
-      class="org.hisp.dhis.dataadmin.action.constant.ValidateConstantAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.constant.ValidateConstantAction"
+    scope="prototype">
     <property name="constantService" ref="org.hisp.dhis.constant.ConstantService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.constant.RemoveConstantAction"
-      class="org.hisp.dhis.dataadmin.action.constant.RemoveConstantAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.constant.RemoveConstantAction"
+    scope="prototype">
     <property name="constantService" ref="org.hisp.dhis.constant.ConstantService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.constant.GetConstantAction"
-      class="org.hisp.dhis.dataadmin.action.constant.GetConstantAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.constant.GetConstantAction"
+    scope="prototype">
     <property name="constantService" ref="org.hisp.dhis.constant.ConstantService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.constant.GetConstantListAction"
-      class="org.hisp.dhis.dataadmin.action.constant.GetConstantListAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.constant.GetConstantListAction"
+    scope="prototype">
     <property name="constantService" ref="org.hisp.dhis.constant.ConstantService" />
   </bean>
 
   <!-- DataSet LockExceptions -->
 
   <bean id="org.hisp.dhis.dataadmin.action.lockexception.GetLockExceptionListAction"
-      class="org.hisp.dhis.dataadmin.action.lockexception.GetLockExceptionListAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.lockexception.GetLockExceptionListAction"
+    scope="prototype">
     <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.lockexception.AddLockExceptionAction"
-      class="org.hisp.dhis.dataadmin.action.lockexception.AddLockExceptionAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.lockexception.AddLockExceptionAction"
+    scope="prototype">
     <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
     <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
     <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.lockexception.GetLockExceptionAction"
-      class="org.hisp.dhis.dataadmin.action.lockexception.GetLockExceptionAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.lockexception.GetLockExceptionAction"
+    scope="prototype">
     <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.lockexception.GetLockExceptionFormAction"
-      class="org.hisp.dhis.dataadmin.action.lockexception.GetLockExceptionFormAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.lockexception.GetLockExceptionFormAction"
+    scope="prototype">
     <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
     <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
     <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
@@ -275,32 +262,32 @@
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.lockexception.RemoveLockExceptionAction"
-      class="org.hisp.dhis.dataadmin.action.lockexception.RemoveLockExceptionAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.lockexception.RemoveLockExceptionAction"
+    scope="prototype">
     <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.lockexception.GetDataSetsAction"
-      class="org.hisp.dhis.dataadmin.action.lockexception.GetDataSetsAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.lockexception.GetDataSetsAction"
+    scope="prototype">
     <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
     <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.lockexception.GetPeriodsAction"
-      class="org.hisp.dhis.dataadmin.action.lockexception.GetPeriodsAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.lockexception.GetPeriodsAction"
+    scope="prototype">
     <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.lockexception.PrepareBatchRemovalAction"
-      class="org.hisp.dhis.dataadmin.action.lockexception.PrepareBatchRemovalAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.lockexception.PrepareBatchRemovalAction"
+    scope="prototype">
     <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.lockexception.BatchRemoveLockExceptionsAction"
-      class="org.hisp.dhis.dataadmin.action.lockexception.BatchRemoveLockExceptionsAction" scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.lockexception.BatchRemoveLockExceptionsAction" scope="prototype">
     <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
     <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
   </bean>
@@ -308,58 +295,58 @@
   <!-- Dynamic Attributes -->
 
   <bean id="org.hisp.dhis.dataadmin.action.attribute.GetAttributeListAction"
-      class="org.hisp.dhis.dataadmin.action.attribute.GetAttributeListAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.attribute.GetAttributeListAction"
+    scope="prototype">
     <property name="attributeService" ref="org.hisp.dhis.attribute.AttributeService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.attribute.GetAttributeListSortOrderAction"
-      class="org.hisp.dhis.dataadmin.action.attribute.GetAttributeListSortOrderAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.attribute.GetAttributeListSortOrderAction"
+    scope="prototype">
     <property name="attributeService" ref="org.hisp.dhis.attribute.AttributeService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.attribute.GetAttributeAction"
-      class="org.hisp.dhis.dataadmin.action.attribute.GetAttributeAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.attribute.GetAttributeAction"
+    scope="prototype">
     <property name="attributeService" ref="org.hisp.dhis.attribute.AttributeService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.attribute.ValidateAttributeAction"
-      class="org.hisp.dhis.dataadmin.action.attribute.ValidateAttributeAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.attribute.ValidateAttributeAction"
+    scope="prototype">
     <property name="attributeService" ref="org.hisp.dhis.attribute.AttributeService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.attribute.AddAttributeAction"
-      class="org.hisp.dhis.dataadmin.action.attribute.AddAttributeAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.attribute.AddAttributeAction"
+    scope="prototype">
     <property name="attributeService" ref="org.hisp.dhis.attribute.AttributeService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.attribute.SaveAttributeSortOrderAction"
-      class="org.hisp.dhis.dataadmin.action.attribute.SaveAttributeSortOrderAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.attribute.SaveAttributeSortOrderAction"
+    scope="prototype">
     <property name="attributeService" ref="org.hisp.dhis.attribute.AttributeService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.attribute.UpdateAttributeAction"
-      class="org.hisp.dhis.dataadmin.action.attribute.UpdateAttributeAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.attribute.UpdateAttributeAction"
+    scope="prototype">
     <property name="attributeService" ref="org.hisp.dhis.attribute.AttributeService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.attribute.RemoveAttributeAction"
-      class="org.hisp.dhis.dataadmin.action.attribute.RemoveAttributeAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.attribute.RemoveAttributeAction"
+    scope="prototype">
     <property name="attributeService" ref="org.hisp.dhis.attribute.AttributeService" />
   </bean>
 
   <!-- Scheduling -->
 
   <bean id="org.hisp.dhis.dataadmin.action.scheduling.ScheduleTasksAction"
-      class="org.hisp.dhis.dataadmin.action.scheduling.ScheduleTasksAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.scheduling.ScheduleTasksAction"
+    scope="prototype">
     <property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
     <property name="schedulingManager" ref="org.hisp.dhis.scheduling.SchedulingManager" />
     <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
@@ -368,38 +355,38 @@
   <!-- OptionSet -->
 
   <bean id="org.hisp.dhis.dataadmin.action.option.GetOptionSetListAction"
-      class="org.hisp.dhis.dataadmin.action.option.GetOptionSetListAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.option.GetOptionSetListAction"
+    scope="prototype">
     <property name="optionService" ref="org.hisp.dhis.option.OptionService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.option.AddOptionSetAction"
-      class="org.hisp.dhis.dataadmin.action.option.AddOptionSetAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.option.AddOptionSetAction"
+    scope="prototype">
     <property name="optionService" ref="org.hisp.dhis.option.OptionService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.option.UpdateOptionSetAction"
-      class="org.hisp.dhis.dataadmin.action.option.UpdateOptionSetAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.option.UpdateOptionSetAction"
+    scope="prototype">
     <property name="optionService" ref="org.hisp.dhis.option.OptionService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.option.RemoveOptionSetAction"
-      class="org.hisp.dhis.dataadmin.action.option.RemoveOptionSetAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.option.RemoveOptionSetAction"
+    scope="prototype">
     <property name="optionService" ref="org.hisp.dhis.option.OptionService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.option.GetOptionSetAction"
-      class="org.hisp.dhis.dataadmin.action.option.GetOptionSetAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.option.GetOptionSetAction"
+    scope="prototype">
     <property name="optionService" ref="org.hisp.dhis.option.OptionService" />
   </bean>
 
   <bean id="org.hisp.dhis.dataadmin.action.option.ValidateOptionSetAction"
-      class="org.hisp.dhis.dataadmin.action.option.ValidateOptionSetAction"
-      scope="prototype">
+    class="org.hisp.dhis.dataadmin.action.option.ValidateOptionSetAction"
+    scope="prototype">
     <property name="optionService" ref="org.hisp.dhis.option.OptionService" />
   </bean>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2013-10-01 16:47:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2013-10-03 09:11:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE struts PUBLIC
-"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-"http://struts.apache.org/dtds/struts-2.0.dtd">
+  "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+  "http://struts.apache.org/dtds/struts-2.0.dtd">
 <struts>
 
   <include file="dhis-web-commons.xml" />
@@ -19,10 +19,11 @@
     <action name="displayMaintenanceForm" class="org.hisp.dhis.dataadmin.action.NoAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">
-        /dhis-web-maintenance-dataadmin/maintenanceForm.vm</param>
+        /dhis-web-maintenance-dataadmin/maintenanceForm.vm
+      </param>
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
       <param name="javascripts">javascript/maintenance.js</param>
-	  <param name="requiredAuthorities">F_PERFORM_MAINTENANCE</param>
+      <param name="requiredAuthorities">F_PERFORM_MAINTENANCE</param>
     </action>
 
     <action name="performMaintenance" class="org.hisp.dhis.dataadmin.action.maintenance.PerformMaintenanceAction">
@@ -30,7 +31,7 @@
         /dhis-web-maintenance-dataadmin/responseSuccess.vm
       </result>
       <param name="onExceptionReturn">plainTextError</param>
-	  <param name="requiredAuthorities">F_PERFORM_MAINTENANCE</param>
+      <param name="requiredAuthorities">F_PERFORM_MAINTENANCE</param>
     </action>
 
     <!-- Resource table -->
@@ -38,75 +39,76 @@
     <action name="displayResourceTableForm" class="org.hisp.dhis.dataadmin.action.NoAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">
-        /dhis-web-maintenance-dataadmin/resourceTableForm.vm</param>
+        /dhis-web-maintenance-dataadmin/resourceTableForm.vm
+      </param>
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
       <param name="javascripts">javascript/resourceTable.js</param>
-	  <param name="requiredAuthorities">F_PERFORM_MAINTENANCE</param>
+      <param name="requiredAuthorities">F_PERFORM_MAINTENANCE</param>
     </action>
 
     <action name="generateResourceTable" class="org.hisp.dhis.dataadmin.action.resourcetable.GenerateResourceTableAction">
       <result name="success" type="velocity-xml">/dhis-web-maintenance-dataadmin/responseSuccess.vm</result>
-	  <param name="requiredAuthorities">F_PERFORM_MAINTENANCE</param>
-    </action>
-
-	<!-- Locale -->
-
-	<action name="locale"
-		class="org.hisp.dhis.dataadmin.action.locale.GetLocaleListAction">
-		<result name="success" type="velocity">/main.vm</result>
-		<param name="page">/dhis-web-maintenance-dataadmin/localeList.vm</param>
-		<param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
-		 <param name="requiredAuthorities">F_LOCALE_MANAGEMENT</param>
-	</action>
-
-
-	<action name="getLocale"
-		class="org.hisp.dhis.dataadmin.action.locale.GetLocaleAction">
-		<result name="success" type="velocity-json">
-			/dhis-web-maintenance-dataadmin/jsonLocale.vm
-		</result>
-		<param name="onExceptionReturn">plainTextError</param>
-	</action>
-
-
-	<action name="removeLocale"
-		class="org.hisp.dhis.dataadmin.action.locale.RemoveLocaleAction">
-		<result name="success" type="velocity-json">
-			/dhis-web-commons/ajax/jsonResponseSuccess.vm
-		</result>
-		<result name="error" type="velocity-json">
-			/dhis-web-commons/ajax/jsonResponseError.vm
-		</result>
-		<param name="requiredAuthorities">F_LOCALE_DELETE</param>
-	</action>
-
-	<action name="addLocale"
-		class="org.hisp.dhis.dataadmin.action.locale.AddLocaleAction">
-		<result name="success" type="redirect">locale.action
-		</result>
-		<param name="requiredAuthorities">F_LOCALE_ADD</param>
-	</action>
-
-	<action name="showAddLocaleForm"
-		class="org.hisp.dhis.dataadmin.action.locale.ShowAddLocaleFormAction">
-		<result name="success" type="velocity">/main.vm</result>
-		<param name="page">/dhis-web-maintenance-dataadmin/addLocaleForm.vm</param>
-		<param name="requiredAuthorities">F_LOCALE_ADD</param>
-	</action>
-
-	<action name="showUpdateLocaleForm"
-		class="org.hisp.dhis.dataadmin.action.locale.ShowUpdateLocaleFormAction">
-		<result name="success" type="velocity">/main.vm</result>
-		<param name="page">/dhis-web-maintenance-dataadmin/updateLocaleForm.vm</param>
-		<param name="requiredAuthorities">F_LOCALE_UPDATE</param>
-	</action>
-
-	<action name="updateLocale"
-		class="org.hisp.dhis.dataadmin.action.locale.UpdateLocaleAction">
-		<result name="success" type="redirect">locale.action
-		</result>
-		<param name="requiredAuthorities">F_LOCALE_UPDATE</param>
-	</action>
+      <param name="requiredAuthorities">F_PERFORM_MAINTENANCE</param>
+    </action>
+
+    <!-- Locale -->
+
+    <action name="locale"
+      class="org.hisp.dhis.dataadmin.action.locale.GetLocaleListAction">
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-maintenance-dataadmin/localeList.vm</param>
+      <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
+      <param name="requiredAuthorities">F_LOCALE_MANAGEMENT</param>
+    </action>
+
+
+    <action name="getLocale"
+      class="org.hisp.dhis.dataadmin.action.locale.GetLocaleAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-maintenance-dataadmin/jsonLocale.vm
+      </result>
+      <param name="onExceptionReturn">plainTextError</param>
+    </action>
+
+
+    <action name="removeLocale"
+      class="org.hisp.dhis.dataadmin.action.locale.RemoveLocaleAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <result name="error" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseError.vm
+      </result>
+      <param name="requiredAuthorities">F_LOCALE_DELETE</param>
+    </action>
+
+    <action name="addLocale"
+      class="org.hisp.dhis.dataadmin.action.locale.AddLocaleAction">
+      <result name="success" type="redirect">locale.action
+      </result>
+      <param name="requiredAuthorities">F_LOCALE_ADD</param>
+    </action>
+
+    <action name="showAddLocaleForm"
+      class="org.hisp.dhis.dataadmin.action.locale.ShowAddLocaleFormAction">
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-maintenance-dataadmin/addLocaleForm.vm</param>
+      <param name="requiredAuthorities">F_LOCALE_ADD</param>
+    </action>
+
+    <action name="showUpdateLocaleForm"
+      class="org.hisp.dhis.dataadmin.action.locale.ShowUpdateLocaleFormAction">
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-maintenance-dataadmin/updateLocaleForm.vm</param>
+      <param name="requiredAuthorities">F_LOCALE_UPDATE</param>
+    </action>
+
+    <action name="updateLocale"
+      class="org.hisp.dhis.dataadmin.action.locale.UpdateLocaleAction">
+      <result name="success" type="redirect">locale.action
+      </result>
+      <param name="requiredAuthorities">F_LOCALE_UPDATE</param>
+    </action>
 
     <action name="validateLocale" class="org.hisp.dhis.dataadmin.action.locale.ValidateLocaleAction">
       <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
@@ -120,12 +122,12 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-dataadmin/showcache.vm</param>
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
-	  <param name="requiredAuthorities">F_PERFORM_MAINTENANCE</param>
+      <param name="requiredAuthorities">F_PERFORM_MAINTENANCE</param>
     </action>
 
     <action name="clearCache" class="org.hisp.dhis.dataadmin.action.cache.ClearCacheAction">
-      <result name="success" type="redirect">showCache.action </result>
-	  <param name="requiredAuthorities">F_PERFORM_MAINTENANCE</param>
+      <result name="success" type="redirect">showCache.action</result>
+      <param name="requiredAuthorities">F_PERFORM_MAINTENANCE</param>
     </action>
 
     <!-- Data integrity -->
@@ -135,27 +137,27 @@
       <param name="page">/dhis-web-maintenance-dataadmin/dataIntegrityForm.vm</param>
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
       <param name="javascripts">javascript/dataIntegrity.js</param>
-	  <param name="requiredAuthorities">F_PERFORM_MAINTENANCE</param>
+      <param name="requiredAuthorities">F_PERFORM_MAINTENANCE</param>
     </action>
 
     <action name="getDataIntegrity" class="org.hisp.dhis.dataadmin.action.dataintegrity.GetDataIntegrityAction">
       <result name="success" type="velocity-json">/dhis-web-maintenance-dataadmin/responseDataIntegrity.vm</result>
-	  <param name="requiredAuthorities">F_PERFORM_MAINTENANCE</param>
+      <param name="requiredAuthorities">F_PERFORM_MAINTENANCE</param>
     </action>
 
     <!-- Statistics -->
 
     <action name="viewStatistics" class="org.hisp.dhis.dataadmin.action.NoAction">
-	  <result name="success" type="velocity">/main.vm</result>
+      <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-dataadmin/viewStatistics.vm</param>
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
       <param name="javascripts">javascript/statistics.js</param>
-	  <param name="requiredAuthorities">F_PERFORM_MAINTENANCE</param>
+      <param name="requiredAuthorities">F_PERFORM_MAINTENANCE</param>
     </action>
 
     <action name="getStatistics" class="org.hisp.dhis.dataadmin.action.statistics.GetStatisticsAction">
       <result name="success" type="velocity">/dhis-web-maintenance-dataadmin/responseStatistics.vm</result>
-	  <param name="requiredAuthorities">F_PERFORM_MAINTENANCE</param>
+      <param name="requiredAuthorities">F_PERFORM_MAINTENANCE</param>
     </action>
 
     <!-- Databrowser -->
@@ -163,11 +165,13 @@
     <action name="displayDataBrowserForm" class="org.hisp.dhis.dataadmin.action.databrowser.GetPeriodTypesAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">
-        /dhis-web-maintenance-dataadmin/dataBrowserForm.vm</param>
+        /dhis-web-maintenance-dataadmin/dataBrowserForm.vm
+      </param>
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
-      <param name="javascripts"> ../dhis-web-commons/oust/oust.js,
+      <param name="javascripts">../dhis-web-commons/oust/oust.js,
         javascript/dataBrowser.js,
-        javascript/dataBrowserForm.js</param>
+        javascript/dataBrowserForm.js
+      </param>
       <param name="requiredAuthorities">F_VIEW_DATABROWSER</param>
     </action>
 
@@ -175,7 +179,8 @@
       <result name="success" type="velocity">/main.vm</result>
       <result name="error" type="velocity">/main.vm</result>
       <param name="page">
-        /dhis-web-maintenance-dataadmin/dataBrowserResult.vm</param>
+        /dhis-web-maintenance-dataadmin/dataBrowserResult.vm
+      </param>
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
       <param name="javascripts">javascript/dataBrowser.js</param>
       <param name="requiredAuthorities">F_VIEW_DATABROWSER</param>
@@ -205,15 +210,16 @@
     <action name="displayOrganisationUnitMergeForm" class="org.hisp.dhis.dataadmin.action.NoAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">
-        /dhis-web-maintenance-dataadmin/organisationUnitMergeForm.vm</param>
+        /dhis-web-maintenance-dataadmin/organisationUnitMergeForm.vm
+      </param>
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
       <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/organisationUnitMerge.js</param>
-	  <param name="requiredAuthorities">F_MERGE_ORGANISATION_UNITS</param>
+      <param name="requiredAuthorities">F_MERGE_ORGANISATION_UNITS</param>
     </action>
 
     <action name="mergeOrganisationUnits" class="org.hisp.dhis.dataadmin.action.organisationunitmerge.MergeOrganisationUnitsAction">
       <result name="success" type="redirect">displayOrganisationUnitMergeForm.action</result>
-	  <param name="requiredAuthorities">F_MERGE_ORGANISATION_UNITS</param>
+      <param name="requiredAuthorities">F_MERGE_ORGANISATION_UNITS</param>
     </action>
 
     <!-- Duplicate data elimination -->
@@ -223,26 +229,12 @@
       <param name="page">/dhis-web-maintenance-dataadmin/duplicateDataEliminationForm.vm</param>
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
       <param name="javascripts">javascript/duplicateDataElimination.js</param>
-	  <param name="requiredAuthorities">F_ELIMINATE_DUPLICATE_DATA_ELEMENTS</param>
+      <param name="requiredAuthorities">F_ELIMINATE_DUPLICATE_DATA_ELEMENTS</param>
     </action>
 
     <action name="eliminateDuplicateData" class="org.hisp.dhis.dataadmin.action.duplicatedataelimination.EliminateDuplicateDataAction">
       <result name="success" type="redirect">displayDuplicateDataEliminationForm.action</result>
-	  <param name="requiredAuthorities">F_ELIMINATE_DUPLICATE_DATA_ELEMENTS</param>
-    </action>
-
-    <!-- Data Element Zero Value Storage Management -->
-
-    <action name="zeroValueStorageManagement" class="org.hisp.dhis.dataadmin.action.zerovaluestorage.OpenDataElementsZeroIsSignificantManagerAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-maintenance-dataadmin/zeroValueStorageManagement.vm</param>
-      <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
-	  <param name="requiredAuthorities">F_PERFORM_MAINTENANCE</param>
-    </action>
-
-    <action name="updateZeroIsSignificantForDataElements" class="org.hisp.dhis.dataadmin.action.zerovaluestorage.UpdateZeroIsSignificantForDataElementsAction">
-      <result name="success" type="redirect">index.action</result>
-	  <param name="requiredAuthorities">F_PERFORM_MAINTENANCE</param>
+      <param name="requiredAuthorities">F_ELIMINATE_DUPLICATE_DATA_ELEMENTS</param>
     </action>
 
     <!-- Data archive -->
@@ -250,20 +242,21 @@
     <action name="displayDataArchiveForm" class="org.hisp.dhis.dataadmin.action.NoAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">
-        /dhis-web-maintenance-dataadmin/dataArchiveForm.vm</param>
+        /dhis-web-maintenance-dataadmin/dataArchiveForm.vm
+      </param>
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
       <param name="javascripts">javascript/dataArchive.js</param>
-	  <param name="requiredAuthorities">F_ARCHIVE_DATA</param>
+      <param name="requiredAuthorities">F_ARCHIVE_DATA</param>
     </action>
 
     <action name="archiveData" class="org.hisp.dhis.dataadmin.action.dataarchive.ArchiveDataAction">
       <result name="success" type="velocity-json">/dhis-web-maintenance-dataadmin/responseNumber.vm</result>
-	  <param name="requiredAuthorities">F_ARCHIVE_DATA</param>
+      <param name="requiredAuthorities">F_ARCHIVE_DATA</param>
     </action>
 
     <action name="getNumberOfOverlaps" class="org.hisp.dhis.dataadmin.action.dataarchive.GetNumberOfOverlapsAction">
       <result name="success" type="velocity-json">/dhis-web-maintenance-dataadmin/responseNumber.vm</result>
-	  <param name="requiredAuthorities">F_ARCHIVE_DATA</param>
+      <param name="requiredAuthorities">F_ARCHIVE_DATA</param>
     </action>
 
     <action name="displayPatientDataArchiveForm" class="org.hisp.dhis.dataadmin.action.NoAction">
@@ -271,17 +264,18 @@
       <param name="page">/dhis-web-maintenance-dataadmin/patientDataArchiveForm.vm</param>
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
       <param name="javascripts">javascript/dataArchive.js</param>
-	  <param name="requiredAuthorities">F_ARCHIVE_DATA</param>
+      <param name="requiredAuthorities">F_ARCHIVE_DATA</param>
     </action>
 
     <action name="archivePatientData" class="org.hisp.dhis.dataadmin.action.dataarchive.ArchivePatientDataAction">
       <result name="success" type="velocity-json">/dhis-web-maintenance-dataadmin/responseNumber.vm</result>
-	  <param name="requiredAuthorities">F_ARCHIVE_DATA</param>
+      <param name="requiredAuthorities">F_ARCHIVE_DATA</param>
     </action>
 
-    <action name="getNumberOfOverlapingPatientValues" class="org.hisp.dhis.dataadmin.action.dataarchive.GetNumberOfOverlapingPatientValuesAction">
+    <action name="getNumberOfOverlapingPatientValues"
+      class="org.hisp.dhis.dataadmin.action.dataarchive.GetNumberOfOverlapingPatientValuesAction">
       <result name="success" type="velocity-json">/dhis-web-maintenance-dataadmin/responseNumber.vm</result>
-	  <param name="requiredAuthorities">F_ARCHIVE_DATA</param>
+      <param name="requiredAuthorities">F_ARCHIVE_DATA</param>
     </action>
 
     <!-- Min/Max validation -->
@@ -289,7 +283,7 @@
     <action name="generateMinMaxValue" class="org.hisp.dhis.dataadmin.action.minmaxvalidation.GenerateMinMaxValuesAction">
       <result name="success" type="velocity-xml">/dhis-web-maintenance-dataadmin/responseSuccess.vm</result>
       <result name="input" type="velocity-xml">/dhis-web-maintenance-dataadmin/responseError.vm</result>
-	  <param name="requiredAuthorities">F_GENERATE_MIN_MAX_VALUES</param>
+      <param name="requiredAuthorities">F_GENERATE_MIN_MAX_VALUES</param>
     </action>
 
     <action name="getMinMaxValidationParams" class="org.hisp.dhis.dataadmin.action.minmaxvalidation.GetMinMaxValidationParamsAction">
@@ -297,7 +291,7 @@
       <param name="page">/dhis-web-maintenance-dataadmin/minMaxValidation.vm</param>
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
       <param name="javascripts">javascript/minMaxValidation.js</param>
-	  <param name="requiredAuthorities">F_GENERATE_MIN_MAX_VALUES</param>
+      <param name="requiredAuthorities">F_GENERATE_MIN_MAX_VALUES</param>
     </action>
 
     <!-- Sql View -->
@@ -330,7 +324,7 @@
       <result name="input" type="velocity-json">
         /dhis-web-commons/ajax/jsonResponseInput.vm
       </result>
-	  <param name="onExceptionReturn">plainTextError</param>
+      <param name="onExceptionReturn">plainTextError</param>
     </action>
 
     <action name="addSqlView" class="org.hisp.dhis.dataadmin.action.sqlview.AddSqlViewAction">
@@ -389,24 +383,26 @@
     </action>
 
     <action name="exportSqlView" class="org.hisp.dhis.dataadmin.action.sqlview.ExportSqlViewResultAction">
-	  <result name="csv" type="gridCsvResult" />
+      <result name="csv" type="gridCsvResult" />
       <result name="xls" type="gridXlsResult" />
       <result name="pdf" type="gridPdfResult" />
       <result name="html" type="velocity">/main.vm</result>
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
       <param name="page">
-        /dhis-web-maintenance-dataadmin/showDataSqlViewForm.vm</param>
+        /dhis-web-maintenance-dataadmin/showDataSqlViewForm.vm
+      </param>
       <param name="javascripts">javascript/sqlView.js</param>
       <param name="requiredAuthorities">F_SQLVIEW_MANAGEMENT</param>
     </action>
 
     <action name="showDataSqlViewByAjax" class="org.hisp.dhis.dataadmin.action.sqlview.ExportSqlViewResultAction">
-	  <result name="csv" type="gridCsvResult" />
+      <result name="csv" type="gridCsvResult" />
       <result name="xls" type="gridXlsResult" />
       <result name="pdf" type="gridPdfResult" />
       <result name="html" type="velocity">/content.vm</result>
       <param name="page">
-        /dhis-web-maintenance-dataadmin/showDataSqlViewGrid.vm</param>
+        /dhis-web-maintenance-dataadmin/showDataSqlViewGrid.vm
+      </param>
       <param name="javascripts">javascript/sqlView.js</param>
       <param name="requiredAuthorities">F_SQLVIEW_MANAGEMENT</param>
     </action>
@@ -415,8 +411,9 @@
 
     <action name="getConstant" class="org.hisp.dhis.dataadmin.action.constant.GetConstantAction">
       <result name="success" type="velocity-json">
-        /dhis-web-maintenance-dataadmin/jsonConstant.vm</result>
-	  <param name="onExceptionReturn">plainTextError</param>
+        /dhis-web-maintenance-dataadmin/jsonConstant.vm
+      </result>
+      <param name="onExceptionReturn">plainTextError</param>
       <param name="requiredAuthorities">F_CONSTANT_MANAGEMENT</param>
     </action>
 
@@ -424,8 +421,9 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
       <param name="page">
-        /dhis-web-maintenance-dataadmin/constant.vm</param>
-	  <param name="javascripts">javascript/constant.js</param>
+        /dhis-web-maintenance-dataadmin/constant.vm
+      </param>
+      <param name="javascripts">javascript/constant.js</param>
       <param name="requiredAuthorities">F_CONSTANT_MANAGEMENT</param>
     </action>
 
@@ -433,7 +431,8 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
       <param name="page">
-        /dhis-web-maintenance-dataadmin/addConstantForm.vm</param>
+        /dhis-web-maintenance-dataadmin/addConstantForm.vm
+      </param>
       <param name="requiredAuthorities">F_CONSTANT_ADD</param>
     </action>
 
@@ -447,7 +446,8 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
       <param name="page">
-        /dhis-web-maintenance-dataadmin/updateConstantForm.vm</param>
+        /dhis-web-maintenance-dataadmin/updateConstantForm.vm
+      </param>
       <param name="requiredAuthorities">F_CONSTANT_ADD</param>
     </action>
 
@@ -584,8 +584,9 @@
 
     <action name="getAttribute" class="org.hisp.dhis.dataadmin.action.attribute.GetAttributeAction">
       <result name="success" type="velocity-json">
-		/dhis-web-maintenance-dataadmin/jsonAttribute.vm</result>
-	  <param name="onExceptionReturn">plainTextError</param>
+        /dhis-web-maintenance-dataadmin/jsonAttribute.vm
+      </result>
+      <param name="onExceptionReturn">plainTextError</param>
     </action>
 
     <action name="validateAttribute" class="org.hisp.dhis.dataadmin.action.attribute.ValidateAttributeAction">
@@ -598,7 +599,7 @@
       <param name="onExceptionReturn">plainTextError</param>
     </action>
 
-	<!-- Scheduling -->
+    <!-- Scheduling -->
 
     <action name="viewScheduledTasks" class="org.hisp.dhis.dataadmin.action.scheduling.ScheduleTasksAction">
       <result name="success" type="velocity">/main.vm</result>
@@ -613,12 +614,12 @@
       <param name="page">/dhis-web-maintenance-dataadmin/viewScheduledTasks.vm</param>
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
       <param name="javascripts">javascript/scheduling.js</param>
-	  <param name="schedule">true</param>
+      <param name="schedule">true</param>
       <param name="requiredAuthorities">F_SCHEDULING_ADMIN</param>
-    </action>	
-	
+    </action>
+
     <!-- OptionSet -->
-  
+
     <action name="optionSet" class="org.hisp.dhis.dataadmin.action.option.GetOptionSetListAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-dataadmin/optionSet.vm</param>
@@ -626,7 +627,7 @@
       <param name="javascripts">javascript/optionSet.js</param>
       <param name="requiredAuthorities">F_OPTIONSET_MANAGEMENT</param>
     </action>
-  
+
     <action name="showAddOptionSetForm" class="org.hisp.dhis.dataadmin.action.NoAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-dataadmin/addOptionSetForm.vm</param>
@@ -638,34 +639,34 @@
       <result name="success" type="redirect">optionSet.action</result>
       <param name="requiredAuthorities">F_OPTIONSET_ADD</param>
     </action>
-   
+
     <action name="showUpdateOptionSetForm" class="org.hisp.dhis.dataadmin.action.option.GetOptionSetAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-dataadmin/updateOptionSetForm.vm</param>
       <param name="javascripts">javascript/optionSet.js</param>
       <param name="requiredAuthorities">F_OPTIONSET_ADD</param>
     </action>
-   
+
     <action name="updateOptionSet" class="org.hisp.dhis.dataadmin.action.option.UpdateOptionSetAction">
       <result name="success" type="redirect">optionSet.action</result>
       <param name="requiredAuthorities">F_OPTIONSET_ADD</param>
     </action>
-    
+
     <action name="removeOptionSet" class="org.hisp.dhis.dataadmin.action.option.RemoveOptionSetAction">
       <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-	  <result name="error" type="velocity-json">/dhis-web-commons/ajax/jsonResponseError.vm</result>
-	  <param name="requiredAuthorities">F_OPTIONSET_DELETE</param>
+      <result name="error" type="velocity-json">/dhis-web-commons/ajax/jsonResponseError.vm</result>
+      <param name="requiredAuthorities">F_OPTIONSET_DELETE</param>
     </action>
-   
+
     <action name="validateOptionSet" class="org.hisp.dhis.dataadmin.action.option.ValidateOptionSetAction">
       <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
       <result name="error" type="velocity-json">/dhis-web-commons/ajax/jsonResponseError.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
     </action>
-	
-	<action name="getOptionSet" class="org.hisp.dhis.dataadmin.action.option.GetOptionSetAction">
+
+    <action name="getOptionSet" class="org.hisp.dhis.dataadmin.action.option.GetOptionSetAction">
       <result name="success" type="velocity-json">/dhis-web-maintenance-dataadmin/jsonOptionSet.vm</result>
     </action>
-   
+
   </package>
 </struts>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/index.vm	2013-08-22 16:02:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/index.vm	2013-10-03 09:11:19 +0000
@@ -11,8 +11,7 @@
     #introListImgItem( "displayDuplicateDataEliminationForm.action" "duplicate_data_elimination" "duplicatedataelimination" )
     #introListImgItem( "viewStatistics.action" "data_statistics" "datastatistics" )
     #introListImgItem( "lockException.action" "lock_exception" "datalocking" )
-    #introListImgItem( "zeroValueStorageManagement.action" "zero_storage_management" "zerovaluestorage" )
-	#introListImgItem( "getMinMaxValidationParams.action" "min_max_value_generation" "minmaxvaluegeneration" ) 
+	#introListImgItem( "getMinMaxValidationParams.action" "min_max_value_generation" "minmaxvaluegeneration" )
     #introListImgItem( "constant.action" "constant" "constant" )
 	#introListImgItem( "optionSet.action" "option_set" "resource" )
     #introListImgItem( "showCache.action" "cache_statistics" "cachestatistics" )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menu.vm	2013-06-19 09:11:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menu.vm	2013-10-03 09:11:19 +0000
@@ -12,7 +12,6 @@
     <li><a href="displayDuplicateDataEliminationForm.action">$i18n.getString( "duplicate_data_elimination" )&nbsp;</a></li>
 	<li><a href="viewStatistics.action">$i18n.getString( "data_statistics" )&nbsp;</a></li>
     <li><a href="lockException.action">$i18n.getString( "lock_exception" )&nbsp;</a></li>
-	<li><a href="zeroValueStorageManagement.action">$i18n.getString( "zero_storage_management" )&nbsp;</a></li>
 	<li><a href="getMinMaxValidationParams.action">$i18n.getString( "min_max_value_generation")&nbsp;</a></li>
 	<li><a href="constant.action">$i18n.getString( "constant")&nbsp;</a></li>
 	<li><a href="optionSet.action">$i18n.getString( "option_set")&nbsp;</a></li>

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/zeroValueStorageManagement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/zeroValueStorageManagement.vm	2012-09-25 02:21:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/zeroValueStorageManagement.vm	1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-<script type="text/javascript">
-	jQuery(document).ready(function() {
-		jQuery("#ignoreZeroValueDataElements").dhisAjaxSelect({
-			source: "../dhis-web-commons-ajax-json/getDataElements.action",
-			iterator: "dataElements",
-			connectedTo: 'zeroDataValueElements',
-			handler: function(item) {
-				var option = jQuery("<option data-id='" + item.groups + "' />");
-				option.text( item.name );
-				option.attr( "value", item.id );
-	
-				return option;
-			},
-			filter: {
-				source: "../dhis-web-commons-ajax-json/getDataElementGroups.action",
-				label: 'dataelement group',
-				iterator: "dataElementGroups",
-				handler: function(item) {
-					return "<option data-key='id' data-value='" + item.id + "'>" + item.name + "</option>";
-				}
-			}
-		});
-	});
-</script>
-
-<h3>$i18n.getString( "zero_storage_management" ) #openHelp( "zeroValueStorage" )</h3>
-<br/>
-<form id="ZeroDataValueManagement" method="POST" action="updateZeroIsSignificantForDataElements.action" onsubmit="selectAllById( 'zeroDataValueElements' )">
-<table>
-    <colgroup>
-      <col style="width: 500px;"/>
-      <col/>
-      <col style="width: 500px;"/>
-    </colgroup>
-
-	<thead>
-		<tr>
-			<th>$i18n.getString( "ignore_zero_data_values" )</th>
-			<td></td>
-			<th>$i18n.getString( "store_zero_data_values" )</th>			
-		</tr>
-	</thead>
-
-	<tbody>
-		<tr>
-			<td>
-				<select id="ignoreZeroValueDataElements" name="ignoreZeroValueDataElements" multiple="multiple" style="height: 200px; width: 100%;"></select>
-			</td>
-		
-	        <td>
-	        	<input type="button" value="&gt;" title="$i18n.getString( 'move_selected' )" style="width:50px" onclick="dhisAjaxSelect_moveAllSelected( 'ignoreZeroValueDataElements' );"/><br/>
-	            <input type="button" value="&lt;" title="$i18n.getString( 'remove_selected' )" style="width:50px" onclick="dhisAjaxSelect_moveAllSelected( 'zeroDataValueElements' );"/><br/>
-				<input type="button" value="&gt;&gt;" title="$i18n.getString('move_all')" style="width:50px" onclick="dhisAjaxSelect_moveAll( 'ignoreZeroValueDataElements' );"/><br/>
-				<input type="button" value="&lt;&lt;" title="$i18n.getString('remove_all')" style="width:50px" onclick="dhisAjaxSelect_moveAll( 'zeroDataValueElements' );"/>
-	        </td>       
-	
-			<td>
-				<select id="zeroDataValueElements" name="zeroDataValueElements" multiple="multiple" style="height: 200px; width: 100%; margin-top: 45px;">
-					#foreach( $zero in $zeroDataValueElements )
-						<option value='$zero.id'>$encoder.htmlEncode( $zero.displayName )</option>
-					#end
-				</select>
-			</td>
-		</tr>
-	</tbody>
-</table>
-
-<p>
-	<input type="submit" value="$i18n.getString( 'save' )" style="width:100px"/>
-	<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='index.action'" style="width:100px"/>
-</p>
-
-</form>