← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15359: removing xslt files used for rendering html view

 

------------------------------------------------------------
revno: 15359
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-05-22 14:23:36 +0200
message:
  removing xslt files used for rendering html view
removed:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/TransformCache.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/TransformCacheImpl.java
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/attributeType.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/category.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryCombo.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryOption.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryOptionCombo.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/chart.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/config/
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/config/sms.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/constant.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dashboard.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElement.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElementGroup.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElementGroupSet.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataSet.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataValueSets.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/document.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/event.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/filter.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/html-wrapper.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/identifiable-row.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicator.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroup.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroupSet.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorType.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/interpretation.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/list.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/map.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/mapLayer.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/mapLegend.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/mapLegendSet.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/mapView.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/messageConversation.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/messageConversations.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/model2html.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/optionSets.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnit.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroup.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroupSet.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitLevel.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/program.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/programStage.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/relativePeriods.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/report.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/reportTable.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/resource.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/sqlView.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/user.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userAuthorityGroup.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userCredentials.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userGroup.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/validationRule.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/validationRuleGroup.xsl
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/metadata2dsd.xsl


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/TransformCache.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/TransformCache.java	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/TransformCache.java	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-package org.hisp.dhis.api.view;
-
-/*
- * Copyright (c) 2004-2014, 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 javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-
-/**
- * @author bobj
- * @version created 02-Dec-2011
- */
-public interface TransformCache
-{
-    /**
-     * A Transformer for processing lists of elements to html tables
-     * 
-     * @return the transformer
-     * @throws TransformerConfigurationException  
-     */
-    Transformer getHtmlTransformer()
-        throws TransformerConfigurationException;   
-}

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/TransformCacheImpl.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/TransformCacheImpl.java	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/TransformCacheImpl.java	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-package org.hisp.dhis.api.view;
-
-/*
- * Copyright (c) 2004-2014, 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.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.xml.transform.ErrorListener;
-import javax.xml.transform.Source;
-import javax.xml.transform.Templates;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamSource;
-
-import org.amplecode.staxwax.transformer.LoggingErrorListener;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.stereotype.Component;
-
-/**
- * 
- * @author bobj
- * @version created 02-Dec-2011
- */
-@Component
-public class TransformCacheImpl
-    implements TransformCache
-{
-    static final String MODEL2HTML = "model2html.xsl";
-
-    static final String HTMLXSLT_RESOURCE = "/templates/html/";
-
-    static private TransformCache instance;
-
-    private Templates htmlCachedTransform;
-
-    private TransformCacheImpl()
-        throws IOException, TransformerConfigurationException
-    {
-        ErrorListener errorListener = new LoggingErrorListener();
-
-        TransformerFactory factory = TransformerFactory.newInstance();
-        factory.setErrorListener( errorListener );
-
-        Source model2html = new StreamSource( new ClassPathResource( HTMLXSLT_RESOURCE + MODEL2HTML ).getInputStream() );
-
-        factory.setURIResolver( new ClassPathUriResolver( HTMLXSLT_RESOURCE ) );
-        htmlCachedTransform = factory.newTemplates( model2html );
-    }
-
-    protected static TransformCache instance()
-    {
-        if ( instance == null )
-        {
-            try
-            {
-                instance = new TransformCacheImpl();
-            }
-            catch ( Exception ex )
-            {
-                Logger.getLogger( TransformCacheImpl.class.getName() ).log( Level.SEVERE, null, ex );
-            }
-        }
-        return instance;
-    }
-
-    @Override
-    public Transformer getHtmlTransformer()
-        throws TransformerConfigurationException
-    {
-        return htmlCachedTransform.newTransformer();
-    }
-}

