[svn r20673] using correct feedback message type

form consistency

main/newscorm/lp_list.php

@@ -108,7 +108,21 @@ if(api_is_allowed_to_edit())
 
   if (!empty($dialog_box))
   {
-    Display::display_normal_message($dialog_box);
+	  switch ($_GET['dialogtype'])
+	  {
+	  	case 'confirmation':
+			Display::display_confirmation_message($dialog_box);
+			break;
+	  	case 'error':
+			Display::display_error_message($dialog_box);
+			break;
+	  	case 'warning':
+			Display::display_warning_message($dialog_box);
+			break;
+	  	default:
+    		Display::display_normal_message($dialog_box);
+			break;
+	  }
   }
   if (api_failure::get_last_failure())
   {

main/upload/form.scorm.php

@@ -35,7 +35,7 @@ $nameTools = get_lang("FileUpload");
 $interbreadcrumb[]= array ("url"=>"../newscorm/lp_controller.php?action=list", "name"=> get_lang("Learnpath"));
 Display::display_header($nameTools,"Path");
 //show the title
-api_display_tool_title(get_lang("Learnpath")." - ".$nameTools.$add_group_to_title);
+//api_display_tool_title(get_lang("Learnpath")." - ".$nameTools.$add_group_to_title);
 //TODO: Include right language file
 
 require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
@@ -43,7 +43,7 @@ include('../newscorm/content_makers.inc.php');
 require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php');
 
 $form = new FormValidator('','POST','upload.php','','id="upload_form" enctype="multipart/form-data" style="background-image: url(\'../img/scorm.jpg\'); background-repeat: no-repeat; background-position: 600px;"');
-
+$form->addElement('header', '', $nameTools);
 $form->addElement('hidden', 'curdirpath', $path);
 $form->addElement('hidden', 'tool', $my_tool);
 
@@ -88,17 +88,14 @@ else{
 
 $form->add_real_progress_bar('uploadScorm','user_file');
 
+// the rules for the form
+$form->addRule('user_file', '<div class="required">'.get_lang('ThisFieldIsRequired'), 'required');
+// the default values for the form
 $defaults = array('index_document'=>'checked="checked"');
 $form->setDefaults($defaults);
 $form->display();
 
-?>
 
-<br />
-<?php
-/*
-==============================================================================
-		FOOTER
-==============================================================================
-*/
-Display::display_footer();
+// footer
+Display::display_footer();
+?>

main/upload/upload.scorm.php

@@ -17,6 +17,7 @@ $error = api_failure::get_last_failure();
 if($error=='not_a_learning_path')
 {
         $msg = urlencode(get_lang('ScormUnknownPackageFormat'));
+		$dialogtype = 'error';
 }else{
 	if (api_get_setting('search_enabled')=='true') {
         require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php');
@@ -35,6 +36,7 @@ if($error=='not_a_learning_path')
     	}
     }
 	$msg = urlencode(get_lang('UplUploadSucceeded'));
+	$dialogtype = 'confirmation';
 }
-header('location: ../newscorm/lp_controller.php?action=list&dialog_box='.$msg);
+header('location: ../newscorm/lp_controller.php?action=list&dialog_box='.$msg.'&dialogtype='.$dialogtype);
 ?>