dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11083
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-05-29 17:09:05 +0200
message:
  Interpretations, redirect to pivot module for report table interpretations
modified:
  dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm


--
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-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java	2013-05-28 17:05:43 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java	2013-05-29 15:09:05 +0000
@@ -105,10 +105,10 @@
         WritableFont.ARIAL, 10, WritableFont.BOLD, false ) );
 
     private static final WritableCellFormat XLS_FORMAT_LABEL = new WritableCellFormat( new WritableFont(
-        WritableFont.ARIAL, 10, WritableFont.BOLD, true ) );
+        WritableFont.ARIAL, 10, WritableFont.BOLD, false ) );
     
-    private static final WritableCellFormat XLS_FORMAT_TEXT = new WritableCellFormat( new WritableFont( WritableFont.ARIAL,
-        10, WritableFont.NO_BOLD, false ) );
+    private static final WritableCellFormat XLS_FORMAT_TEXT = new WritableCellFormat( new WritableFont( 
+        WritableFont.ARIAL, 10, WritableFont.NO_BOLD, false ) );
 
     private static final Encoder ENCODER = new Encoder();
     

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm	2013-02-06 14:45:08 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm	2013-05-29 15:09:05 +0000
@@ -37,7 +37,7 @@
 	    #elseif( $ip.reportTableInterpretation )	        
 	        <a class="bold"
 	           title="$i18n.getString( 'click_to_view_report_table' )" 
-	           href="../dhis-web-reporting/exportTable.action?uid=${ip.reportTable.uid}${pe}${ou}">
+	           href="../dhis-web-pivot/app/index.html?id=${ip.reportTable.uid}${pe}${ou}">
 	           $encoder.htmlEncode( $ip.reportTable.name )</a>
 	    #elseif( $ip.dataSetReportInterpretation )
 	        <a class="bold"