From f5bc0cffcf17321ac58f6fb6735553c1f1d82197 Mon Sep 17 00:00:00 2001
From: Patrick Cool <patrick.cool@ugent.be>
Date: Mon, 18 May 2009 13:23:37 +0200
Subject: [PATCH] [svn r20772] correct use of feedback messages

---
 main/newscorm/learnpath.class.php | 26 ++----------
 main/newscorm/lp_add_item.php     | 67 ++++---------------------------
 main/newscorm/lp_admin_view.php   | 12 +-----
 main/newscorm/lp_build.php        |  4 +-
 4 files changed, 15 insertions(+), 94 deletions(-)

diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php
index 191a7a0f32..5b0b388f63 100644
--- a/main/newscorm/learnpath.class.php
+++ b/main/newscorm/learnpath.class.php
@@ -5252,10 +5252,7 @@ class learnpath {
 				$return .= get_lang("EditCurrentExecice").'&nbsp;:' . "\n";
 			
 			if(isset($_GET['edit']) && $_GET['edit'] == 'true') {
-				$return .= '<div class="warning-message">';				
-					$return .= '<p class="lp_title">'.get_lang("Warning").' !</p>';
-					$return .= get_lang("WarningEditingDocument");				
-				$return .= '</div>';
+				$return .= Display::return_warning_message('<p class="lp_title">'.get_lang("Warning").' !</p>'.get_lang("WarningEditingDocument"));
 			}
 			$return .= '</div>';
 			$return .= '<div class="sectioncomment">';
@@ -5498,12 +5495,7 @@ class learnpath {
 
 			if(isset($_GET['edit']) && $_GET['edit'] == 'true')
 			{
-				$return .= '<div class="warning-message">';
-
-					$return .= '<p class="lp_title">'.get_lang("Warning").' !</p>';
-					$return .= get_lang("WarningEditingDocument");
-
-				$return .= '</div>';
+				$return .= Display::return_warning_message('<p class="lp_title">'.get_lang("Warning").' !</p>'.get_lang("WarningEditingDocument"));
 			}
 
 			$return .= '<form method="POST">' . "\n";
@@ -6539,19 +6531,9 @@ class learnpath {
 
 			if(isset($_GET['edit']) && $_GET['edit'] == 'true')
 			{
-				$return .= '<div class="warning-message">';				
-				$return .= '<strong>'.get_lang("Warning").' !</strong><br />';
-				$return .= get_lang("WarningEditingDocument");				
-				$return .= '</div>';
-			}
-			/*
-			if($no_display_add==true){
-				$return .= '<div class="warning-message">';
-				$return .= get_lang("CantEditDocument");
-				$return .= '</div>';
-				return $return;
+				$return .= Display::return_warning_message('<strong>'.get_lang("Warning").' !</strong><br />'.get_lang("WarningEditingDocument"), false);
 			}
-			*/
+
 			require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
 			
 			$form = new FormValidator('form','POST',api_get_self()."?".$_SERVER["QUERY_STRING"],'','enctype="multipart/form-data"');
diff --git a/main/newscorm/lp_add_item.php b/main/newscorm/lp_add_item.php
index cf18326ddc..a6a15c642d 100644
--- a/main/newscorm/lp_add_item.php
+++ b/main/newscorm/lp_add_item.php
@@ -249,100 +249,49 @@ echo '<table cellpadding="0" cellspacing="0" class="lp_build">';
 				{
 					
 					case 'chapter':
-						
 						echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
-						
-						echo '<div class="confirmation-message">';
-						
-							echo get_lang("NewChapterCreated");
-						
-						echo '</div>';
-						
+						Display::display_confirmation_message(get_lang('NewChapterCreated'));					
 						break;
 						
 					case TOOL_LINK:
-						
 						echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
-						
-						echo '<div class="confirmation-message">';
-						
-							echo get_lang("NewLinksCreated");
-						
-						echo '</div>';
-						
+						Display::display_confirmation_message(get_lang('NewLinksCreated'));	
 						break;
 					
 					case TOOL_STUDENTPUBLICATION:
 						
 						echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
-						
-						echo '<div class="confirmation-message">';
-						
-							echo get_lang("NewStudentPublicationCreated");
-						
-						echo '</div>';
-						
+						Display::display_confirmation_message(get_lang('NewStudentPublicationCreated'));
 						break;
 						
 					case 'module':
 						
 						echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
-						
-						echo '<div class="confirmation-message">';
-						
-							echo get_lang("NewModuleCreated");
-						
-						echo '</div>';
-						
+						Display::display_confirmation_message(get_lang('NewModuleCreated'));
 						break;
 						
 					case TOOL_QUIZ:
 					
 						echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
-						
-						echo '<div class="confirmation-message">';
-						
-							echo get_lang("NewExerciseCreated");
-						
-						echo '</div>';
-						
+						Display::display_confirmation_message(get_lang('NewExerciseCreated'));
 						break;
 					
 					
 					case TOOL_DOCUMENT:
-						
-						$msg = '<div class="confirmation-message">';
-						
-							$msg .= get_lang("NewDocumentCreated");
-						
-						$msg .= '</div>';
-						
+						Display::display_confirmation_message(get_lang('NewDocumentCreated'));
 						echo $_SESSION['oLP']->display_item($new_item_id, true, $msg);
-						
 						break;
 						
 						
 					case TOOL_FORUM:
 						echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
-						
-						echo '<div class="confirmation-message">';
-						
-							echo get_lang("NewForumCreated");
-						
-						echo '</div>';
-						
+						Display::display_confirmation_message(get_lang('NewForumCreated'));
 						break;
 					
 					
 					case 'thread':
 						echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
-						
-						echo '<div class="confirmation-message">';
-						
-							echo get_lang("NewThreadCreated");
-						
-						echo '</div>';
-						
+						Display::display_confirmation_message(get_lang('NewThreadCreated'));
 						break;
 					
 				}
diff --git a/main/newscorm/lp_admin_view.php b/main/newscorm/lp_admin_view.php
index 1fc9198dd2..72f3091492 100644
--- a/main/newscorm/lp_admin_view.php
+++ b/main/newscorm/lp_admin_view.php
@@ -180,11 +180,7 @@ switch($_GET['action'])
 		
 		if(isset($is_success) && $is_success === true)
 		{
-			echo '<div class="confirmation-message">';
-			
-				echo get_lang("_learnpath_item_edited");
-			
-			echo '</div>';
+			Display::display_confirmation_message(get_lang("_learnpath_item_edited"));
 		}
 		else
 		{
@@ -197,11 +193,7 @@ switch($_GET['action'])
 		
 		if(isset($is_success) && $is_success === true)
 		{
-			echo '<div class="confirmation-message">';
-			
-				echo get_lang("_learnpath_item_deleted");
-			
-			echo '</div>';
+			Display::display_confirmation_message(get_lang("_learnpath_item_deleted"));
 		}
 		
 		break;
diff --git a/main/newscorm/lp_build.php b/main/newscorm/lp_build.php
index e38773e12a..6b6ea559b1 100644
--- a/main/newscorm/lp_build.php
+++ b/main/newscorm/lp_build.php
@@ -214,9 +214,7 @@ echo '<table cellpadding="0" cellspacing="0" class="lp_build">';
 		echo '<td class="workspace">';
 		
 			if(isset($is_success) && $is_success === true) {
-				echo '<div class="confirmation-message">';			
-				echo get_lang("ItemRemoved");			
-				echo '</div>';
+				Display::display_confirmation_message(get_lang('ItemRemoved'));
 			} else {
 				if($is_new) {
 					Display::display_normal_message(get_lang('LearnPathAdded'), false);