dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2360
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2010-10-13 14:27:34 +0700
message:
  Allowing to the details div can be resiable, draggable when show up.
  Added new method setHeaderTimeDelayMessage() that allow to show up message by the given timing.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.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	2010-10-12 05:05:04 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2010-10-13 07:27:34 +0000
@@ -494,11 +494,23 @@
 }
 
 /**
- * Sets the header message and hides it after 3 seconds, as default.
- */
-function setHeaderDelayMessage( message, timing )
-{
-	if ( timing == undefined ) { timing = 3000; }
+ * Sets the header message and hides it after 3 seconds.
+ */
+function setHeaderDelayMessage( message )
+{
+	setHeaderMessage( message );
+	
+	window.clearTimeout( headerMessageTimeout ); // Clear waiting invocations
+	
+	headerMessageTimeout = window.setTimeout( "hideHeaderMessage();", 3000 );
+}
+
+/**
+ * Sets the header message and hides it after the given seconds, default as 3s.
+ */
+function setHeaderTimeDelayMessage( message, timing )
+{
+	if ( timing == undefined ) { setHeaderDelayMessage( message ); return;}
 	
 	setHeaderMessage( message );
 	
@@ -539,7 +551,10 @@
  */
 function showDetails()
 {
-    $( '#detailsArea' ).show( "fast" );
+    $( '#detailsArea' )
+	.resizable()
+	.draggable()
+	.show( "fast" );
 }
 
 /**

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm	2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm	2010-10-13 07:27:34 +0000
@@ -73,7 +73,7 @@
 		</td>
 		<td style="width:20em; padding-left:2em; vertical-align:top">
 
-			<div id="detailsArea" style="display:none">
+			<div id="detailsArea" style="top:70px;right:20px;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>				

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm	2010-10-12 05:05:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm	2010-10-13 07:27:34 +0000
@@ -111,7 +111,7 @@
 				confirmStatus = 'required';
 				if ( selectedListLen != 0 )
 				{
-					setHeaderDelayMessage( i18n_datasets_different_orgunitlist, 4500 );
+					setHeaderTimeDelayMessage( i18n_datasets_different_orgunitlist, 4500 );
 				}
 			}
 			else