DHIS 2

=== modified file 'labs/dhis-web-light/src/main/resources/struts.xml' --- labs/dhis-web-light/src/main/resources/struts.xml 2011-04-07 08:52:20 +0000 +++ labs/dhis-web-light/src/main/resources/struts.xml 2011-04-07 10:29:18 +0000 @@ -9,9 +9,15 @@ - /dhis-web-light/dashboard.vm + /dhis-web-light/main.vm + /dhis-web-light/dashboard.vm + + /dhis-web-light/main.vm + /dhis-web-light/inputReportParamsForm.vm + + 480 @@ -19,9 +25,5 @@ - - /dhis-web-light/inputReportParamsForm.vm - - \ No newline at end of file === 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-04-07 08:52:20 +0000 +++ labs/dhis-web-light/src/main/webapp/dhis-web-light/dashboard.vm 2011-04-07 10:29:18 +0000 @@ -1,46 +1,12 @@ - - - - DHIS 2 - - - - - - - - - - - -

- #foreach( $id in $charts ) -

-#end - -#if( $chartAreaA ) -

-#end - -#if( $chartAreaB ) -

-#end - -#if( $chartAreaC ) -

-#end - -#if( $chartAreaD ) -

-#end - +

+#end

@@ -62,6 +28,3 @@

$encoder.htmlEncode( $doc.name )

#end - - - === modified file 'labs/dhis-web-light/src/main/webapp/dhis-web-light/inputReportParamsForm.vm' --- labs/dhis-web-light/src/main/webapp/dhis-web-light/inputReportParamsForm.vm 2011-04-07 08:52:20 +0000 +++ labs/dhis-web-light/src/main/webapp/dhis-web-light/inputReportParamsForm.vm 2011-04-07 10:29:18 +0000 @@ -1,22 +1,3 @@ - - - - DHIS 2 - - - - - - - - - - - - - - - -

$i18n.getString( "report_table_parameters" )

- - - - - #if ( $!reportParams.isParamReportingMonth() ) - - - - - - - - - - - - #end - - - - #if ( $!reportParams.isParamGrandParentOrganisationUnit() || $!reportParams.isParamParentOrganisationUnit() || $!reportParams.isParamOrganisationUnit() ) - - - - - - - - - - - - #end - - - - - - -

$i18n.getString( "reporting_month" )
- -

$i18n.getString( "organisation_unit" )
- - -

- #if( $!reportParams.isSet() ) - - - #end -

+ + +#if ( $!reportParams.isParamReportingMonth() ) + +

$i18n.getString( "reporting_month" )

+ +

+ +#end + + + +#if ( $!reportParams.isParamGrandParentOrganisationUnit() || $!reportParams.isParamParentOrganisationUnit() || $!reportParams.isParamOrganisationUnit() ) + +

$i18n.getString( "organisation_unit" )

+ +

+ + +#end + + + +

+#if( $!reportParams.isSet() ) + +#end +

- - - === added file 'labs/dhis-web-light/src/main/webapp/dhis-web-light/main.vm' --- labs/dhis-web-light/src/main/webapp/dhis-web-light/main.vm 1970-01-01 00:00:00 +0000 +++ labs/dhis-web-light/src/main/webapp/dhis-web-light/main.vm 2011-04-07 10:29:18 +0000 @@ -0,0 +1,27 @@ + + + + DHIS 2 + + + + + + + + + + + + + + + + + + + +#parse( $page ) + + + === 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 08:52:20 +0000 +++ labs/dhis-web-light/src/main/webapp/dhis-web-light/style/dhis-web-light.css 2011-04-07 10:29:18 +0000 @@ -3,24 +3,27 @@ /* Dashboard */ /*----------------------------------------------------------------------------*/ -html, body { - font-family: sans-serif; -} - body { margin: 0px; padding: 0px; + font-family: sans-serif; + background-color: #35699f; + color: #ffffff; +} + +table th { + text-align: left; } .headerDiv { position: relative; width: 100%; - font-size: 2em; - color: #ffffff; + font-size: 1em; background-color: #000000; padding-top: 0.6em; padding-bottom: 0.6em; - border-bottom: 1px solid #e0e0e0; + border-top: 1px solid #ffffff; + border-bottom: 1px solid #ffffff; } .header { @@ -33,32 +36,39 @@ } .contentChartDiv { - margin-top: 1.5em; + margin-top: 1em; padding-top: 1.5em; padding-bottom: 1.5em; - margin-bottom: 1.5em; - border-bottom: 1px solid #e0e0e0; + margin-bottom: 1em; + background-color: #ffffff; } .contentItemDiv { - color: #ffffff; - font-size: 2em; - padding: 1.5em; + font-size: 1em; + padding: 1.2em; border-bottom: 1px solid #e0e0e0; - background-color: #35699f; cursor: pointer; } +.labelDiv { + font-size: 1em; + margin-top: 1em; + margin-bottom: 0.4em; + margin-left: 0.3em; +} + +.pageDiv { + margin-left: 0.3em; +} + /*----------------------------------------------------------------------------*/ /* Organisation Unit Selection Tree */ /*----------------------------------------------------------------------------*/ div#selectionTree { - font-size: 9pt; /* Size to change */ + font-size: 1em; /* Size to change */ background-color: white; - height: 300px; - width:595px; overflow:auto; border:1px solid #cccccc; } @@ -82,7 +92,7 @@ div#selectionTree span.toggle { font-family: courier new, monospace; - font-size: 9pt; /* Size to change */ + font-size: 1em; /* Size to change */ cursor: pointer; }