dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12121
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-09-17 19:15:10 +0200
message:
  Made interpretations look better
modified:
  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/style/dashboard.css


--
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-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-05-29 15:09:05 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm	2013-09-17 17:15:10 +0000
@@ -1,33 +1,39 @@
+#macro( getSymbol $ip )
+#if( $ip.chartInterpretation )
+<img src="../images/chart.png">
+#elseif( $ip.mapInterpretation )
+<img src="../images/map.png">
+#elseif( $ip.reportTableInterpretation )
+<img src="../images/table.png">
+#elseif( $ip.dataSetReportInterpretation )
+<img src="../images/dataset.png">
+#end
+#end
+
 #set( $maxComments = 4 )
 #foreach( $ip in $interpretations )
 <div class="interpretationContainer">
-    <div class="interpretationSymbol">
-	#if( $ip.chartInterpretation )
-	   <img src="../images/chart.png">
-    #elseif( $ip.mapInterpretation )
-        <img src="../images/map.png">
-    #elseif( $ip.reportTableInterpretation )
-        <img src="../images/table.png">
-    #elseif( $ip.dataSetReportInterpretation )
-        <img src="../images/dataset.png">
-    #end
-    
     #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
-    </div>
+    
     <div class="interpretation">
 	    <div class="interpretationName">
-	        <a class="bold userLink" href="profile.action?id=${ip.user.uid}">${encoder.htmlEncode( $ip.user.name )}</a>&nbsp;
-	        <span class="grey">${format.formatDate( $ip.created )}</span>
+	    	<div class="interpretationSymbol">
+	    	  #getSymbol( $ip )
+	    	</div>
+	    	<div class="interpretationUser">
+	           <a class="bold userLink" href="profile.action?id=${ip.user.uid}">${encoder.htmlEncode( $ip.user.name )}</a><br>
+	           <span class="tipText">${format.formatDate( $ip.created )}</span>
+	        </div>
 	    </div>
 	    <div class="interpretationText">
 	        $!dhisTextUtils.htmlify( ${ip.text} )
 	    </div>
-	    <div class="interpretationChart">
+	    <div class="interpretationItem">
 	    #if( $ip.chartInterpretation )
 	        <a href="../dhis-web-visualizer/app/index.html?id=${ip.chart.uid}&date=${format.formatDate( $ip.created )}">
 	        <img style="cursor:pointer" 
-	             src="../api/charts/${ip.chart.uid}/data?date=${format.formatDate( $ip.created )}&width=530&height=300${ou}"	             
+	             src="../api/charts/${ip.chart.uid}/data?date=${format.formatDate( $ip.created )}&width=560&height=300${ou}"	             
 	             title="$i18n.getString( 'click_to_view_in_data_visualizer' )"></a>
 	    #elseif( $ip.mapInterpretation )
 	        <a class="bold" 

=== 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	2013-09-08 20:40:11 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2013-09-17 17:15:10 +0000
@@ -99,8 +99,8 @@
   padding: 6px;
   margin: 0 19px 19px 0;
   border-radius: 3px;
-  cursor: pointer;  
-  box-shadow: #ddd 0px 1px 3px 0px;
+  cursor: pointer;
+  box-shadow: #ddd 0 1px 3px 0;
   overflow: auto;
 }
 
@@ -128,7 +128,7 @@
 .item:hover
 {
   border: 1px solid #bbb;
-  box-shadow: #ccc 0px 1px 3px 0px;
+  box-shadow: #ccc 0 1px 3px 0;
 }
 
 .item::-webkit-scrollbar
@@ -201,7 +201,7 @@
   width: 486px;
   border: 1px solid #aaa;
   padding: 5px 6px 0 6px;
-  box-shadow: #ccc 0px 1px 2px 0px inset;
+  box-shadow: #ccc 0 1px 2px 0 inset;
   border-radius: 2px;
 }
 
@@ -237,7 +237,7 @@
   background-color: #fff;
   display: none;
   z-index: 5;
-  box-shadow: #ccc 0px 1px 2px 0px;
+  box-shadow: #ccc 0 1px 2px 0;
 }
 
 #hitDiv li
@@ -456,11 +456,6 @@
   height: 200px;
 }
 
-.grey
-{
-  color: #555;
-}
-
 .userLink
 {
   font-size: 10pt;
@@ -473,7 +468,6 @@
 #interpretationFeed
 {
   width: 600px;
-  border-top: 1px solid #ccc;
 }
 
 #shareLink
@@ -485,34 +479,44 @@
 
 .interpretationContainer
 {
-  width: 590px;
-  border-bottom: 1px solid #ccc;
-  padding: 24px 10px 24px 10px;
-}
-
-.interpretation
-{
-  margin-left: 48px;
+  width: 580px;
+  border: 1px solid #ddd;
+  border-radius: 3px;
+  padding: 30px 20px 20px 20px;
+  margin-bottom: 25px;
+  box-shadow: #ddd 0 1px 1px 0;
 }
 
 .interpretationSymbol
 {
-  float: left;
+  display: inline-block;
+  padding-right: 15px;
+}
+
+.interpretationUser
+{
+  display: inline-block;
 }
 
 .interpretationName
 {
-  margin-bottom: 7px;
+  margin-bottom: 20px;
 }
 
 .interpretationText
 {
-  margin-bottom: 16px;
-}
-
-.interpretationChart
-{
-  margin-bottom: 16px;
+  margin-bottom: 20px;
+}
+
+.interpretationItem
+{
+  margin-bottom: 22px;
+}
+
+.interpretationItem img
+{
+  border: 1px solid #eee;
+  padding: 10px;
 }
 
 .interpretationCommentArea