dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 5195 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-11-22 15:15:27 +0100
message:
  Export image width/height gui removed.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.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/mapping/index.html'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html	2011-11-16 08:36:37 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html	2011-11-22 14:14:29 +0000
@@ -46,8 +46,6 @@
         <input type="hidden" id="layerField" name="layer"/>
         <input type="hidden" id="imageLegendRowsField" name="imageLegendRows"/>
         <input type="hidden" id="svgField" name="svg"/>
-        <input type="hidden" id="widthField" name="width"/>
-        <input type="hidden" id="heightField" name="height"/>
         <input type="hidden" id="includeLegendsField" name="includeLegends"/>
         <input type="hidden" id="includeValuesField" name="includeValues"/>
         <input type="hidden" id="periodField" name="period"/>

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js	2011-11-22 13:58:34 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js	2011-11-22 14:14:29 +0000
@@ -688,43 +688,6 @@
                         triggerAction: 'all'
                     },
                     {
-                        xtype: 'combo',
-                        id: 'exportimagewidth_cb',
-                        fieldLabel: G.i18n.width,
-                        labelSeparator: G.conf.labelseparator,
-                        editable: false,
-                        valueField: 'width',
-                        displayField: 'text',
-                        width: G.conf.combo_width_fieldset,
-                        minListWidth: G.conf.combo_width_fieldset,
-                        mode: 'local',
-                        triggerAction: 'all',
-                        value: 1190,
-                        store: new Ext.data.ArrayStore({
-                            fields: ['width', 'text'],
-                            data: [[800, 'Small'], [1190, 'Medium'], [1920, 'Large']]
-                        })
-                    },
-                    {
-                        xtype: 'combo',
-                        id: 'exportimageheight_cb',
-                        fieldLabel: G.i18n.height,
-                        labelSeparator: G.conf.labelseparator,
-                        editable: false,
-                        valueField: 'height',
-                        displayField: 'text',
-                        width: G.conf.combo_width_fieldset,
-                        minListWidth: G.conf.combo_width_fieldset,
-                        mode: 'local',
-                        triggerAction: 'all',
-                        value: 880,
-                        store: {
-                            xtype: 'arraystore',
-                            fields: ['height', 'text'],
-                            data: [[600, 'Small'], [880, 'Medium'], [1200, 'Large']]
-                        }
-                    },
-                    {
                         xtype: 'checkbox',
                         id: 'exportimageincludelegend_chb',
                         fieldLabel: G.i18n.legend,
@@ -826,9 +789,7 @@
                         exportForm.action = '../exportImage.action';
                         
                         document.getElementById('titleField').value = title;
-                        document.getElementById('svgField').value = svg;  
-                        document.getElementById('widthField').value = Ext.getCmp('exportimagewidth_cb').getValue();
-                        document.getElementById('heightField').value = Ext.getCmp('exportimageheight_cb').getValue();
+                        document.getElementById('svgField').value = svg;
                         document.getElementById('includeLegendsField').value = Ext.getCmp('exportimageincludelegend_chb').getValue();
 
                         exportForm.submit();