dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #17846
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7267: (DV) CSS fixes.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 7267 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2012-06-10 23:56:49 +0300
message:
(DV) CSS fixes.
modified:
dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties
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
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/i18n.vm
--
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/resources/org/hisp/dhis/visualizer/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties 2012-06-04 13:15:13 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties 2012-06-10 16:06:59 +0000
@@ -1,12 +1,12 @@
title=DHIS 2 Data Visualizer
chart_type=Chart type
-column_chart= Column
-stacked_column_chart=Stacked column
-bar_chart=Bar
-stacked_bar_chart=Stacked bar
-line_chart=Line
-area_chart=Area
-pie_chart=Pie
+column_chart= Column chart
+stacked_column_chart=Stacked column chart
+bar_chart=Bar chart
+stacked_bar_chart=Stacked bar chart
+line_chart=Line chart
+area_chart=Area chart
+pie_chart=Pie chart
series=Series
category=Category
filter=Filter
@@ -64,7 +64,7 @@
delete_favorite=Delete favorite
are_you_sure=Are you sure?
save=Save
-example_chart_cannot_be_saved=* The example chart cannot be saved
+create_chart_before_saving = Please create a chart before saving
overwrite=Overwrite
download=Download
no_svg_format=No SVG format
=== 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 2012-06-09 15:52:46 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2012-06-10 20:54:09 +0000
@@ -225,7 +225,6 @@
west_maxheight_accordion_period: 340,
west_maxheight_accordion_organisationunit: 700,
west_maxheight_accordion_options: 393,
- center_tbar_height: 31,
east_tbar_height: 31,
east_gridcolumn_height: 30,
form_label_width: 55,
@@ -2382,6 +2381,7 @@
xtype: 'button',
icon: 'images/column.png',
name: DV.conf.finals.chart.column,
+ tooltip: DV.i18n.column_chart,
width: 40,
pressed: true
},
@@ -2389,36 +2389,42 @@
xtype: 'button',
icon: 'images/column-stacked.png',
name: DV.conf.finals.chart.stackedcolumn,
+ tooltip: DV.i18n.stacked_column_chart,
width: 40
},
{
xtype: 'button',
icon: 'images/bar.png',
name: DV.conf.finals.chart.bar,
+ tooltip: DV.i18n.bar_chart,
width: 40
},
{
xtype: 'button',
icon: 'images/bar-stacked.png',
name: DV.conf.finals.chart.stackedbar,
+ tooltip: DV.i18n.stacked_bar_chart,
width: 40
},
{
xtype: 'button',
icon: 'images/line.png',
name: DV.conf.finals.chart.line,
+ tooltip: DV.i18n.line_chart,
width: 40
},
{
xtype: 'button',
icon: 'images/area.png',
name: DV.conf.finals.chart.area,
+ tooltip: DV.i18n.area_chart,
width: 40
},
{
xtype: 'button',
icon: 'images/pie.png',
name: DV.conf.finals.chart.pie,
+ tooltip: DV.i18n.pie_chart,
width: 40
}
]
@@ -3544,7 +3550,6 @@
tbar: {
xtype: 'toolbar',
cls: 'dv-toolbar-1',
- height: DV.conf.layout.center_tbar_height,
defaults: {
height: 30
},
@@ -3681,10 +3686,9 @@
store: DV.store.favorite,
tbar: {
id: 'favorite_t',
- cls: 'dv-toolbar-2',
- height: 30,
+ cls: 'dv-toolbar-tbar',
defaults: {
- height: 24
+ height: 28
},
items: [
{
@@ -3697,7 +3701,7 @@
afterrender: function(b) {
this.addCls('dv-menu-togglegroup');
this.menu = Ext.create('Ext.menu.Menu', {
- margin: '2 0 0 0',
+ margin: '-1 0 0 -1',
shadow: false,
showSeparator: false,
width: 109,
@@ -3796,7 +3800,10 @@
}
],
bbar: {
- cls: 'dv-toolbar-2',
+ cls: 'dv-toolbar-bbar',
+ defaults: {
+ height: 28
+ },
items: [
{
xtype: 'label',
@@ -3896,7 +3903,10 @@
}
],
bbar: {
- cls: 'dv-toolbar-2',
+ cls: 'dv-toolbar-bbar',
+ defaults: {
+ height: 28
+ },
items: [
{
text: DV.i18n.cancel,
@@ -3949,11 +3959,14 @@
}
],
bbar: {
- cls: 'dv-toolbar-2',
+ cls: 'dv-toolbar-bbar',
+ defaults: {
+ height: 28
+ },
items: [
{
xtype: 'label',
- style: 'padding-left:2px; line-height:22px; font-size:10px; color:#666; width:70%',
+ style: 'padding-left:6px; line-height:29px; font-size:10px; color:#666; width:70%',
listeners: {
added: function() {
DV.cmp.favorite.label = this;
@@ -3990,7 +4003,7 @@
}
else {
if (DV.cmp.favorite.name.getValue()) {
- DV.cmp.favorite.label.setText(DV.i18n.example_chart_cannot_be_saved);
+ DV.cmp.favorite.label.setText('* ' + DV.i18n.create_chart_before_saving);
}
else {
DV.cmp.favorite.label.setText('');
@@ -4019,25 +4032,31 @@
cls: 'dv-window-confirm-list'
}
],
- bbar: [
- {
- text: DV.i18n.cancel,
- handler: function() {
- this.up('window').close();
- }
+ bbar: {
+ cls: 'dv-toolbar-bbar',
+ defaults: {
+ height: 28
},
- '->',
- {
- text: DV.i18n.overwrite,
- handler: function() {
- this.up('window').close();
- DV.util.crud.favorite.update(function() {
- DV.cmp.favorite.window.resetForm();
- });
-
+ items: [
+ {
+ text: DV.i18n.cancel,
+ handler: function() {
+ this.up('window').close();
+ }
+ },
+ '->',
+ {
+ text: DV.i18n.overwrite,
+ handler: function() {
+ this.up('window').close();
+ DV.util.crud.favorite.update(function() {
+ DV.cmp.favorite.window.resetForm();
+ });
+
+ }
}
- }
- ]
+ ]
+ }
});
w.setPosition((screen.width/2)-(DV.conf.layout.window_confirm_width/2), DV.conf.layout.window_favorite_ypos + 100, true);
w.show();
@@ -4191,7 +4210,10 @@
}
],
bbar: {
- cls: 'dv-toolbar-2',
+ cls: 'dv-toolbar-1',
+ defaults: {
+ height: 30
+ },
items: [
'->',
{
=== 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 2012-06-07 17:26:10 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css 2012-06-10 20:54:09 +0000
@@ -213,8 +213,17 @@
}
/* DV toolbar */
+.dv-toolbar-1, .dv-toolbar-2, .dv-toolbar-tbar, .dv-toolbar-bbar {
+ padding: 0;
+}
.dv-toolbar-1 {
- padding: 0;
+ height: 31px;
+}
+.dv-toolbar-tbar {
+ height: 30px;
+}
+.dv-toolbar-bbar {
+ height: 29px;
}
/* DV toolbar checkbox */
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/i18n.vm'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/i18n.vm 2012-06-04 13:08:06 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/i18n.vm 2012-06-10 16:06:59 +0000
@@ -65,7 +65,7 @@
delete_favorite:'$encoder.jsEscape($i18n.getString( 'delete_favorite' ) , "'")',
are_you_sure:'$encoder.jsEscape($i18n.getString( 'are_you_sure' ) , "'")',
save:'$encoder.jsEscape($i18n.getString( 'save' ) , "'")',
-example_chart_cannot_be_saved:'$encoder.jsEscape($i18n.getString( 'example_chart_cannot_be_saved' ) , "'")',
+create_chart_before_saving:'$encoder.jsEscape($i18n.getString( 'create_chart_before_saving' ) , "'")',
overwrite:'$encoder.jsEscape($i18n.getString( 'overwrite' ) , "'")',
download:'$encoder.jsEscape($i18n.getString( 'download' ) , "'")',
no_svg_format:'$encoder.jsEscape($i18n.getString( 'no_svg_format' ) , "'")',
