dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7329
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-06-19 10:52:43 +0700
message:
  Error paging in patient module; minor fix for multi-data entry form.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/paging/paging.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-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2012-06-09 21:27:46 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2012-06-19 03:52:43 +0000
@@ -1536,6 +1536,7 @@
 // -----------------------------------------------------------------------------
 
 isAjax = false;
+var contentDiv = 'contentDiv';
 function pagingList( currentPage, pageSize )
 {
 	var baseLink = jQuery( "#baseLink" ).val();	
@@ -1568,17 +1569,9 @@
 	}
 	else
 	{		
-		jQuery.postUTF8( link , data, function(html)
-		{
-			if ( contentDiv == undefined )
-			{
-				setInnerHTML( 'contentDiv', html );
-			}
-			else
-			{
-				setInnerHTML( contentDiv, html );
-			}
-		} );
+		jQuery.postUTF8( link , data, function(html){
+			setInnerHTML( contentDiv, html );
+		});
 	}
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/paging/paging.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/paging/paging.vm	2012-02-14 16:03:54 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/paging/paging.vm	2012-06-19 03:52:43 +0000
@@ -23,7 +23,7 @@
 					<input type="text" id="jumpToPage" value="$!currentPage" style="width:50px" onKeyPress="changePageSize(event);">
 				</td>
 				<td>
-					<input type="button" id="submitButton" value="$i18n.getString( 'go' )" onclick="changePageSize(event);">
+					<input type="button" id="submitButton" style='width:40px;' value="$i18n.getString( 'go' )" onclick="changePageSize(event);">
 				</td>				
 			</tr>		
 			<tr>