dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 10478 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-04-04 17:36:17 +0200
message:
  (PT, DV) Fade in.
modified:
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js


--
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 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2013-04-04 14:15:50 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2013-04-04 15:10:12 +0000
@@ -85,6 +85,13 @@
 			if (id) {
 				pt.util.pivot.loadTable(id);
 			}
+
+			// Fade in
+			Ext.defer( function() {
+				Ext.getBody().fadeIn({
+					duration: 800
+				});
+			}, 500 );
 		};
 
 		return init;

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css	2013-04-04 13:24:28 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css	2013-04-04 15:10:12 +0000
@@ -40,6 +40,12 @@
  * General
  *--------------------------------------------------------------------------*/
 
+body {
+	background-color: #e1e1e1;
+	opacity: 0;
+	filter:Alpha(opacity=0)
+}
+
 body,
 .x-body,
 .x-btn-default-toolbar-small .x-btn-inner,

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css	2013-03-20 16:21:23 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css	2013-04-04 15:34:51 +0000
@@ -18,6 +18,12 @@
 
 /* General */
 
+body {
+	background-color: #e1e1e1;
+	opacity: 0;
+	filter:Alpha(opacity=0)
+}
+
 body,
 .x-body,
 .x-btn-default-toolbar-small .x-btn-inner,

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2013-04-04 09:24:59 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2013-04-04 15:34:51 +0000
@@ -338,6 +338,13 @@
         DV.init.cmd = DV.util.getUrlParam(DV.conf.finals.cmd.urlparam) || DV.conf.finals.cmd.init;
 
         DV.exe.execute(DV.init.cmd);
+
+        // Fade in
+		Ext.defer( function() {
+			Ext.getBody().fadeIn({
+				duration: 500
+			});
+		}, 500 );
     };
 
     DV.util = {