dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16591: Analysis apps, fixed wrong path to javascripts

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Sun, 31 Aug 2014 15:23:26 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 16591
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-08-31 17:21:11 +0200
message:
  Analysis apps, fixed wrong path to javascripts
modified:
  dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java
  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-visualizer/index.html
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/index.html
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/index.html
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/index.html
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/plugin.html


--
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-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java	2014-08-28 12:01:44 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java	2014-08-31 15:21:11 +0000
@@ -113,7 +113,7 @@
         
         clock.logTime( "Partition tables: " + tables + ", last years: " + lastYears );
         
-        notifier.notify( taskId, "Creating analytics tables, last years: " + lastYears + ", processes: " + processNo );
+        notifier.notify( taskId, "Creating analytics tables, processes: " + processNo );
         
         createTables( tables );
         

=== 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-08-27 12:44:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/index.html	2014-08-31 15:21:11 +0000
@@ -6,23 +6,23 @@
 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
-	<link rel="stylesheet" type="text/css" href="../../dhis-web-commons/javascripts/ext/resources/css/ext-all-gray.css"/>
-	<link rel="stylesheet" type="text/css" href="../../dhis-web-commons/javascripts/jQuery/calendars/css/jquery.calendars.picker.css"/>
+	<link rel="stylesheet" type="text/css" href="../dhis-web-commons/javascripts/ext/resources/css/ext-all-gray.css"/>
+	<link rel="stylesheet" type="text/css" href="../dhis-web-commons/javascripts/jQuery/calendars/css/jquery.calendars.picker.css"/>
 	<link rel="stylesheet" type="text/css" href="styles/style.css" />
 </head>
 
 <body>
-    <script src="../../dhis-web-commons/javascripts/ext/ext-all.js"></script>
-    <script src="../../dhis-web-commons/javascripts/ext-ux/layout/component/form/MultiSelect.js"></script>
-    <script src="../../dhis-web-commons/javascripts/ext-ux/form/MultiSelect.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/ext/ext-all.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/ext-ux/layout/component/form/MultiSelect.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/ext-ux/form/MultiSelect.js"></script>
 
-    <script src="../../dhis-web-commons/javascripts/jQuery/jquery.min.js"></script>
-    <script src="../../dhis-web-commons/javascripts/jQuery/jquery.plugin.min.js"></script>
-    <script src="../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.min.js"></script>
-    <script src="../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.plus.min.js"></script>
-    <script src="../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.picker.min.js"></script>
-    <script src="../../dhis-web-commons/javascripts/dhis2/dhis2.util.js"></script>
-    <script src="../../dhis-web-commons/javascripts/date.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.plugin.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.plus.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.picker.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.util.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/date.js"></script>
     
 	<script src="scripts/core.js"></script>
 	<script src="scripts/app.js"></script>

=== 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-08-27 12:44:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/index.html	2014-08-31 15:21:11 +0000
@@ -6,8 +6,8 @@
 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
-	<link rel="stylesheet" type="text/css" href="../../dhis-web-commons/javascripts/ext/resources/css/ext-all-gray.css"/>
-	<link rel="stylesheet" type="text/css" href="../../dhis-web-commons/javascripts/jQuery/calendars/css/jquery.calendars.picker.css"/>
+	<link rel="stylesheet" type="text/css" href="../dhis-web-commons/javascripts/ext/resources/css/ext-all-gray.css"/>
+	<link rel="stylesheet" type="text/css" href="../dhis-web-commons/javascripts/jQuery/calendars/css/jquery.calendars.picker.css"/>
 	<link rel="stylesheet" type="text/css" href="styles/style.css" />
 </head>
 
@@ -17,21 +17,21 @@
         <input type="hidden" id="filenameField" name="filename"/>
     </form>
     
-    <script src="../../dhis-web-commons/javascripts/ext/ext-all.js"></script>
-    <script src="../../dhis-web-commons/javascripts/ext-ux/layout/component/form/MultiSelect.js"></script>
-    <script src="../../dhis-web-commons/javascripts/ext-ux/form/MultiSelect.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/ext/ext-all.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/ext-ux/layout/component/form/MultiSelect.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/ext-ux/form/MultiSelect.js"></script>
 
-    <script src="../../dhis-web-commons/javascripts/jQuery/jquery.min.js"></script>
-    <script src="../../dhis-web-commons/javascripts/jQuery/jquery.plugin.min.js"></script>
-    <script src="../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.min.js"></script>
-    <script src="../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.plus.min.js"></script>
-    <script src="../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.picker.min.js"></script>
-    <script src="../../dhis-web-commons/javascripts/dhis2/dhis2.util.js"></script>
-    <script src="../../dhis-web-commons/javascripts/date.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.plugin.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.plus.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.picker.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.util.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/date.js"></script>
     
-    <script src="../../dhis-web-commons/javascripts/simpleRegression.js"></script>
-	<script src="scripts/core.js"></script>
-	<script src="scripts/app.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/simpleRegression.js"></script>
+	<script type="text/javascript" src="scripts/core.js"></script>
+	<script type="text/javascript" src="scripts/app.js"></script>
 </body>
 
 </html>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/index.html	2014-08-27 12:44:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/index.html	2014-08-31 15:21:11 +0000
@@ -4,8 +4,8 @@
 <head>
     <title>DHIS2 GIS</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-	<link rel="stylesheet" type="text/css" href="../../dhis-web-commons/javascripts/ext/resources/css/ext-all-gray.css"/>
