dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #14689
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5066: (DV) Windozified CSS.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 5066 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-10-31 16:13:55 +0100
message:
(DV) Windozified CSS.
added:
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrowleft.png
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrowleftdouble.png
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrowright.png
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrowrightdouble.png
modified:
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/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-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2011-10-31 13:12:24 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2011-10-31 15:05:30 +0000
@@ -107,7 +107,7 @@
},
getXY: function() {
var c = Ext.getCmp('center');
- return {x: c.x + 15, y: c.y + 45};
+ return {x: c.x + 15, y: c.y + 43};
}
},
multiselect: {
@@ -417,6 +417,23 @@
}
}
},
+ window: {
+ datatable: {
+ getHeight: function() {
+ if (DV.value.values.length) {
+ if (Ext.isWindows && Ext.isGecko) {
+ return 22 * DV.value.values.length + 57;
+ }
+ else if (Ext.isWindows && Ext.isIE) {
+ return 21 * DV.value.values.length + 58;
+ }
+ else {
+ return 21 * DV.value.values.length + 57;
+ }
+ }
+ }
+ }
+ },
number: {
isInteger: function(n) {
var str = new String(n);
@@ -1187,7 +1204,8 @@
'->',
{
xtype: 'button',
- text: '>',
+ icon: 'images/arrowright.png',
+ width: 22,
handler: function() {
DV.util.multiselect.select(DV.util.getCmp('multiselect[name="availableIndicators"]'),
DV.util.getCmp('multiselect[name="selectedIndicators"]'));
@@ -1195,12 +1213,14 @@
},
{
xtype: 'button',
- text: '>>',
+ icon: 'images/arrowrightdouble.png',
+ width: 22,
handler: function() {
DV.util.multiselect.selectAll(DV.util.getCmp('multiselect[name="availableIndicators"]'),
DV.util.getCmp('multiselect[name="selectedIndicators"]'));
}
- }
+ },
+ ' '
],
listeners: {
afterrender: function(ms) {
@@ -1222,9 +1242,11 @@
queryMode: 'local',
store: DV.store.indicator.selected,
tbar: [
+ ' ',
{
xtype: 'button',
- text: '<<',
+ icon: 'images/arrowleftdouble.png',
+ width: 22,
handler: function() {
DV.util.multiselect.unselectAll(DV.util.getCmp('multiselect[name="availableIndicators"]'),
DV.util.getCmp('multiselect[name="selectedIndicators"]'));
@@ -1232,7 +1254,8 @@
},
{
xtype: 'button',
- text: '<',
+ icon: 'images/arrowleft.png',
+ width: 22,
handler: function() {
DV.util.multiselect.unselect(DV.util.getCmp('multiselect[name="availableIndicators"]'),
DV.util.getCmp('multiselect[name="selectedIndicators"]'));
@@ -1336,7 +1359,8 @@
'->',
{
xtype: 'button',
- text: '>',
+ icon: 'images/arrowright.png',
+ width: 22,
handler: function() {
DV.util.multiselect.select(DV.util.getCmp('multiselect[name="availableDataElements"]'),
DV.util.getCmp('multiselect[name="selectedDataElements"]'));
@@ -1344,12 +1368,14 @@
},
{
xtype: 'button',
- text: '>>',
+ icon: 'images/arrowrightdouble.png',
+ width: 22,
handler: function() {
DV.util.multiselect.selectAll(DV.util.getCmp('multiselect[name="availableDataElements"]'),
DV.util.getCmp('multiselect[name="selectedDataElements"]'));
}
- }
+ },
+ ' '
],
listeners: {
afterrender: function(ms) {
@@ -1371,9 +1397,11 @@
queryMode: 'remote',
store: DV.store.dataelement.selected,
tbar: [
+ ' ',
{
xtype: 'button',
- text: '<<',
+ icon: 'images/arrowleftdouble.png',
+ width: 22,
handler: function() {
DV.util.multiselect.unselectAll(DV.util.getCmp('multiselect[name="availableDataElements"]'),
DV.util.getCmp('multiselect[name="selectedDataElements"]'));
@@ -1381,7 +1409,8 @@
},
{
xtype: 'button',
- text: '<',
+ icon: 'images/arrowleft.png',
+ width: 22,
handler: function() {
DV.util.multiselect.unselect(DV.util.getCmp('multiselect[name="availableDataElements"]'),
DV.util.getCmp('multiselect[name="selectedDataElements"]'));
@@ -1677,7 +1706,7 @@
layout: 'fit',
iconCls: 'dv-window-title-datatable',
width: 560,
- height: Ext.Array.min([21*DV.value.values.length+57, DV.viewport.getHeight()*3/4]),
+ height: Ext.Array.min([DV.util.window.datatable.getHeight(), DV.viewport.getHeight()*3/4]),
items: [
{
xtype: 'grid',
@@ -1686,7 +1715,7 @@
{
text: DV.conf.finals.dimension.indicator.rawvalue,
dataIndex: DV.conf.finals.dimension.indicator.value,
- width: 150,
+ width: 150
},
{
text: DV.conf.finals.dimension.period.rawvalue,
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css 2011-10-31 13:12:24 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css 2011-10-31 15:05:30 +0000
@@ -2,6 +2,10 @@
ExtJS overrides
****************/
+.x-body {
+ font-family: arial, ubuntu;
+}
+
/* Combobox empty text */
.x-form-empty-field, textarea.x-form-empty-field {
font-size: 10px;
@@ -20,7 +24,7 @@
/* Combobox field label font */
.x-form-item-label {
- font: 11px arial;
+ font: 11px arial, ubuntu;
color: #111;
}
@@ -86,7 +90,7 @@
/* Tree panel font */
.x-grid-row .x-grid-cell {
- font: 10px arial;
+ font: 10px arial, ubuntu;
color: #222;
}
@@ -152,6 +156,11 @@
border-width: 1px;
}
+/* Button font-family */
+.x-btn-default-toolbar-small .x-btn-inner {
+ font-family: arial, ubuntu;
+}
+
/* Toolbar separator */
.x-toolbar .x-toolbar-separator-horizontal {
height: 15px;
@@ -182,7 +191,7 @@
***************/
body {
- font: normal 11px arial,ubuntu;
+ font: normal 11px arial, ubuntu;
}
li {
@@ -296,7 +305,7 @@
/* Chart tips */
.dv-chart-tips {
- font: normal 13px arial;
+ font: normal 13px arial, ubuntu;
padding: 0 0 3px 3px;
}
@@ -304,4 +313,4 @@
.dv-window-title-datatable {
padding-left: 19px;
background-image: url('../images/datatable.png');
-}
+}
\ No newline at end of file
=== added file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrowleft.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrowleft.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrowleft.png 2011-10-31 13:46:55 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrowleftdouble.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrowleftdouble.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrowleftdouble.png 2011-10-31 13:46:55 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrowright.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrowright.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrowright.png 2011-10-31 13:46:55 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrowrightdouble.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrowrightdouble.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrowrightdouble.png 2011-10-31 13:46:55 +0000 differ
