dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2292
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Fri 2010-10-01 14:03:45 +0700
message:
  Fix bug: Details information is opening in extreme right side not even see the close button of that window ( SQL View function ) and "The Msg pruning Done "remains same  it must be disappeared ( Organisation Unit Pruning  function).
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/pruneOrganisationUnit.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/sqlView.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showSqlViewListForm.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-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/pruneOrganisationUnit.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/pruneOrganisationUnit.js	2010-06-21 12:41:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/pruneOrganisationUnit.js	2010-10-01 07:03:45 +0000
@@ -15,7 +15,8 @@
 	        function( json )
 	        {
 	            document.getElementById( "keepNameField" ).innerHTML = json.organisationUnit.name;
-	            document.getElementById( "pruneButton" ).disabled = false;        
+	            document.getElementById( "pruneButton" ).disabled = false; 
+				hideById('message');
 	        }
 	    );
 	}

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/sqlView.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/sqlView.js	2010-09-16 10:04:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/sqlView.js	2010-10-01 07:03:45 +0000
@@ -53,8 +53,9 @@
 	var description = getElementValue( viewElement, 'description' );
     setInnerHTML( 'descriptionField', description ? description : '[' + i18n_none + ']' );
     setInnerHTML( 'sqlQueryField', getElementValue( viewElement, 'sqlquery' ) );
-    
-    showDetails();
+    	
+	showPopupWindowById('detailsInfo', 400, 200);
+	jQuery("#detailsInfo").css('background-color', '#DCE0EF' );
 }
 
 /**

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showSqlViewListForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showSqlViewListForm.vm	2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showSqlViewListForm.vm	2010-10-01 07:03:45 +0000
@@ -32,14 +32,27 @@
 
 		</td>
 		<td style="width:10em; padding-left:2em; vertical-align:top">
-
-			<div id="detailsArea" style="display:none">
-				<div style="float:right">
-					<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"/></a>
-				</div>				
-				<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
-				<p><label>$i18n.getString( "description" ):</label><br/><span id="descriptionField"></span></p>
-				<p><label>$i18n.getString( "sql_statement" ):</label><br/><span id="sqlQueryField"></span></p>
+			
+			<div id="detailsInfo" style="display:none;">
+				<table width="100%">
+					<tr style="background-color:#3F5D8E; color:#FFFFFF">
+						<td colspan='2'><strong>$i18n.getString('details')</strong>
+						<a href="javascript:hideById('detailsInfo'); unLockScreen();" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )" align="right"/></a>
+						</td>
+					</tr>
+					<tr>
+						<td><strong>$i18n.getString( "name" ):</strong></td>
+						<td id="nameField"></td>
+					</tr>
+					<tr>
+						<td><strong>$i18n.getString( "description" ):</strong></td>
+						<td id="descriptionField"></td>
+					</tr>
+					<tr>
+						<td><strong>$i18n.getString( "sql_statement" ):</strong></td>
+						<td id="sqlQueryField"></td>
+					</tr>
+				</table>
 			</div>
 			
 			<div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">