dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #17372
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6884: HTML backup
------------------------------------------------------------
revno: 6884
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-05-08 20:54:13 +0200
message:
HTML backup
removed:
resources/util/index.html
resources/util/plugin.html
added:
resources/html/
resources/html/carousel.html
resources/html/index.html
resources/html/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
=== added directory 'resources/html'
=== added file 'resources/html/carousel.html'
--- resources/html/carousel.html 1970-01-01 00:00:00 +0000
+++ resources/html/carousel.html 2012-05-08 18:54:13 +0000
@@ -0,0 +1,99 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+<title>DHIS Web Portal</title>
+
+<!-- Import ext js and carousel css and js -->
+
+<link rel="stylesheet" type="text/css" href="http://apps.dhis2.org/dev/dhis-web-commons/javascripts/ext-ux/carousel/css/carousel.css"; />
+<script type="text/javascript" src="http://extjs-public.googlecode.com/svn/tags/extjs-4.0.7/release/ext-all.js";></script>
+<script type="text/javascript" src="http://apps.dhis2.org/dev/dhis-web-commons/javascripts/ext-ux/carousel/Carousel.js";></script>
+<script type="text/javascript" src="http://apps.dhis2.org/dev/dhis-web-commons/javascripts/plugin/chart.js";></script>
+
+<!-- Custom CSS -->
+
+<style type="text/css">
+
+body {
+ font-family: Georgia, sans-serif;
+ color: #3B3B3B;
+ line-height: 1.5;
+}
+
+h1 {
+ color: black;
+}
+
+h1, h3 {
+ font-weight: lighter;
+}
+
+.chart {
+ width: 900px;
+ height: 500px;
+ border: 1px solid #ddd;
+ margin-top: 21px;
+}
+
+#chartCarousel {
+ width: 902px;
+ height: 550px;
+ margin: 20px;
+}
+
+</style>
+
+<script type="text/javascript">
+var base = 'http://apps.dhis2.org/dev/';
+
+Ext.onReady( function() {
+ Ext.Ajax.request({
+ url: base + "dhis-web-commons-security/login.action",
+ method: 'POST',
+ params: { j_username: "admin", j_password: "district" },
+ success: setLinks
+ });
+});
+
+function setLinks() {
+ DHIS.getChart({ uid: 'R0DVGvXDUNP', el: 'chartA1', url: base });
+
+ DHIS.getChart({ uid: 'X0CPnV6uLjR', el: 'chartA2', url: base });
+
+ DHIS.getChart({ uid: 'j1gNXBgwKVm', el: 'chartA3', url: base });
+
+ DHIS.getChart({ uid: 'X7PqaXfevnL', el: 'chartA4', url: base });
+
+ new Ext.ux.carousel.Carousel( 'chartCarousel', {
+ autoPlay: true,
+ itemSelector: 'div.chart',
+ interval: 5,
+ showPlayButton: true
+ });
+}
+</script>
+
+</head>
+
+<body>
+
+<h1>Chart Carousel</h1>
+
+<p><a href="http://dhis2.org";>Home</a> | <a href="index.html">Portal</a> | <a href="plugin.html">Plugin</a> | <a href="carousel.html">Carousel</a></p>
+
+<p>This page illustrates how the charts made by the Data Visualizer plugin can be placed inside a carousel widget in order to make an attractive front page.</p>
+
+<h3>Carousel widget</h3>
+
+<div id="chartCarousel">
+
+<div id="chartA1" class="chart"></div>
+<div id="chartA2" class="chart"></div>
+<div id="chartA3" class="chart"></div>
+<div id="chartA4" class="chart"></div>
+
+</div>
+
+</body>
+</html>
=== added file 'resources/html/index.html'
--- resources/html/index.html 1970-01-01 00:00:00 +0000
+++ resources/html/index.html 2012-05-08 18:54:13 +0000
@@ -0,0 +1,90 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+<title>DHIS Web Portal</title>
+
+<style type="text/css">
+
+body {
+ font-family: Georgia, sans-serif;
+ color: #3B3B3B;
+ line-height: 1.5;
+}
+
+h1 {
+ color: black;
+}
+
+h1, h3 {
+ font-weight: lighter;
+}
+
+</style>
+
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js";></script>
+
+<script type="text/javascript">
+
+var base = "http://apps.dhis2.org/demo/";;
+
+function setLinks() {
+ jQuery("#map1").attr("src", base + "api/maps/mVHksDN1dIP/data");
+ jQuery("#map2").attr("src", base + "api/maps/Y8dSQ3fH0Xe/data");
+ jQuery("#chart1").attr("src", base + "api/charts/j1gNXBgwKVm/data");
+ jQuery("#chart2").attr("src", base + "api/charts/EbRN2VIbPdV/data");
+ jQuery("#table1").load( base + "api/reportTables/zfFRJUAZ8II/data");
+ jQuery("#table2").load( base + "api/reportTables/NBt7kGTOQTb/data");
+}
+
+jQuery(document).ready(function() {
+ $.post( base + "dhis-web-commons-security/login.action", {
+ j_username: "admin", j_password: "district"
+ },
+ setLinks
+ );
+});
+
+</script>
+
+</head>
+<body>
+
+<h1>Web Portal</h1>
+
+<p><a href="http://dhis2.org";>Home</a> | <a href="index.html">Portal</a> | <a href="plugin.html">Plugin</a> | <a href="carousel.html">Carousel</a></p>
+
+<p>This page illustrates how the DHIS Web API can be used as back-end for a Web portal. All content on this
+page is loaded dynamically from the Web API running with the demo DHIS instance. Right-click on the page and
+view the page source to see how authentication and requests are handled. Notice that the portal must be
+hosted at the same domain as the DHIS instance to avoid "same origin policy" issues for authentication and
+loading of resources.</p>
+
+<h3>Reports</h3>
+<ul>
+<li><a href="http://apps.dhis2.org/demo/api/reports/KlcaBsIqTV4/data";>EPI Report by Facility Type</a></li>
+<li><a href="http://apps.dhis2.org/demo/api/reports/hUMx9D1e5a1/data";>Nutrition Indicators</a></li>
+<li><a href="http://apps.dhis2.org/demo/api/reports/KUb4jJluGAF/data";>HIV Indicators</a></li>
+</ul>
+
+<h3>Tables</h3>
+<ul>
+<li><a href="http://apps.dhis2.org/demo/api/reportTables/NBt7kGTOQTb/data";>District Feedback Indicators</a> | <a href="http://apps.dhis2.org/demo/api/reportTables/NBt7kGTOQTb/data.pdf";>PDF</a> | <a href="http://apps.dhis2.org/demo/api/reportTables/NBt7kGTOQTb/data.xls";>XLS</a> | <a href="http://apps.dhis2.org/demo/api/reportTables/NBt7kGTOQTb/data.csv";>CSV</a></li>
+<li><a href="http://apps.dhis2.org/demo/api/reportTables/xIWpSo5jjT1/data";>District Maternal Health</a> | <a href="http://apps.dhis2.org/demo/api/reportTables/xIWpSo5jjT1/data.pdf";>PDF</a> | <a href="http://apps.dhis2.org/demo/api/reportTables/xIWpSo5jjT1/data.xls";>XLS</a> | <a href="http://apps.dhis2.org/demo/api/reportTables/xIWpSo5jjT1/data.csv";>CSV</a></li>
+<li><a href="http://apps.dhis2.org/demo/api/reportTables/GXG56cBuqcm/data";>ANC Visits Fixed and Outreach</a> | <a href="http://apps.dhis2.org/demo/api/reportTables/GXG56cBuqcm/data.pdf";>PDF</a> | <a href="http://apps.dhis2.org/demo/api/reportTables/GXG56cBuqcm/data.xls";>XLS</a> | <a href="http://apps.dhis2.org/demo/api/reportTables/GXG56cBuqcm/data.csv";>CSV</a></li>
+</ul>
+
+<h3>Maps</h3>
+<img style="padding: 15px; margin: 15px; border: 1px solid #c0c0c0;" id="map1" />
+<img style="padding: 15px; margin: 15px; border: 1px solid #c0c0c0;" id="map2" />
+
+<h3>Charts</h3>
+<img style="padding: 15px; margin: 15px; border: 1px solid #c0c0c0;" id="chart1" />
+<img style="padding: 15px; margin: 15px; border: 1px solid #c0c0c0;" id="chart2" />
+
+<h3>Embedded tables</h3>
+<div id="table1"></div>
+<div id="table2"></div>
+
+</body>
+</html>
=== added file 'resources/html/plugin.html'
--- resources/html/plugin.html 1970-01-01 00:00:00 +0000
+++ resources/html/plugin.html 2012-05-08 18:54:13 +0000
@@ -0,0 +1,128 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+<title>DHIS Web Portal</title>
+
+<!-- Import ext js, ext css and visualizer plugin js -->
+
+<script type="text/javascript" src="http://extjs-public.googlecode.com/svn/tags/extjs-4.0.7/release/ext-all.js";></script>
+<script type="text/javascript" src="http://apps.dhis2.org/demo/dhis-web-visualizer/app/plugin/plugin.js";></script>
+
+<!-- Custom CSS -->
+
+<style type="text/css">
+
+body {
+ font-family: Georgia, sans-serif;
+ color: #3B3B3B;
+ line-height: 1.5;
+}
+
+h1 {
+ color: black;
+}
+
+h1, h3 {
+ font-weight: lighter;
+}
+
+.chart {
+ width: 900px;
+ height: 500px;
+ border: 1px solid #ddd;
+ margin: 30px;
+}
+
+</style>
+
+<!-- Login and initialize charts -->
+
+<script type="text/javascript">
+var base = 'http://apps.dhis2.org/demo/';
+
+Ext.onReady( function() {
+ Ext.Ajax.request({
+ url: base + "dhis-web-commons-security/login.action",
+ method: 'POST',
+ params: { j_username: "admin", j_password: "district" },
+ success: setLinks
+ });
+});
+
+function setLinks() {
+ DHIS.getChart({ uid: 'R0DVGvXDUNP', el: 'chartA1', url: base });
+
+ DHIS.getChart({ uid: 'X0CPnV6uLjR', el: 'chartA2', url: base });
+
+ DHIS.getChart({ uid: 'j1gNXBgwKVm', el: 'chartA3', url: base });
+
+ DHIS.getChart({ uid: 'X7PqaXfevnL', el: 'chartA4', url: base });
+
+ DHIS.getChart({ el: 'chartB1', url: base,
+ type: 'bar',
+ indicators: ['FnYCr2EAzWS','eTDtyyaSA7f','tUIlpyeeX9N'],
+ periods: 'last12Months',
+ organisationunits: ['ImspTQPwCqd']
+ });
+
+ DHIS.getChart({ el: 'chartB2', url: base,
+ type: 'column',
+ indicators: ['Uvn6LCg7dVU','sB79w2hiLp8'],
+ periods: 'thisYear',
+ organisationunits: ['O6uvpzGd5pu','fdc6uOvgoji','lc3eMKXaEfw','jmIPBj66vD6'],
+ series: 'data',
+ category: 'organisationunit',
+ filter: 'period'
+ });
+
+ DHIS.getChart({ el: 'chartB3', url: base,
+ type: 'line',
+ indicators: ['Uvn6LCg7dVU','sB79w2hiLp8'],
+ periods: 'last12Months',
+ organisationunits: ['ImspTQPwCqd'],
+ series: 'data',
+ category: 'period',
+ filter: 'organisationunit'
+ });
+
+ DHIS.getChart({ el: 'chartB4', url: base,
+ type: 'pie',
+ dataelements: ['sre820mphBu','nckBHiObFAn','Z2GiSR6S3DO','rEgPZfxBScE','T2H6EDoHxxy'],
+ periods: 'thisYear',
+ organisationunits: ['ImspTQPwCqd'],
+ series: 'period',
+ category: 'data',
+ filter: 'organisationunit'
+ });
+};
+</script>
+
+</head>
+
+<body>
+
+<h1>Visualizer Plugin</h1>
+
+<p><a href="http://dhis2.org";>Home</a> | <a href="index.html">Portal</a> | <a href="plugin.html">Plugin</a> | <a href="carousel.html">Carousel</a></p>
+
+<p>This page illustrates the use of the Data Visualizer plugin which can be used to embed Ext dynamic charts into a Web page. You can embed charts
+pointing to pre-defined charts in DHIS, or select custom indicators, periods and org units to create dynamic charts. View the source of this page to
+see how it is done.</p>
+
+<h3>Pre-defined charts</h3>
+
+<div id="chartA1" class="chart"></div>
+<div id="chartA2" class="chart"></div>
+<div id="chartA3" class="chart"></div>
+<div id="chartA4" class="chart"></div>
+
+<h3>Dynamic charts</h3>
+
+<div id="chartB1" class="chart"></div>
+<div id="chartB2" class="chart"></div>
+<div id="chartB3" class="chart"></div>
+<div id="chartB4" class="chart"></div>
+
+</body>
+</html>
=== removed file 'resources/util/index.html'
--- resources/util/index.html 2012-05-02 16:35:24 +0000
+++ resources/util/index.html 1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-
-<title>DHIS Web Portal</title>
-
-<style type="text/css">
-
-body {
- font-family: Georgia, sans-serif;
- color: #3B3B3B;
- line-height: 1.5;
-}
-
-h1 {
- color: black;
-}
-
-h1, h3 {
- font-weight: lighter;
-}
-
-</style>
-
-<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js";></script>
-
-<script type="text/javascript">
-
-var base = "http://apps.dhis2.org/demo/";;
-
-function setLinks() {
- jQuery("#map1").attr("src", base + "api/maps/mVHksDN1dIP/data");
- jQuery("#map2").attr("src", base + "api/maps/Y8dSQ3fH0Xe/data");
- jQuery("#chart1").attr("src", base + "api/charts/j1gNXBgwKVm/data");
- jQuery("#chart2").attr("src", base + "api/charts/EbRN2VIbPdV/data");
- jQuery("#table1").load( base + "api/reportTables/zfFRJUAZ8II/data");
- jQuery("#table2").load( base + "api/reportTables/NBt7kGTOQTb/data");
-}
-
-jQuery(document).ready(function() {
- $.post( base + "dhis-web-commons-security/login.action", {
- j_username: "admin", j_password: "district"
- },
- setLinks
- );
-});
-
-</script>
-
-</head>
-<body>
-
-<h1>Web Portal</h1>
-
-<p><a href="http://dhis2.org";>Home</a> | <a href="index.html">Portal</a> | <a href="plugin.html">Plugin</a></p>
-
-<p>This page illustrates how the DHIS Web API can be used as back-end for a Web portal. All content on this
-page is loaded dynamically from the Web API running with the demo DHIS instance. Right-click on the page and
-view the page source to see how authentication and requests are handled. Notice that the portal must be
-hosted at the same domain as the DHIS instance to avoid "same origin policy" issues for authentication and
-loading of resources.</p>
-
-<h3>Reports</h3>
-<ul>
-<li><a href="http://apps.dhis2.org/demo/api/reports/KlcaBsIqTV4/data";>EPI Report by Facility Type</a></li>
-<li><a href="http://apps.dhis2.org/demo/api/reports/hUMx9D1e5a1/data";>Nutrition Indicators</a></li>
-<li><a href="http://apps.dhis2.org/demo/api/reports/KUb4jJluGAF/data";>HIV Indicators</a></li>
-</ul>
-
-<h3>Tables</h3>
-<ul>
-<li><a href="http://apps.dhis2.org/demo/api/reportTables/NBt7kGTOQTb/data";>District Feedback Indicators</a> | <a href="http://apps.dhis2.org/demo/api/reportTables/NBt7kGTOQTb/data.pdf";>PDF</a> | <a href="http://apps.dhis2.org/demo/api/reportTables/NBt7kGTOQTb/data.xls";>XLS</a> | <a href="http://apps.dhis2.org/demo/api/reportTables/NBt7kGTOQTb/data.csv";>CSV</a></li>
-<li><a href="http://apps.dhis2.org/demo/api/reportTables/xIWpSo5jjT1/data";>District Maternal Health</a> | <a href="http://apps.dhis2.org/demo/api/reportTables/xIWpSo5jjT1/data.pdf";>PDF</a> | <a href="http://apps.dhis2.org/demo/api/reportTables/xIWpSo5jjT1/data.xls";>XLS</a> | <a href="http://apps.dhis2.org/demo/api/reportTables/xIWpSo5jjT1/data.csv";>CSV</a></li>
-<li><a href="http://apps.dhis2.org/demo/api/reportTables/GXG56cBuqcm/data";>ANC Visits Fixed and Outreach</a> | <a href="http://apps.dhis2.org/demo/api/reportTables/GXG56cBuqcm/data.pdf";>PDF</a> | <a href="http://apps.dhis2.org/demo/api/reportTables/GXG56cBuqcm/data.xls";>XLS</a> | <a href="http://apps.dhis2.org/demo/api/reportTables/GXG56cBuqcm/data.csv";>CSV</a></li>
-</ul>
-
-<h3>Maps</h3>
-<img style="padding: 15px; margin: 15px; border: 1px solid #c0c0c0;" id="map1" />
-<img style="padding: 15px; margin: 15px; border: 1px solid #c0c0c0;" id="map2" />
-
-<h3>Charts</h3>
-<img style="padding: 15px; margin: 15px; border: 1px solid #c0c0c0;" id="chart1" />
-<img style="padding: 15px; margin: 15px; border: 1px solid #c0c0c0;" id="chart2" />
-
-<h3>Embedded tables</h3>
-<div id="table1"></div>
-<div id="table2"></div>
-
-</body>
-</html>
=== removed file 'resources/util/plugin.html'
--- resources/util/plugin.html 2012-05-02 16:35:24 +0000
+++ resources/util/plugin.html 1970-01-01 00:00:00 +0000
@@ -1,139 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-
-<title>DHIS Web Portal</title>
-
-<!-- Import ext js, ext css and visualizer plugin js -->
-
-<link rel="stylesheet" type="text/css" href="http://extjs-public.googlecode.com/svn/tags/extjs-4.0.7/release/resources/css/ext-all-gray.css"; />
-<script type="text/javascript" src="http://extjs-public.googlecode.com/svn/tags/extjs-4.0.7/release/ext-all.js";></script>
-<script type="text/javascript" src="http://apps.dhis2.org/demo/dhis-web-visualizer/app/plugin/plugin.js";></script>
-
-<!-- Custom css -->
-
-<style type="text/css">
-
-h1, h3 {
- font-family: Georgia, sans-serif;
- color: black;
- font-size: 32px;
- margin: 8px;
- margin-bottom: 21px;
- font-weight: lighter;
- line-height: 1.5;
-}
-
-h3 {
- margin-top: 21px;
- font-size: 18px;
- color: #3B3B3B;
-}
-
-p {
- font-family: Georgia, sans-serif;
- color: #3B3B3B;
- line-height: 1.5;
- font-size: 16px;
- margin: 8px;
-}
-
-.chart {
- width: 900px;
- height: 500px;
- border: 1px solid #ddd;
- margin: 30px;
-}
-
-</style>
-
-<!-- Login and initialize charts -->
-
-<script type="text/javascript">
-var base = 'http://apps.dhis2.org/demo/';
-
-Ext.onReady( function() {
- Ext.Ajax.request({
- url: base + "dhis-web-commons-security/login.action",
- method: 'POST',
- params: { j_username: "admin", j_password: "district" },
- success: setLinks
- });
-});
-
-function setLinks() {
- DHIS.getChart({ uid: 'R0DVGvXDUNP', el: 'chartA1', url: base });
-
- DHIS.getChart({ uid: 'X0CPnV6uLjR', el: 'chartA2', url: base });
-
- DHIS.getChart({ uid: 'j1gNXBgwKVm', el: 'chartA3', url: base });
-
- DHIS.getChart({ uid: 'X7PqaXfevnL', el: 'chartA4', url: base });
-
- DHIS.getChart({ el: 'chartB1', url: base,
- type: 'bar',
- indicators: ['FnYCr2EAzWS','eTDtyyaSA7f','tUIlpyeeX9N'],
- periods: 'last12Months',
- organisationunits: ['ImspTQPwCqd']
- });
-
- DHIS.getChart({ el: 'chartB2', url: base,
- type: 'column',
- indicators: ['Uvn6LCg7dVU','sB79w2hiLp8'],
- periods: 'thisYear',
- organisationunits: ['O6uvpzGd5pu','fdc6uOvgoji','lc3eMKXaEfw','jmIPBj66vD6'],
- series: 'data',
- category: 'organisationunit',
- filter: 'period'
- });
-
- DHIS.getChart({ el: 'chartB3', url: base,
- type: 'line',
- indicators: ['Uvn6LCg7dVU','sB79w2hiLp8'],
- periods: 'last12Months',
- organisationunits: ['ImspTQPwCqd'],
- series: 'data',
- category: 'period',
- filter: 'organisationunit'
- });
-
- DHIS.getChart({ el: 'chartB4', url: base,
- type: 'pie',
- dataelements: ['sre820mphBu','nckBHiObFAn','Z2GiSR6S3DO','rEgPZfxBScE','T2H6EDoHxxy'],
- periods: 'thisYear',
- organisationunits: ['ImspTQPwCqd'],
- series: 'period',
- category: 'data',
- filter: 'organisationunit'
- });
-};
-</script>
-
-</head>
-
-<body>
-
-<h1>Visualizer Plugin</h1>
-
-<p><a href="http://dhis2.org";>Home</a> | <a href="index.html">Portal</a> | <a href="plugin.html">Plugin</a></p>
-
-<p>This page illustrates the use of the Data Visualizer plugin which can be used to embed Ext dynamic charts into a Web page. You can embed charts
-pointing to pre-defined charts in DHIS, or select custom indicators, periods and org units to create dynamic charts. View the source of this page to
-see how it is done.</p>
-
-<h3>Pre-defined charts</h3>
-
-<div id="chartA1" class="chart"></div>
-<div id="chartA2" class="chart"></div>
-<div id="chartA3" class="chart"></div>
-<div id="chartA4" class="chart"></div>
-
-<h3>Dynamic charts</h3>
-
-<div id="chartB1" class="chart"></div>
-<div id="chartB2" class="chart"></div>
-<div id="chartB3" class="chart"></div>
-<div id="chartB4" class="chart"></div>
-
-</body>
-</html>
