dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 9008 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-11-13 17:16:07 +0100
message:
  (GIS) Radius checkbox label made clickable.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/ext-ux/ext-ux-custom.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css


--
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/ext-ux/ext-ux-custom.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/ext-ux/ext-ux-custom.js	2012-11-10 15:09:47 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/ext-ux/ext-ux-custom.js	2012-11-13 16:15:42 +0000
@@ -221,7 +221,8 @@
 		var that = this;
 		
 		this.checkbox = Ext.create('Ext.form.field.Checkbox', {
-			width: 14,
+			width: 196,
+			boxLabel: this.text,
 			checked: this.value,
 			disabled: this.disabled,
 			listeners: {
@@ -255,15 +256,11 @@
 				items: this.checkbox
 			},
 			{
-				width: this.width - this.checkbox.width - 6 - this.numberField.width,
-				html: this.text,
-				bodyStyle: 'padding-top: 4px'
-			},
-			{
 				width: this.numberField.width,
 				items: this.numberField
 			}
 		];
+		alert(this.width - this.checkbox.width - 6 - this.numberField.width);
 		
 		this.callParent();
 	}

=== 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-13 11:53:35 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css	2012-11-13 16:15:42 +0000
@@ -520,6 +520,10 @@
     cursor: pointer;
     cursor: hand;
 }
+label.x-form-cb-label {
+    cursor: pointer;
+    cursor: hand;
+}
 
 /* NumberField */