dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #20003
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8975: (DV) Minor fix.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 8975 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-11-12 15:48:30 +0100
message:
(DV) Minor fix.
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css
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/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-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css 2012-11-07 12:07:29 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css 2012-11-12 14:46:04 +0000
@@ -234,9 +234,9 @@
/* Toolbar btn menu */
.gis-toolbar-btn-menu { /* Align menu */
margin-top: 5px;
- }
+ }
.gis-toolbar-btn-menu .x-panel-body-default { /* Menu border */
- border-radius: 3px;
+ border-radius: 2px;
border-color: #999;
}
=== 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-11-03 09:10:29 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css 2012-11-12 14:06:23 +0000
@@ -269,9 +269,6 @@
width: 32px;
height: 32px;
}
-.x-btn-arrow {
- background-image: url('../images/arrow.png');
-}
/* Button border */
.x-btn-default-toolbar-small,
=== 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-11-06 19:17:42 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2012-11-12 14:06:23 +0000
@@ -4178,10 +4178,16 @@
DV.exe.execute();
}
},
+ {
+ xtype: 'tbseparator',
+ height: 18,
+ style: 'border-color: transparent #d1d1d1 transparent transparent; margin-right: 4px',
+ },
{
xtype: 'button',
cls: 'dv-toolbar-btn-2',
- text: DV.i18n.favorites + '..',
+ text: DV.i18n.favorites,
+ menu: {},
listeners: {
afterrender: function(b) {
this.menu = Ext.create('Ext.menu.Menu', {
@@ -4753,10 +4759,71 @@
}
}
},
+ {
+ xtype: 'tbseparator',
+ height: 18,
+ style: 'border-color: transparent #d1d1d1 transparent transparent; margin-right: 4px',
+ },
+ {
+ xtype: 'button',
+ cls: 'dv-toolbar-btn-2',
+ text: DV.i18n.download,
+ menu: {},
+ execute: function(type) {
+ var svg = document.getElementsByTagName('svg');
+
+ if (svg.length < 1) {
+ DV.util.notification.error(DV.i18n.et_svg_browser, DV.i18n.em_svg_browser);
+ return;
+ }
+
+ document.getElementById('titleField').value = DV.c.filter.names[0] || 'Example chart';
+ document.getElementById('svgField').value = svg[0].parentNode.innerHTML;
+ document.getElementById('typeField').value = type;
+
+ var exportForm = document.getElementById('exportForm');
+ exportForm.action = '../exportImage.action';
+
+ if (svg[0].parentNode.innerHTML && type) {
+ exportForm.submit();
+ }
+ else {
+ alert(DV.i18n.no_svg_format);
+ }
+ },
+ listeners: {
+ afterrender: function(b) {
+ this.menu = Ext.create('Ext.menu.Menu', {
+ cls: 'dv-menu',
+ shadow: false,
+ showSeparator: false,
+ items: [
+ {
+ text: DV.i18n.image_png,
+ iconCls: 'dv-menu-item-png',
+ minWidth: 105,
+ handler: function() {
+ b.execute(DV.conf.finals.image.png);
+ }
+ },
+ {
+ text: 'PDF',
+ iconCls: 'dv-menu-item-pdf',
+ minWidth: 105,
+ handler: function() {
+ b.execute(DV.conf.finals.image.pdf);
+ }
+ }
+ ]
+ });
+ }
+ }
+ },
{
xtype: 'button',
cls: 'dv-toolbar-btn-2',
- text: DV.i18n.share + '..',
+ text: DV.i18n.share,
+ menu: {},
disabled: true,
xable: function() {
if (DV.c.currentFavorite) {
@@ -4885,60 +4952,6 @@
{
xtype: 'button',
cls: 'dv-toolbar-btn-2',
- text: DV.i18n.download + '..',
- execute: function(type) {
- var svg = document.getElementsByTagName('svg');
-
- if (svg.length < 1) {
- DV.util.notification.error(DV.i18n.et_svg_browser, DV.i18n.em_svg_browser);
- return;
- }
-
- document.getElementById('titleField').value = DV.c.filter.names[0] || 'Example chart';
- document.getElementById('svgField').value = svg[0].parentNode.innerHTML;
- document.getElementById('typeField').value = type;
-
- var exportForm = document.getElementById('exportForm');
- exportForm.action = '../exportImage.action';
-
- if (svg[0].parentNode.innerHTML && type) {
- exportForm.submit();
- }
- else {
- alert(DV.i18n.no_svg_format);
- }
- },
- listeners: {
- afterrender: function(b) {
- this.menu = Ext.create('Ext.menu.Menu', {
- cls: 'dv-menu',
- shadow: false,
- showSeparator: false,
- items: [
- {
- text: DV.i18n.image_png,
- iconCls: 'dv-menu-item-png',
- minWidth: 105,
- handler: function() {
- b.execute(DV.conf.finals.image.png);
- }
- },
- {
- text: 'PDF',
- iconCls: 'dv-menu-item-pdf',
- minWidth: 105,
- handler: function() {
- b.execute(DV.conf.finals.image.pdf);
- }
- }
- ]
- });
- }
- }
- },
- {
- xtype: 'button',
- cls: 'dv-toolbar-btn-2',
text: DV.i18n.data_table,
disabled: true,
handler: function() {
