------------------------------------------------------------
revno: 269
committer: Miri <[email protected]>
branch nick: trunk
timestamp: Sun 2009-05-03 23:40:52 +0200
message:
Added openHelpForm() function to main.js. Popup was not showing by "method
not found".
Also added dhis-2/dhis-web as module to dhis-2, dhis-2/dhis-web-portal to
dhis-2/dhis-web as module.
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js
dhis-2/dhis-web/pom.xml
dhis-2/pom.xml
=== modified file
'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js
2009-04-20 14:54:22 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js
2009-05-03 21:40:52 +0000
@@ -73,4 +73,10 @@
var request = new Request();
request.send( '../dhis-web-commons/menu/setMenuHidden.action' );
}
+
+
+ this.openHelpForm = function( id )
+ {
+ window.open
("../dhis-web-commons/help/viewDynamicHelp.action?id=" + id,"Help",
'width=800,height=600,scrollbars=yes');
+ }
}
=== modified file 'dhis-2/dhis-web/pom.xml'
--- dhis-2/dhis-web/pom.xml 2009-04-22 21:31:10 +0000
+++ dhis-2/dhis-web/pom.xml 2009-05-03 21:40:52 +0000
@@ -27,6 +27,7 @@
<module>dhis-web-openhealth-integration</module>
<module>dhis-web-dashboard-integration</module>
<module>dhis-web-jforum-integration</module>
+ <module>dhis-web-portal</module>
</modules>
<distributionManagement>
=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml 2009-04-22 21:31:10 +0000
+++ dhis-2/pom.xml 2009-05-03 21:40:52 +0000
@@ -22,6 +22,7 @@
<module>dhis-services</module>
<module>dhis-support</module>
<module>dhis-useradminandsecurity</module>
+ <module>dhis-web</module>
</modules>
<!--
<repositories>
--
Trunk
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.
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
