dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5445
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-12-15 21:23:22 +0100
message:
  Web api, added link to data view on all object pages
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	2011-12-15 19:34:24 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/chart.xsl	2011-12-15 20:23:22 +0000
@@ -6,7 +6,15 @@
 
   <xsl:template match="d:chart">
     <div class="chart">
-      <h2>Chart: <xsl:value-of select="@name"/> </h2>
+      <h2> <xsl:value-of select="@name"/> </h2>
+	  
+	  <table>
+		<tr>
+			<td>Data</td>
+			<td><a href="{@link}/data">png</a></td>
+		</tr>
+	  </table><br/>
+	  
       <a href="{@link}/data"><img src="{@link}/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	2011-12-15 19:34:24 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/document.xsl	2011-12-15 20:23:22 +0000
@@ -7,6 +7,14 @@
   <xsl:template match="d:document">
     <div class="document">
       <h2> <xsl:value-of select="@name" /> </h2>
+	  
+	  <table>
+		<tr>
+			<td>Data</td>
+			<td><a href="{@link}/data">any</a></td>
+		</tr>
+	  </table><br/>
+	  
       <table>
         <tr>
           <td>ID</td>

=== 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	2011-12-15 19:34:24 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/map.xsl	2011-12-15 20:23:22 +0000
@@ -5,7 +5,15 @@
   <xsl:template match="d:map">
     <div class="map">
       <h2><xsl:value-of select="@name"/></h2>
-      <a href="{@link}.png"><img src="{@link}.png" style="border-style:solid; border-width: 1px; padding: 5px;" /></a>
+	  
+	  <table>
+		<tr>
+			<td>Data</td>
+			<td><a href="{@link}/data">png</a></td>
+		</tr>
+	  </table><br/>
+	  
+      <a href="{@link}/data"><img src="{@link}/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/report.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/report.xsl	2011-12-15 19:34:24 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/report.xsl	2011-12-15 20:23:22 +0000
@@ -6,9 +6,16 @@
 
   <xsl:template match="d:report">
     <div class="report">
-      <h2>
-        <xsl:value-of select="@name" />
-      </h2>
+      <h2> <xsl:value-of select="@name" /> </h2>
+	  
+	  <table>
+		<tr>
+			<td>Data</td>
+			<td><a href="{@link}/data">pdf</a></td>
+			<td><a href="{@link}/data.xls">xls</a></td>
+		</tr>
+	  </table><br/>
+	  
       <table>
         <tr>
           <td>ID</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	2011-12-15 19:34:24 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/reportTable.xsl	2011-12-15 20:23:22 +0000
@@ -6,9 +6,18 @@
 
   <xsl:template match="d:reportTable">
     <div class="reportTable">
-      <h2>
-        <xsl:value-of select="@name" />
-      </h2>
+      <h2> <xsl:value-of select="@name" /> </h2>
+	  
+	  <table>
+		<tr>
+			<td>Data</td>
+			<td><a href="{@link}/data">html</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>
+		</tr>
+	  </table><br/>
+	  	  
       <table>
         <tr>
           <td>ID</td>