← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7772: Updated link to href in web api

 

------------------------------------------------------------
revno: 7772
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-07-30 21:02:10 +0200
message:
  Updated link to href in web api
modified:
  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/document.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/report.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/reportTable.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/html/chart.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/chart.xsl	2012-07-10 10:12:30 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/chart.xsl	2012-07-30 19:02:10 +0000
@@ -11,7 +11,7 @@
 	  <table>
 		<tr>
 			<td>Resource Data</td>
-			<td><a href="{@link}/data">png</a></td>
+			<td><a href="{@href}/data">png</a></td>
 		</tr>
 		<tr>
 			<td>width</td>
@@ -54,7 +54,7 @@
 		</tr>
 	  </table><br/>
 	  
-      <a href="{@link}/data"><img src="{@link}/data" style="border-style:solid; border-width: 1px; padding: 5px;" /></a>
+      <a href="{@href}/data"><img src="{@href}/data" style="border-style:solid; border-width: 1px; padding: 5px;" /></a>
 
       <h3>Details</h3>
 

=== modified 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	2012-04-08 20:23:29 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/document.xsl	2012-07-30 19:02:10 +0000
@@ -11,7 +11,7 @@
 	  <table>
 		<tr>
 			<td>Resource Data</td>
-			<td><a href="{@link}/data">any</a></td>
+			<td><a href="{@href}/data">any</a></td>
 		</tr>
 	  </table><br/>
 	  

=== modified 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	2012-04-08 20:23:29 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/map.xsl	2012-07-30 19:02:10 +0000
@@ -9,7 +9,7 @@
 	  <table>
 		<tr>
 			<td>Resource Data</td>
-			<td><a href="{@link}/data">png</a></td>
+			<td><a href="{@href}/data">png</a></td>
 		</tr>
 	  </table><br/>
 	  
@@ -32,7 +32,7 @@
 		</tr>
 	  </table><br/>
 	  
-      <a href="{@link}/data"><img src="{@link}/data" style="border-style:solid; border-width: 1px; padding: 5px;" /></a>
+      <a href="{@href}/data"><img src="{@href}/data" style="border-style:solid; border-width: 1px; padding: 5px;" /></a>
 
       <h3>Details</h3>
 
@@ -43,7 +43,7 @@
         <xsl:for-each select="child::*">
           <tr><td><xsl:value-of select="local-name()"/></td><td>
             <xsl:choose>
-              <xsl:when test="@name"><a href="{@link}"><xsl:value-of select="@name"/></a>
+              <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>
@@ -58,31 +58,31 @@
       <td><xsl:value-of select="@name"/></td>
       <td>
         <xsl:element name="a">
-          <xsl:attribute name="href"><xsl:value-of select="@link"/></xsl:attribute>
+          <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(@link,'.png')"/></xsl:attribute>
+          <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(@link,'.xml')"/></xsl:attribute>
+          <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(@link,'.json')"/></xsl:attribute>
+          <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(@link,'.jsonp')"/></xsl:attribute>
+          <xsl:attribute name="href"><xsl:value-of select="concat(@href,'.jsonp')"/></xsl:attribute>
           <xsl:text>jsonp</xsl:text>
         </xsl:element>
       </td>

=== modified 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	2012-04-08 20:23:29 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/report.xsl	2012-07-30 19:02:10 +0000
@@ -11,8 +11,8 @@
 	  <table>
 		<tr>
 			<td>Resource Data</td>
-			<td><a href="{@link}/data">pdf</a></td>
-			<td><a href="{@link}/data.xls">xls</a></td>
+			<td><a href="{@href}/data">pdf</a></td>
+			<td><a href="{@href}/data.xls">xls</a></td>
 		</tr>
 		<tr>
 			<td>ou</td>

=== modified 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	2012-05-16 20:48:16 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/reportTable.xsl	2012-07-30 19:02:10 +0000
@@ -11,12 +11,12 @@
 	  <table>
       <tr>
         <td>Resource Data</td>
-        <td><a href="{@link}/data.html">html</a></td>
-        <td><a href="{@link}/data.xml">xml</a></td>
-        <td><a href="{@link}/data.json">json</a></td>
-        <td><a href="{@link}/data.pdf">pdf</a></td>
-        <td><a href="{@link}/data.xls">xls</a></td>
-        <td><a href="{@link}/data.csv">csv</a></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>