dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #07951
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2356: (GIS) Html file cleaned up.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 2356 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-10-12 18:09:41 +0200
message:
(GIS) Html file cleaned up.
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.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-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html 2010-09-28 22:06:26 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html 2010-10-12 16:05:56 +0000
@@ -18,55 +18,9 @@
<link rel="stylesheet" type="text/css" href="../resources/ext-ux/msg/msg.css"/>
<link rel="stylesheet" type="text/css" href="../resources/ext-ux/checkbox/checkbox_or.css"/>
<link rel="stylesheet" type="text/css" href="../resources/ext-ux/statusbar/StatusBar.css"/>
-
- <!-- Flot
- <link rel="stylesheet" type="text/css" href="../resources/flot/Flot.css"/>
- -->
<!-- DHIS -->
<link rel="stylesheet" type="text/css" href="css/style.css"/>
-
- <!-- JavaScript -->
-
- <!-- JQuery
- <script type="text/javascript" src="../resources/jquery/jquery-1.4.2.min.js"></script>
- <script type="text/javascript">$.noConflict();</script>
- -->
-
- <!-- Ext JS -->
- <script type="text/javascript" src="../resources/ext/adapter/ext/ext-base.js"></script>
- <script type="text/javascript" src="../resources/ext/ext-all.js"></script>
-
- <!-- User extensions -->
- <script type="text/javascript" src="../resources/ext-ux/msg/msg.js"></script>
- <script type="text/javascript" src="../resources/ext-ux/colorfield/color-field.js"></script>
- <script type="text/javascript" src="../resources/ext-ux/itemselector/DDView.js"></script>
- <script type="text/javascript" src="../resources/ext-ux/multiselect/MultiSelect.js"></script>
- <script type="text/javascript" src="../resources/ext-ux/itemselector/ItemSelector.js"></script>
- <script type="text/javascript" src="../resources/ext-ux/statusbar/StatusBar.js"></script>
-
- <!-- OpenLayers -->
- <script type="text/javascript" src="../resources/openlayers-2.10/OpenLayers.js"></script>
-
- <!-- User extensions -->
- <script type="text/javascript" src="../resources/openlayers-ux/newSelectFeature.js"></script>
-
- <!-- Flot
- <script type="text/javascript" src="../resources/flot/jquery.flot.trunk.pie.js"></script>
- <script type="text/javascript" src="../resources/flot/Flot.js"></script>
- -->
-
- <!-- GeoExt -->
- <script type="text/javascript" src="../resources/geoext/script/GeoExt.js"></script>
-
- <!-- MapFish -->
- <script type="text/javascript" src="../resources/mapfish/MapFish.js"></script>
-
- <!-- DHIS -->
- <script type="text/javascript" src="i18nJavaScript.action"></script>
- <script type="text/javascript" src="script/config.js"></script>
- <script type="text/javascript" src="script/util.js"></script>
- <script type="text/javascript" src="script/index.js"></script>
</head>
<body>
@@ -103,7 +57,39 @@
<input type="hidden" id="legendsField" name="legends"/>
<input type="hidden" id="dataValuesField" name="datavalues"/>
<input type="hidden" id="imageFormat" name="imageFormat"/>
- </form>
+ </form>
+
+ <!-- JavaScript -->
+
+ <!-- Ext JS -->
+ <script type="text/javascript" src="../resources/ext/adapter/ext/ext-base.js"></script>
+ <script type="text/javascript" src="../resources/ext/ext-all.js"></script>
+
+ <!-- User extensions -->
+ <script type="text/javascript" src="../resources/ext-ux/msg/msg.js"></script>
+ <script type="text/javascript" src="../resources/ext-ux/colorfield/color-field.js"></script>
+ <script type="text/javascript" src="../resources/ext-ux/itemselector/DDView.js"></script>
+ <script type="text/javascript" src="../resources/ext-ux/multiselect/MultiSelect.js"></script>
+ <script type="text/javascript" src="../resources/ext-ux/itemselector/ItemSelector.js"></script>
+ <script type="text/javascript" src="../resources/ext-ux/statusbar/StatusBar.js"></script>
+
+ <!-- OpenLayers -->
+ <script type="text/javascript" src="../resources/openlayers-2.10/OpenLayers.js"></script>
+
+ <!-- User extensions -->
+ <script type="text/javascript" src="../resources/openlayers-ux/newSelectFeature.js"></script>
+
+ <!-- GeoExt -->
+ <script type="text/javascript" src="../resources/geoext/script/GeoExt.js"></script>
+
+ <!-- MapFish -->
+ <script type="text/javascript" src="../resources/mapfish/MapFish.js"></script>
+
+ <!-- DHIS -->
+ <script type="text/javascript" src="i18nJavaScript.action"></script>
+ <script type="text/javascript" src="script/config.js"></script>
+ <script type="text/javascript" src="script/util.js"></script>
+ <script type="text/javascript" src="script/index.js"></script>
</body>
</html>
\ No newline at end of file
