dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3315
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-04-07 15:30:46 +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/resources/org/hisp/dhis/light/i18n_module.properties
  labs/dhis-web-light/src/main/webapp/dhis-web-light/javascript/dhis-web-light.js
  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-28 16:19:29 +0000
+++ labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetChartAction.java	2011-04-07 13:30:46 +0000
@@ -114,7 +114,7 @@
         {
             chart = chartService.getJFreeChart( id, format );
             
-            height = 300;
+            height = 280;
             
             width = 400;
         }

=== modified file 'labs/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties'
--- labs/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties	2011-04-07 08:52:20 +0000
+++ labs/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties	2011-04-07 13:30:46 +0000
@@ -1,3 +1,4 @@
 report_table_parameters = Report parameters
 reporting_month = Reporting month
 get_report = Get report
+select_organisation_unit = Please select organisation unit
\ No newline at end of file

=== modified file 'labs/dhis-web-light/src/main/webapp/dhis-web-light/javascript/dhis-web-light.js'
--- labs/dhis-web-light/src/main/webapp/dhis-web-light/javascript/dhis-web-light.js	2011-04-07 12:42:11 +0000
+++ labs/dhis-web-light/src/main/webapp/dhis-web-light/javascript/dhis-web-light.js	2011-04-07 13:30:46 +0000
@@ -1,4 +1,14 @@
 
+$( document ).ready( function() { pageInit(); } );
+
+function pageInit()
+{
+	// Zebra stripes in lists
+	
+	$( "table.listTable tbody tr:odd" ).addClass( "listAlternateRow" );
+    $( "table.listTable tbody tr:even" ).addClass( "listRow" );
+}
+
 // -----------------------------------------------------------------------------
 // Report table
 // -----------------------------------------------------------------------------

=== 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-04-07 11:55:24 +0000
+++ labs/dhis-web-light/src/main/webapp/dhis-web-light/style/dhis-web-light.css	2011-04-07 13:30:46 +0000
@@ -13,8 +13,17 @@
 
 table th {
   text-align: left;
+  white-space: nowrap;
 }
   
+h3 {
+  margin-left: 10px;
+}
+
+h5 {
+  margin-left: 10px;
+}
+
 .headerDiv {
   position: relative;
   width: 100%;
@@ -52,7 +61,7 @@
 
 .labelDiv {
   font-size: 1em;
-  margin-top: 1em;
+  margin-top: 0.9em;
   margin-bottom: 0.4em;
   margin-left: 0.3em;
 }
@@ -62,6 +71,40 @@
 }
 
 /*----------------------------------------------------------------------------*/
+/* List table                                                                 */
+/*----------------------------------------------------------------------------*/
+
+.listTable {
+  width: 100%;
+  border-collapse: collapse;
+  background-color: #ffffff;
+  color: #000000;
+}
+
+.listTable th {
+  background-color: #000000;
+  color: #ffffff;
+  padding-top: 0.2em;
+  padding-bottom: 0.2em;
+  border-top: 1px solid #ffffff;
+  border-bottom: 1px solid #cad5e5;
+}
+
+.listTable td {
+  padding: 0.2em;
+  white-space:nowrap;
+}
+
+.listRow {
+  border-bottom: 1px solid #cad5e5;
+}
+
+.listAlternateRow {
+  border-bottom: 1px solid #cad5e5;
+  background-color: #ebf0f6;
+}
+
+/*----------------------------------------------------------------------------*/
 /* Organisation Unit Selection Tree                                           */
 /*----------------------------------------------------------------------------*/
 
@@ -114,3 +157,18 @@
 {
   color: green;
 }
+
+/*----------------------------------------------------------------------------*/
+/* Message                                                                    */
+/*----------------------------------------------------------------------------*/
+
+span#message 
+{
+  display: none;
+  padding: 0.9em;
+  margin: 0.3em;
+  background-color: #ffffbf;
+  border: 1px solid #cccc00;
+  width: 272px;
+  color: #000000;
+}