=== modified file 'dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties' --- dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties 2014-03-24 21:39:15 +0000 +++ dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties 2014-03-25 21:41:27 +0000 @@ -37,13 +37,13 @@ #-- Modules --------------------------------------------------------------------# -dhis-web-maintenance-datadictionary=Data Elements and Indicators +dhis-web-maintenance-datadictionary=Data Elements / Indicators dhis-web-maintenance-dataset=Data Sets dhis-web-maintenance-organisationunit=Organisation Units dhis-web-maintenance-user=Users dhis-web-maintenance-dataadmin=Data Administration dhis-web-maintenance-settings=Settings -dhis-web-maintenance-program=Programs and Attributes +dhis-web-maintenance-program=Programs / Attributes dhis-web-maintenance-mobile=Mobile Configuration dhis-web-maintenance-appmanager=App Management dhis-web-caseentry=Individual Records @@ -92,8 +92,10 @@ intro_dhis-web-dashboard-integration=Get an overview of favorite charts, reports and maps and view or write messages. intro_dhis-web-visualizer=Create dynamic data visualizations for data elements and indicators. intro_dhis-web-pivot=Generate flexible pivot tables with data aggregated in all dimensions. -intro_dhis-web-sms=Send SMS reminders and notifications as to phones manually or as scheduled tasks. +intro_dhis-web-sms=Send SMS reminders and notifications manually or as scheduled tasks. intro_dhis-web-spreadsheet-reporting=Generate and import data based on predefined Excel templates. +intro_dhis-web-event-reports=Query for events and create aggregated, dimensional analysis of events. +intro_dhis-web-event-capture=Capture information about, validate and filter events. #-- Intro functions -------------------------------------------------------------# === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2014-03-25 15:25:36 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2014-03-25 21:41:27 +0000 @@ -158,8 +158,6 @@ background-color: #467e4a; display: none; z-index: 10; - filter: alpha(opacity=98); - opacity: 0.98; border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; box-shadow: #ccc 0px 1px 1px 0px; === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css 2014-03-25 15:25:36 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css 2014-03-25 21:41:27 +0000 @@ -158,8 +158,6 @@ background-color: #518a0f; display: none; z-index: 10; - filter: alpha(opacity=98); - opacity: 0.98; border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; box-shadow: #ccc 0px 1px 1px 0px; === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2014-03-25 15:25:36 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2014-03-25 21:41:27 +0000 @@ -158,8 +158,6 @@ background-color: #276696; display: none; z-index: 10; - filter: alpha(opacity=98); - opacity: 0.98; border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; box-shadow: #ccc 0 1px 1px 0; === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/menu.css' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/menu.css 2014-03-25 15:25:36 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/menu.css 2014-03-25 21:41:27 +0000 @@ -57,6 +57,7 @@ .app-menu .app-menu-item:hover { border: 1px dashed #9ec5df; background-color: #e9f5fb; + box-shadow: 0; } .app-menu-item-description { @@ -140,10 +141,9 @@ */ .app-menu-dropdown { background-color: #fff; - background-color: rgba(255, 255, 255, 0.95); border: 1px solid #bbb; border-radius: 2px; - box-shadow: 0px 0px 3px #bbb; + box-shadow: rgba(0, 0, 0, 0.24) 0px 2px 8px 0px; color: #000; overflow-y: inherit; padding: 10px; === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css 2014-03-25 15:25:36 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css 2014-03-25 21:41:27 +0000 @@ -158,8 +158,6 @@ background-color: #b91010; display: none; z-index: 10; - filter: alpha(opacity=98); - opacity: 0.98; border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; box-shadow: #ccc 0px 1px 1px 0px;