dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3607
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-05-13 01:33:22 +0200
message:
  minor fixes.. only 1px separates webkit from firefox
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/viewDataEntryForm.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm


--
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-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/viewDataEntryForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/viewDataEntryForm.js	2011-05-12 22:47:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/viewDataEntryForm.js	2011-05-12 23:33:22 +0000
@@ -19,11 +19,15 @@
 		var indicatorSelector = $("#indicatorSelector");
 		var dataElementSelector = $("#dataElementSelector");
 
+		/* Great for debugging when size of dialog is changed */
+		// console.log("D: " + dialog.height() + ", DE: " + dataElementSelector.height() + ", I: " + indicatorSelector.height());
+
 		// TODO look into this.. firefox does not treat the box-model the same as webkit... 
 		// 		should be fixable by setting fixed paddings/margin somewhere!
-		var adjustment = 63;
-		if($.browser.webkit) adjustment = 67;
-		else if($.browser.mozilla) adjustment = 63;
+		
+		var adjustment = 65;
+		if($.browser.webkit) adjustment = 66;
+		else if($.browser.mozilla) adjustment = 65;
 		
 		dataElementSelector.height( dialog.height() - adjustment );
 		indicatorSelector.height( dialog.height() - adjustment );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm	2011-05-12 22:47:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm	2011-05-12 23:33:22 +0000
@@ -117,7 +117,7 @@
 		<table style="width: 100%;">
 			<tr id="dataElementsFilter" style="padding: 0; margin: 0; width: 100%;">
 				<td>
-					<input id="dataElementsFilterInput" type="text" style="width: 100%; border: 1px inset #888; padding: 1px 0 1px 0;" />
+					<input id="dataElementsFilterInput" placeholder="Filter" type="text" style="width: 100%; height: 18px; border: 1px inset #888; padding: 1px 0 1px 0;" />
 				</td>
 				<td style="padding: 0; margin: 0; width: 20px; height: 20px;">
 					<button id="dataElementsFilterButton" style="width: 20px; height: 20px;">Filter</button>
@@ -141,7 +141,7 @@
 
 			<tr id="indicatorsFilter">
 				<td>
-					<input type="text" id="indicatorsFilterInput" style="width: 100%; border: 1px inset #888; padding: 1px 0 1px 0;" />
+					<input type="text" id="indicatorsFilterInput" placeholder="Filter" style="width: 100%; height: 18px; border: 1px inset #888; padding: 1px 0 1px 0;" />
 				</td>
 				<td style="padding: 0; margin: 0; width: 20px; height: 20px;">
 					<button id="indicatorsFilterButton" style="width: 20px; height: 20px;">Filter</button>