| Thread Previous • Date Previous • Date Next • Thread Next |
Merge authors: Jan Henrik Øverland (janhenrik-overland) ------------------------------------------------------------ revno: 3765 [merge] committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx> branch nick: dhis2 timestamp: Fri 2011-05-27 10:43:09 +0200 message: Minor fixes. modified: dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css 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/css/style.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css 2011-05-25 10:07:22 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css 2011-05-27 08:42:07 +0000
@@ -300,7 +300,7 @@
}
#window-image-title {
padding:0 0 3px 21px;
- background:url('../../../images/image2.png') no-repeat 0 0 transparent;
+ background:url('../../../images/export3.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
=== 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-05-26 13:44:26 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js 2011-05-27 08:42:07 +0000
@@ -1790,6 +1790,82 @@
minHeight: 77,
items: [
{
+ title: 'Google Maps',
+ items: [
+ {
+ xtype: 'form',
+ bodyStyle: 'padding:8px',
+ labelWidth: G.conf.label_width,
+ items: [
+ {html: '<div class="window-info">Update Google Maps API key</div>'},
+ {
+ xtype: 'textfield',
+ id: 'googlemapsapikey_tf',
+ fieldLabel: G.i18n.api_key,
+ labelSeparator: G.conf.labelseparator,
+ width: G.conf.combo_width_fieldset,
+ minListWidth: G.conf.combo_width_fieldset
+ }
+ ]
+ },
+ {
+ xtype: 'form',
+ items: [
+ {
+ xtype: 'toolbar',
+ style: 'padding-top:4px',
+ items: [
+ '->',
+ {
+ xtype: 'button',
+ text: G.i18n.update,
+ iconCls: 'icon-assign',
+ handler: function() {
+ if (!Ext.getCmp('googlemapsapikey_tf').getValue()) {
+ Ext.message.msg(false, G.i18n.form_is_not_complete);
+ return;
+ }
+
+ Ext.Ajax.request({
+ url: G.conf.path_mapping + 'setMapSystemSettings' + G.conf.type,
+ method: 'POST',
+ params: {googleKey: Ext.getCmp('googlemapsapikey_tf').getValue()},
+ success: function(r) {
+ window.location.reload();
+ }
+ });
+ }
+ },
+ {
+ xtype: 'button',
+ text: 'Use localhost',
+ iconCls: 'icon-remove',
+ handler: function() {
+ Ext.Ajax.request({
+ url: G.conf.path_mapping + 'deleteMapSystemSettings' + G.conf.type,
+ method: 'POST',
+ params: {googleKey: true},
+ success: function() {
+ window.location.reload();
+ }
+ });
+ }
+ }
+ ]
+ }
+ ]
+ }
+ ],
+ listeners: {
+ expand: function() {
+ adminWindow.setHeight(Ext.isChrome || (Ext.isWindows && Ext.isGecko) ? 170 : 166);
+ },
+ collapse: function() {
+ adminWindow.setHeight(77);
+ }
+ }
+ },
+ {
title: 'Date',
items: [
{
@@ -1850,87 +1926,11 @@
adminWindow.setHeight(77);
}
}
- },
- {
- title: 'Google Maps',
- items: [
- {
- xtype: 'form',
- bodyStyle: 'padding:8px',
- labelWidth: G.conf.label_width,
- items: [
- {html: '<div class="window-info">Update Google Maps API key</div>'},
- {
- xtype: 'textfield',
- id: 'googlemapsapikey_tf',
- fieldLabel: G.i18n.api_key,
- labelSeparator: G.conf.labelseparator,
- width: G.conf.combo_width_fieldset,
- minListWidth: G.conf.combo_width_fieldset
- }
- ]
- },
- {
- xtype: 'form',
- items: [
- {
- xtype: 'toolbar',
- style: 'padding-top:4px',
- items: [
- '->',
- {
- xtype: 'button',
- text: G.i18n.update,
- iconCls: 'icon-assign',
- handler: function() {
- if (!Ext.getCmp('googlemapsapikey_tf').getValue()) {
- Ext.message.msg(false, G.i18n.form_is_not_complete);
- return;
- }
-
- Ext.Ajax.request({
- url: G.conf.path_mapping + 'setMapSystemSettings' + G.conf.type,
- method: 'POST',
- params: {googleKey: Ext.getCmp('googlemapsapikey_tf').getValue()},
- success: function(r) {
- window.location.reload();
- }
- });
- }
- },
- {
- xtype: 'button',
- text: 'Use localhost',
- iconCls: 'icon-remove',
- handler: function() {
- Ext.Ajax.request({
- url: G.conf.path_mapping + 'deleteMapSystemSettings' + G.conf.type,
- method: 'POST',
- params: {googleKey: true},
- success: function() {
- window.location.reload();
- }
- });
- }
- }
- ]
- }
- ]
- }
- ],
- listeners: {
- expand: function() {
- adminWindow.setHeight(Ext.isChrome || (Ext.isWindows && Ext.isGecko) ? 169 : 166);
- },
- collapse: function() {
- adminWindow.setHeight(77);
- }
- }
- }
+ }
],
listeners: {
afterrender: function() {
- adminWindow.setHeight(Ext.isChrome || (Ext.isWindows && Ext.isGecko) ? 145 : 143);
+ adminWindow.setHeight(Ext.isChrome || (Ext.isWindows && Ext.isGecko) ? 170 : 166);
}
}
});
| Thread Previous • Date Previous • Date Next • Thread Next |
