=== 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-11-29 13:41:44 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm 2013-11-29 14:20:31 +0000 @@ -10,21 +10,108 @@ #end #end + + + + +#macro( gearDropDown ) +
+ +
+#end + + + #set( $maxComments = 4 ) #foreach( $ip in $interpretations )
#if( $ip.organisationUnit )#set( $ou = "&ou=" + $ip.organisationUnit.uid )#else#set( $ou = "" )#end #if( $ip.period )#set( $pe = "&pe=" + $ip.period.isoDate )#else#set( $pe = "" )#end - +
#getSymbol( $ip )
- ${encoder.htmlEncode( $ip.user.name )}
- ${format.formatDate( $ip.created )} -
+ ${encoder.htmlEncode( $ip.user.name )}
+ ${format.formatDate( $ip.created )} +
+ #gearDropDown()
$!dhisTextUtils.htmlify( ${ip.text} ) @@ -32,7 +119,7 @@
#if( $ip.chartInterpretation ) - #elseif( $ip.mapInterpretation ) @@ -40,9 +127,9 @@ - #elseif( $ip.reportTableInterpretation ) + #elseif( $ip.reportTableInterpretation ) $encoder.htmlEncode( $ip.reportTable.name ) #elseif( $ip.dataSetReportInterpretation ) @@ -52,12 +139,12 @@ $encoder.htmlEncode( $ip.dataSet.name ) #end
- + #set( $comments = $ip.comments ) #set( $commentStartPos = ( $comments.size() - $maxComments ) ) -
+
#if( $comments.size() > $maxComments ) - + #end
#foreach( $comment in $comments )