=== removed directory 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html'
=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/attributeType.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/attributeType.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/attributeType.xsl	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:attributeType">
-    <div class="attributeType">
-      <h2> <xsl:value-of select="@name" /> </h2>
-
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-        <tr>
-          <td>Mandatory</td>
-          <td> <xsl:value-of select="d:mandatory" /> </td>
-        </tr>
-        <tr>
-          <td>Value Type</td>
-          <td> <xsl:value-of select="d:valueType" /> </td>
-        </tr>
-        <tr>
-          <td>Applicable for DataElements</td>
-          <td> <xsl:value-of select="d:dataElementAttribute" /> </td>
-        </tr>
-        <tr>
-          <td>Applicable for Indicators</td>
-          <td> <xsl:value-of select="d:indicatorAttribute" /> </td>
-        </tr>
-        <tr>
-          <td>Applicable for OrganisationUnits</td>
-          <td> <xsl:value-of select="d:organisationUnitAttribute" /> </td>
-        </tr>
-        <tr>
-          <td>Applicable for Users</td>
-          <td> <xsl:value-of select="d:userAttribute" /> </td>
-        </tr>
-      </table>
-
-    </div>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/category.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/category.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/category.xsl	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:category">
-    <div class="category">
-      <h2> <xsl:value-of select="@name" /> </h2>
-
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:categoryOptions" mode="short"/>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:category" mode="short">
-    <h3>Category</h3>
-    <table class="category">
-      <xsl:apply-templates select="." mode="row"/>
-    </table>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryCombo.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryCombo.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryCombo.xsl	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:categoryCombo">
-    <div class="categoryCombo">
-      <h2> <xsl:value-of select="@name" /> </h2>
-
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:categoryOptionCombos|d:categories" mode="short"/>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:categoryCombo" mode="short">
-    <h3>CategoryCombo</h3>
-    <table border="1" class="categoryCombo">
-      <xsl:apply-templates select="." mode="row"/>
-    </table>
-  </xsl:template>
-  
-  <xsl:template match="d:categories" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>Categories</h3>
-      <table border="1" class="categories">
-        <xsl:apply-templates select="child::*" mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryOption.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryOption.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryOption.xsl	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:categoryOption">
-    <div class="categoryOption">
-      <h2> <xsl:value-of select="@name" /> </h2>
-
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:category|d:categoryOptionCombos" mode="short"/>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:categoryOptions" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>CategoryOptions</h3>
-      <table class="categoryOptions">
-        <xsl:apply-templates select="child::*" mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-  
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryOptionCombo.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryOptionCombo.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryOptionCombo.xsl	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:categoryOptionCombo">
-    <div class="categoryOptionCombo">
-      <h2> <xsl:value-of select="@name" /> </h2>
-
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:categoryCombo|d:categoryOptions" mode="short"/>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:categoryOptionCombos" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>CategoryOptionCombos</h3>
-      <table class="categoryOptionCombos">
-        <xsl:apply-templates select="child::*" mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-  
-  <xsl:template match="d:optionCombos" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>OptionCombos</h3>
-      <table class="optionCombos">
-        <xsl:apply-templates select="child::*" mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-  
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/chart.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/chart.xsl	2014-01-07 18:38:03 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/chart.xsl	1970-01-01 00:00:00 +0000
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-                version="1.0">
-
-  <xsl:template match="d:chart">
-    <div class="chart">
-      <h2> <xsl:value-of select="@name"/> </h2>
-	  
-	  <table>
-		<tr>
-			<td>Resource Data</td>
-			<td><a href="{@href}/data">png</a></td>
-		</tr>
-		<tr>
-			<td>width</td>
-			<td>width in px (opt)</td>
-		</tr>
-		<tr>
-			<td>height</td>
-			<td>height in px (opt)</td>
-		</tr>
-	  </table><br/>
-	  
-	  <table>
-		<tr>
-			<td>Dynamic Data</td>
-			<td><a href="data">png</a></td>
-		</tr>
-		<tr>
-			<td>in</td>
-			<td>indicator uid (req)</td>
-		</tr>
-		<tr>
-			<td>ou</td>
-			<td>organisation unit uid (req)</td>
-		</tr>
-		<tr>
-			<td>periods</td>
-			<td>use periods or org units (opt)</td>
-		</tr>
-		<tr>
-			<td>width</td>
-			<td>width in px (opt)</td>
-		</tr>
-		<tr>
-			<td>height</td>
-			<td>height in px (opt)</td>
-		</tr>
-		<tr>
-			<td>skipTitle</td>
-			<td>skip title (opt)</td>
-		</tr>
-	  </table><br/>
-	  
-      <a href="{@href}/data"><img src="{@href}/data" style="border: 1px solid;padding: 5px;" /></a>
-
-      <h3>Details</h3>
-
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id"/> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated"/> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-        <tr>
-          <td>Series</td>
-          <td> <xsl:value-of select="d:series"/> </td>
-        </tr>
-        <tr>
-          <td>Category</td>
-          <td> <xsl:value-of select="d:category"/> </td>
-        </tr>
-        <tr>
-          <td>Filter</td>
-          <td> <xsl:value-of select="d:filter"/> </td>
-        </tr>
-        <tr>
-          <td>Hide legend</td>
-          <td> <xsl:value-of select="d:hideLegend"/> </td>
-        </tr>
-        <tr>
-          <td>Hide subtitle</td>
-          <td> <xsl:value-of select="d:hideSubtitle"/> </td>
-        </tr>
-        <tr>
-          <td>Regression</td>
-          <td> <xsl:value-of select="d:regression"/> </td>
-        </tr>
-        <tr>
-          <td>Target line label</td>
-          <td> <xsl:value-of select="d:targetLineLabel"/> </td>
-        </tr>
-        <tr>
-          <td>Type</td>
-          <td> <xsl:value-of select="d:type"/> </td>
-        </tr>
-        <tr>
-          <td>User organisation unit</td>
-          <td> <xsl:value-of select="d:userOrganisationUnit"/> </td>
-        </tr>
-        <tr>
-          <td>User organisation unit children</td>
-          <td> <xsl:value-of select="d:userOrganisationUnitChildren"/> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:organisationUnits|d:dataElements|d:indicators" mode="short"/>
-      <xsl:apply-templates select="d:relativePeriods" />
-
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:chart" mode="short">
-    <xsl:if test="@name">
-      <h3>Chart</h3>
-      <table class="chart">
-        <xsl:apply-templates select="." mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed directory 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/config'
=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/config/sms.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/config/sms.xsl	2011-12-15 08:46:42 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/config/sms.xsl	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0" xmlns="http://www.w3.org/1999/xhtml";
-  xmlns:d="http://dhis2.org/schema/dxf/2.0";>
-
-  <xsl:template match="d:smsConfiguration">
-    <div class="config">
-      <h2>Sms configuration</h2>
-
-      <table border="1">
-        <tr>
-          <td>Enabled</td>
-          <td>
-            <xsl:value-of select="d:enabled" />
-          </td>
-        </tr>
-        <tr>
-          <td>Polling interval</td>
-          <td>
-            <xsl:value-of select="d:pollingInterval" />
-          </td>
-        </tr>
-        <tr>
-          <td>Long number</td>
-          <td>
-            <xsl:value-of select="d:longNumber" />
-          </td>
-        </tr>
-      </table>
-
-      <h3>Gateways configured</h3>
-      <xsl:if test="d:gateways">
-        <xsl:for-each select="d:gateways/*">
-          <h4>
-            <xsl:value-of select="local-name(.)" />
-          </h4>
-          <table border="1">
-            <xsl:for-each select="child::*">
-              <tr>
-                <td>
-                  <xsl:value-of select="local-name(.)" />
-                </td>
-                <td>
-                  <xsl:value-of select="." />
-                </td>
-              </tr>
-            </xsl:for-each>
-          </table>
-        </xsl:for-each>
-      </xsl:if>
-    </div>
-  </xsl:template>
-
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/constant.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/constant.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/constant.xsl	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:constant">
-    <div class="constant">
-      <h2> <xsl:value-of select="@name" /> </h2>
-
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-        <tr>
-          <td>Value</td>
-          <td> <xsl:value-of select="d:value" /> </td>
-        </tr>
-      </table>
-
-    </div>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dashboard.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dashboard.xsl	2013-09-09 13:50:00 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dashboard.xsl	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:dashboard">
-    <div class="dashboard">
-      <h2> <xsl:value-of select="@name" /> </h2>
-
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Item Count</td>
-          <td> <xsl:value-of select="d:itemCount" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:dashboardItems|d:user" mode="short" />
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:dashboardItems" mode="short">
-    <h3>Dashboard Items</h3>
-    <xsl:apply-templates select="d:dashboardItem" mode="short" />
-  </xsl:template>
-
-  <xsl:template match="d:dashboardItem" mode="short">
-    <h4 style="border-bottom: 1px solid black; width: 800px;">Dashboard Item (<xsl:value-of select="d:type" />)</h4>
-    <xsl:apply-templates select="d:users|d:documents|d:reportTables|d:reports|d:reportTable|d:chart" mode="short" />
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElement.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElement.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElement.xsl	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:dataElement">
-    <div class="dataElement">
-      <h2> <xsl:value-of select="@name" /> </h2>
-
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-        <tr>
-          <td>Short Name</td>
-          <td> <xsl:value-of select="@shortName" /> </td>
-        </tr>
-        <tr>
-          <td>Type</td>
-          <td> <xsl:value-of select="d:type" /> </td>
-        </tr>
-        <tr>
-          <td>Zero is Significant</td>
-          <td> <xsl:value-of select="d:zeroIsSignificant" /> </td>
-        </tr>
-        <tr>
-          <td>Active</td>
-          <td> <xsl:value-of select="d:active" /> </td>
-        </tr>
-        <tr>
-          <td>Aggregation Operator</td>
-          <td> <xsl:value-of select="d:aggregationOperator" /> </td>
-        </tr>
-        <tr>
-          <td>Domain Type</td>
-          <td> <xsl:value-of select="d:domainType" /> </td>
-        </tr>
-      </table>
-      <xsl:apply-templates select="d:categoryCombo|d:dataElementGroups|d:dataSets" mode="short"/>
-    </div>
-  </xsl:template>
-  
-  <xsl:template match="d:dataElements" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>DataElements</h3>
-      <table class="dataElements">
-        <xsl:apply-templates mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-  
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElementGroup.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElementGroup.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElementGroup.xsl	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:dataElementGroup">
-    <div class="dataElementGroup">
-      <h2> <xsl:value-of select="@name" /> </h2>
-
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:dataElements" mode="short"/>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:dataElementGroups" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>DataElementGroups</h3>
-      <table class="dataElementGroups">
-        <xsl:apply-templates select="child::*" mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-  
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElementGroupSet.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElementGroupSet.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElementGroupSet.xsl	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:dataElementGroupSet">
-    <div class="dataElementGroupSet">
-      <h2> <xsl:value-of select="@name" /> </h2>
-
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:dataElementGroups" mode="short"/>
-    </div>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataSet.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataSet.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataSet.xsl	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-  xmlns="http://www.w3.org/1999/xhtml";
-  xmlns:d="http://dhis2.org/schema/dxf/2.0";
-  >
-
-  <xsl:template match="d:dataSet">
-    <div class="dataSet">
-      <h2>
-        <xsl:value-of select="@name" />
-      </h2>
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-        <tr>
-          <td>Short Name</td>
-          <td> <xsl:value-of select="d:shortName" /> </td>
-        </tr>
-        <tr>
-          <td>Period Type</td>
-          <td> <xsl:value-of select="d:periodType" /> </td>
-        </tr>
-        <tr>
-          <td>Expiry Days</td>
-          <td> <xsl:value-of select="d:expiryDays" /> </td>
-        </tr>
-        <tr>
-          <td>Version</td>
-          <td> <xsl:value-of select="d:version" /> </td>
-        </tr>
-        <tr>
-          <td>Mobile</td>
-          <td> <xsl:value-of select="d:mobile" /> </td>
-        </tr>
-
-      </table>
-
-      <xsl:apply-templates select="d:dataElements|d:indicators|d:organisationUnits" mode="short" />
-
-    </div>
-  </xsl:template>
-  
-  <xsl:template match="d:dataSets" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>DataSets</h3>
-      <table class="dataSets">
-        <xsl:apply-templates select="child::*" mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataValueSets.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataValueSets.xsl	2013-06-17 15:51:12 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataValueSets.xsl	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-<xsl:template match="d:dxf2/d:dataValueSets">
-
-<p>The DataValueSet resource provides a way to POST data values into DHIS 2.</p>
-
-<p>Identifiers can be found by browsing the API from the <a href="../api/resources">resources endpoint</a>.</p>
-
-<p>Period values are given in ISO format. Some examples:</p>
-
-<table>
-  <tr><th>Interval</th><th>Format</th><th>Example</th><th>Description</th></tr>
-  <tr><td>Day</td><td>yyyyMMdd</td><td>20040315</td><td>March 15 2004</td></tr>
-  <tr><td>Week</td><td>yyyyWn</td><td>2004W10</td><td>Week 10 2004</td></tr>
-  <tr><td>Month</td><td>yyyyMM</td><td>200403</td><td>March 2004</td></tr>
-  <tr><td>Quarter</td><td>yyyyQn</td><td>2004Q1</td><td>January-March 2004</td></tr>
-  <tr><td>Sixmonth</td><td>yyyySn</td><td>2004S1</td><td>Janary-June 2004</td></tr>
-  <tr><td>Year</td><td>yyyy</td><td>2004</td><td>2004</td></tr>
-</table>
-
-<p>A complete example of a data value set:</p>
-
-<pre style="font-size:12pt;">
-<![CDATA[
-<dataValueSet xmlns="http://dhis2.org/schema/dxf/2.0"; period="periodISODate" orgUnit="orgUnitID" dataSet="dataSetID" completeDate="yyyy-MM-dd">
-  <dataValues>
-    <dataValue dataElement="dataElementID" categoryOptionCombo="categoryOptionComboID" value="1" />
-    <dataValue dataElement="dataElementID" categoryOptionCombo="categoryOptionComboID" value="2" />
-    <dataValue dataElement="dataElementID" categoryOptionCombo="categoryOptionComboID" value="3" />
-  </dataValues>
-</dataValueSet>
-]]>
-</pre>
-
-</xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/document.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/document.xsl	2013-09-09 13:50:00 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/document.xsl	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:document">
-    <div class="document">
-      <h2> <xsl:value-of select="@name" /> </h2>
-	  
-	  <table>
-		<tr>
-			<td>Resource Data</td>
-			<td><a href="{@href}/data">any</a></td>
-		</tr>
-	  </table><br/>
-	  
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>URL</td>
-          <td> <xsl:value-of select="d:url" /> </td>
-        </tr>
-        <tr>
-          <td>External</td>
-          <td> <xsl:value-of select="d:external" /> </td>
-        </tr>
-        <tr>
-          <td>Content type</td>
-          <td> <xsl:value-of select="d:contentType" /> </td>
-        </tr>
-      </table>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:documents" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>Documents</h3>
-      <table class="documents">
-        <xsl:apply-templates select="child::*" mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/event.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/event.xsl	2013-07-05 04:25:13 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/event.xsl	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml"; xmlns:d="http://dhis2.org/schema/dxf/2.0";>
-
-  <xsl:template match="d:event">
-    <div class="event">
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@event" /> </td>
-        </tr>
-        <tr>
-          <td>Program</td>
-          <td> <xsl:value-of select="@program" /> </td>
-        </tr>
-        <tr>
-          <td>Program Stage</td>
-          <td> <xsl:value-of select="@programStage" /> </td>
-        </tr>
-        <tr>
-          <td>Organisation Unit</td>
-          <td> <xsl:value-of select="@orgUnit" /> </td>
-        </tr>
-        <tr>
-          <td>Event Date</td>
-          <td> <xsl:value-of select="@eventDate" /> </td>
-        </tr>
-        <tr>
-          <td>Completed</td>
-          <td> <xsl:value-of select="@completed" /> </td>
-        </tr>
-        <tr>
-          <td>Stored By</td>
-          <td> <xsl:value-of select="@storedBy" /> </td>
-        </tr>
-      </table>
-
-    </div>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/filter.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/filter.xsl	2013-09-14 14:03:39 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/filter.xsl	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-        >
-    <!--@author Ovidiu Rosu <rosu.ovi@xxxxxxxxx>-->
-    <xsl:template match="d:filter">
-        <div class="filter">
-            <h2> <xsl:value-of select="@name" /> </h2>
-
-            <table>
-                <tr>
-                    <td>ID</td>
-                    <td> <xsl:value-of select="@id" /> </td>
-                </tr>
-                <tr>
-                    <td>Created</td>
-                    <td> <xsl:value-of select="@created" /> </td>
-                </tr>
-                <tr>
-                    <td>Last Updated</td>
-                    <td> <xsl:value-of select="@lastUpdated" /> </td>
-                </tr>
-                <tr>
-                    <td>MetaData UIDs</td>
-                    <td> <xsl:value-of select="d:metaDataUids" /> </td>
-                </tr>
-            </table>
-
-        </div>
-    </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/html-wrapper.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/html-wrapper.xsl	2012-04-28 08:59:43 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/html-wrapper.xsl	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:output method="html" doctype-system="about:legacy-compat"/>
-
-  <xsl:template match="/">
-    <html>
-      <head>
-        <title>DHIS Web-API</title>
-        <style type="text/css">
-        html {
-          font-family: sans-serif;
-          font-size: 12pt;
-        }
-        table {
-          border-collapse: collapse;
-		}
-		table, th, td {
-		  border: 1px solid #c0c0c0;
-          padding: 3px;
-        }
-		h1, h2, h3 {
-          text-transform: capitalize;
-        }
-		</style>
-      </head>
-
-      <body>
-        <xsl:apply-templates />
-      </body>
-
-    </html>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/identifiable-row.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/identifiable-row.xsl	2013-09-09 13:50:00 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/identifiable-row.xsl	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml"; xmlns:d="http://dhis2.org/schema/dxf/2.0";>
-
-  <xsl:template match="*" mode="row">
-    <xsl:if test="@name">
-      <tr>
-        <td> <xsl:value-of select="@name"/> </td>
-        <td> <a href="{@href}">html</a> </td>
-        <td> <a href="{@href}.xml">xml</a> </td>
-        <td> <a href="{@href}.json">json</a> </td>
-        <td> <a href="{@href}.jsonp">jsonp</a> </td>
-        <td> <a href="{@href}.pdf">pdf</a> </td>
-        <td> <a href="{@href}.xls">xls</a> </td>
-        <td> <a href="{@href}.csv">csv</a> </td>
-      </tr>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicator.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicator.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicator.xsl	1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-  xmlns="http://www.w3.org/1999/xhtml";
-  xmlns:d="http://dhis2.org/schema/dxf/2.0";
-  >
-  
-  <xsl:template match="d:indicator">
-    <div class="indicator">
-      <h2>
-        <xsl:value-of select="@name" />
-      </h2>
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-        <tr>
-          <td>Short Name</td>
-          <td> <xsl:value-of select="d:shortName" /> </td>
-        </tr>
-        <tr>
-          <td>Description</td>
-          <td> <xsl:value-of select="d:description" /> </td>
-        </tr>
-        <tr>
-          <td>Numerator</td>
-          <td> <xsl:value-of select="d:numerator" /> </td>
-        </tr>
-        <tr>
-          <td>Numerator Description</td>
-          <td> <xsl:value-of select="d:numeratorDescription" /> </td>
-        </tr>
-        <tr>
-          <td>Denominator</td>
-          <td> <xsl:value-of select="d:denominator" /> </td>
-        </tr>
-        <tr>
-          <td>Denominator Description</td>
-          <td> <xsl:value-of select="d:denominatorDescription" /> </td>
-        </tr>
-        <tr>
-          <td>Annualized</td>
-          <td> <xsl:value-of select="d:annualized" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:indicatorGroups|d:dataSets" mode="short"/>
-
-    </div>
-  </xsl:template>
-  
-  <xsl:template match="d:indicators" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>Indicators</h3>
-      <table class="indicators">
-        <xsl:apply-templates select="child::*" mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-  
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroup.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroup.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroup.xsl	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:indicatorGroup">
-    <div class="indicatorGroup">
-      <h2> <xsl:value-of select="@name" /> </h2>
-
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:indicatorGroupSet|d:indicators" mode="short"/>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:indicatorGroups" mode="short" >
-    <xsl:if test="count(child::*) > 0">
-      <h3>Indicator Groups</h3>
-      <table class="indicatorGroups">
-        <xsl:apply-templates select="child::*" mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-  
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroupSet.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroupSet.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroupSet.xsl	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:indicatorGroupSet">
-    <div class="indicatorGroupSet">
-      <h2> <xsl:value-of select="@name" /> </h2>
-
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-        <tr>
-          <td>Compulsory</td>
-          <td> <xsl:value-of select="d:compulsory" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:indicatorGroups" mode="short"/>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:indicatorGroupSet" mode="short">
-    <h3>Indicator Group Set</h3>
-    <table class="indicatorGroupSet">
-      <xsl:apply-templates select="." mode="row"/>
-    </table>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorType.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorType.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorType.xsl	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:indicatorType">
-    <div class="indicatorType">
-      <h2>
-        <xsl:value-of select="@name" />
-      </h2>
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-        <tr>
-          <td>Factor</td>
-          <td> <xsl:value-of select="d:factor" /> </td>
-        </tr>
-        <tr>
-          <td>Number</td>
-          <td> <xsl:value-of select="d:number" /> </td>
-        </tr>
-      </table>
-
-    </div>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/interpretation.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/interpretation.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/interpretation.xsl	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-  xmlns="http://www.w3.org/1999/xhtml";
-  xmlns:d="http://dhis2.org/schema/dxf/2.0";
-  >
-  
-  <xsl:template match="d:interpretation">
-    <div class="interpretation">
-      <h2>
-        <xsl:value-of select="@name" />
-      </h2>
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Text</td>
-          <td> <xsl:value-of select="d:text" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="d:created" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:user|d:comments" mode="short" />
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:comments" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>Comments</h3>
-      <xsl:apply-templates select="child::*" mode="short"/>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="d:comment" mode="short">
-    <table class="comments">
-      <tr>
-        <td>Created</td>
-        <td> <xsl:value-of select="d:created" /> </td>
-      </tr>
-      <tr>
-        <td>Text</td>
-        <td> <xsl:value-of select="d:text" /> </td>
-      </tr>
-    </table>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/list.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/list.xsl	2014-03-13 16:17:36 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/list.xsl	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-    xmlns="http://www.w3.org/1999/xhtml";
-    xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:include href="identifiable-row.xsl" />
-
-  <!-- match all plural elements -->
-  <xsl:template match="d:metaData">
-    <xsl:apply-templates select="d:pager"/>
-    <xsl:apply-templates select="d:*[local-name()!='pager']"/>
-  </xsl:template>
-
-  <xsl:template match="d:resources|d:maps|d:mapViews|d:charts|d:categoryCombos|d:categories|
-      d:categoryOptions|d:categoryOptionCombos|d:dataElements|d:indicators|
-      d:organisationUnits|d:dataElementGroups|d:dataElementGroupSets|d:dataSets|
-      d:documents|d:indicatorGroups|d:indicatorGroupSets|d:organisationUnitGroups|
-      d:organisationUnitGroupSets|d:indicatorTypes|d:attributes|d:reports|d:constants|
-      d:sqlViews|d:validationRules|d:validationRuleGroups|d:users|d:userGroups|d:userAuthorityGroups|
-      d:reportTables|d:mapLegends|d:mapLegendSets|d:mapLayers|d:optionSets|d:interpretations|
-      d:sections|d:userRoles|d:organisationUnitLevels|d:programs|d:programStages|d:dimensions|d:dashboards">
-
-    <h3>
-      <xsl:value-of select="local-name()" />
-    </h3>
-
-    <table>
-      <xsl:apply-templates select="child::*" mode="row" />
-    </table>
-
-  </xsl:template>
-
-  <xsl:template match="d:pager">
-      <table>
-        <tr>
-          <td>Page
-            <xsl:choose>
-              <xsl:when test="d:page">
-                <xsl:value-of select="d:page" />
-              </xsl:when>
-              <xsl:otherwise>1</xsl:otherwise>
-            </xsl:choose>
-
-            <xsl:text> / </xsl:text>
-
-            <xsl:choose>
-              <xsl:when test="d:page">
-                <xsl:value-of select="d:pageCount" />
-              </xsl:when>
-              <xsl:otherwise>1</xsl:otherwise>
-            </xsl:choose>
-
-          </td>
-
-          <xsl:if test="d:prevPage">
-            <td>
-              <xsl:element name="a">
-                <xsl:attribute name="href">
-                  <xsl:value-of select="d:prevPage" />
-                </xsl:attribute>
-                <xsl:text>Previous Page</xsl:text>
-              </xsl:element>
-            </td>
-          </xsl:if>
-
-          <xsl:if test="d:nextPage">
-            <td>
-              <xsl:element name="a">
-                <xsl:attribute name="href">
-                  <xsl:value-of select="d:nextPage" />
-                </xsl:attribute>
-                <xsl:text>Next Page</xsl:text>
-              </xsl:element>
-            </td>
-          </xsl:if>
-        </tr>
-      </table>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/map.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/map.xsl	2013-09-09 13:50:00 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/map.xsl	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml"; xmlns:d="http://dhis2.org/schema/dxf/2.0";>
-
-  <xsl:template match="d:map">
-    <div class="map">
-      <h2> <xsl:value-of select="@name" /> </h2>
-
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-      </table>
-      
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:map" mode="short">
-    <h3>Map</h3>
-    <table class="map">
-      <xsl:apply-templates select="." mode="row"/>
-    </table>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/mapLayer.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/mapLayer.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/mapLayer.xsl	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-  xmlns="http://www.w3.org/1999/xhtml";
-  xmlns:d="http://dhis2.org/schema/dxf/2.0";
-  >
-  
-  <xsl:template match="d:mapLayer">
-    <div class="mapLayer">
-      <h2>
-        <xsl:value-of select="@name" />
-      </h2>
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-        <tr>
-          <td>Type</td>
-          <td> <xsl:value-of select="d:type" /> </td>
-        </tr>
-        <tr>
-          <td>URL</td>
-          <td> <xsl:value-of select="d:url" /> </td>
-        </tr>
-        <tr>
-          <td>Layers</td>
-          <td> <xsl:value-of select="d:layers" /> </td>
-        </tr>
-        <tr>
-          <td>Time</td>
-          <td> <xsl:value-of select="d:time" /> </td>
-        </tr>
-        <tr>
-          <td>Fill Color</td>
-          <td> <xsl:value-of select="d:fillColor" /> </td>
-        </tr>
-        <tr>
-          <td>Fill Opacity</td>
-          <td> <xsl:value-of select="d:fillOpacity" /> </td>
-        </tr>
-        <tr>
-          <td>Stroke Color</td>
-          <td> <xsl:value-of select="d:strokeColor" /> </td>
-        </tr>
-        <tr>
-          <td>Stroke Width</td>
-          <td> <xsl:value-of select="d:strokeWidth" /> </td>
-        </tr>
-      </table>
-
-    </div>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/mapLegend.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/mapLegend.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/mapLegend.xsl	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-  xmlns="http://www.w3.org/1999/xhtml";
-  xmlns:d="http://dhis2.org/schema/dxf/2.0";
-  >
-
-  <xsl:template match="d:mapLegend">
-    <div class="mapLegend">
-      <h2>
-        <xsl:value-of select="@name" />
-      </h2>
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-        <tr>
-          <td>Image</td>
-          <td> <xsl:value-of select="d:image" /> </td>
-        </tr>
-        <tr>
-          <td>Start Value</td>
-          <td> <xsl:value-of select="d:startValue" /> </td>
-        </tr>
-        <tr>
-          <td>End Value</td>
-          <td> <xsl:value-of select="d:endValue" /> </td>
-        </tr>
-      </table>
-
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:mapLegends" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>MapLegends</h3>
-      <table class="mapLegends">
-        <xsl:apply-templates select="child::*" mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/mapLegendSet.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/mapLegendSet.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/mapLegendSet.xsl	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-  xmlns="http://www.w3.org/1999/xhtml";
-  xmlns:d="http://dhis2.org/schema/dxf/2.0";
-  >
-  
-  <xsl:template match="d:mapLegendSet">
-    <div class="mapLegend">
-      <h2>
-        <xsl:value-of select="@name" />
-      </h2>
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-        <tr>
-          <td>Symbolizer</td>
-          <td> <xsl:value-of select="d:symbolizer" /> </td>
-        </tr>
-        <tr>
-          <td>Type</td>
-          <td> <xsl:value-of select="d:type" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:mapLegends" mode="short"/>
-
-    </div>
-  </xsl:template>
-  
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/mapView.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/mapView.xsl	2014-01-07 18:38:03 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/mapView.xsl	1970-01-01 00:00:00 +0000
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml"; xmlns:d="http://dhis2.org/schema/dxf/2.0";>
-
-  <xsl:template match="d:mapView">
-    <div class="mapView">
-      <h2><xsl:value-of select="@name"/></h2>
-      
-      <table>
-        <tr>
-            <td>Resource Data</td>
-            <td><a href="{@href}/data">png</a></td>
-        </tr>
-      </table><br/>
-      
-      <table>
-        <tr>
-            <td>Dynamic Data</td>
-            <td><a href="data">png</a></td>
-        </tr>
-        <tr>
-            <td>in</td>
-            <td>indicator uid (req)</td>
-        </tr>
-        <tr>
-            <td>ou</td>
-            <td>organisation unit uid (req)</td>
-        </tr>
-        <tr>
-            <td>level</td>
-            <td>organisation unit level (opt)</td>
-        </tr>
-      </table><br/>
-      
-      <a href="{@href}/data"><img src="{@href}/data" style="border: 1px solid; padding: 5px;" /></a>
-
-      <h3>Details</h3>
-
-      <table>
-        <xsl:for-each select="attribute::*">
-          <tr><td><xsl:value-of select="local-name()"/></td><td><xsl:value-of select="."/></td></tr>
-        </xsl:for-each>
-        <xsl:for-each select="child::*">
-          <tr><td><xsl:value-of select="local-name()"/></td><td>
-            <xsl:choose>
-              <xsl:when test="@name"><a href="{@href}"><xsl:value-of select="@name"/></a>
-              </xsl:when>
-              <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
-            </xsl:choose>
-          </td></tr>
-        </xsl:for-each>
-      </table>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:mapView" mode="row">
-    <tr>
-      <td><xsl:value-of select="@name"/></td>
-      <td>
-        <xsl:element name="a">
-          <xsl:attribute name="href"><xsl:value-of select="@href"/></xsl:attribute>
-          <xsl:text>html</xsl:text>
-        </xsl:element>
-      </td>
-      <td>
-        <xsl:element name="a">
-          <xsl:attribute name="href"><xsl:value-of select="concat(@href,'.png')"/></xsl:attribute>
-          <xsl:text>png</xsl:text>
-        </xsl:element>
-      </td>
-      <td>
-        <xsl:element name="a">
-          <xsl:attribute name="href"><xsl:value-of select="concat(@href,'.xml')"/></xsl:attribute>
-          <xsl:text>xml</xsl:text>
-        </xsl:element>
-      </td>
-      <td>
-        <xsl:element name="a">
-          <xsl:attribute name="href"><xsl:value-of select="concat(@href,'.json')"/></xsl:attribute>
-          <xsl:text>json</xsl:text>
-        </xsl:element>
-      </td>
-      <td>
-        <xsl:element name="a">
-          <xsl:attribute name="href"><xsl:value-of select="concat(@href,'.jsonp')"/></xsl:attribute>
-          <xsl:text>jsonp</xsl:text>
-        </xsl:element>
-      </td>
-    </tr>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/messageConversation.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/messageConversation.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/messageConversation.xsl	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:messageConversation">
-    <div class="messageConversation">
-      <h2>
-        <xsl:value-of select="@name" />
-      </h2>
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:lastSender|d:messages" />
-
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:lastSender">
-    <h3>Last Sender</h3>
-    <table border="1" class="lastSender">
-      <xsl:apply-templates select="." mode="row"/>
-    </table>
-  </xsl:template>
-
-  <xsl:template match="d:messages">
-    <h3>Messages</h3>
-    <xsl:apply-templates />
-  </xsl:template>
-
-  <xsl:template match="d:message">
-    <table>
-      <tr>
-        <td style="width: 80px;">Text</td>
-        <td style="width: 800px;"> <xsl:value-of select="@name" /> </td>
-      </tr>
-    </table>
-    <br/>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/messageConversations.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/messageConversations.xsl	2012-03-19 20:16:30 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/messageConversations.xsl	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-<xsl:template match="d:messageConversations">
-
-<h3> <xsl:value-of select="local-name()" /> </h3>
-
-<h4>Starting a new conversation</h4>
-<p>This is done through a POST to <code>/api/messageConversations</code> using the format below.</p>
-
-<pre style="font-size: 12pt;">
-<![CDATA[
-<message xmlns="http://dhis2.org/schema/dxf/2.0";>
-  <subject>This is the subject</subject>
-  <text>This is the text</text>
-  <users>
-    <user id="user1ID" />
-    <user id="user2ID" />
-    <user id="user3ID" />
-  </users>
-</message>
-]]>
-</pre>
-
-<p>Example using curl:<br/>
-<code>curl -d @input.xml "http://localhost:8080/api/messageConversations"; -H "Content-Type:application/xml" -u admin:district -X POST -v</code>
-</p>
-
-<h4>Replying to a conversation</h4>
-
-<p> This is done with a POST to <code>/api/messageConversations/{conversation-id}</code>. The request body will be the reply text.</p>
-
-<p>Example using curl:<br/>
-<code>curl -d "This is my reply" "http://localhost:8080/api/messageConversations/adfAd134GTh"; -H "Content-Type:text/plain" -u admin:district -X POST -v</code>
-</p>
-
-<h4>Writing a feedback</h4>
-
-<p>This is done with a POST to <code>/api/messageConversations/feedback</code></p>
-
-<p>Example using curl:<br/>
-<code>curl -d "This is my feedback" "http://localhost:8080/api/messageConversations/feedback?subject={message-subject}"; -H "Content-Type:text/plain" -u admin:district -X POST -v</code>
-</p>
-    
-<table>
-  <xsl:apply-templates select="child::*" mode="row" />
-</table>
-
-</xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/model2html.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/model2html.xsl	2014-05-22 12:18:21 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/model2html.xsl	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-  xmlns="http://www.w3.org/1999/xhtml";
-  xmlns:d="http://dhis2.org/schema/dxf/2.0";
-  exclude-result-prefixes="d"
-  >
-
-  <xsl:output method="html" />
-
-  <!-- html page level settings -->
-  <xsl:include href="html-wrapper.xsl" />
-
-  <!-- for list views -->
-  <xsl:include href="list.xsl" />
-
-  <!-- for rendering elements -->
-  <xsl:include href="resource.xsl" />
-  <xsl:include href="relativePeriods.xsl" />
-  <xsl:include href="map.xsl" />
-  <xsl:include href="mapView.xsl" />
-  <xsl:include href="mapLegend.xsl" />
-  <xsl:include href="mapLegendSet.xsl" />
-  <xsl:include href="mapLayer.xsl" />
-  <xsl:include href="chart.xsl" />
-  <xsl:include href="constant.xsl" />
-  <xsl:include href="category.xsl" />
-  <xsl:include href="categoryOption.xsl" />
-  <xsl:include href="categoryCombo.xsl" />
-  <xsl:include href="categoryOptionCombo.xsl" />
-  <xsl:include href="dataElement.xsl" />
-  <xsl:include href="dataElementGroup.xsl" />
-  <xsl:include href="dataElementGroupSet.xsl" />
-  <xsl:include href="document.xsl" />
-  <xsl:include href="indicator.xsl" />
-  <xsl:include href="indicatorType.xsl" />
-  <xsl:include href="indicatorGroup.xsl" />
-  <xsl:include href="indicatorGroupSet.xsl" />
-  <xsl:include href="organisationUnit.xsl" />
-  <xsl:include href="organisationUnitLevel.xsl" />
-  <xsl:include href="organisationUnitGroup.xsl" />
-  <xsl:include href="organisationUnitGroupSet.xsl" />
-  <xsl:include href="dataSet.xsl" />
-  <xsl:include href="attributeType.xsl" />
-  <xsl:include href="report.xsl" />
-  <xsl:include href="reportTable.xsl" />
-  <xsl:include href="validationRule.xsl" />
-  <xsl:include href="validationRuleGroup.xsl" />
-  <xsl:include href="sqlView.xsl" />
-
-  <xsl:include href="user.xsl" />
-  <xsl:include href="userGroup.xsl" />
-  <xsl:include href="userAuthorityGroup.xsl" />
-  <xsl:include href="userCredentials.xsl" />
-  <xsl:include href="messageConversations.xsl" />
-  <xsl:include href="messageConversation.xsl" />
-  <xsl:include href="interpretation.xsl" />
-  <xsl:include href="dataValueSets.xsl" />
-  <xsl:include href="optionSets.xsl" />
-  <xsl:include href="program.xsl" />
-  <xsl:include href="programStage.xsl" />
-  <xsl:include href="event.xsl" />
-  <xsl:include href="dashboard.xsl" />
-
-  <!-- Config elements -->
-
-  <xsl:include href="config/sms.xsl" />
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/optionSets.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/optionSets.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/optionSets.xsl	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:optionSet">
-    <div class="optionSet">
-      <h2> <xsl:value-of select="@name" /> </h2>
-
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Options</td>
-          <td>
-          <ul>
-          <xsl:for-each select="d:options/d:option">
-              <li> <xsl:value-of select="." /> </li>
-          </xsl:for-each>
-          </ul>
-          </td>
-        </tr>
-      </table>
-
-    </div>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnit.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnit.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnit.xsl	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-  xmlns="http://www.w3.org/1999/xhtml";
-  xmlns:d="http://dhis2.org/schema/dxf/2.0";
-  >
-  
-  <xsl:template match="d:organisationUnit">
-    <div class="organisationUnit">
-      <h2> <xsl:value-of select="@name" /> </h2>
-
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-        <tr>
-          <td>Short Name</td>
-          <td> <xsl:value-of select="d:shortName" /> </td>
-        </tr>
-        <tr>
-          <td>Opening Date</td>
-          <td> <xsl:value-of select="d:openingDate" /> </td>
-        </tr>
-        <tr>
-          <td>Closed Date</td>
-          <td> <xsl:value-of select="d:closedDate" /> </td>
-        </tr>
-        <tr>
-          <td>Active</td>
-          <td> <xsl:value-of select="d:active" /> </td>
-        </tr>
-        <tr>
-          <td>Address</td>
-          <td> <xsl:value-of select="d:address" /> </td>
-        </tr>
-        <tr>
-          <td>PhoneNumber</td>
-          <td> <xsl:value-of select="d:phoneNumber" /> </td>
-        </tr>
-
-      </table>
-
-      <xsl:apply-templates select="d:parent|d:children|d:organisationUnitGroups|d:dataSets" mode="short" />
-
-    </div>
-  </xsl:template>
-  
-  <xsl:template match="d:parent" mode="short">
-    <h3>Parent OrganisationUnit</h3>
-    <table>
-      <xsl:apply-templates select="." mode="row"/>
-    </table>
-  </xsl:template>
-
-  <xsl:template match="d:children" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>Child OrganisationUnits</h3>
-      <table>
-        <xsl:apply-templates select="child::*" mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="d:organisationUnits" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>OrganisationUnits</h3>
-      <table>
-        <xsl:apply-templates select="child::*" mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="d:dataSets" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>DataSets</h3>
-      <table class="dataSets">
-        <xsl:apply-templates select="child::*" mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroup.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroup.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroup.xsl	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:organisationUnitGroup">
-    <div class="organisationUnitGroup">
-      <h2> <xsl:value-of select="@name" /> </h2>
-
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:organisationUnitGroupSet|d:organisationUnits" mode="short"/>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:organisationUnitGroups" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>OrganisationUnit Groups</h3>
-      <table class="organisationUnitGroups">
-        <xsl:apply-templates select="child::*" mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-  
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroupSet.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroupSet.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroupSet.xsl	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:organisationUnitGroupSet">
-    <div class="organisationUnitGroupSet">
-      <h2> <xsl:value-of select="@name" /> </h2>
-
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:organisationUnitGroups" mode="short"/>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:organisationUnitGroupSet" mode="short">
-    <h3>OrganisationUnit Group Set</h3>
-    <table class="organisationUnitGroupSet">
-      <xsl:apply-templates select="." mode="row"/>
-    </table>
-  </xsl:template>
-
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitLevel.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitLevel.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitLevel.xsl	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-  xmlns="http://www.w3.org/1999/xhtml";
-  xmlns:d="http://dhis2.org/schema/dxf/2.0";
-  >
-
-  <xsl:template match="d:organisationUnitLevel">
-    <div class="organisationUnitLevel">
-      <h2> <xsl:value-of select="@name" /> </h2>
-
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Level</td>
-          <td> <xsl:value-of select="@level" /> </td>
-        </tr>
-      </table>
-    </div>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/program.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/program.xsl	2013-05-31 05:04:24 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/program.xsl	1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:program">
-    <div class="program">
-      <h2> <xsl:value-of select="@name" /> </h2>
-
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>description</td>
-          <td> <xsl:value-of select="d:description" /> </td>
-        </tr>
-        <tr>
-          <td>version</td>
-          <td> <xsl:value-of select="d:version" /> </td>
-        </tr>
-        <tr>
-          <td>dateOfEnrollmentDescription</td>
-          <td> <xsl:value-of select="d:dateOfEnrollmentDescription" /> </td>
-        </tr>
-        <tr>
-          <td>dateOfIncidentDescription</td>
-          <td> <xsl:value-of select="d:dateOfIncidentDescription" /> </td>
-        </tr>
-        <tr>
-          <td>Type</td>
-          <td> <xsl:value-of select="d:type" /> </td>
-        </tr>
-        <tr>
-          <td>displayProvidedOtherFacility</td>
-          <td> <xsl:value-of select="d:displayProvidedOtherFacility" /> </td>
-        </tr>
-        <tr>
-          <td>displayIncidentDate</td>
-          <td> <xsl:value-of select="d:displayIncidentDate" /> </td>
-        </tr>
-        <tr>
-          <td>generatedByEnrollmentDate</td>
-          <td> <xsl:value-of select="d:generatedByEnrollmentDate" /> </td>
-        </tr>
-        <tr>
-          <td>ignoreOverdueEvents</td>
-          <td> <xsl:value-of select="d:ignoreOverdueEvents" /> </td>
-        </tr>
-        <tr>
-          <td>blockEntryForm</td>
-          <td> <xsl:value-of select="d:blockEntryForm" /> </td>
-        </tr>
-        <tr>
-          <td>onlyEnrollOnce</td>
-          <td> <xsl:value-of select="d:onlyEnrollOnce" /> </td>
-        </tr>
-        <tr>
-          <td>remindCompleted</td>
-          <td> <xsl:value-of select="d:remindCompleted" /> </td>
-        </tr>
-        <tr>
-          <td>disableRegistrationFields</td>
-          <td> <xsl:value-of select="d:disableRegistrationFields" /> </td>
-        </tr>
-        <tr>
-          <td>displayOnAllOrgunit</td>
-          <td> <xsl:value-of select="d:displayOnAllOrgunit" /> </td>
-        </tr>
-        <tr>
-          <td>singleEvent</td>
-          <td> <xsl:value-of select="d:singleEvent" /> </td>
-        </tr>
-        <tr>
-          <td>registration</td>
-          <td> <xsl:value-of select="d:registration" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:programStages|d:userRoles" mode="short" />
-      <xsl:apply-templates select="d:organisationUnits" mode="short" />
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:program" mode="short">
-    <h3>Program</h3>
-    <table>
-      <xsl:apply-templates select="." mode="row"/>
-    </table>
-  </xsl:template>
-
-  <xsl:template match="d:programs" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>Programs</h3>
-      <table class="programs">
-        <xsl:apply-templates mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/programStage.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/programStage.xsl	2013-06-11 04:59:27 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/programStage.xsl	1970-01-01 00:00:00 +0000
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:programStage">
-    <div class="programStage">
-      <h2> <xsl:value-of select="@name" /> </h2>
-
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>description</td>
-          <td> <xsl:value-of select="d:description" /> </td>
-        </tr>
-        <tr>
-          <td>minDaysFromStart</td>
-          <td> <xsl:value-of select="d:minDaysFromStart" /> </td>
-        </tr>
-        <tr>
-          <td>irregular</td>
-          <td> <xsl:value-of select="d:irregular" /> </td>
-        </tr>
-        <tr>
-          <td>reportDateDescription</td>
-          <td> <xsl:value-of select="d:reportDateDescription" /> </td>
-        </tr>
-        <tr>
-          <td>autoGenerateEvent</td>
-          <td> <xsl:value-of select="d:autoGenerateEvent" /> </td>
-        </tr>
-        <tr>
-          <td>validCompleteOnly</td>
-          <td> <xsl:value-of select="d:validCompleteOnly" /> </td>
-        </tr>
-        <tr>
-          <td>validCompleteOnly</td>
-          <td> <xsl:value-of select="d:validCompleteOnly" /> </td>
-        </tr>
-        <tr>
-          <td>displayGenerateEventBox</td>
-          <td> <xsl:value-of select="d:displayGenerateEventBox" /> </td>
-        </tr>
-        <tr>
-          <td>dataEntryType</td>
-          <td> <xsl:value-of select="d:dataEntryType" /> </td>
-        </tr>
-        <tr>
-          <td>defaultTemplateMessage</td>
-          <td> <xsl:value-of select="d:defaultTemplateMessage" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:program|d:programStageDataElements" mode="short" />
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:programStages" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>ProgramStages</h3>
-      <table class="programStages">
-        <xsl:apply-templates mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="d:programStageDataElements" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>ProgramStage DataElements</h3>
-        <xsl:for-each select="d:programStageDataElement">
-          <table>
-            <tr>
-              <td>Compulsory</td>
-              <td colspan="4"> <xsl:value-of select="d:compulsory" /> </td>
-            </tr>
-            <tr>
-              <td>allowProvidedElsewhere</td>
-              <td colspan="4"> <xsl:value-of select="d:allowProvidedElsewhere" /> </td>
-            </tr>
-            <tr>
-              <td>displayInReports</td>
-              <td colspan="4"> <xsl:value-of select="d:displayInReports" /> </td>
-            </tr>
-            <xsl:call-template name="local-de" />
-          </table>
-          <br />
-        </xsl:for-each>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template name="local-de">
-    <tr>
-      <td> <xsl:value-of select="d:dataElement/@name"/> </td>
-      <td> <a href="../dataElements/{d:dataElement/@id}">html</a> </td>
-      <td> <a href="../dataElements/{d:dataElement/@id}.xml">xml</a> </td>
-      <td> <a href="../dataElements/{d:dataElement/@id}.json">json</a> </td>
-      <td> <a href="../dataElements/{d:dataElement/@id}.jsonp">jsonp</a> </td>
-    </tr>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/relativePeriods.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/relativePeriods.xsl	2012-07-24 04:04:14 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/relativePeriods.xsl	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-                version="1.0">
-
-  <xsl:template match="d:relativePeriods">
-    <div class="relativePeriods">
-      <h2>Relative Periods</h2>
-
-	  <table>
-      <tr>
-        <td>lastSixMonth</td>
-        <td> <xsl:value-of select="d:lastSixMonth"/> </td>
-      </tr>
-      <tr>
-        <td>monthsThisYear</td>
-        <td> <xsl:value-of select="d:monthsThisYear"/> </td>
-      </tr>
-      <tr>
-        <td>quartersThisYear</td>
-        <td> <xsl:value-of select="d:quartersThisYear"/> </td>
-      </tr>
-      <tr>
-        <td>thisYear</td>
-        <td> <xsl:value-of select="d:thisYear"/> </td>
-      </tr>
-      <tr>
-        <td>monthsLastYear</td>
-        <td> <xsl:value-of select="d:monthsLastYear"/> </td>
-      </tr>
-      <tr>
-        <td>quartersLastYear</td>
-        <td> <xsl:value-of select="d:quartersLastYear"/> </td>
-      </tr>
-      <tr>
-        <td>lastYear</td>
-        <td> <xsl:value-of select="d:lastYear"/> </td>
-      </tr>
-      <tr>
-        <td>last5Years</td>
-        <td> <xsl:value-of select="d:last5Years"/> </td>
-      </tr>
-      <tr>
-        <td>last12Months</td>
-        <td> <xsl:value-of select="d:last12Months"/> </td>
-      </tr>
-	  <tr>
-        <td>last3Months</td>
-        <td> <xsl:value-of select="d:last3Months"/> </td>
-      </tr>
-      <tr>
-        <td>last6BiMonths</td>
-        <td> <xsl:value-of select="d:last6BiMonths"/> </td>
-      </tr>
-      <tr>
-        <td>last4Quarters</td>
-        <td> <xsl:value-of select="d:last4Quarters"/> </td>
-      </tr>
-      <tr>
-        <td>last2SixMonths</td>
-        <td> <xsl:value-of select="d:last2SixMonths"/> </td>
-      </tr>
-      <tr>
-        <td>lastMonth</td>
-        <td> <xsl:value-of select="d:lastMonth"/> </td>
-      </tr>
-      <tr>
-        <td>lastBimonth</td>
-        <td> <xsl:value-of select="d:lastBimonth"/> </td>
-      </tr>
-      <tr>
-        <td>lastQuarter</td>
-        <td> <xsl:value-of select="d:lastQuarter"/> </td>
-      </tr>
-    </table>
-
-    </div>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/report.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/report.xsl	2013-09-09 13:50:00 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/report.xsl	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-  xmlns="http://www.w3.org/1999/xhtml";
-  xmlns:d="http://dhis2.org/schema/dxf/2.0";
-  >
-
-  <xsl:template match="d:report">
-  <div class="report">
-    <h2> <xsl:value-of select="@name" /> </h2>
-	  
-	  <table>
-		<tr>
-			<td>Resource Data</td>
-			<td><a href="{@href}/data">pdf</a></td>
-			<td><a href="{@href}/data.xls">xls</a></td>
-		</tr>
-		<tr>
-			<td>ou</td>
-			<td colspan="2">organisation unit uid (opt)</td>
-		</tr>
-		<tr>
-			<td>pe</td>
-			<td colspan="2">period yyyy-MM-dd (opt)</td>
-		</tr>
-	  </table><br/>
-	  
-    <table>
-      <tr>
-        <td>ID</td>
-        <td> <xsl:value-of select="@id" /> </td>
-      </tr>
-      <tr>
-        <td>Created</td>
-        <td> <xsl:value-of select="@created" /> </td>
-      </tr>
-      <tr>
-        <td>Last Updated</td>
-        <td> <xsl:value-of select="@lastUpdated" /> </td>
-      </tr>
-      <tr>
-        <td>Code</td>
-        <td> <xsl:value-of select="@code" /> </td>
-      </tr>
-      <tr>
-        <td>UsingOrgUnitGroupSets</td>
-        <td> <xsl:value-of select="d:usingOrgUnitGroupSets" /> </td>
-      </tr>
-    </table>
-
-    <xsl:apply-templates select="d:reportTable" mode="short"/>
-  </div>
-  </xsl:template>
-
-  <xsl:template match="d:reports" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>Reports</h3>
-      <table class="reports">
-        <xsl:apply-templates select="child::*" mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="d:reportTable" mode="short">
-    <xsl:if test="@name">
-      <h3>ReportTable</h3>
-      <table class="reportTable">
-        <xsl:apply-templates select="." mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/reportTable.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/reportTable.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/reportTable.xsl	1970-01-01 00:00:00 +0000
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-  xmlns="http://www.w3.org/1999/xhtml";
-  xmlns:d="http://dhis2.org/schema/dxf/2.0";
-  >
-
-  <xsl:template match="d:reportTable">
-    <div class="reportTable">
-      <h2> <xsl:value-of select="@name" /> </h2>
-	  
-	  <table>
-      <tr>
-        <td>Resource Data</td>
-        <td><a href="{@href}/data.html">html</a></td>
-        <td><a href="{@href}/data.xml">xml</a></td>
-        <td><a href="{@href}/data.json">json</a></td>
-        <td><a href="{@href}/data.pdf">pdf</a></td>
-        <td><a href="{@href}/data.xls">xls</a></td>
-        <td><a href="{@href}/data.csv">csv</a></td>
-      </tr>
-
-      <tr>
-        <td>ou</td>
-        <td colspan="6">organisation unit uid (opt)</td>
-      </tr>
-
-      <tr>
-        <td>pe</td>
-        <td colspan="6">period yyyy-MM-dd (opt)</td>
-      </tr>
-	  </table><br/>
-	  
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-        <tr>
-          <td>Regression</td>
-          <td> <xsl:value-of select="d:regression" /> </td>
-        </tr>
-        <tr>
-          <td>TopLimit</td>
-          <td> <xsl:value-of select="d:topLimit" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:reportParams|d:indicators|d:dataElements|d:dataSets|d:categoryOptionCombos|d:organisationUnits" mode="short" />
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:reportParams" mode="short">
-    <h3>ReportParams</h3>
-    <table class="reportParams">
-      <tr>
-        <td>ParamGrandParentOrganisationUnit</td>
-        <td> <xsl:value-of select="d:paramGrandParentOrganisationUnit" /> </td>
-      </tr>
-      <tr>
-        <td>ParamOrganisationUnit</td>
-        <td> <xsl:value-of select="d:paramOrganisationUnit" /> </td>
-      </tr>
-      <tr>
-        <td>ParamParentOrganisationUnit</td>
-        <td> <xsl:value-of select="d:paramParentOrganisationUnit" /> </td>
-      </tr>
-      <tr>
-        <td>ParamReportingMonth</td>
-        <td> <xsl:value-of select="d:paramReportingMonth" /> </td>
-      </tr>
-    </table>
-  </xsl:template>
-
-  <xsl:template match="d:reportTables" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>ReportTables</h3>
-      <table class="reportTables">
-        <xsl:apply-templates select="child::*" mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/resource.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/resource.xsl	2012-04-17 08:24:35 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/resource.xsl	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-  xmlns="http://www.w3.org/1999/xhtml";
-  xmlns:d="http://dhis2.org/schema/dxf/2.0";
-  >
-
-  <xsl:template match="d:metaData/d:resources" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>Resources</h3>
-      <table>
-        <xsl:apply-templates select="child::*" mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/sqlView.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/sqlView.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/sqlView.xsl	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-  xmlns="http://www.w3.org/1999/xhtml";
-  xmlns:d="http://dhis2.org/schema/dxf/2.0";
-  >
-
-  <xsl:template match="d:sqlView">
-    <div class="sqlView">
-      <h2>
-        <xsl:value-of select="@name" />
-      </h2>
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-        <tr>
-          <td>Description</td>
-          <td> <xsl:value-of select="d:description" /> </td>
-        </tr>
-        <tr>
-          <td>SqlQuery</td>
-          <td> <xsl:value-of select="d:sqlQuery" /> </td>
-        </tr>
-      </table>
-    </div>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/user.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/user.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/user.xsl	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:user">
-    <div class="user">
-      <h2>
-        <xsl:value-of select="@name" />
-      </h2>
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-        <tr>
-          <td>First Name</td>
-          <td> <xsl:value-of select="d:firstName" /> </td>
-        </tr>
-        <tr>
-          <td>Surname</td>
-          <td> <xsl:value-of select="d:surname" /> </td>
-        </tr>
-        <tr>
-          <td>E-Mail</td>
-          <td> <xsl:value-of select="d:email" /> </td>
-        </tr>
-        <tr>
-          <td>PhoneNumber</td>
-          <td> <xsl:value-of select="d:phoneNumber" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:userCredentials|d:organisationUnits" mode="short" />
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:users" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>Users</h3>
-      <table class="users">
-        <xsl:apply-templates select="child::*" mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userAuthorityGroup.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userAuthorityGroup.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userAuthorityGroup.xsl	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:userRole">
-    <div class="userRole">
-      <h2>
-        <xsl:value-of select="@name" />
-      </h2>
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:authorities|d:dataSets" mode="short" />
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:authorities" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>Authorities</h3>
-      <ul>
-        <xsl:apply-templates select="child::*" mode="row"/>
-      </ul>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="d:authority" mode="row">
-    <li><xsl:value-of select="." /> </li>
-  </xsl:template>
-
-  <xsl:template match="d:userRoles" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>UserRoles</h3>
-      <table class="userRoles">
-        <xsl:apply-templates select="child::*" mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userCredentials.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userCredentials.xsl	2012-04-29 08:31:18 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userCredentials.xsl	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:userCredentials" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>UserCredentials</h3>
-      <table class="userCredentials">
-        <tr>
-          <td>Username</td>
-          <td> <xsl:value-of select="d:username" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:userAuthorityGroups" mode="short" />
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userGroup.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userGroup.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userGroup.xsl	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml";
-                xmlns:d="http://dhis2.org/schema/dxf/2.0";
-    >
-
-  <xsl:template match="d:userGroup">
-    <div class="userGroup">
-      <h2>
-        <xsl:value-of select="@name" />
-      </h2>
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:users" mode="short" />
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:userGroups" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>UserGroups</h3>
-      <table class="userGroups">
-        <xsl:apply-templates select="child::*" mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/validationRule.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/validationRule.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/validationRule.xsl	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-  xmlns="http://www.w3.org/1999/xhtml";
-  xmlns:d="http://dhis2.org/schema/dxf/2.0";
-  >
-
-  <xsl:template match="d:validationRule">
-    <div class="validationRule">
-      <h2>
-        <xsl:value-of select="@name" />
-      </h2>
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-        <tr>
-          <td>Description</td>
-          <td> <xsl:value-of select="d:description" /> </td>
-        </tr>
-        <tr>
-          <td>Operator</td>
-          <td> <xsl:value-of select="d:operator" /> </td>
-        </tr>
-        <tr>
-          <td>Type</td>
-          <td> <xsl:value-of select="d:type" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:leftSide|d:rightSide|d:validationRuleGroups" mode="short" />
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:leftSide" mode="short">
-    <h3>LeftSide Expression</h3>
-    <table class="expression">
-      <tr>
-        <td>Description</td>
-        <td> <xsl:value-of select="d:description" /> </td>
-      </tr>
-      <tr>
-        <td>Expression</td>
-        <td> <xsl:value-of select="d:expression" /> </td>
-      </tr>
-    </table>
-  </xsl:template>
-
-  <xsl:template match="d:rightSide" mode="short">
-    <h3>RightSide Expression</h3>
-    <table class="expression">
-      <tr>
-        <td>Description</td>
-        <td> <xsl:value-of select="d:description" /> </td>
-      </tr>
-      <tr>
-        <td>Expression</td>
-        <td> <xsl:value-of select="d:expression" /> </td>
-      </tr>
-    </table>
-  </xsl:template>
-
-  <xsl:template match="d:validationRules" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>ValidationRules</h3>
-      <table class="validationRules">
-        <xsl:apply-templates select="child::*" mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/validationRuleGroup.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/validationRuleGroup.xsl	2013-05-31 04:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/validationRuleGroup.xsl	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-  xmlns="http://www.w3.org/1999/xhtml";
-  xmlns:d="http://dhis2.org/schema/dxf/2.0";
-  >
-
-  <xsl:template match="d:validationRuleGroup">
-    <div class="validationRuleGroup">
-      <h2>
-        <xsl:value-of select="@name" />
-      </h2>
-      <table>
-        <tr>
-          <td>ID</td>
-          <td> <xsl:value-of select="@id" /> </td>
-        </tr>
-        <tr>
-          <td>Created</td>
-          <td> <xsl:value-of select="@created" /> </td>
-        </tr>
-        <tr>
-          <td>Last Updated</td>
-          <td> <xsl:value-of select="@lastUpdated" /> </td>
-        </tr>
-        <tr>
-          <td>Code</td>
-          <td> <xsl:value-of select="@code" /> </td>
-        </tr>
-        <tr>
-          <td>Description</td>
-          <td> <xsl:value-of select="d:description" /> </td>
-        </tr>
-      </table>
-
-      <xsl:apply-templates select="d:validationRules" mode="short" />
-    </div>
-  </xsl:template>
-
-  <xsl:template match="d:validationRuleGroups" mode="short">
-    <xsl:if test="count(child::*) > 0">
-      <h3>ValidationRuleGroups</h3>
-      <table class="validationRuleGroups">
-        <xsl:apply-templates select="child::*" mode="row"/>
-      </table>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/metadata2dsd.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/metadata2dsd.xsl	2012-10-29 13:52:55 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/metadata2dsd.xsl	2014-05-22 12:23:36 +0000
@@ -1,73 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet 
-    xmlns:d2="http://dhis2.org/schema/dxf/2.0";
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
-    version="1.0">
-    
-    <xsl:output method="xml" indent="yes"/>
-    
-    <xsl:key name="disaggs_per_categorycombo" 
-             match="/d2:metaData/d2:categoryOptionCombos/d2:categoryOptionCombo" 
-             use="d2:categoryCombo/@id"/>
-
-    <xsl:template match="/">
-        <reportTemplates>
-            <dataElements>
-                <xsl:apply-templates select="/d2:metaData/d2:dataElements"/>
-            </dataElements>
-            <disaggregations>
-                <xsl:apply-templates select="/d2:metaData/d2:categoryOptionCombos"/>
-            </disaggregations>
-            <xsl:apply-templates select="/d2:metaData/d2:dataSets"/>
-        </reportTemplates>
-    </xsl:template>
-    
-    <xsl:template match="d2:dataElement">
-        <dataElement uid="{@id}" code="{@code}" name="{@name}" type="{d2:type}"/>
-    </xsl:template>
-    
-    <xsl:template match="d2:categoryOptionCombo">
-        <!-- catoptcombos have no code :-(
-          <disaggregation uid="{@id}" code="{@code}" name="{@name}" />
-        -->
-        <disaggregation uid="{@id}" code="{@id}" name="{@name}" />
-    </xsl:template>
-    
-    <xsl:template match="d2:dataSet">
-        <reportTemplate>
-            <name>
-                <xsl:value-of select="@name"/>
-            </name>
-            <uid>
-                <xsl:value-of select="@id"/>
-            </uid>
-            <code>
-                <xsl:value-of select="@code"/>
-            </code>
-            <periodType>
-                <xsl:value-of select="d2:periodType"/>
-            </periodType>
-            <dataValueTemplates>
-                <xsl:apply-templates select="d2:dataElements" mode="dataset"/>
-            </dataValueTemplates>
-        </reportTemplate>
-    </xsl:template>
-    
-    <xsl:template match="d2:dataElement" mode="dataset">
-        <xsl:variable name="de_id" select="@id"/>
-        <xsl:variable name="de_code" select="@code"/>
-        <xsl:variable name="catcombo"
-                      select="/d2:metaData/d2:dataElements/d2:dataElement[@id=$de_id]/d2:categoryCombo/@id"/>
-        <xsl:for-each select="key('disaggs_per_categorycombo',$catcombo)">
-            <xsl:element name="dataValueTemplate">
-                <xsl:attribute name="dataElement">
-                    <xsl:value-of select="$de_code"/>
-                </xsl:attribute>
-                <xsl:attribute name="disaggregation">
-                    <xsl:value-of select="@id"/>
-                </xsl:attribute>        
-            </xsl:element>
-        </xsl:for-each>
-    </xsl:template>
-    
+<xsl:stylesheet
+  xmlns:d2="http://dhis2.org/schema/dxf/2.0";
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
+  version="1.0">
+
+  <xsl:output method="xml" indent="yes" />
+
+  <xsl:key name="disaggs_per_categorycombo"
+    match="/d2:metaData/d2:categoryOptionCombos/d2:categoryOptionCombo"
+    use="d2:categoryCombo/@id" />
+
+  <xsl:template match="/">
+    <reportTemplates>
+      <dataElements>
+        <xsl:apply-templates select="/d2:metaData/d2:dataElements" />
+      </dataElements>
+      <disaggregations>
+        <xsl:apply-templates select="/d2:metaData/d2:categoryOptionCombos" />
+      </disaggregations>
+      <xsl:apply-templates select="/d2:metaData/d2:dataSets" />
+    </reportTemplates>
+  </xsl:template>
+
+  <xsl:template match="d2:dataElement">
+    <dataElement uid="{@id}" code="{@code}" name="{@name}" type="{d2:type}" />
+  </xsl:template>
+
+  <xsl:template match="d2:categoryOptionCombo">
+    <!-- catoptcombos have no code :-(
+      <disaggregation uid="{@id}" code="{@code}" name="{@name}" />
+    -->
+    <disaggregation uid="{@id}" code="{@id}" name="{@name}" />
+  </xsl:template>
+
+  <xsl:template match="d2:dataSet">
+    <reportTemplate>
+      <name>
+        <xsl:value-of select="@name" />
+      </name>
+      <uid>
+        <xsl:value-of select="@id" />
+      </uid>
+      <code>
+        <xsl:value-of select="@code" />
+      </code>
+      <periodType>
+        <xsl:value-of select="d2:periodType" />
+      </periodType>
+      <dataValueTemplates>
+        <xsl:apply-templates select="d2:dataElements" mode="dataset" />
+      </dataValueTemplates>
+    </reportTemplate>
+  </xsl:template>
+
+  <xsl:template match="d2:dataElement" mode="dataset">
+    <xsl:variable name="de_id" select="@id" />
+    <xsl:variable name="de_code" select="@code" />
+    <xsl:variable name="catcombo"
+      select="/d2:metaData/d2:dataElements/d2:dataElement[@id=$de_id]/d2:categoryCombo/@id" />
+    <xsl:for-each select="key('disaggs_per_categorycombo',$catcombo)">
+      <xsl:element name="dataValueTemplate">
+        <xsl:attribute name="dataElement">
+          <xsl:value-of select="$de_code" />
+        </xsl:attribute>
+        <xsl:attribute name="disaggregation">
+          <xsl:value-of select="@id" />
+        </xsl:attribute>
+      </xsl:element>
+    </xsl:for-each>
+  </xsl:template>
+
 </xsl:stylesheet>
\ No newline at end of file