dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #18385
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7734: (DV) Period/favorite bugs fixed.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 7734 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-07-26 19:27:01 +0200
message:
(DV) Period/favorite bugs fixed.
modified:
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/index.html
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js
--
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-visualizer/src/main/webapp/dhis-web-visualizer/app/index.html'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/index.html 2012-07-17 09:40:47 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/index.html 2012-07-26 17:25:16 +0000
@@ -1,6 +1,8 @@
+<!DOCTYPE html>
<html>
<head>
<title>DHIS 2 Data Visualizer</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="css/style.css" />
</head>
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2012-07-25 00:20:50 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2012-07-26 17:25:16 +0000
@@ -195,7 +195,6 @@
lastYear: 1,
last5Years: 5,
last12Months: 12,
- last3Months: 3,
last4Quarters: 4,
last2SixMonths: 2,
reportingMonth: 1,
@@ -2096,6 +2095,7 @@
dataset: {},
relativeperiod: {},
fixedperiod: {},
+ period: {},
organisationunit: {},
hidesubtitle: false,
hidelegend: false,
@@ -2121,8 +2121,7 @@
this.model.indicator = {};
this.model.dataelement = {};
this.model.dataset = {};
- this.model.relativeperiod = {};
- this.model.fixedperiod = {};
+ this.model.period = {};
this.model.organisationunit = {};
this.model.hidesubtitle = false;
this.model.hidelegend = false;
@@ -3183,18 +3182,13 @@
paramName: 'last12Months',
boxLabel: DV.i18n.last_12_months,
checked: true
- },
- {
- xtype: 'checkbox',
- paramName: 'last3Months',
- boxLabel: DV.i18n.last_3_months
}
]
},
{
xtype: 'panel',
layout: 'anchor',
- bodyStyle: 'border-style:none; padding:0 0 0 15px',
+ bodyStyle: 'border-style:none; padding:0 0 0 32px',
defaults: {
labelSeparator: '',
listeners: {
@@ -3226,7 +3220,7 @@
{
xtype: 'panel',
layout: 'anchor',
- bodyStyle: 'border-style:none; padding:0 0 0 15px',
+ bodyStyle: 'border-style:none; padding:0 0 0 32px',
defaults: {
labelSeparator: '',
listeners: {
@@ -3302,7 +3296,7 @@
{
xtype: 'panel',
layout: 'anchor',
- bodyStyle: 'border-style:none; padding:5px 0 0 15px',
+ bodyStyle: 'border-style:none; padding:5px 0 0 46px',
defaults: {
labelSeparator: ''
},
