=== 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-11-16 19:23:27 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2011-11-17 00:39:31 +0000
@@ -66,7 +66,8 @@
west_cmp_width: 380,
west_width: 424,
center_tbar_height: 31,
- east_tbar_height: 31
+ east_tbar_height: 31,
+ east_gridcolumn_height: 30
}
};
@@ -827,13 +828,11 @@
legend: DV.util.chart.getLegend(),
axes: [
{
- title: DV.conf.finals.dimension[DV.state.category.dimension].rawvalue,
type: 'Category',
position: 'left',
fields: DV.store.chart.left
},
{
- title: 'Value',
type: 'Numeric',
position: 'bottom',
minimum: 0,
@@ -872,7 +871,6 @@
legend: DV.util.chart.getLegend(),
axes: [
{
- title: 'Value',
type: 'Numeric',
position: 'left',
minimum: 0,
@@ -885,7 +883,6 @@
}
},
{
- title: DV.conf.finals.dimension[DV.state.category.dimension].rawvalue,
type: 'Category',
position: 'bottom',
fields: DV.store.chart.bottom,
@@ -904,7 +901,6 @@
legend: DV.util.chart.getLegend(),
axes: [
{
- title: 'Value',
type: 'Numeric',
position: 'left',
minimum: 0,
@@ -917,7 +913,6 @@
}
},
{
- title: DV.conf.finals.dimension[DV.state.category.dimension].rawvalue,
type: 'Category',
position: 'bottom',
fields: DV.store.chart.bottom,
@@ -988,30 +983,35 @@
datatable: null,
getDataTable: function(exe) {
this.datatable = Ext.create('Ext.grid.Panel', {
- height: DV.util.viewport.getSize().y - DV.conf.layout.east_tbar_height,
+ id: 'datatable_g',
+ height: DV.util.viewport.getSize().y - 1,
scroll: 'vertical',
cls: 'dv-datatable',
columns: [
{
text: DV.state.getIndiment().rawvalue,
dataIndex: DV.state.getIndiment().value,
- width: 150
+ width: 150,
+ height: DV.conf.layout.east_gridcolumn_height
},
{
text: DV.conf.finals.dimension.period.rawvalue,
dataIndex: DV.conf.finals.dimension.period.value,
width: 100,
+ height: DV.conf.layout.east_gridcolumn_height,
sortable: false
},
{
text: DV.conf.finals.dimension.organisationunit.rawvalue,
dataIndex: DV.conf.finals.dimension.organisationunit.value,
- width: 150
+ width: 150,
+ height: DV.conf.layout.east_gridcolumn_height
},
{
text: 'Value',
dataIndex: 'v',
- width: 80
+ width: 80,
+ height: DV.conf.layout.east_gridcolumn_height
}
],
store: DV.store.datatable,
@@ -1769,11 +1769,11 @@
listeners: {
collapse: function(p) {
p.collapsed = true;
- DV.util.getCmp('button[name="resizeleft"]').setText('>>>');
+ DV.util.getCmp('button[name="resizeleft"]').setText('>>>');
},
expand: function(p) {
p.collapsed = false;
- DV.util.getCmp('button[name="resizeleft"]').setText('<<<');
+ DV.util.getCmp('button[name="resizeleft"]').setText('<<<');
}
}
},
@@ -1788,9 +1788,9 @@
items: [
{
xtype: 'button',
- id: 'resizeleft_b',
+ cls: 'dv-btn-toolbar',
name: 'resizeleft',
- text: '<<<',
+ text: '<<<',
tooltip: 'Show/hide chart settings',
handler: function() {
var p = DV.util.getCmp('panel[region="west"]');
@@ -1801,23 +1801,19 @@
p.collapse();
}
}
- },'-',
+ },
{
xtype: 'button',
- id: 'update_b',
- text: 'Update',
- cls: 'x-btn-text-icon',
- icon: 'images/refresh.png',
+ cls: 'dv-btn-toolbar',
+ text: 'Update',
handler: function() {
DV.exe.execute(true, DV.init.isInit);
}
- },'-',
+ },
{
xtype: 'button',
- id: 'datatable_b',
- text: 'Data table',
- cls: 'x-btn-text-icon',
- icon: 'images/datatable.png',
+ cls: 'dv-btn-toolbar',
+ text: 'Data table',
handler: function(b) {
var p = DV.util.getCmp('panel[region="east"]');
if (p.collapsed && p.items.length) {
@@ -1831,15 +1827,13 @@
},
{
xtype: 'button',
- id: 'exportpng_b',
- text: 'Export image',
- cls: 'x-btn-text-icon',
- icon: 'images/exportimage.png',
+ cls: 'dv-btn-toolbar',
+ text: 'Save as image',
handler: function(b) {
var svg = document.getElementsByTagName('svg');
if (svg.length < 1) {
- alert('Please use Chrome, Firefox, Opera or Safari to export image');
+ alert('Please use Chrome, Firefox, Opera or Safari to export images');
return;
}
@@ -1852,14 +1846,12 @@
exportForm.action = '../exportImage.action';
exportForm.submit();
}
- }, '-',
+ },
'->',
{
xtype: 'button',
- id: 'exit_b',
- text: 'Exit',
- cls: 'x-btn-text-icon',
- icon: 'images/exit.png',
+ cls: 'dv-btn-toolbar',
+ text: 'Exit',
handler: function() {
window.location.href = DV.conf.finals.ajax.url_portal + 'redirect.action';
}
@@ -1874,18 +1866,7 @@
collapsible: true,
collapsed: true,
collapseMode: 'mini',
- width: 498,
- tbar: {
- height: DV.conf.layout.east_tbar_height,
- items: [
- ' ',
- {
- xtype: 'label',
- text: 'Data table',
- style: 'font-weight:bold; color:#444; padding:0 4px'
- }
- ]
- }
+ width: 498
}
],
listeners: {
=== 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-11-16 13:24:53 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css 2011-11-17 00:32:08 +0000
@@ -158,7 +158,7 @@
-ms-border-radius: 2px 2px 2px 2px;
-khtml-border-radius: 2px 2px 2px 2px;
border-radius: 2px 2px 2px 2px;
- border-width: 1px;
+ border-width: 1px;
}
.x-btn-default-toolbar-small-over {
@@ -216,6 +216,16 @@
text-align: center;
}
+/* Grid datatable column header */
+.x-column-header {
+ font: normal 11px arial, ubuntu;
+}
+
+/* Grid datatable column chooser */
+.x-column-header-over .x-column-header-trigger, .x-column-header-open .x-column-header-trigger {
+ display: none;
+}
+
/****************
Data Visualizer
***************/
@@ -320,19 +330,7 @@
border-width: 1px;
border-style: solid;
border-color: #aaa;
-}
-
-/* Update button */
-#update_b, #datatable_b, #exportpng_b, #exit_b {
- border-width: 1px;
- padding: 3px 1px 3px 4px;
-}
-
-#resizeleft_b {
- border-width: 1px;
- padding: 3px;
-}
-
+}
/* Fieldset */
.dv-fieldset-title-link {
@@ -362,12 +360,20 @@
border-style: none;
}
-/* Grid datatable column header */
-.x-column-header {
- font: normal 11px arial, ubuntu;
-}
-
-/* Grid datatable column chooser */
-.x-column-header-over .x-column-header-trigger, .x-column-header-open .x-column-header-trigger {
- display: none;
+#datatable_g .x-fit-item {
+ border-top: 1px solid #d0d0d0;
+}
+
+/* Button - toolbar */
+.dv-btn-toolbar {
+ border-width: 1px;
+ padding: 3px;
+}
+
+.dv-btn-toolbar-text-1 {
+ color: #444;
+ font-weight: bold;
+}
+.dv-btn-toolbar-text-2 {
+ color: #555;
}