=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/chart.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/chart.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/chart.png	2012-10-04 10:34:08 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/dataset.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/dataset.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/dataset.png	2012-10-04 10:34:08 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/map.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/map.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/map.png	2012-10-04 10:34:08 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/table.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/table.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/table.png	2012-10-04 10:34:08 +0000 differ
=== 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	2012-10-03 16:07:42 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm	2012-10-04 10:34:08 +0000
@@ -1,55 +1,66 @@
 #foreach( $ip in $interpretations )
-<div class="interpretation">
-
-    <div class="interpretationName">
-        <span class="bold" style="cursor:pointer" onclick="showUserInfo( '${ip.user.id}' )">${ip.user.name}</span>&nbsp;
-        <span class="grey">${format.formatDate( $ip.created )}</span>
-    </div>
-    <div class="interpretationText">
-        $!dhisTextUtils.htmlify( ${ip.text} )
-    </div>
-    <div class="interpretationChart">
-    #if( $ip.chartInterpretation )  
-        <img style="cursor:pointer" 
-             src="../api/charts/${ip.chart.uid}/data?date=${format.formatDate( $ip.created )}&width=530&height=300" 
-             onclick="javascript:window.location.href='../dhis-web-visualizer/app/index.html?id=${ip.chart.uid}&date=${format.formatDate( $ip.created )}'"
-             title="$i18n.getString( 'click_to_view_in_data_visualizer' )">
+<div class="interpretationContainer">
+    <div class="interpretationSymbol">
+	#if( $ip.chartInterpretation )
+	   <img src="../images/chart.png">
     #elseif( $ip.mapViewInterpretation )
-        <a class="bold" 
-           title="$i18n.getString( 'click_to_view_in_gis' )" 
-           href="../dhis-web-mapping/mapping/index.html?id=${ip.mapView.uid}">$encoder.htmlEncode( $ip.mapView.name )</a>
+        <img src="../images/map.png">
     #elseif( $ip.reportTableInterpretation )
-        #if( $ip.organisationUnit )#set( $ou = "&ou=" + $ip.organisationUnit.uid )#else#set( $ou = "" )#end
-        <a class="bold" 
-           title="$i18n.getString( 'click_to_view_report_table' )" 
-           href="../dhis-web-reporting/exportTable.action?uid=${ip.reportTable.uid}&pe=${format.formatDate( $ip.created )}${ou}">
-            $encoder.htmlEncode( $ip.reportTable.name )</a>
+        <img src="../images/table.png">
     #elseif( $ip.dataSetReportInterpretation )
-        <a class="bold"
-           title="$i18n.getString( 'click_to_view_data_set_report' )"
-           href="../dhis-web-reporting/showDataSetReportForm.action?ds=${ip.dataSet.uid}&pe=${ip.period.isoDate}&ou=${ip.organisationUnit.uid}">
-           $encoder.htmlEncode( $ip.dataSet.name )</a>
+        <img src="../images/dataset.png">
     #end
     </div>
