dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3876
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-06-12 01:05:27 +0200
message:
  Fixed incorrect javascript paths
modified:
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/config.js
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm
  dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml


--
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-importexport/src/main/webapp/dhis-web-importexport/javascript/config.js'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/config.js	2009-03-08 05:33:34 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/config.js	2011-06-11 23:05:27 +0000
@@ -20,7 +20,7 @@
     
     if ( type == "input" )
     {
-        setMessage( message );
+        setHeaderMessage( message );
     }
     else
     {

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm	2011-04-07 10:29:18 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm	2011-06-11 23:05:27 +0000
@@ -10,7 +10,7 @@
   <meta name="viewport" content="initial-scale=1.0"/>
   <meta name="viewport" content="user-scalable=true"/>
   
-  <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-1.6.1.min.js"></script>
   <script type="text/javascript" src="../dhis-web-commons/javascripts/commons.js"></script>
   <script type="text/javascript" src="../dhis-web-commons/javascripts/commons.ajax.js"></script>
   <script type="text/javascript" src="../dhis-web-commons/oust/oust.js"></script>

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml	2011-05-31 05:38:55 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml	2011-06-11 23:05:27 +0000
@@ -167,7 +167,7 @@
       <param name="javascripts">
         ../dhis-web-commons/ouwt/ouwt.js,
         ../dhis-web-commons/oust/oust.js,       
-        ../dhis-web-commons/lists/lists.js,
+        ../dhis-web-commons/javascripts/lists.js,
         javascript/dataAnalysis.js,
 		javascript/editDataValue.js
       </param>