using smarty + some minor changes

main/auth/my_progress.php

@@ -12,14 +12,12 @@
 $language_file = array('registration', 'tracking', 'exercice', 'admin', 'learnpath');
 
 $cidReset = true;
-
 require_once '../inc/global.inc.php';
-require_once api_get_path(LIBRARY_PATH).'tracking.lib.php';
-require_once api_get_path(LIBRARY_PATH).'course.lib.php';
 require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpath.class.php';
 require_once api_get_path(SYS_CODE_PATH).'exercice/exercise.lib.php';
       
 $this_section = SECTION_TRACKING;
+
 $nameTools = get_lang('MyProgress');
 
 api_block_anonymous_users();
@@ -47,23 +45,19 @@ $(function() {
 });
 </script>';
 
-Display :: display_header($nameTools);
-
-// Database table definitions
-$tbl_course 				= Database :: get_main_table(TABLE_MAIN_COURSE);
-$tbl_user 					= Database :: get_main_table(TABLE_MAIN_USER);
-$tbl_session 				= Database :: get_main_table(TABLE_MAIN_SESSION);
-
-
-$user_progress = Tracking::show_user_progress(api_get_user_id());
-if (!empty($user_progress)) {
-    $user_progress .= '<br /><br />';
+$content = Tracking::show_user_progress(api_get_user_id());
+if (!empty($content)) {
+    $content .= '<br /><br />';
 }
-$user_progress .= Tracking::show_course_detail(api_get_user_id(), $_GET['course'], $_GET['session_id']);
-if (!empty($user_progress)) {
-    echo $user_progress;
-} else {
-    Display::display_warning_message(get_lang('NoDataAvailable'));
+$content .= Tracking::show_course_detail(api_get_user_id(), $_GET['course'], $_GET['session_id']);
+
+if (empty($content)) {
+    $message = Display::return_message(get_lang('NoDataAvailable'), 'warning');
 }
     
-Display :: display_footer();
+$tpl = new Template($tool_name);
+
+//$tpl->assign('actions', $actions);
+$tpl->assign('message', $message);
+$tpl->assign('content', $content);
+$tpl->display_one_col_template();

main/inc/lib/display.lib.php

@@ -362,6 +362,7 @@ class Display {
                break;
             case 'confirmation':
             case 'confirm':
+            case 'success':
                 $class .= 'confirmation-message';
                break;
             case 'normal':

main/inc/lib/template.lib.php

@@ -317,7 +317,7 @@ class Template extends Smarty {
 			$css_file_to_string .= api_get_css($css_file);
 		}
 	
-		global $this_section;
+		global $this_section;        
 		$this->assign('css_file_to_string', $css_file_to_string);
 		$this->assign('js_file_to_string',  $js_file_to_string);		
 		$this->assign('text_direction',	    api_get_text_direction());			
@@ -350,10 +350,11 @@ class Template extends Smarty {
 		}
 		$this->assign('favico', $favico);
 				
-		global $my_session_id;
+		/*global $my_session_id;
 		$session_id     = api_get_session_id();
 		$session_name   = api_get_session_name($my_session_id);
-		
+		*/
+        
 		$help_content = '';
         if (api_get_setting('enable_help_link') == 'true') { 
     		if (!empty($help)) {