-	<link rel="stylesheet" type="text/css" href="../../dhis-web-commons/javascripts/jQuery/calendars/css/jquery.calendars.picker.css"/>
+	<link rel="stylesheet" type="text/css" href="../dhis-web-commons/javascripts/ext/resources/css/ext-all-gray.css"/>
+	<link rel="stylesheet" type="text/css" href="../dhis-web-commons/javascripts/jQuery/calendars/css/jquery.calendars.picker.css"/>
 	<link rel="stylesheet" type="text/css" href="styles/style.css" />
 </head>
 
@@ -23,17 +23,17 @@
 
     <script type="text/javascript" src="https://maps.google.com/maps/api/js?sensor=false";></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 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 type="text/javascript" src="scripts/custom.js"></script>
 
-    <script src="../../dhis-web-commons/javascripts/jQuery/jquery.min.js"></script>
-    <script src="../../dhis-web-commons/javascripts/jQuery/jquery.plugin.min.js"></script>
-    <script src="../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.min.js"></script>
-    <script src="../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.plus.min.js"></script>
-    <script src="../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.picker.min.js"></script>
-    <script src="../../dhis-web-commons/javascripts/dhis2/dhis2.util.js"></script>
-    <script src="../../dhis-web-commons/javascripts/date.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.plugin.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.plus.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.picker.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.util.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/date.js"></script>
 
     <script type="text/javascript" src="scripts/core.js"></script>
 

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/index.html	2014-08-27 12:44:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/index.html	2014-08-31 15:21:11 +0000
@@ -7,24 +7,24 @@
 
     <title>Pivot Table</title>
 
-	<link rel="stylesheet" type="text/css" href="../../dhis-web-commons/javascripts/ext/resources/css/ext-all-gray.css"/>
+	<link rel="stylesheet" type="text/css" href="../dhis-web-commons/javascripts/ext/resources/css/ext-all-gray.css"/>
 	<link rel="stylesheet" type="text/css" href="styles/style.css" />
 </head>
 
 <body>
-    <script src="../../dhis-web-commons/javascripts/ext/ext-all.js"></script>
-    <script src="../../dhis-web-commons/javascripts/ext-ux/layout/component/form/MultiSelect.js"></script>
-    <script src="../../dhis-web-commons/javascripts/ext-ux/form/MultiSelect.js"></script>
-
-    <script src="../../dhis-web-commons/javascripts/jQuery/jquery.min.js"></script>
-    <script src="../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.min.js"></script>
-    <script src="../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.plus.min.js"></script>
-    <script src="../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.picker.min.js"></script>
-    <script src="../../dhis-web-commons/javascripts/dhis2/dhis2.util.js"></script>
-    <script src="../../dhis-web-commons/javascripts/date.js"></script>
-
-	<script src="scripts/core.js"></script>
-	<script src="scripts/app.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/ext/ext-all.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/ext-ux/layout/component/form/MultiSelect.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/ext-ux/form/MultiSelect.js"></script>
+
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.plus.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.picker.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.util.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/date.js"></script>
+
+	<script type="text/javascript" src="scripts/core.js"></script>
+	<script type="text/javascript" src="scripts/app.js"></script>
 </body>
 
 </html>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/index.html	2014-08-27 12:44:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/index.html	2014-08-31 15:21:11 +0000
@@ -6,7 +6,7 @@
 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
-	<link rel="stylesheet" type="text/css" href="../../dhis-web-commons/javascripts/ext/resources/css/ext-all-gray.css"/>
+	<link rel="stylesheet" type="text/css" href="../dhis-web-commons/javascripts/ext/resources/css/ext-all-gray.css"/>
 	<link rel="stylesheet" type="text/css" href="styles/style.css" />
 </head>
 
@@ -16,20 +16,20 @@
         <input type="hidden" id="filenameField" name="filename"/>
     </form>
 
-    <script src="../../dhis-web-commons/javascripts/ext/ext-all.js"></script>
-    <script src="../../dhis-web-commons/javascripts/ext-ux/layout/component/form/MultiSelect.js"></script>
-    <script src="../../dhis-web-commons/javascripts/ext-ux/form/MultiSelect.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/ext/ext-all.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/ext-ux/layout/component/form/MultiSelect.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/ext-ux/form/MultiSelect.js"></script>
 
-    <script src="../../dhis-web-commons/javascripts/jQuery/jquery.min.js"></script>
-    <script src="../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.min.js"></script>
-    <script src="../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.plus.min.js"></script>
-    <script src="../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.picker.min.js"></script>
-    <script src="../../dhis-web-commons/javascripts/dhis2/dhis2.util.js"></script>
-    <script src="../../dhis-web-commons/javascripts/date.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.plus.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.picker.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.util.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/date.js"></script>
     
-    <script src="../../dhis-web-commons/javascripts/simpleRegression.js"></script>
-	<script src="scripts/core.js"></script>
-	<script src="scripts/app.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/simpleRegression.js"></script>
+	<script type="text/javascript" src="scripts/core.js"></script>
+	<script type="text/javascript" src="scripts/app.js"></script>
 </body>
 
 </html>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/plugin.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/plugin.html	2014-08-27 12:44:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/plugin.html	2014-08-31 15:21:11 +0000
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="stylesheet" type="text/css" href="../../dhis-web-commons/javascripts/ext/resources/css/ext-plugin-gray.css" />
-    <script src="../../dhis-web-commons/javascripts/ext/ext-all.js"></script>
+    <link rel="stylesheet" type="text/css" href="../dhis-web-commons/javascripts/ext/resources/css/ext-plugin-gray.css" />
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/ext/ext-all.js"></script>
     <script src="scripts/plugin.js"></script>
 
     <style type="text/css">