← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #04856

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1622: Used header message div for user feedback in dataelement- and indicatorgroup editor.

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 1622
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-03-11 14:32:06 +0100
message:
  Used header message div for user feedback in dataelement- and indicatorgroup editor.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView1.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView1.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView2.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView2.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView1.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView2.js


--
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-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView1.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView1.vm	2010-02-25 19:44:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView1.vm	2010-03-11 13:32:06 +0000
@@ -22,8 +22,6 @@
 	$i18n.getString( "data_element_group_management" ) #openHelp( "dataElementGroupEditor" )
 </h3>
 
-<span id='message' style="position:fixed;top:80px;right:5px;"></span>
-
 <table >
 	<tr>
 		<th>$i18n.getString( "data_element_group" )</th>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView1.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView1.vm	2010-02-26 06:40:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView1.vm	2010-03-11 13:32:06 +0000
@@ -1,7 +1,5 @@
 <h3>$i18n.getString( "indicator_group_editor" ) #openHelp( "indicatorGroupEditor" )</h3>
 
-<span id='message' style="position:fixed;top:80px;right:5px;"></span>
-
 <table >	
 	<tr>
 		<th>$i18n.getString( "indicator_group" )</th>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView2.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView2.vm	2010-02-26 06:40:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView2.vm	2010-03-11 13:32:06 +0000
@@ -1,7 +1,5 @@
 <h3>$i18n.getString( "indicator_group_editor" ) #openHelp( "indicatorGroupEditor" )</h3>
 
-<span id='message' style="position:fixed;top:80px;right:5px;z-index:100000"></span>
-
 <table >	
 	<tr>		
 		<th>$i18n.getString( "available_indicators" )</th>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js	2010-02-25 08:57:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js	2010-03-11 13:32:06 +0000
@@ -213,8 +213,7 @@
 function updateDataElementGroupMembersReceived( xmlObject )
 {
     dataElementGroupsSelect = document.getElementById( 'dataElementGroups' );
-    document.getElementById('message').style.display='block';
-    document.getElementById('message').innerHTML = i18n_update_success + " : " + dataElementGroupsSelect.options[ dataElementGroupsSelect.selectedIndex ].text;
+    setHeaderDelayMessage( i18n_update_success + " : " + dataElementGroupsSelect.options[ dataElementGroupsSelect.selectedIndex ].text );
 }
 
 function deleteDataElementGroup()

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView2.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView2.js	2010-02-25 08:57:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView2.js	2010-03-11 13:32:06 +0000
@@ -335,8 +335,9 @@
 {
     var dataElementId = byId( 'availableDataElements' ).value;   
 	
-	if( dataElementId=="" ){
-		setMessage( i18n_select_dataelement );
+	if( dataElementId=="" )
+	{
+		setHeaderDelayMessage( i18n_select_dataelement );
 		return;
 	}
 
@@ -360,5 +361,5 @@
 
 function assignGroupsForDataElementReceived( message )
 {	
-	setMessage( i18n_update_success );
+	setHeaderDelayMessage( i18n_update_success );
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView1.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView1.js	2010-02-26 06:40:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView1.js	2010-03-11 13:32:06 +0000
@@ -378,7 +378,7 @@
 function updateIndicatorGroupMembersReceived( xmlObject ){       
     
 	var name = xmlObject.getElementsByTagName( "name" )[0].firstChild.nodeValue;
-    setMessage(i18n_update_success + " : " + name);
+    setHeaderDelayMessage(i18n_update_success + " : " + name);
 }
 
 /*==============================================================================

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView2.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView2.js	2010-02-26 06:40:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView2.js	2010-03-11 13:32:06 +0000
@@ -219,7 +219,7 @@
     
     if ( type=='input' )
     {
-        setMessage(xmlObject.firstChild.nodeValue);
+        setHeaderDelayMessage(xmlObject.firstChild.nodeValue);
     }
     if ( type=='success' )
     {
@@ -257,7 +257,7 @@
 	
 	if( list.value== '' )
 	{
-		setMessage(i18n_select_indicator_group);
+		setHeaderDelayMessage(i18n_select_indicator_group);
 	}
 	else
 	{
@@ -285,7 +285,7 @@
     
     if( type=='input' )
     {
-        setMessage(xmlObject.firstChild.nodeValue);
+        setHeaderDelayMessage(xmlObject.firstChild.nodeValue);
     }
     
     if( type=='success' )
@@ -313,8 +313,7 @@
 function assignGroupsForIndicator()
 {
 	try
-	{
-		
+	{		
 	    var indicatorId = byId('availableIndicators').value;	
 		
 	    var request = new Request();
@@ -337,14 +336,13 @@
 	}
 	catch( e )
 	{
-		setMessage( i18n_select_indicator_group );
+		setHeaderDelayMessage( i18n_select_indicator_group );
 	}
 }
 
 function assignGroupsForIndicatorReceived( xmlObject )
-{           
-	
-    setMessage( i18n_update_success );
+{	
+    setHeaderDelayMessage( i18n_update_success );
 }
 
 /*==============================================================================
@@ -359,7 +357,7 @@
 	
 		if( list.value== '' )
 		{
-			setMessage(i18n_select_indicator_group);
+			setHeaderDelayMessage(i18n_select_indicator_group);
 		}else{			
 			var request = new Request();
 			request.setResponseTypeXML( 'xmlObject' );
  Thread Previous • Date Previous • • Thread Next