dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Bob Jolliffe bobjolliffe@xxxxxxxxx
------------------------------------------------------------
revno: 5309 [merge]
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-12-06 16:53:31 +0100
message:
  merged with dhis-dxf
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/xslt/chart.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/xslt/dataSet.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/xslt/indicator.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/xslt/map.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

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/xslt/chart.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/xslt/chart.xsl	2011-12-06 13:34:35 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/xslt/chart.xsl	2011-12-06 14:07:14 +0000
@@ -5,7 +5,7 @@
     version="1.0">
     
     <xsl:template match="d:chart">
-        <div class="d:chart">
+        <div class="chart">
             <h2>
                 <xsl:value-of select="@name"/>
             </h2>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/xslt/dataSet.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/xslt/dataSet.xsl	2011-12-06 13:34:35 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/xslt/dataSet.xsl	2011-12-06 14:07:14 +0000
@@ -5,7 +5,7 @@
   >
 
   <xsl:template match="d:dataSet">
-    <div class="d:dataSet">
+    <div class="dataSet">
       <h2>
         <xsl:value-of select="@name" />
       </h2>
@@ -51,7 +51,7 @@
   <xsl:template match="d:dataElements">
     <xsl:if test="count(child::*) > 0">
       <h3>DataElements</h3>
-      <table border="1" class="d:dataElements">
+      <table border="1" class="dataElements">
           <xsl:apply-templates mode="row"/>
       </table>
     </xsl:if>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/xslt/indicator.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/xslt/indicator.xsl	2011-12-06 13:34:35 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/xslt/indicator.xsl	2011-12-06 14:07:14 +0000
@@ -75,7 +75,7 @@
   <xsl:template match="d:groups">
     <xsl:if test="count(child::*) > 0">
       <h3>Indicator Groups</h3>
-      <table border="1" class="d:indicatorGroups">
+      <table border="1" class="indicatorGroups">
         <xsl:apply-templates select="child::*" mode="row"/>
       </table>
     </xsl:if>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/xslt/map.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/xslt/map.xsl	2011-12-06 15:03:45 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/xslt/map.xsl	2011-12-06 15:53:31 +0000
@@ -1,13 +1,11 @@
 <?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";
-    >
+    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>Map: <xsl:value-of select="@name"/></h2>
-              <a href="{@link}.png"><img src="{@link}.png" style="border-style:solid; border-width: 1px; padding: 5px;" /></a>
+            <a href="{@link}.png"><img src="{@link}.png" style="border-style:solid; border-width: 1px; padding: 5px;" /></a>
 
             <table border="1">
                <xsl:for-each select="attribute::*">