Merge

main/exercice/overview.php

@@ -12,8 +12,14 @@
 $language_file = 'exercice';
 require_once 'exercise.class.php';
 require_once '../inc/global.inc.php';
-
 require_once 'exercise.lib.php';
+
+
+// Clear the exercise session just in case
+if (isset ($_SESSION['objExercise'])) {
+	api_session_unregister('objExercise');
+}
+
 $this_section = SECTION_COURSES;
 
 // Notice for unauthorized people.
@@ -180,9 +186,7 @@ if ($objExercise->selectAttempts()) {
 	if ($is_allowed_to_edit) {
 		//$options.= Display::div(get_lang('ExerciseAttempts').' '.$objExercise->selectAttempts(), array('class'=>'right_option'));
 	} else {		
-	}
-	
-	$red_class = '';
+	}	
 	if ($counter == $objExercise->selectAttempts()) {
 		$class = 'red_alert';
 	}

main/inc/lib/display.lib.php

@@ -328,7 +328,7 @@ class Display {
         	$message = api_htmlentities($message, ENT_QUOTES, api_is_xml_http_request() ? 'UTF-8' : api_get_system_encoding());        	
             //$message = Security::remove_XSS($message);
         }
-        $class = "  ";
+        $class = "";
         switch($type) {
             case 'warning':
                $class .= 'warning-message';
@@ -345,7 +345,7 @@ class Display {
             default:
                 $class .= 'normal-message';
         }
-        return self::div($message, array('class'=>$class));
+        return self::div($message, array('class'=> $class));
     }
 
     /**

main/inc/lib/template.lib.php

@@ -323,6 +323,7 @@ class Template extends Smarty {
 		//Extra JS files
 		
 		$js_files = array(
+            'modernizr.js',
 			'jquery.min.js',
 			'chosen/chosen.jquery.min.js',
 			'thickbox.js',

main/session/index.php

@@ -11,6 +11,7 @@
 // Language files that should be included.
 $language_file = array('learnpath', 'courses', 'index','tracking','exercice', 'admin');
 $cidReset = true;
+
 require_once '../inc/global.inc.php';
 require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
 require_once api_get_path(SYS_CODE_PATH).'exercice/exercise.lib.php';
@@ -30,6 +31,11 @@ $course_id  = isset($_GET['course_id'])  ? intval($_GET['course_id']) : null;
 
 $_SESSION['id_session'] = $session_id;
 
+// Clear the exercise session just in case
+if (isset ($_SESSION['objExercise'])) {
+	api_session_unregister('objExercise');
+}
+
 $session_info   = SessionManager::fetch($session_id);
 $session_list   = SessionManager::get_sessions_by_coach(api_get_user_id());
 $course_list    = SessionManager::get_course_list_by_session_id($session_id);
@@ -182,8 +188,7 @@ $now = time();
 foreach($final_array as $session_data) {
     $my_course_list = isset($session_data['data']) ? $session_data['data']: array();    
     if (!empty($my_course_list))     
-    foreach ($my_course_list as $my_course_code=>$course_data) {
-        //echo '<pre>';        print_r($course_data);
+    foreach ($my_course_list as $my_course_code=>$course_data) {        
         if (isset($course_id) && !empty($course_id)) {
             if ($course_id != $course_data['id']) {
                 continue;
@@ -222,7 +227,7 @@ foreach($final_array as $session_data) {
                             $exercise_info->exercise = Display::url($exercise_info->exercise, api_get_path(WEB_CODE_PATH)."exercice/result.php?cidReq=$my_course_code&id={$exercise_result['exe_id']}&id_session=$session_id&show_headers=1", array('target'=>SESSION_LINK_TARGET,'class'=>'exercise-result-link'));
                             
                             $my_real_array[]= array(	//'date'        => api_get_local_time($exercise_result['exe_date']),
-                            							'status'      => Display::return_icon('quiz.gif', get_lang('Attempted'),'',ICON_SIZE_SMALL), 
+                            							'status'      => Display::return_icon('quiz.gif', get_lang('Attempted'),'', ICON_SIZE_SMALL), 
                             							'date'        => $start_date,
                             							'course'      => $course_data['name'], 
                             						    'exercise'    => $exercise_info->exercise,

main/template/default/layout/head.tpl

@@ -2,14 +2,13 @@
 <link href="http://www.chamilo.org/documentation.php" rel="Help" />
 <link href="http://www.chamilo.org/team.php" rel="Author" />
 <link href="http://www.chamilo.org" rel="Copyright" />
+
 <!-- <link rel="top"		href="{$_p.web_main}index.php" title="" />
 <link rel="courses" href="{$_p.web_main}auth/courses.php" title="{"OtherCourses"|get_lang}"/>
 <link rel="profil"  href="{$_p.web_main}auth/profile.php" title="{"ModifyProfile"|get_lang}"/> -->
 
 <meta name="Generator" content="{$_s.software_name} {$_s.system_version|substr:0:1}" />
-<meta charset="{$system_charset}" />
-<meta http-equiv="content-language" content="{$document_language}">
-		
+<meta charset="{$system_charset}" />		
 <title>{$title_string}</title>
 
 <style type="text/css" media="screen, projection">
@@ -47,7 +46,6 @@ var online_button   = '{$online_button}';
 var offline_button  = '{$offline_button}';
 var	connect_lang    = '{"ChatConnected"|get_lang}';
 var	disconnect_lang = '{"ChatDisconnected"|get_lang}';
-
 </script>
 
 {$js_file_to_string}

main/template/default/layout/main_header.tpl

@@ -1,15 +1,15 @@
 <!DOCTYPE html>
-<html>
+<html lang="{$document_language}">
 <head>
     {include file="default/layout/head.tpl"}
 </head>
 <body dir="{$text_direction}" class="{$section_name}">
 
 <div class="skip">
-	<ul>
-		<li><a href="#menu">{"WCAGGoMenu"|get_lang}</a></li>
-		<li><a href="#content" accesskey="2">{"WCAGGoContent"|get_lang}</a></li>
-	</ul>
+    <ul>
+        <li><a href="#menu">{"WCAGGoMenu"|get_lang}</a></li>
+        <li><a href="#content" accesskey="2">{"WCAGGoContent"|get_lang}</a></li>
+    </ul>
 </div>
     
 <div id="wrapper">
@@ -27,8 +27,7 @@
             {* header1 - logo *}
             <div id="header1">                
                 {$header1}
-            </div> 
-            
+            </div>            
             {$plugin_header}    
 
             {* header 2 - right menu (notifications) *}