dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #40405
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20485: DV enums + intro spinner.
------------------------------------------------------------
revno: 20485
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2015-10-03 01:14:02 +0300
message:
DV enums + intro spinner.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/index.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/index.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/styles/style.css
--
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-pivot/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/index.html 2015-10-02 14:16:28 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/index.html 2015-10-02 22:14:02 +0000
@@ -13,7 +13,7 @@
<body>
<div id="init">
- <div class="logotext"><span class="text-medium">DHIS2</span> PIVOT TABLES</div>
+ <div><span class="text-medium">DHIS2</span> PIVOT TABLE</div>
<div class="spinner"></div>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/index.html 2014-11-06 15:44:09 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/index.html 2015-10-02 22:14:02 +0000
@@ -11,8 +11,11 @@
</head>
<body>
- <div id="init"></div>
-
+ <div id="init">
+ <div><span class="text-medium">DHIS2</span> DATA VISUALIZER</div>
+ <div class="spinner"></div>
+ </div>
+
<form id="exportForm" method="post">
<input type="hidden" id="svgField" name="svg"/>
<input type="hidden" id="filenameField" name="filename"/>
@@ -28,7 +31,7 @@
<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.picker.min.js"></script>
<script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.util.js"></script>
<script type="text/javascript" src="../dhis-web-commons/javascripts/date.js"></script>
-
+
<script type="text/javascript" src="../dhis-web-commons/javascripts/simpleRegression.js"></script>
<script type="text/javascript" src="scripts/core.js"></script>
<script type="text/javascript" src="scripts/app.js"></script>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2015-09-10 20:26:24 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2015-10-02 22:14:02 +0000
@@ -2599,7 +2599,7 @@
ns.app.xResponse = xResponse;
// legend set
- if (xLayout.type === 'gauge' && Ext.Array.contains(xLayout.axisObjectNames, ind) && xLayout.objectNameIdsMap[ind].length) {
+ if (xLayout.type === 'GAUGE' && Ext.Array.contains(xLayout.axisObjectNames, ind) && xLayout.objectNameIdsMap[ind].length) {
Ext.Ajax.request({
url: ns.core.init.contextPath + '/api/indicators/' + xLayout.objectNameIdsMap[ind][0] + '.json?fields=legendSet[legends[id,name,startValue,endValue,color]]',
disableCaching: false,
@@ -7915,7 +7915,6 @@
NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
if (keyUiLocale === defaultKeyUiLocale) {
- Ext.get('init').update(NS.i18n.initializing + '..');
fn();
}
else {
@@ -7928,7 +7927,6 @@
console.log('No translations found for system locale (' + keyUiLocale + ')');
},
callback: function() {
- Ext.get('init').update(NS.i18n.initializing + '..');
fn();
}
});
@@ -7939,7 +7937,6 @@
url: 'i18n/i18n_app_' + keyUiLocale + '.properties',
success: function(r) {
NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
- Ext.get('init').update(NS.i18n.initializing + '..');
},
failure: function() {
alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js 2015-09-10 20:26:24 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js 2015-10-02 22:14:02 +0000
@@ -618,15 +618,15 @@
series: 'series',
category: 'category',
filter: 'filter',
- column: 'column',
- stackedcolumn: 'stackedcolumn',
- bar: 'bar',
- stackedbar: 'stackedbar',
- line: 'line',
- area: 'area',
- pie: 'pie',
- radar: 'radar',
- gauge: 'gauge'
+ column: 'COLUMN',
+ stackedcolumn: 'STACKED_COLUMN',
+ bar: 'BAR',
+ stackedbar: 'STACKED_BAR',
+ line: 'LINE',
+ area: 'AREA',
+ pie: 'PIE',
+ radar: 'RADAR',
+ gauge: 'GAUGE'
},
data: {
domain: 'domain_',
@@ -865,7 +865,7 @@
getValidatedDimensionArray,
validateSpecialCases;
- // type: string ('column') - 'column', 'stackedcolumn', 'bar', 'stackedbar', 'line', 'area', 'pie'
+ // type: string ('COLUMN') - 'COLUMN', 'STACKED_COLUMN', 'BAR', 'STACKED_BAR', 'LINE', 'AREA', 'PIE'
// columns: [Dimension]
@@ -1128,7 +1128,7 @@
//config = analytical2layout(config);
// layout
- layout.type = Ext.isString(config.type) ? config.type.toLowerCase() : conf.finals.chart.column;
+ layout.type = Ext.isString(config.type) ? config.type : conf.finals.chart.column;
layout.columns = config.columns;
layout.rows = config.rows;
@@ -3356,7 +3356,7 @@
store = config.store || {},
width = app.getCenterRegionWidth(),
height = app.getCenterRegionHeight(),
- isLineBased = Ext.Array.contains(['line', 'area'], xLayout.type),
+ isLineBased = Ext.Array.contains(['LINE', 'AREA'], xLayout.type),
defaultConfig = {
//animate: true,
animate: false,
@@ -3413,7 +3413,7 @@
return chart;
};
- generator.column = function(isStacked) {
+ generator['COLUMN'] = function(isStacked) {
var store = getDefaultStore(isStacked),
numericAxis = getDefaultNumericAxis(store),
categoryAxis = getDefaultCategoryAxis(store),
@@ -3443,7 +3443,7 @@
});
};
- generator.stackedcolumn = function() {
+ generator['STACKED_COLUMN'] = function() {
var chart = this.column(true);
for (var i = 0, item; i < chart.series.items.length; i++) {
@@ -3457,7 +3457,7 @@
return chart;
};
- generator.bar = function(isStacked) {
+ generator['BAR'] = function(isStacked) {
var store = getDefaultStore(isStacked),
numericAxis = getDefaultNumericAxis(store),
categoryAxis = getDefaultCategoryAxis(store),
@@ -3529,7 +3529,7 @@
});
};
- generator.stackedbar = function() {
+ generator['STACKED_BAR'] = function() {
var chart = this.bar(true);
for (var i = 0, item; i < chart.series.items.length; i++) {
@@ -3543,7 +3543,7 @@
return chart;
};
- generator.line = function() {
+ generator['LINE'] = function() {
var store = getDefaultStore(),
numericAxis = getDefaultNumericAxis(store),
categoryAxis = getDefaultCategoryAxis(store),
@@ -3617,7 +3617,7 @@
});
};
- generator.area = function() {
+ generator['AREA'] = function() {
// NB, always true for area charts as extjs area charts cannot handle nulls
xLayout.hideEmptyRows = true;
@@ -3658,7 +3658,7 @@
});
};
- generator.pie = function() {
+ generator['PIE'] = function() {
var store = getDefaultStore(),
series,
colors,
@@ -3757,7 +3757,7 @@
return chart;
};
- generator.radar = function() {
+ generator['RADAR'] = function() {
var store = getDefaultStore(),
axes = [],
series = [],
@@ -3837,7 +3837,7 @@
return chart;
};
- generator.gauge = function() {
+ generator['GAUGE'] = function() {
var valueColor = '#aaa',
store,
axis,
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/styles/style.css 2015-08-09 19:59:57 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/styles/style.css 2015-10-02 22:14:02 +0000
@@ -57,8 +57,9 @@
#init {
display: table;
- margin: 200px auto;
- font-size: 15px;
+ margin: 300px auto;
+ font-size: 13px;
+ color: #444;
}
/* Scrollbar Webkit */
@@ -129,6 +130,48 @@
cursor: pointer;
}
+.text-medium {
+ font-weight: 600;
+}
+
+
+/*----------------------------------------------------------------------------
+ * Spinner
+ *--------------------------------------------------------------------------*/
+
+.spinner {
+ width: 20px;
+ height: 20px;
+ margin: 50px auto;
+ background-color: #aaa;
+
+ border-radius: 100%;
+ -webkit-animation: sk-scaleout 0.8s infinite ease-in-out;
+ animation: sk-scaleout 0.8s infinite ease-in-out;
+}
+
+@-webkit-keyframes sk-scaleout {
+ 0% {
+ -webkit-transform: scale(0)
+ }
+ 100% {
+ -webkit-transform: scale(1.0);
+ opacity: 0;
+ }
+}
+
+@keyframes sk-scaleout {
+ 0% {
+ -webkit-transform: scale(0);
+ transform: scale(0);
+ }
+ 100% {
+ -webkit-transform: scale(1.0);
+ transform: scale(1.0);
+ opacity: 0;
+ }
+}
+
/*----------------------------------------------------------------------------
* NS viewport
@@ -136,11 +179,11 @@
.ns-viewport-text * {
padding: 3px 10px;
- font-size: 11px;
- color: #515a62;
+ font-size: 13px;
+ color: #777;
}
.ns-viewport-text h3 {
- font-size: 14px;
+ font-size: 13px;
font-weight: 500;
color: #333;
padding: 0 0 8px 0;
