dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #11469
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3275: Work in progress
------------------------------------------------------------
revno: 3275
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-04-04 15:45:27 +0200
message:
Work in progress
added:
labs/dhis-web-light/src/main/webapp/dhis-web-light/javascript/
labs/dhis-web-light/src/main/webapp/dhis-web-light/javascript/dhis-web-light.js
modified:
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/webapp/dhis-web-light/dashboard.vm'
--- labs/dhis-web-light/src/main/webapp/dhis-web-light/dashboard.vm 2011-03-28 16:19:29 +0000
+++ labs/dhis-web-light/src/main/webapp/dhis-web-light/dashboard.vm 2011-04-04 13:45:27 +0000
@@ -6,14 +6,16 @@
<link type="text/css" rel="stylesheet" media="screen" href="style/dhis-web-light.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="javascript/dhis-web-light.js"></script>
</head>
<head>
<body>
-<div class="headerDiv">DHIS 2</div>
+<div class="headerDiv"><span class="header">DHIS 2</span></div>
<!-- Charts -->
@@ -39,17 +41,17 @@
<!-- Report tables -->
-<div class="headerDiv">Report tables</div>
+<div class="headerDiv"><span class="header">Report tables</span></div>
<div class="contentDiv">
#foreach( $table in $reportTables )
-<div class="contentItemDiv" onclick="">$encoder.htmlEncode( $table.name )</div>
+<div class="contentItemDiv" id="reportTable${table.id}" onclick="generateReportTable( '${table.id}' )">$encoder.htmlEncode( $table.name )</div>
#end
</div>
<!-- Documents -->
-<div class="headerDiv">Documents</div>
+<div class="headerDiv"><span class="header">Documents</span></div>
<div class="contentDiv">
#foreach( $doc in $documents )
=== added directory 'labs/dhis-web-light/src/main/webapp/dhis-web-light/javascript'
=== added 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 1970-01-01 00:00:00 +0000
+++ labs/dhis-web-light/src/main/webapp/dhis-web-light/javascript/dhis-web-light.js 2011-04-04 13:45:27 +0000
@@ -0,0 +1,9 @@
+
+$( document ).ready( function() {
+
+} );
+
+function generateReportTable( id )
+{
+
+}
=== 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-28 16:19:29 +0000
+++ labs/dhis-web-light/src/main/webapp/dhis-web-light/style/dhis-web-light.css 2011-04-04 13:45:27 +0000
@@ -10,15 +10,17 @@
.headerDiv {
position: relative;
- width: 96%;
+ width: 100%;
font-size: 2em;
color: #ffffff;
- background-color: #32669a;
- padding-top: 0.5em;
- padding-bottom: 0.5em;
- padding-left: 4%;
- border-top: 1px solid #c0c0c0;
- border-bottom: 1px solid #c0c0c0;
+ background-color: #000000;
+ padding-top: 0.6em;
+ padding-bottom: 0.6em;
+ border-bottom: 1px solid #e0e0e0;
+}
+
+.header {
+ margin: 1em;
}
.contentDiv {
@@ -31,14 +33,14 @@
padding-top: 1.5em;
padding-bottom: 1.5em;
margin-bottom: 1.5em;
- border-bottom: 1px solid #c0c0c0;
+ border-bottom: 1px solid #e0e0e0;
}
.contentItemDiv {
- font-size: 1.8em;
- margin: 1em;
+ color: #ffffff;
+ font-size: 2em;
padding: 1.5em;
- border: 1px solid #c0c0c0;
- background-color: #d0f6d5;
+ border-bottom: 1px solid #e0e0e0;
+ background-color: #35699f;
cursor: pointer;
}