-    
-    #set( $comments = $ip.comments )
-    <div class="interpretationCommentArea">
-        <div id="comments${ip.uid}">
-        #foreach( $comment in $comments )
-        <div>
-            <div class="interpretationName">
-                <span class="bold pointer" onclick="showUserInfo( '${comment.user.id}' )">${comment.user.name}</span>&nbsp;
-                <span class="grey">${format.formatDate( $comment.created )}</span>
-            </div>
-        </div>
-        <div class="interpretationText">
-            ${comment.text}
-        </div>
-        #end
-        </div>
-        <textarea id="commentArea${ip.uid}" class="commentArea" placeholder="$i18n.getString( 'add_a_comment' )..."></textarea>
-        <input type="button" class="commentButton" value="Post comment" onclick="postComment( '${ip.uid}' )">
+    <div class="interpretation">
+	    <div class="interpretationName">
+	        <span class="bold" style="cursor:pointer" onclick="showUserInfo( '${ip.user.id}' )">${ip.user.name}</span>&nbsp;
+	        <span class="grey">${format.formatDate( $ip.created )}</span>
+	    </div>
+	    <div class="interpretationText">
+	        $!dhisTextUtils.htmlify( ${ip.text} )
+	    </div>
+	    <div class="interpretationChart">
+	    #if( $ip.chartInterpretation )
+	        <img style="cursor:pointer" 
+	             src="../api/charts/${ip.chart.uid}/data?date=${format.formatDate( $ip.created )}&width=530&height=300" 
+	             onclick="javascript:window.location.href='../dhis-web-visualizer/app/index.html?id=${ip.chart.uid}&date=${format.formatDate( $ip.created )}'"
+	             title="$i18n.getString( 'click_to_view_in_data_visualizer' )">
+	    #elseif( $ip.mapViewInterpretation )
+	        <a class="bold" 
+	           title="$i18n.getString( 'click_to_view_in_gis' )" 
+	           href="../dhis-web-mapping/mapping/index.html?id=${ip.mapView.uid}">$encoder.htmlEncode( $ip.mapView.name )</a>
+	    #elseif( $ip.reportTableInterpretation )
+	        #if( $ip.organisationUnit )#set( $ou = "&ou=" + $ip.organisationUnit.uid )#else#set( $ou = "" )#end
+	        <a class="bold"
+	           title="$i18n.getString( 'click_to_view_report_table' )" 
+	           href="../dhis-web-reporting/exportTable.action?uid=${ip.reportTable.uid}&pe=${format.formatDate( $ip.created )}${ou}">
+	            $encoder.htmlEncode( $ip.reportTable.name )</a>
+	    #elseif( $ip.dataSetReportInterpretation )
+	        <a class="bold"
+	           title="$i18n.getString( 'click_to_view_data_set_report' )"
+	           href="../dhis-web-reporting/showDataSetReportForm.action?ds=${ip.dataSet.uid}&pe=${ip.period.isoDate}&ou=${ip.organisationUnit.uid}">
+	           $encoder.htmlEncode( $ip.dataSet.name )</a>
+	    #end
+	    </div>
+	    
+	    #set( $comments = $ip.comments )
+	    <div class="interpretationCommentArea">
+	        <div id="comments${ip.uid}">
+	        #foreach( $comment in $comments )
+	        <div>
+	            <div class="interpretationName">
+	                <span class="bold pointer" onclick="showUserInfo( '${comment.user.id}' )">${comment.user.name}</span>&nbsp;
+	                <span class="grey">${format.formatDate( $comment.created )}</span>
+	            </div>
+	        </div>
+	        <div class="interpretationText">
+	            ${comment.text}
+	        </div>
+	        #end
+	        </div>
+	        <textarea id="commentArea${ip.uid}" class="commentArea" placeholder="$i18n.getString( 'add_a_comment' )..."></textarea>
+	        <input type="button" class="commentButton" value="Post comment" onclick="postComment( '${ip.uid}' )">
+	    </div>
     </div>
-    
 </div>
 #end
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2012-07-27 12:38:08 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2012-10-04 10:34:08 +0000
@@ -219,7 +219,7 @@
 
 #interpretationFeed
 {
-  width: 550px;
+  width: 600px;
   border-top: 1px solid #ccc;
 }
 
@@ -230,11 +230,21 @@
   margin-bottom: 9px;
 }
 
+.interpretationContainer
+{
+  width: 590px;
+  border-bottom: 1px solid #ccc;
+  padding: 22px 10px 20px 10px;
+}
+
 .interpretation
 {
-  width: 550px;
-  border-bottom: 1px solid #ccc;
-  padding: 22px 10px 16px 10px;
+  margin-left: 50px;
+}
+
+.interpretationSymbol
+{
+  float: left;
 }
 
 .interpretationName
@@ -263,7 +273,7 @@
 .commentArea
 {
   height: 18px;
-  width: 370px;
+  width: 360px;
   border: 1px solid #ccc;
   resize: none;
   overflow: auto;