dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #33924
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17376: Minor
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 17376 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-11-06 16:50:37 +0100
message:
Minor
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/plugin.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/plugin.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/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-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/plugin.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/plugin.html 2014-11-04 11:55:05 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/plugin.html 2014-11-06 15:50:10 +0000
@@ -1,9 +1,9 @@
<!DOCTYPE html>
<html>
<head>
- <link rel="stylesheet" type="text/css" href="http://localhost:8080/dhis-web-commons/javascripts/ext/resources/css/ext-plugin-gray.css"; />
- <script src="http://localhost:8080/dhis-web-commons/javascripts/ext/ext-all.js";></script>
- <script src="http://localhost:8080/dhis-web-event-visualizer/scripts/plugin.js";></script>
+ <link rel="stylesheet" type="text/css" href="//localhost:8080/dhis-web-commons/javascripts/ext/resources/css/ext-plugin-gray.css" />
+ <script src="//localhost:8080/dhis-web-commons/javascripts/ext/ext-all.js"></script>
+ <script src="scripts/plugin.js"></script>
<style type="text/css">
body {font-family:sans-serif; margin:0 0 0 60px;}
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/plugin.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/plugin.html 2014-08-27 12:44:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/plugin.html 2014-11-06 15:50:10 +0000
@@ -3,10 +3,10 @@
<head>
<title>DHIS2 GIS Plugin</title>
- <link rel="stylesheet" type="text/css" href="http://localhost:8080/dhis-web-commons/javascripts/ext/resources/css/ext-all-gray.css"/>
- <script src="http://localhost:8080/dhis-web-commons/javascripts/ext/ext-all.js";></script>
- <script src="https://maps.google.com/maps/api/js?sensor=false";></script>
- <script src="http://localhost:8080/dhis-web-commons/javascripts/openlayers/OpenLayers.js";></script>
+ <link rel="stylesheet" type="text/css" href="//localhost:8080/dhis-web-commons/javascripts/ext/resources/css/ext-all-gray.css"/>
+ <script src="//localhost:8080/dhis-web-commons/javascripts/ext/ext-all.js"></script>
+ <script src="//maps.google.com/maps/api/js?sensor=false"></script>
+ <script src="//localhost:8080/dhis-web-commons/javascripts/openlayers/OpenLayers.js"></script>
<script src="scripts/plugin.js"></script>
<style>h1 {font-size: 20px; padding: 30px 0 20px;}</style>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/plugin.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/plugin.html 2014-09-01 19:20:31 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/plugin.html 2014-11-06 15:50:10 +0000
@@ -2,12 +2,9 @@
<html>
<head>
- <link rel="stylesheet" type="text/css" href="http://localhost:8080/dhis-web-commons/javascripts/ext/resources/css/ext-plugin-gray.css"; />
- <script src="http://localhost:8080/dhis-web-commons/javascripts/ext/ext-all.js";></script>
-<!--
- <script src="http://dhis2-cdn.org/v214/plugin/table.js";></script>
--->
- <script src="http://localhost:8080/dhis-web-pivot/scripts/plugin.js";></script>
+ <link rel="stylesheet" type="text/css" href="//localhost:8080/dhis-web-commons/javascripts/ext/resources/css/ext-plugin-gray.css" />
+ <script src="//localhost:8080/dhis-web-commons/javascripts/ext/ext-all.js"></script>
+ <script src="//localhost:8080/dhis-web-pivot/scripts/plugin.js"></script>
<style type="text/css">
body {font-family:sans-serif; margin:0 0 0 60px;}
