Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 4207 [merge]
committer: Jan Henrik Overland <[email protected]>
branch nick: dhis2
timestamp: Mon 2011-07-25 21:12:58 +0200
message:
Map view name max length set to 255. Map view combo boxes now expand in order
to show the full names.
modified:
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/resources/mapfish/widgets/geostat/Choropleth.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.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/javascript/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js 2011-07-13 21:01:29 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js 2011-07-25 19:09:57 +0000
@@ -437,7 +437,7 @@
labelSeparator: G.conf.labelseparator,
fieldLabel: G.i18n.display_name,
width: G.conf.combo_width_fieldset,
- autoCreate: {tag: 'input', type: 'text', size: '20', autocomplete: 'off', maxlength: '35'}
+ autoCreate: {tag: 'input', type: 'text', size: '20', autocomplete: 'off', maxlength: '255'}
},
{
xtype: 'checkbox',
@@ -464,7 +464,7 @@
labelSeparator: G.conf.labelseparator,
selectOnFocus: true,
width: G.conf.combo_width_fieldset,
- minListWidth: G.conf.combo_width_fieldset,
+ listWidth: 'auto',
store:G.stores.mapView
}
]
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js 2011-07-13 21:01:29 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js 2011-07-25 19:09:57 +0000
@@ -307,6 +307,7 @@
emptyText: G.i18n.optional,
selectOnFocus: true,
width: G.conf.combo_width,
+ listWidth: 'auto',
store: G.stores.mapView,
listeners: {
'select': {
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js 2011-07-13 21:01:29 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js 2011-07-25 19:09:57 +0000
@@ -278,6 +278,7 @@
emptyText: G.i18n.optional,
selectOnFocus: true,
width: G.conf.combo_width,
+ listWidth: 'auto',
store: G.stores.mapView,
listeners: {
'select': {
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
