=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/en.properties' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/en.properties 2014-10-14 09:42:40 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/en.properties 2014-10-22 16:41:32 +0000 @@ -171,3 +171,4 @@ show_row_subtotals=Show row sub-totals last_52_weeks=Last 52 weeks last_6_months=Last 6 months +initializing=Initializing === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/index.html' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/index.html 2014-10-22 15:25:22 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/index.html 2014-10-22 16:41:32 +0000 @@ -12,6 +12,8 @@ +
+ === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-10-22 15:25:22 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-10-22 16:41:32 +0000 @@ -7101,6 +7101,8 @@ render: function() { ns.app.viewport = this; + document.getElementById('init').remove(); + ns.app.aggregateLayoutWindow = AggregateLayoutWindow(); ns.app.aggregateLayoutWindow.hide(); ns.app.queryLayoutWindow = QueryLayoutWindow(); @@ -7280,6 +7282,7 @@ url: 'i18n/' + keyUiLocale + '.properties', success: function(r) { NS.i18n = dhis2.util.parseJavaProperties(r.responseText); + Ext.get('init').update(NS.i18n.initializing + '..'); if (keyUiLocale !== defaultKeyUiLocale) { Ext.Ajax.request({ === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css 2014-10-16 12:41:01 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css 2014-10-22 16:41:32 +0000 @@ -63,6 +63,13 @@ -webkit-text-stroke: 0.2px #888; } +#init { + width: 100%; + text-align: center; + margin-top: 200px; + font-size: 15px; +} + /* Scrollbar Webkit */ ::-webkit-scrollbar { width: 8px; === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/en.properties' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/en.properties 2014-10-14 09:46:02 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/en.properties 2014-10-22 16:41:32 +0000 @@ -195,3 +195,4 @@ example8=Click Download to save chart graphics to your computer last_52_weeks=Last 52 weeks last_6_months=Last 6 months +initializing=Initializing === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/index.html' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/index.html 2014-10-22 15:25:22 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/index.html 2014-10-22 16:41:32 +0000 @@ -12,6 +12,8 @@ +
+
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-10-22 15:25:22 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-10-22 16:41:32 +0000 @@ -6744,6 +6744,8 @@ render: function() { ns.app.viewport = this; + document.getElementById('init').remove(); + ns.app.aggregateLayoutWindow = AggregateLayoutWindow(); ns.app.aggregateLayoutWindow.hide(); ns.app.aggregateOptionsWindow = AggregateOptionsWindow(); @@ -6919,6 +6921,7 @@ url: 'i18n/' + keyUiLocale + '.properties', success: function(r) { NS.i18n = dhis2.util.parseJavaProperties(r.responseText); + Ext.get('init').update(NS.i18n.initializing + '..'); if (keyUiLocale !== defaultKeyUiLocale) { Ext.Ajax.request({ === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/styles/style.css' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/styles/style.css 2014-10-14 09:46:02 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/styles/style.css 2014-10-22 16:41:32 +0000 @@ -63,6 +63,13 @@ -webkit-text-stroke: 0.2px #888; } +#init { + width: 100%; + text-align: center; + margin-top: 200px; + font-size: 15px; +} + /* Scrollbar Webkit */ ::-webkit-scrollbar { width: 8px;