Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 12334 [merge]
committer: Jan Henrik Overland <janhenrik.overl...@gmail.com>
branch nick: dhis2
timestamp: Mon 2013-09-30 15:44:11 +0200
message:
(PT,DV,GIS) Plugin updates.
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/plugin.html
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/plugin.js
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/plugin.html
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/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-mapping/src/main/webapp/dhis-web-mapping/app/plugin.html'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/plugin.html 2013-09-09 09:39:16 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/plugin.html 2013-09-30 13:40:30 +0000
@@ -5,20 +5,20 @@
<title>DHIS2 GIS Plugin</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="styles/style.css" />
+
+ <style>
+ body {font-family: sans-serif; margin: 0 0 0 60px;}
+ h1 {font-size: 20px; margin: 20px 0;}
+ </style>
</head>
<body style="margin:10px 0 0 30px">
- <p>
- <div style="font-size:20px !important; padding:10px">My map 1</div>
- <div id="map1" style="width:700px; height:400px"></div>
- </p>
-
- <p>
- <div style="font-size:20px !important; padding:10px">My map 2</div>
- <div id="map2" style="width:700px; height:400px"></div>
- </p>
+ <h1>My map 1</h1>
+ <div id="map1" style="width:700px; height:400px"></div>
+
+ <h1>My map 2</h1>
+ <div id="map2" style="width:700px; height:400px"></div>
<script type="text/javascript" src="https://maps.google.com/maps/api/js?sensor=false";></script>
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js 2013-09-26 13:35:07 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js 2013-09-30 13:40:30 +0000
@@ -6,7 +6,13 @@
// namespace
if (!('GIS' in window)) {
GIS = {
- i18n: {}
+ i18n: {
+ thematic_layer_1_legend: 'Thematic layer 1 legend',
+ thematic_layer_2_legend: 'Thematic layer 2 legend',
+ thematic_layer_3_legend: 'Thematic layer 3 legend',
+ thematic_layer_4_legend: 'Thematic layer 4 legend',
+ facility_layer_legend: 'Facility layer legend'
+ }
};
}
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/plugin.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/plugin.js 2013-09-16 10:14:59 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/plugin.js 2013-09-30 13:40:30 +0000
@@ -24,6 +24,31 @@
radiusLow number 5 (Optional) Automatic legend set, low radius for points.
radiusHigh number 15 (Optional) Automatic legend set, high radius for points.
*/
+
+ // css
+ var css = 'body { \n font-family: arial, sans-serif, liberation sans, consolas !important; \n font-size: 11px; \n } \n';
+ css += '.x-panel-body { \n font-size: 11px; \n } \n';
+ css += '.x-panel-header { \n height: 30px; \n padding: 7px 4px 4px 7px; \n border: 0 none; \n } \n';
+ css += '.olControlPanel { \n position: absolute; \n top: 0; \n right: 0; \n border: 0 none; \n } \n';
+ css += '.olControlButtonItemActive { \n background: #556; \n color: #fff; \n width: 24px; \n height: 24px; \n opacity: 0.75; \n filter: alpha(opacity=75); \n -ms-filter: "alpha(opacity=75)"; \n cursor: pointer; \n cursor: hand; \n text-align: center; \n font-size: 21px !important; \n text-shadow: 0 0 1px #ddd; \n } \n';
+ css += '.olControlPanel.zoomIn { \n right: 72px; \n } \n';
+ css += '.olControlPanel.zoomIn .olControlButtonItemActive { \n border-bottom-left-radius: 2px; \n } \n';
+ css += '.olControlPanel.zoomOut { \n right: 48px; \n } \n';
+ css += '.olControlPanel.zoomVisible { \n right: 24px; \n } \n';
+ css += '.olControlPermalink { \n display: none !important; \n } \n';
+ css += '.olControlMousePosition { \n background: #fff !important; \n opacity: 0.8 !important; \n filter: alpha(opacity=80) !important; \n -ms-filter: "alpha(opacity=80)" !important; \n right: 0 !important; \n bottom: 0 !important; \n border-top-left-radius: 2px !important; \n padding: 2px 2px 2px 5px !important; \n color: #000 !important; \n -webkit-text-stroke-width: 0.2px; \n -webkit-text-stroke-color: #555; \n } \n';
+ css += '.olControlMousePosition * { \n font-size: 10px !important; \n } \n';
+ css += '.text-mouseposition-lonlat { \n color: #555; \n } \n';
+ css += '.olLayerGoogleCopyright, .olLayerGoogleV3.olLayerGooglePoweredBy { \n display: none; \n } \n';
+ css += '#google-logo { \n background: url("../images/google-logo.png") no-repeat; \n width: 40px; \n height: 13px; \n margin-left: 6px; \n display: inline-block; \n vertical-align: bottom; \n cursor: pointer; \n cursor: hand; \n } \n';
+ css += '.olControlScaleLine { \n left: 5px !important; \n bottom: 5px !important; \n } \n';
+ css += '.olControlScaleLineBottom { \n display: none; \n } \n';
+ css += '.olControlScaleLineTop { \n font-weight: bold; \n } \n';
+ css += '.x-mask-msg { \n padding: 0; \n border: 0 none; \n background-image: none; \n background-color: transparent; \n } \n';
+ css += '.x-mask-msg div { \n background-position: 11px center; \n } \n';
+ css += '.x-mask-msg .x-mask-loading { \n border: 0 none; \n background-color: #000; \n color: #fff; \n border-radius: 2px; \n padding: 12px 14px 12px 30px; \n opacity: 0.65; \n } \n';
+
+ Ext.util.CSS.createStyleSheet(css);
GIS.plugin = {};
@@ -190,6 +215,7 @@
items: [
{
title: GIS.i18n.thematic_layer_1_legend,
+ bodyStyle: 'padding:3px 0 4px 5px; border-width:1px 0 1px 0; border-color:#d0d0d0;',
listeners: {
added: function() {
gis.layer.thematic1.legendPanel = this;
@@ -198,6 +224,7 @@
},
{
title: GIS.i18n.thematic_layer_2_legend,
+ bodyStyle: 'padding:3px 0 4px 5px; border-width:1px 0 1px 0; border-color:#d0d0d0;',
listeners: {
added: function() {
gis.layer.thematic2.legendPanel = this;
@@ -206,6 +233,7 @@
},
{
title: GIS.i18n.thematic_layer_3_legend,
+ bodyStyle: 'padding:3px 0 4px 5px; border-width:1px 0 1px 0; border-color:#d0d0d0;',
listeners: {
added: function() {
gis.layer.thematic3.legendPanel = this;
@@ -214,6 +242,7 @@
},
{
title: GIS.i18n.thematic_layer_4_legend,
+ bodyStyle: 'padding:3px 0 4px 5px; border-width:1px 0 1px 0; border-color:#d0d0d0;',
listeners: {
added: function() {
gis.layer.thematic4.legendPanel = this;
@@ -222,6 +251,7 @@
},
{
title: GIS.i18n.facility_layer_legend,
+ bodyStyle: 'padding:3px 0 4px 5px; border-width:1px 0 1px 0; border-color:#d0d0d0;',
listeners: {
added: function() {
gis.layer.facility.legendPanel = this;
=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/plugin.html'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/plugin.html 2013-08-04 15:52:54 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/plugin.html 2013-09-30 13:02:16 +0000
@@ -34,7 +34,7 @@
],
rows: [
{dimension: 'J5jldMd8OHv', items: [{id: 'CXw2yu5fodb'}, {id: 'tDZVQ1WtwpA'}]},
- {dimension: 'ou', items: [{id: 'LEVEL-4-C9uduqDZr9d'}]}
+ {dimension: 'ou', items: [{id: 'LEVEL-4'}, {id:'C9uduqDZr9d'}]}
],
hideEmptyRows: true
});
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin.html'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin.html 2013-09-09 09:39:16 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin.html 2013-09-30 13:03:49 +0000
@@ -52,10 +52,10 @@
</head>
<body>
- <h1>CHART 1</h1>
+ <h1>CHART BY UID</h1>
<div id="chart1"></div>
- <h1>CHART 2</h1>
+ <h1>CHART BY CONFIG</h1>
<div id="chart2"></div>
</body>
</html>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
