← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10391: Minor fixes.

 

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 10391 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-03-21 18:54:43 +0100
message:
  Minor fixes.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.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/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2013-03-21 16:05:57 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2013-03-21 17:53:58 +0000
@@ -930,6 +930,7 @@
 			title: layer.name,
 			layout: 'fit',
 			iconCls: 'gis-window-title-icon-' + layer.id,
+            bodyStyle: 'padding:5px',
 			cls: 'gis-container-default',
 			closeAction: 'hide',
 			width: gis.conf.layout.widget.window_width,
@@ -2434,7 +2435,7 @@
 					{
 						dataIndex: 'name',
 						sortable: false,
-						width: 363
+						width: 369
 					},
 					{
 						xtype: 'actioncolumn',
@@ -3044,6 +3045,7 @@
 			layout: 'fit',
 			iconCls: 'gis-window-title-icon-download',
 			cls: 'gis-container-default',
+            bodyStyle: 'padding:2px',
 			resizable: true,
 			modal: true,
 			items: textfield,
@@ -3077,7 +3079,7 @@
 		panel = Ext.create('Ext.panel.Panel', {
 			cls: 'gis-container-inner',
 			html: '<b>Link: </b>' + gis.init.contextPath + '/dhis-web-mapping/app/index.html?id=' + gis.map.id, //todo
-			style: 'padding-top: 9px; padding-bottom: 2px'
+			style: 'padding:6px 0 6px 1px'
 		});
 
 		button = Ext.create('Ext.button.Button', {
@@ -3102,6 +3104,7 @@
 			layout: 'fit',
 			iconCls: 'gis-window-title-icon-interpretation',
 			cls: 'gis-container-default',
+            bodyStyle: 'padding:5px 5px 0',
 			width: 500,
 			resizable: true,
 			modal: true,

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js	2013-03-20 13:28:12 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js	2013-03-21 17:00:12 +0000
@@ -58,7 +58,7 @@
 			widget: {
 				item_width: 262,
 				itemlabel_width: 95,
-				window_width: 290
+				window_width: 284
 			},
 			tool: {
 				item_width: 222,