dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 17973 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-01-14 10:52:17 +0100
message:
  GM and OL libs moved from main to dashboard.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm


--
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-commons-resources/src/main/webapp/main.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2015-01-12 16:09:26 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2015-01-14 09:51:17 +0000
@@ -29,8 +29,6 @@
     <script type="text/javascript" src="../dhis-web-commons/javascripts/es5-sham.min.js?_rev=$!{buildRevision}"></script>
 
     <script type="text/javascript" src="../dhis-web-commons/javascripts/ext/ext-all.js"></script>
-    <script type="text/javascript" src="../dhis-web-commons/javascripts/openlayers/OpenLayers.js"></script>
-    <script src="//maps.google.com/maps/api/js"></script>
 
     <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.min.js?_rev=$!{buildRevision}"></script>
     <!--[if lte IE 8]><script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/placeholders.jquery.min.js?_rev=$!{buildRevision}"></script><![endif]-->

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm	2015-01-13 18:53:55 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm	2015-01-14 09:51:17 +0000
@@ -1,7 +1,17 @@
 
 #sharingDialog()
 
+<script type="text/javascript" src="//maps.google.com/maps/api/js"></script>
+<script type="text/javascript" src="../dhis-web-commons/javascripts/openlayers/OpenLayers.js"></script>
+<script type="text/javascript" src="plugin/table.js"></script>
+<script type="text/javascript" src="plugin/chart.js"></script>
+<script type="text/javascript" src="plugin/map.js"></script>
+<script type="text/javascript" src="plugin/eventreport.js"></script>
+<script type="text/javascript" src="plugin/eventchart.js"></script>
+<script type="text/javascript" src="javascript/dashboard.js"></script>
+
 <script type="text/javascript">
+
 var i18n_share_your_interpretation_of = '$encoder.jsEscape( $i18n.getString( "share_your_interpretation_of" ), "'")';
 var i18n_interpretation_was_shared = '$encoder.jsEscape( $i18n.getString( "interpretation_was_shared" ), "'")';
 var i18n_viewing = '$encoder.jsEscape( $i18n.getString( "viewing" ), "'")';
@@ -25,19 +35,6 @@
   dhis2.leftBar.resetPosition(); ## Force left bar initial position when displaying dashboard
 });
 
-Ext.onReady( function() {
-    Ext.Loader.injectScriptElement('plugin/table.js', function() {
-	Ext.Loader.injectScriptElement('plugin/chart.js', function() {
-	    Ext.Loader.injectScriptElement('plugin/map.js', function() {
-		Ext.Loader.injectScriptElement('plugin/eventreport.js', function() {
-		    Ext.Loader.injectScriptElement('plugin/eventchart.js', function() {
-			Ext.Loader.injectScriptElement('javascript/dashboard.js', function() {} );
-		    });
-		});
-	    });
-	});
-    });
-});
 </script>
 
 <div id="dashboardHeader"><h3>