=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/CombinationGenerator.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/CombinationGenerator.java 2011-02-22 18:28:46 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/CombinationGenerator.java 2011-03-31 12:37:13 +0000 @@ -52,7 +52,7 @@ } /** - * Returns an List of Lists with combinations of objects. + * Returns a List of Lists with combinations of objects. */ public List> getCombinations() { @@ -67,7 +67,7 @@ } /** - * Indicates whether there are more combinations to be returned. + * Indicates whether there are more combinations to be returned or not. */ public boolean hasNext() { === modified file 'dhis-2/dhis-services/dhis-service-options/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-services/dhis-service-options/src/main/resources/META-INF/dhis/beans.xml 2010-11-28 19:45:45 +0000 +++ dhis-2/dhis-services/dhis-service-options/src/main/resources/META-INF/dhis/beans.xml 2011-03-31 12:37:13 +0000 @@ -198,18 +198,10 @@ green/green.css - openhealth - openhealth/openhealth.css - - vietnam vietnam/vietnam.css - vista - vista/vista.css - - india india/india.css === modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/Timer.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/Timer.java 2011-02-06 08:36:01 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/Timer.java 2011-03-31 12:37:13 +0000 @@ -24,7 +24,7 @@ if ( !printDisabled ) { - System.out.println( msg + ": " + time ); + System.out.println( msg + ": " + time + " micros" ); } return time; @@ -36,6 +36,7 @@ long time = ( endTime - startTime ) / 1000000; return time; } + public long getTime( String msg ) { long time = getSplitTime( msg ); === removed directory 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth' === removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/dom.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/dom.js 2010-07-01 03:25:19 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/dom.js 1970-01-01 00:00:00 +0000 @@ -1,35 +0,0 @@ - -$( document ).ready( function() -{ - $( "li.menuDropDownItem" ).mouseover( function() // Over dropdown item - { - $( this ).css( "background-color", "#588db5" ); - $( this ).css( "color", "#ffffff" ); - $( this ).css( "border", "1px solid #f0f0f0" ); - }); - - $( "li.menuDropDownItem" ).mouseout( function() // Out dropdown item - { - $( this ).css( "background-color", "#d6e6f2" ); - $( this ).css( "color", "#407298" ); - $( this ).css( "border", "1px solid #d6e6f2" ); - }); - - $( "li.introItem" ).mouseover( function() // Over intro item - { - $( this ).css( "background-color", "#a4d2a3" ); - $( this ).css( "border", "1px solid #ffffff" ); - }); - - $( "li.introItem" ).mouseout( function() // Out intro item - { - $( this ).css( "background-color", "#d5efd5" ); - $( this ).css( "border", "1px solid #d5efd5" ); - }); -}); - -// Called from main/Leftbar -function setMainPageNormal() -{ - document.getElementById( 'mainPage' ).style.marginLeft = '300px'; -} === removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/head.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/head.png 2010-11-29 16:55:31 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/head.png 1970-01-01 00:00:00 +0000 differ === removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/logo_background.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/logo_background.png 2009-07-07 21:34:47 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/logo_background.png 1970-01-01 00:00:00 +0000 differ === removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/logo_banner.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/logo_banner.png 2009-07-07 21:34:47 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/logo_banner.png 1970-01-01 00:00:00 +0000 differ === removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/logo_left.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/logo_left.png 2009-07-07 21:34:47 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/logo_left.png 1970-01-01 00:00:00 +0000 differ === removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/logo_right.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/logo_right.png 2009-07-07 21:34:47 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/logo_right.png 1970-01-01 00:00:00 +0000 differ === removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/logo_separator.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/logo_separator.png 2009-07-07 21:34:47 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/logo_separator.png 1970-01-01 00:00:00 +0000 differ === removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/openhealth.css' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/openhealth.css 2011-01-11 16:52:46 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/openhealth.css 1970-01-01 00:00:00 +0000 @@ -1,429 +0,0 @@ - -/*----------------------------------------------------------------------------*/ -/* General */ -/*----------------------------------------------------------------------------*/ - -* -{ - font-family: arial, sans-serif; - line-height: 125%; -} - -html,body -{ - margin: 0px; - padding: 0px; - background-color: white; -} - -img -{ - border: 0; -} - -ul,ol -{ - padding: 0px; -} - -/*----------------------------------------------------------------------------*/ -/* Header */ -/*----------------------------------------------------------------------------*/ - -div#header -{ - background-image: url('logo_background.png'); - background-repeat: repeat-x; - height: 83px; - position: absolute; - top: 0px; - left: 10px; - right: 10px; -} - -img#header1 -{ - float: left; -} - -img#header2 -{ - position: absolute; - top: 0px; - left: 25px; -} - -img#header3 -{ - float: right; -} - -img#menuSeparator1 -{ - position: absolute; - top: 0px; - left: 570px; -} - -img#menuSeparator2 -{ - position: absolute; - top: 0px; - left: 670px; -} - -img#menuSeparator3 -{ - position: absolute; - top: 0px; - left: 770px; -} - -img#menuSeparator4 -{ - position: absolute; - top: 0px; - left: 870px; -} - -img#menuSeparator5 -{ - position: absolute; - top: 0px; - left: 970px; -} - -.menuLink -{ - height: 68px; - width: 98px; - font-size: 12px; - color: #588db5; - font-weight: bold; - text-align: center; - line-height: 59px; - cursor: pointer; -} - -div#menuLink1 -{ - position: absolute; - top: 2px; - left: 572px; -} - -div#menuLink2 -{ - position: absolute; - top: 2px; - left: 672px; -} - -div#menuLink3 -{ - position: absolute; - top: 2px; - left: 772px; -} - -div#menuLink4 -{ - position: absolute; - top: 2px; - left: 872px; -} - -span#headerText -{ - position: absolute; - top: 20px; - left: 270px; - font-weight: lighter; - color: white; - font-size: 13pt; -} - -div#popupHeader -{ - background-color: #425073; - height: 34px; - width: 100%; - position: absolute; - top: 0px; - left: 0px; - border-bottom: 1px solid #202020; -} - -span#popupHeaderText -{ - position: absolute; - top: 3px; - left: 218px; - font-size: 14px; - color: white; - margin: 5px; -} - -div#menuDropDown1 -{ - position: absolute; - top: 68px; - left: 570px; -} - -div#menuDropDown2 -{ - position: absolute; - top: 68px; - left: 670px; -} - -div#menuDropDown3 -{ - position: absolute; - top: 68px; - left: 770px; -} - -.menuDropDownArea -{ - font-size: 12px; - color: #407298; - border: 1px solid #588db5; - padding-left: 5px; - padding-right: 5px; - width: 189px; - background-color: #d6e6f2; - display: none; - z-index: 10; - filter: alpha(opacity=90); - opacity: 0.90; -} - -.menuDropDownBox -{ - list-style-type:none; - margin-left: 0; -} - -.menuDropDownItem -{ - padding-top: 5px; - padding-left: 10px; - padding-bottom: 5px; - padding-right: 10px; - border: 1px solid #d6e6f2; - cursor: pointer; -} - -/*----------------------------------------------------------------------------*/ -/* Left bar */ -/*----------------------------------------------------------------------------*/ - -#leftBar -{ - background-color: #d6e6f2; - height: 472px; - width: 250px; - float: left; - position: absolute; - top: 77px; - left: 10px; - border-style: solid; - border-width: 1px; - border-color: #588db5; - filter: alpha(opacity=90); - opacity: 0.90; -} - -#leftBarContents -{ - font-size: 12px; -} - -#leftBarContents h2 -{ - font-size: 14px; - margin-top: 16px; - margin-right: 17px; - margin-left: 17px; - background-color: #588db5; - padding-top: 6px; - padding-bottom: 5px; - padding-left: 10px; - color: white; - border-style: solid; - border-width: 1px; - border-color: #f0f0f0; - font-weight: normal; -} - -#leftBarContents ul -{ - margin-left: 40px; - list-style-type: square; - color: #477ca4; -} - -#leftBarContents a -{ - color: #407298; - text-decoration: none; -} - -#leftBarContents a:hover -{ - color: #23557b; -} - -/*----------------------------------------------------------------------------*/ -/* Main page */ -/*----------------------------------------------------------------------------*/ - -.mainPageTable -{ - width: 100%; -} - -.page -{ - font-size: 9pt; -} - -.page h1 -{ - font-size: 16pt; - font-weight: lighter; - color: #606060; -} - -.page h2 -{ - font-size: 15pt; - font-weight: lighter; - color: #606060; -} - -.page h3 -{ - font-size: 14pt; - font-weight: lighter; - color: #606060; -} - -.page h4 -{ - font-size: 13pt; - font-weight: lighter; - color: #606060; -} - -.page h5 -{ - font-size: 12pt; - font-weight: lighter; - color: #606060; -} - -.page h6 -{ - font-size: 11pt; - font-weight: lighter; - color: #606060; -} - -.page p,.page td,.page th,.page input,.page select,.page textarea -{ - font-size: 9pt; -} - -.page th, thead tr -{ - background-image: url('head.png'); - background-repeat: repeat-x; - text-align: left; - color: #3f5d8e; - border-style: solid; - border-width: 1px; - border-color: #99bbe8; - padding-left: 7px; - height: 19px; -} - -#mainPage -{ - margin: 102px 10px 10px 300px; -} - -#popupPage -{ - margin: 50px 10px 10px 10px; -} - -.required -{ - font-style: normal; - color: #ff0000; -} - -.listTable -{ - width: 100%; - border-collapse: collapse; -} - -.listTable td -{ - padding: 2px; -} - -.listRow -{ - border-bottom: 1px solid #cad5e5; -} - -.listAlternateRow -{ - border-bottom: 1px solid #cad5e5; - background-color: #ebf0f6; -} - -.listHoverRow -{ - background-color: #dfe9f4; -} - -/*----------------------------------------------------------------------------*/ -/* Intro */ -/*----------------------------------------------------------------------------*/ - -#introList -{ - display: none; - list-style-type:none; - width: 450px; - background-color: #d5efd5; - border: 1px solid #a4d2a3; - padding-top: 15px; - padding-bottom: 20px; - padding-left: 5px; - padding-right: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} - -.introItem -{ - padding: 15px; - cursor: pointer; - border: 1px solid #d5efd5; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} - -.introItemHeader -{ - color: #3c533c; - font-weight: bold; -} - === removed directory 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista' === removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/dom.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/dom.js 2010-07-01 03:25:19 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/dom.js 1970-01-01 00:00:00 +0000 @@ -1,33 +0,0 @@ - -$( document ).ready( function() -{ - $( "li.menuDropDownItem" ).mouseover( function() // Over dropdown item - { - $( this ).css( "background-color", "#5B5B5B" ); - $( this ).css( "border", "1px solid #EAEAEA" ); - }); - - $( "li.menuDropDownItem" ).mouseout( function() // Out dropdown item - { - $( this ).css( "background-color", "#2f2f2f" ); - $( this ).css( "border", "1px solid #2f2f2f" ); - }); - - $( "li.introItem" ).mouseover( function() // Over intro item - { - $( this ).css( "background-color", "#a4d2a3" ); - $( this ).css( "border", "1px solid #ffffff" ); - }); - - $( "li.introItem" ).mouseout( function() // Out intro item - { - $( this ).css( "background-color", "#d5efd5" ); - $( this ).css( "border", "1px solid #d5efd5" ); - }); -}); - -// Called from main/Leftbar -function setMainPageNormal() -{ - document.getElementById( 'mainPage' ).style.marginLeft = '300px'; -} === removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/head.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/head.png 2010-11-29 16:55:31 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/head.png 1970-01-01 00:00:00 +0000 differ === removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/logo_background.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/logo_background.png 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/logo_background.png 1970-01-01 00:00:00 +0000 differ === removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/logo_banner.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/logo_banner.png 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/logo_banner.png 1970-01-01 00:00:00 +0000 differ === removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/logo_left.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/logo_left.png 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/logo_left.png 1970-01-01 00:00:00 +0000 differ === removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/logo_right.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/logo_right.png 2009-07-07 18:41:01 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/logo_right.png 1970-01-01 00:00:00 +0000 differ === removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/logo_separator.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/logo_separator.png 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/logo_separator.png 1970-01-01 00:00:00 +0000 differ === removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/vista.css' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/vista.css 2011-01-11 16:52:46 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/vista.css 1970-01-01 00:00:00 +0000 @@ -1,428 +0,0 @@ - -/*----------------------------------------------------------------------------*/ -/* General */ -/*----------------------------------------------------------------------------*/ - -* -{ - font-family: arial, sans-serif; - line-height: 125%; -} - -html,body -{ - margin: 0px; - padding: 0px; - background-color: white; -} - -img -{ - border: 0; -} - -ul,ol -{ - padding: 0px; -} - -/*----------------------------------------------------------------------------*/ -/* Header */ -/*----------------------------------------------------------------------------*/ - -div#header -{ - background-image: url('logo_background.png'); - background-repeat: repeat-x; - height: 83px; - position: absolute; - top: 0px; - left: 10px; - right: 10px; -} - -img#header1 -{ - float: left; -} - -img#header2 -{ - position: absolute; - top: 13px; - left: 25px; -} - -img#header3 -{ - float: right; -} - -img#menuSeparator1 -{ - position: absolute; - top: 0px; - left: 570px; -} - -img#menuSeparator2 -{ - position: absolute; - top: 0px; - left: 670px; -} - -img#menuSeparator3 -{ - position: absolute; - top: 0px; - left: 770px; -} - -img#menuSeparator4 -{ - position: absolute; - top: 0px; - left: 870px; -} - -img#menuSeparator5 -{ - position: absolute; - top: 0px; - left: 970px; -} - -.menuLink -{ - height: 68px; - width: 98px; - font-size: 12px; - color: #ffffff; - font-weight: bold; - text-align: center; - line-height: 67px; - cursor: pointer; -} - -div#menuLink1 -{ - position: absolute; - top: 7px; - left: 572px; -} - -div#menuLink2 -{ - position: absolute; - top: 7px; - left: 672px; -} - -div#menuLink3 -{ - position: absolute; - top: 7px; - left: 772px; -} - -div#menuLink4 -{ - position: absolute; - top: 7px; - left: 872px; -} - -span#headerText -{ - position: absolute; - top: 30px; - left: 228px; - font-weight: lighter; - color: white; - font-size: 13pt; -} - -div#popupHeader -{ - background-color: #313131; - height: 34px; - width: 100%; - position: absolute; - top: 0px; - left: 0px; - border-bottom: 1px solid #000000; -} - -span#popupHeaderText -{ - position: absolute; - top: 3px; - left: 30px; - font-size: 14px; - color: white; - margin: 5px; -} - -div#menuDropDown1 -{ - position: absolute; - top: 76px; - left: 570px; -} - -div#menuDropDown2 -{ - position: absolute; - top: 76px; - left: 670px; -} - -div#menuDropDown3 -{ - position: absolute; - top: 76px; - left: 770px; -} - -.menuDropDownArea -{ - font-size: 12px; - color: #ffffff; - border: 1px solid #000000; - padding-left: 5px; - padding-right: 5px; - width: 189px; - background-color: #2f2f2f; - display: none; - z-index: 10; - filter: alpha(opacity=90); - opacity: 0.90; -} - -.menuDropDownBox -{ - list-style-type:none; -} - -.menuDropDownItem -{ - padding-top: 5px; - padding-left: 10px; - padding-bottom: 5px; - padding-right: 10px; - border: 1px solid #2f2f2f; - cursor: pointer; -} - -/*----------------------------------------------------------------------------*/ -/* Left bar */ -/*----------------------------------------------------------------------------*/ - -#leftBar -{ - background-color: #2f2f2f; - height: 472px; - width: 250px; - float: left; - position: absolute; - top: 85px; - left: 10px; - border-style: solid; - border-width: 1px; - border-color: #000000; - filter: alpha(opacity=90); - opacity: 0.90; -} - -#leftBarContents -{ - color: black; - font-size: 12px; -} - -#leftBarContents h2 -{ - font-size: 14px; - margin-top: 16px; - margin-right: 17px; - margin-left: 17px; - background-color: #5B5B5B; - padding-top: 6px; - padding-bottom: 5px; - padding-left: 10px; - color: white; - border-style: solid; - border-width: 1px; - border-color: #EAEAEA; -} - -#leftBarContents ul -{ - margin-left: 40px; - list-style-type: square; - color: white; -} - -#leftBarContents a -{ - color: white; - text-decoration: none; -} - -#leftBarContents a:hover -{ - color: #BBBBBB; -} - -/*----------------------------------------------------------------------------*/ -/* Main page */ -/*----------------------------------------------------------------------------*/ - -.mainPageTable -{ - width: 100%; -} - -.page -{ - font-size: 9pt; -} - -.page h1 -{ - font-size: 16pt; - font-weight: lighter; - color: #606060; -} - -.page h2 -{ - font-size: 15pt; - font-weight: lighter; - color: #606060; -} - -.page h3 -{ - font-size: 14pt; - font-weight: lighter; - color: #606060; -} - -.page h4 -{ - font-size: 13pt; - font-weight: lighter; - color: #606060; -} - -.page h5 -{ - font-size: 12pt; - font-weight: lighter; - color: #606060; -} - -.page h6 -{ - font-size: 11pt; - font-weight: lighter; - color: #606060; -} - -.page p,.page td,.page th,.page input,.page select,.page textarea -{ - font-size: 9pt; -} - -.page th, thead tr -{ - background-image: url('head.png'); - background-repeat: repeat-x; - text-align: left; - color: #3f5d8e; - border-style: solid; - border-width: 1px; - border-color: #99bbe8; - padding-left: 7px; - height: 19px; -} - -#mainPage -{ - margin: 102px 10px 10px 300px; -} - -#popupPage -{ - margin: 50px 10px 10px 10px; -} - -.required -{ - font-style: normal; - color: #ff0000; -} - -.listTable -{ - width: 100%; - border-collapse: collapse; -} - -.listTable td -{ - padding: 2px; -} - -.listRow -{ - border-bottom: 1px solid #cad5e5; -} - -.listAlternateRow -{ - border-bottom: 1px solid #cad5e5; - background-color: #ebf0f6; -} - -.listHoverRow -{ - background-color: #dfe9f4; -} - -/*----------------------------------------------------------------------------*/ -/* Intro */ -/*----------------------------------------------------------------------------*/ - -#introList -{ - display: none; - list-style-type:none; - width: 450px; - background-color: #d5efd5; - border: 1px solid #a4d2a3; - padding-top: 15px; - padding-bottom: 20px; - padding-left: 5px; - padding-right: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} - -.introItem -{ - padding: 15px; - cursor: pointer; - border: 1px solid #d5efd5; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} - -.introItemHeader -{ - color: #3c533c; - font-weight: bold; -} - === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ContextInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ContextInterceptor.java 2010-10-29 12:19:15 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ContextInterceptor.java 2011-03-31 12:37:13 +0000 @@ -30,6 +30,7 @@ import java.util.HashMap; import java.util.Map; +import org.hisp.dhis.message.MessageService; import org.hisp.dhis.system.database.DatabaseInfoProvider; import com.opensymphony.xwork2.ActionInvocation; @@ -42,6 +43,7 @@ implements Interceptor { private static final String KEY_IN_MEMORY_DATABASE = "inMemoryDatabase"; + private static final String KEY_UNREAD_MESSAGES = "keyUnreadMessages"; private DatabaseInfoProvider databaseInfoProvider; @@ -49,6 +51,13 @@ { this.databaseInfoProvider = databaseInfoProvider; } + + private MessageService messageService; + + public void setMessageService( MessageService messageService ) + { + this.messageService = messageService; + } @Override public void destroy() @@ -65,8 +74,12 @@ throws Exception { Map map = new HashMap(); - map.put( KEY_IN_MEMORY_DATABASE, databaseInfoProvider.isInMemory() ); + + map.put( KEY_IN_MEMORY_DATABASE, databaseInfoProvider.isInMemory() ); + map.put( KEY_UNREAD_MESSAGES, messageService.getUnreadMessageCount() ); + invocation.getStack().push( map ); + return invocation.invoke(); } } === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2011-03-02 11:53:49 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2011-03-31 12:37:13 +0000 @@ -476,6 +476,7 @@ +