dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3191: Work in progress

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Mon, 28 Mar 2011 16:21:28 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 3191
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-03-28 18:19:29 +0200
message:
  Work in progress
modified:
  labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetChartAction.java
  labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/ProvideContentAction.java
  labs/dhis-web-light/src/main/webapp/dhis-web-light/dashboard.vm
  labs/dhis-web-light/src/main/webapp/dhis-web-light/style/dhis-web-light.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 'labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetChartAction.java'
--- labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetChartAction.java	2011-03-24 19:34:13 +0000
+++ labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetChartAction.java	2011-03-28 16:19:29 +0000
@@ -114,7 +114,7 @@
         {
             chart = chartService.getJFreeChart( id, format );
             
-            height = 200;
+            height = 300;
             
             width = 400;
         }

=== modified file 'labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/ProvideContentAction.java'
--- labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/ProvideContentAction.java	2011-03-24 19:34:13 +0000
+++ labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/ProvideContentAction.java	2011-03-28 16:19:29 +0000
@@ -72,7 +72,6 @@
         if ( config != null )
         {
             ActionContext.getContext().getActionInvocation().getStack().push( config.getAreaItems() );
-            System.out.println( config.getAreaItems() );
         }
         
         User user = currentUserService.getCurrentUser();

=== modified file 'labs/dhis-web-light/src/main/webapp/dhis-web-light/dashboard.vm'
--- labs/dhis-web-light/src/main/webapp/dhis-web-light/dashboard.vm	2011-03-24 19:34:13 +0000
+++ labs/dhis-web-light/src/main/webapp/dhis-web-light/dashboard.vm	2011-03-28 16:19:29 +0000
@@ -8,7 +8,6 @@
   
   <script type="text/javascript" src="../dhis-web-commons/javascripts/commons.js"></script>
   <script type="text/javascript" src="../dhis-web-commons/javascripts/commons.ajax.js"></script>
-  <script type="text/javascript" src="../dhis-web-commons/javascripts/lists.js"></script>
   
 </head>
 <head>
@@ -16,30 +15,47 @@
 
 <div class="headerDiv">DHIS 2</div>
 
-<div class="contentDiv">
-
 <!-- Charts -->
 
+<div class="contentDiv">
+
 #if( $chartAreaA )
-<div class="contentItemDiv"><img src="getChart.action?id=${chartAreaA}" style="width:100%"></div>
+<div class="contentChartDiv"><img src="getChart.action?id=${chartAreaA}" style="width:100%"></div>
 #end
 
 #if( $chartAreaB )
-<div class="contentItemDiv"><img src="getChart.action?id=${chartAreaB}" style="width:100%"></div>
+<div class="contentChartDiv"><img src="getChart.action?id=${chartAreaB}" style="width:100%"></div>
 #end
 
 #if( $chartAreaC )
-<div class="contentItemDiv"><img src="getChart.action?id=${chartAreaC}" style="width:100%"></div>
+<div class="contentChartDiv"><img src="getChart.action?id=${chartAreaC}" style="width:100%"></div>
 #end
 
 #if( $chartAreaD )
-<div class="contentItemDiv"><img src="getChart.action?id=${chartAreaD}" style="width:100%"></div>
+<div class="contentChartDiv"><img src="getChart.action?id=${chartAreaD}" style="width:100%"></div>
 #end
 
+</div>
+
 <!-- Report tables -->
 
-
-
-</div>
+<div class="headerDiv">Report tables</div>
+
+<div class="contentDiv">
+#foreach( $table in $reportTables )
+<div class="contentItemDiv" onclick="">$encoder.htmlEncode( $table.name )</div>
+#end
+</div>
+
+<!-- Documents -->
+
+<div class="headerDiv">Documents</div>
+
+<div class="contentDiv">
+#foreach( $doc in $documents )
+<div class="contentItemDiv" onclick="">$encoder.htmlEncode( $doc.name )</div>
+#end
+</div>
+
 </body>
 </html>

=== modified file 'labs/dhis-web-light/src/main/webapp/dhis-web-light/style/dhis-web-light.css'
--- labs/dhis-web-light/src/main/webapp/dhis-web-light/style/dhis-web-light.css	2011-03-24 19:34:13 +0000
+++ labs/dhis-web-light/src/main/webapp/dhis-web-light/style/dhis-web-light.css	2011-03-28 16:19:29 +0000
@@ -10,23 +10,35 @@
   
 .headerDiv {
   position: relative;
-  width: 100%;
+  width: 96%;
   font-size: 2em;
-  text-align: center;
   color: #ffffff;
   background-color: #32669a;
-  padding: 0.5em;
-  border-bottom: 1px solid #d0d0d0;
+  padding-top: 0.5em;
+  padding-bottom: 0.5em;
+  padding-left: 4%;
+  border-top: 1px solid #c0c0c0;
+  border-bottom: 1px solid #c0c0c0;
 }
-  
+
 .contentDiv {
   position: relative;
   width: 100%;
 }
-  
+
+.contentChartDiv {
+  margin-top: 1.5em;
+  padding-top: 1.5em;
+  padding-bottom: 1.5em;
+  margin-bottom: 1.5em;
+  border-bottom: 1px solid #c0c0c0;
+}
+
 .contentItemDiv {
-  position: relative;
-  padding-top: 3em;
-  padding-bottom: 3em;
-  border-bottom: 1px solid #d0d0d0;
+  font-size: 1.8em;
+  margin: 1em;
+  padding: 1.5em;
+  border: 1px solid #c0c0c0;
+  background-color: #d0f6d5;
+  cursor: pointer;
 }