dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #14085
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4647: updated light module (moved dashboard to own link)
------------------------------------------------------------
revno: 4647
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-09-22 12:22:37 +0200
message:
updated light module (moved dashboard to own link)
removed:
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/javascript/dhis-web-light.js
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/dhis-web-light.css
added:
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/NoAction.java
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_page.vm
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/javascript/dashboard.js
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/dashboard.css
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm
dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard.vm
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm
--
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-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm 2011-09-22 09:21:26 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm 2011-09-22 10:22:37 +0000
@@ -49,7 +49,7 @@
</tr>
<tr>
<td>
- <input type="text" id="j_password" name="j_password" size="9">
+ <input type="password" id="j_password" name="j_password" size="9">
</td>
</tr>
<tr>
=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/NoAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/NoAction.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/NoAction.java 2011-09-22 10:22:37 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2004-2010, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.light.action;
+
+import com.opensymphony.xwork2.Action;
+
+public class NoAction
+ implements Action
+{
+ @Override
+ public String execute()
+ {
+ return SUCCESS;
+ }
+}
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml 2011-04-07 12:42:11 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml 2011-09-22 10:22:37 +0000
@@ -1,30 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="
+<beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
- <bean id="org.hisp.dhis.light.action.ProvideContentAction"
- class="org.hisp.dhis.light.action.ProvideContentAction" scope="prototype">
- <property name="dashboardManager" ref="org.hisp.dhis.dashboard.DashboardManager"/>
- <property name="dashboardService" ref="org.hisp.dhis.dashboard.DashboardService"/>
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService"/>
- </bean>
-
- <bean id="org.hisp.dhis.light.action.GetReportAction"
- class="org.hisp.dhis.light.action.GetReportAction" scope="prototype">
- <property name="reportTableService" ref="org.hisp.dhis.reporttable.ReportTableService"/>
- </bean>
-
- <bean id="org.hisp.dhis.light.action.GetChartAction"
- class="org.hisp.dhis.light.action.GetChartAction" scope="prototype">
- <property name="chartService" ref="org.hisp.dhis.chart.ChartService"/>
- </bean>
-
- <bean id="org.hisp.dhis.light.action.GetReportParamsAction"
- class="org.hisp.dhis.light.action.GetReportParamsAction" scope="prototype">
- <property name="reportTableService" ref="org.hisp.dhis.reporttable.ReportTableService"/>
- <property name="selectionTreeManager" ref="org.hisp.dhis.oust.manager.SelectionTreeManager"/>
- </bean>
-
+ <bean id="org.hisp.dhis.light.action.NoAction" class="org.hisp.dhis.light.action.NoAction" />
+
+ <bean id="org.hisp.dhis.light.action.ProvideContentAction" class="org.hisp.dhis.light.action.ProvideContentAction"
+ scope="prototype">
+ <property name="dashboardManager" ref="org.hisp.dhis.dashboard.DashboardManager" />
+ <property name="dashboardService" ref="org.hisp.dhis.dashboard.DashboardService" />
+ <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
+ </bean>
+
+ <bean id="org.hisp.dhis.light.action.GetReportAction" class="org.hisp.dhis.light.action.GetReportAction" scope="prototype">
+ <property name="reportTableService" ref="org.hisp.dhis.reporttable.ReportTableService" />
+ </bean>
+
+ <bean id="org.hisp.dhis.light.action.GetChartAction" class="org.hisp.dhis.light.action.GetChartAction" scope="prototype">
+ <property name="chartService" ref="org.hisp.dhis.chart.ChartService" />
+ </bean>
+
+ <bean id="org.hisp.dhis.light.action.GetReportParamsAction" class="org.hisp.dhis.light.action.GetReportParamsAction"
+ scope="prototype">
+ <property name="reportTableService" ref="org.hisp.dhis.reporttable.ReportTableService" />
+ <property name="selectionTreeManager" ref="org.hisp.dhis.oust.manager.SelectionTreeManager" />
+ </bean>
+
</beans>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml 2011-04-07 11:55:24 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml 2011-09-22 10:22:37 +0000
@@ -3,32 +3,35 @@
"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
"http://struts.apache.org/dtds/struts-2.0.dtd";>
<struts>
+ <include file="dhis-web-commons.xml" />
- <include file="dhis-web-commons.xml"/>
-
<package name="dhis-web-light" extends="dhis-web-commons" namespace="/dhis-web-light">
- <action name="index" class="org.hisp.dhis.light.action.ProvideContentAction">
- <result name="success" type="velocity">/dhis-web-light/main.vm</result>
- <param name="page">/dhis-web-light/dashboard.vm</param>
- </action>
-
+ <action name="index" class="org.hisp.dhis.light.action.NoAction">
+ <result name="success" type="velocity">/dhis-web-light/main.vm</result>
+ </action>
+
+ <action name="dashboard" class="org.hisp.dhis.light.action.ProvideContentAction">
+ <result name="success" type="velocity">/dhis-web-light/dashboard_page.vm</result>
+ <param name="page">/dhis-web-light/dashboard.vm</param>
+ </action>
+
<action name="getReport" class="org.hisp.dhis.light.action.GetReportAction">
- <result name="success" type="velocity">/dhis-web-light/main.vm</result>
- <param name="page">/dhis-web-commons/ajax/htmlGrid.vm</param>
+ <result name="success" type="velocity">/dhis-web-light/dashboard_page.vm</result>
+ <param name="page">/dhis-web-commons/ajax/htmlGrid.vm</param>
</action>
<action name="getReportParams" class="org.hisp.dhis.light.action.GetReportParamsAction">
- <result name="success" type="velocity">/dhis-web-light/main.vm</result>
- <param name="page">/dhis-web-light/inputReportParamsForm.vm</param>
+ <result name="success" type="velocity">/dhis-web-light/dashboard_page.vm</result>
+ <param name="page">/dhis-web-light/inputReportParamsForm.vm</param>
</action>
-
+
<action name="getChart" class="org.hisp.dhis.light.action.GetChartAction">
<result name="success" type="chart">
- <param name="width">480</param>
- <param name="height">800</param>
+ <param name="width">480</param>
+ <param name="height">800</param>
</result>
</action>
-
+
</package>
</struts>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard.vm 2011-04-07 13:57:13 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard.vm 2011-09-22 10:22:37 +0000
@@ -1,6 +1,3 @@
-
-<div class="headerDiv"><span class="header">DHIS 2</span></div>
-
<!-- Charts -->
<div class="contentDiv">
=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_page.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_page.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_page.vm 2011-09-22 10:22:37 +0000
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd";>
+<html>
+<head>
+ <title>DHIS 2</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+ <link type="text/css" rel="stylesheet" media="screen" href="style/dashboard.css">
+
+ <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.min.js"></script>
+ <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/oust/oust.js"></script>
+ <script type="text/javascript" src="../request.js"></script>
+ <script type="text/javascript" src="javascript/dashboard.js"></script>
+
+</head>
+<head>
+<body>
+
+<div class="headerDiv"><span class="header">DHIS 2</span></div>
+
+#parse( $page )
+
+</body>
+</html>
=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/javascript/dashboard.js'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/javascript/dashboard.js 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/javascript/dashboard.js 2011-09-22 10:22:37 +0000
@@ -0,0 +1,52 @@
+
+$( 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
+// -----------------------------------------------------------------------------
+
+function getReportParams( id )
+{
+ window.location.href = "getReportParams.action?id=" + id;
+}
+
+function validationError()
+{
+ if ( $( "#selectionTree" ).length && selectionTreeSelection.getSelected().length == 0 )
+ {
+ setMessage( i18n_please_select_unit );
+ return true;
+ }
+
+ return false;
+}
+
+function generateReport()
+{
+ if ( validationError() )
+ {
+ return false;
+ }
+
+ var url = "id=" + $( "#id" ).val() + "&mode=" + $( "#mode" ).val();
+
+ if ( $( "#reportingPeriod" ).length )
+ {
+ url += "&reportingPeriod=" + $( "#reportingPeriod" ).val();
+ }
+
+ if ( $( "#selectionTree" ).length )
+ {
+ url += "&organisationUnitId=" + selectionTreeSelection.getSelected()[0];
+ }
+
+ window.location.href = "getReport.action?" + url;
+}
=== removed file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/javascript/dhis-web-light.js'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/javascript/dhis-web-light.js 2011-04-07 13:30:46 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/javascript/dhis-web-light.js 1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-
-$( 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
-// -----------------------------------------------------------------------------
-
-function getReportParams( id )
-{
- window.location.href = "getReportParams.action?id=" + id;
-}
-
-function validationError()
-{
- if ( $( "#selectionTree" ).length && selectionTreeSelection.getSelected().length == 0 )
- {
- setMessage( i18n_please_select_unit );
- return true;
- }
-
- return false;
-}
-
-function generateReport()
-{
- if ( validationError() )
- {
- return false;
- }
-
- var url = "id=" + $( "#id" ).val() + "&mode=" + $( "#mode" ).val();
-
- if ( $( "#reportingPeriod" ).length )
- {
- url += "&reportingPeriod=" + $( "#reportingPeriod" ).val();
- }
-
- if ( $( "#selectionTree" ).length )
- {
- url += "&organisationUnitId=" + selectionTreeSelection.getSelected()[0];
- }
-
- window.location.href = "getReport.action?" + url;
-}
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm 2011-09-19 08:08:56 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm 2011-09-22 10:22:37 +0000
@@ -1,27 +1,86 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd";>
<html>
+
<head>
- <title>DHIS 2</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
- <link type="text/css" rel="stylesheet" media="screen" href="style/dhis-web-light.css">
-
- <meta name="viewport" content="width=320"/>
- <meta name="viewport" content="initial-scale=1.0"/>
- <meta name="viewport" content="user-scalable=yes"/>
-
- <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.min.js"></script>
- <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/oust/oust.js"></script>
- <script type="text/javascript" src="../request.js"></script>
- <script type="text/javascript" src="javascript/dhis-web-light.js"></script>
-
+<title>DHIS 2</title>
+<meta name="viewport" content="width=device-width, user-scalable=yes" />
+
+<style type="text/css">
+html,body
+{
+ background-color: #1d5288;
+ color: white;
+ font-size: 1.1em;
+ width: 100%;
+ font-family: verdana, sans, sans-serif;
+
+ padding: 0;
+ margin: 0;
+}
+
+.header {
+ border-bottom: 1px solid #eee;
+ font-size: 1.2em;
+ font-weight: bold;
+ background-color: black;
+ color: white;
+ width: 100%;
+ padding-top: 5px;
+ padding-bottom: 5px;
+}
+
+.header span {
+ padding-left: 5px;
+}
+
+.footer {
+ border-top: 1px solid #eee;
+ font-size: 0.8em;
+ background-color: black;
+ color: white;
+ width: 100%;
+ padding-top: 5px;
+ padding-bottom: 5px;
+ text-align: right;
+}
+
+.footer a {
+ padding-right: 5px;
+}
+
+input {
+ font-size: 1em;
+ font-family: verdana, sans, sans-serif;
+ width: 96%;
+}
+
+table {
+ width: 100%;
+}
+
+a:link, a:visited, a:active, a:hover {
+ color: white;
+}
+
+ul li {
+ list-style-type: none;
+}
+</style>
+
</head>
-<head>
+
<body>
-#parse( $page )
+<div class="header">
+ <span>DHIS 2</span>
+</div>
+
+<ul>
+ <li><a href="dashboard.action">Dashboard</a></li>
+</ul>
+
+<div class="footer">
+ <a href="../dhis-web-commons-security/logout.action">Logout</a>
+</div>
</body>
-</html>
+
=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/dashboard.css'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/dashboard.css 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/dashboard.css 2011-09-22 10:22:37 +0000
@@ -0,0 +1,174 @@
+
+/*----------------------------------------------------------------------------*/
+/* Dashboard */
+/*----------------------------------------------------------------------------*/
+
+body {
+ margin: 0px;
+ padding: 0px;
+ font-family: sans-serif;
+ background-color: #35699f;
+ color: #ffffff;
+}
+
+table th {
+ text-align: left;
+ white-space: nowrap;
+}
+
+h3 {
+ margin-left: 10px;
+}
+
+h5 {
+ margin-left: 10px;
+}
+
+.headerDiv {
+ position: relative;
+ width: 100%;
+ font-size: 1em;
+ background-color: #000000;
+ padding-top: 0.6em;
+ padding-bottom: 0.6em;
+ border-top: 1px solid #ffffff;
+ border-bottom: 1px solid #ffffff;
+}
+
+.header {
+ margin: 1em;
+}
+
+.contentDiv {
+ position: relative;
+ width: 100%;
+}
+
+.contentChartDiv {
+ margin-top: 1em;
+ padding-top: 1.5em;
+ padding-bottom: 1.5em;
+ margin-bottom: 1em;
+ background-color: #ffffff;
+}
+
+.contentItemDiv {
+ font-size: 1em;
+ padding: 1.2em;
+ border-bottom: 1px solid #e0e0e0;
+ cursor: pointer;
+}
+
+.labelDiv {
+ font-size: 1em;
+ margin-top: 0.9em;
+ margin-bottom: 0.4em;
+ margin-left: 0.3em;
+}
+
+.pageDiv {
+ margin-left: 0.3em;
+}
+
+/*----------------------------------------------------------------------------*/
+/* 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 */
+/*----------------------------------------------------------------------------*/
+
+div#selectionTree
+{
+ font-size: 1em;
+ background-color: white;
+ overflow:auto;
+ border:1px solid #cccccc;
+}
+
+div#selectionTree ul
+{
+ padding: 0em;
+ margin: 0em;
+}
+
+div#selectionTree li
+{
+ margin: 0em 0em 0em 1.1em;
+ list-style-type: none;
+ white-space: nowrap;
+}
+
+div#selectionTree span.toggle
+{
+ font-family: courier new, monospace;
+ font-size: 1em;
+ cursor: pointer;
+}
+
+div#selectionTree a
+{
+ color: black;
+ text-decoration: none;
+ cursor: pointer;
+}
+
+div#selectionTree a:hover
+{
+ color: #808080;
+}
+
+div#selectionTree a.selected
+{
+ color: orange;
+}
+
+div#selectionTree a.locked
+{
+ color: green;
+}
+
+/*----------------------------------------------------------------------------*/
+/* Message */
+/*----------------------------------------------------------------------------*/
+
+span#message
+{
+ display: none;
+ padding: 0.9em;
+ margin: 0.3em;
+ background-color: #ffffbf;
+ border: 1px solid #cccc00;
+ width: 272px;
+ color: #000000;
+}
=== removed file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/dhis-web-light.css'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/dhis-web-light.css 2011-04-07 13:48:56 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/dhis-web-light.css 1970-01-01 00:00:00 +0000
@@ -1,174 +0,0 @@
-
-/*----------------------------------------------------------------------------*/
-/* Dashboard */
-/*----------------------------------------------------------------------------*/
-
-body {
- margin: 0px;
- padding: 0px;
- font-family: sans-serif;
- background-color: #35699f;
- color: #ffffff;
-}
-
-table th {
- text-align: left;
- white-space: nowrap;
-}
-
-h3 {
- margin-left: 10px;
-}
-
-h5 {
- margin-left: 10px;
-}
-
-.headerDiv {
- position: relative;
- width: 100%;
- font-size: 1em;
- background-color: #000000;
- padding-top: 0.6em;
- padding-bottom: 0.6em;
- border-top: 1px solid #ffffff;
- border-bottom: 1px solid #ffffff;
-}
-
-.header {
- margin: 1em;
-}
-
-.contentDiv {
- position: relative;
- width: 100%;
-}
-
-.contentChartDiv {
- margin-top: 1em;
- padding-top: 1.5em;
- padding-bottom: 1.5em;
- margin-bottom: 1em;
- background-color: #ffffff;
-}
-
-.contentItemDiv {
- font-size: 1em;
- padding: 1.2em;
- border-bottom: 1px solid #e0e0e0;
- cursor: pointer;
-}
-
-.labelDiv {
- font-size: 1em;
- margin-top: 0.9em;
- margin-bottom: 0.4em;
- margin-left: 0.3em;
-}
-
-.pageDiv {
- margin-left: 0.3em;
-}
-
-/*----------------------------------------------------------------------------*/
-/* 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 */
-/*----------------------------------------------------------------------------*/
-
-div#selectionTree
-{
- font-size: 1em;
- background-color: white;
- overflow:auto;
- border:1px solid #cccccc;
-}
-
-div#selectionTree ul
-{
- padding: 0em;
- margin: 0em;
-}
-
-div#selectionTree li
-{
- margin: 0em 0em 0em 1.1em;
- list-style-type: none;
- white-space: nowrap;
-}
-
-div#selectionTree span.toggle
-{
- font-family: courier new, monospace;
- font-size: 1em;
- cursor: pointer;
-}
-
-div#selectionTree a
-{
- color: black;
- text-decoration: none;
- cursor: pointer;
-}
-
-div#selectionTree a:hover
-{
- color: #808080;
-}
-
-div#selectionTree a.selected
-{
- color: orange;
-}
-
-div#selectionTree a.locked
-{
- color: green;
-}
-
-/*----------------------------------------------------------------------------*/
-/* Message */
-/*----------------------------------------------------------------------------*/
-
-span#message
-{
- display: none;
- padding: 0.9em;
- margin: 0.3em;
- background-color: #ffffbf;
- border: 1px solid #cccc00;
- width: 272px;
- color: #000000;
-}
