Course progress to "heavy" to be loaded in a popup (too much fckeditors), replacing with a simple page

main/course_progress/index.php

@@ -80,11 +80,11 @@ $default_thematic_plan_title = $thematic->get_default_thematic_plan_title();
 $htmlHeadXtra[] = '<script type="text/javascript">
 	
 $(document).ready(function() {
-	//Second col
-	
-    $("#add_plan").live("click", function() {
+
+	//Second col	
+    $("#thematic_plan_add").live("submit", function() {
                    
-		var serialize_form_content = $("#thematic_plan_add").serialize();
+		var serialize_form_content = $(this).serialize();
 
 		//Getting FCK content								
 		var oEditor = FCKeditorAPI.GetInstance("description[1]");
@@ -108,21 +108,19 @@ $(document).ready(function() {
 				var thematic_id = $("input[name=\"thematic_id\"]").val();
 				$("#thematic_plan_"+thematic_id).html(data);				
 				$("#thematic_plan_add").html("<div class=\"confirmation-message\">'.addslashes(get_lang('Saved')).'</div>");																	
-					
+                //location.reload(true);					
 			}
 		});
 		//prevent the browser to follow the link
         return false;				
 	});
-        
-    
     
    // Third col
    
-	$("#update_button, #add_button").click(function() {
+	$("#thematic_advance").live("submit", function() {
 	   	var url = this.href;        
         var my_id = this.id;
-		var serialize_form_content = $("#thematic_advance").serialize();
+		var serialize_form_content = $(this).serialize();
 		
 		//Getting FCK content								
 		var oEditor = FCKeditorAPI.GetInstance("content");
@@ -133,45 +131,21 @@ $(document).ready(function() {
 				data: "real_content=" + content + "&" +serialize_form_content,
 				success: function(data) {										
 					var thematic_advance_id = $("input[name=\"thematic_advance_id\"]").val();
-					$("#thematic_advance_"+thematic_advance_id).html(data);
-					
+					$("#thematic_advance_"+thematic_advance_id).html(data);					
 					$("#thematic_advance").html("<div class=\"confirmation-message\">'.addslashes(get_lang('Saved')).'</div>");																	
 					
 					//Only refresh if the parent is to add
 					if (my_id == "add_button") {
-						location.reload(true);
+						//location.reload(true);
 					}
 				}
 		});								
 		//prevent the browser to follow the link
         return false;	
 	});
-        
     
-});   	
-</script>';
-
- 
-$htmlHeadXtra[] = '<script type="text/javascript">
-
-function datetime_by_attendance(selected_value) {
-	$.ajax({
-		contentType: "application/x-www-form-urlencoded",
-		beforeSend: function(objeto) {},
-		type: "POST",
-		url: "'.api_get_path(WEB_AJAX_PATH).'thematic.ajax.php?a=get_datetime_by_attendance",
-		data: "attendance_id="+selected_value+"&thematic_advance_id='.$thematic_id.'",
-		success: function(datos) {
-			$("#div_datetime_attendance").html(datos);			
-			$("#start_date_select_calendar").val($("#start_date_select_calendar option:first").val());
-			// $("#duration_in_hours_element").focus();
-
-		}
-	});
-}
 
-$(document).ready(function() {
-	$(".thematic_advance_actions, .thematic_tools ").hide();	
+    $(".thematic_advance_actions, .thematic_tools ").hide();	
 	
 	$(".thematic_content").mouseover(function() {
 		var id = parseInt(this.id.split("_")[3]);
@@ -191,11 +165,37 @@ $(document).ready(function() {
 	$(".thematic_advance_content").mouseleave(function() {
 		var id = parseInt(this.id.split("_")[4]);
 		$("#thematic_advance_tools_"+id ).hide();
-	});
-	
-	  
-});    
+	});    
+    /*
+    $("#custom_date").live("click", function() {         
+        $("#div_custom_datetime").css("display", "none");
+        $("#div_datetime_by_attendance").hide();		
+    });
+    
+    $("#from_attendance").live("click", function() {         
+        $("#div_custom_datetime").css("display", "block");
+        $("#div_custom_datetime").show();
+        $("#div_datetime_by_attendance").show();		
+    });*/
+});   	
+</script>';
+
+ 
+$htmlHeadXtra[] = '<script type="text/javascript">
 
+function datetime_by_attendance(selected_value) {
+	$.ajax({
+		contentType: "application/x-www-form-urlencoded",
+		beforeSend: function(objeto) {},
+		type: "POST",
+		url: "'.api_get_path(WEB_AJAX_PATH).'thematic.ajax.php?a=get_datetime_by_attendance",
+		data: "attendance_id="+selected_value+"&thematic_advance_id='.$thematic_id.'",
+		success: function(datos) {
+			$("#div_datetime_attendance").html(datos);			
+			$("#start_date_select_calendar").val($("#start_date_select_calendar option:first").val());
+		}
+	});
+}
 
 function update_done_thematic_advance(selected_value) {
 	$.ajax({
@@ -224,26 +224,25 @@ function update_done_thematic_advance(selected_value) {
 			break;
 		}
 	}
-
 }
 
 function check_per_attendance(obj) {
 	if (obj.checked) {
-		document.getElementById(\'div_datetime_by_attendance\').style.display=\'block\';
-		document.getElementById(\'div_custom_datetime\').style.display=\'none\';
+        $("#div_datetime_by_attendance").show();        
+        $("#div_custom_datetime").hide();
 	} else {
-		document.getElementById(\'div_datetime_by_attendance\').style.display=\'none\';
-		document.getElementById(\'div_custom_datetime\').style.display=\'block\';
+        $("#div_datetime_by_attendance").hide();
+        $("#div_custom_datetime").show();        
 	}
 }
 
 function check_per_custom_date(obj) {
 	if (obj.checked) {
-		document.getElementById(\'div_custom_datetime\').style.display=\'block\';
-		document.getElementById(\'div_datetime_by_attendance\').style.display=\'none\';
+        $("#div_custom_datetime").show();
+        $("#div_datetime_by_attendance").hide();		        
 	} else {
-		document.getElementById(\'div_custom_datetime\').style.display=\'none\';
-		document.getElementById(\'div_datetime_by_attendance\').style.display=\'block\';
+        $("#div_custom_datetime").hide();
+        $("#div_datetime_by_attendance").show();		
 	}
 }
 

main/course_progress/thematic.php

@@ -127,7 +127,7 @@ if ($action == 'thematic_list') {
 							
 			//if (api_is_allowed_to_edit(null, true) &&  api_get_session_id() == $thematic['session_id']) {
 			if (api_is_allowed_to_edit(null, true)) {
-				echo '<div style="text-align:right"><a class="thickbox" href="index.php?'.api_get_cidreq().'&origin=thematic_details&action=thematic_plan_list&thematic_id='.$thematic['id'].'&width=700&height=500">'.
+				echo '<div style="text-align:right"><a href="index.php?'.api_get_cidreq().'&origin=thematic_details&action=thematic_plan_list&thematic_id='.$thematic['id'].'&width=700&height=500">'.
 				Display::return_icon('edit.png', get_lang('EditThematicPlan'), array('style'=>'vertical-align:middle'),ICON_SIZE_MEDIUM).'</a></div><br />';
 			}			
 			
@@ -145,7 +145,7 @@ if ($action == 'thematic_list') {
 			//if (api_is_allowed_to_edit(null, true) &&  api_get_session_id() == $thematic['session_id']) {					
 			if (api_is_allowed_to_edit(null, true)) {
 				//echo '<div style="text-align:right"><a href="index.php?'.api_get_cidreq().'&origin=thematic_details&action=thematic_advance_list&thematic_id='.$thematic['id'].'">'.Display::return_icon('edit.png',get_lang('EditThematicAdvance'),array('style'=>'vertical-align:middle'),ICON_SIZE_SMALL).'</a></div><br />';
-				echo '<div style="text-align:right"><a class="thickbox" href="index.php?'.api_get_cidreq().'&action=thematic_advance_add&thematic_id='.$thematic['id'].'">'.Display::return_icon('add.png',get_lang('NewThematicAdvance'),'',ICON_SIZE_MEDIUM).'</a></div>';
+				echo '<div style="text-align:right"><a href="index.php?'.api_get_cidreq().'&action=thematic_advance_add&thematic_id='.$thematic['id'].'">'.Display::return_icon('add.png',get_lang('NewThematicAdvance'),'',ICON_SIZE_MEDIUM).'</a></div>';
 			}						
 			
 			//if (api_is_allowed_to_edit(null, true) &&  api_get_session_id() == $thematic['session_id']) {

main/course_progress/thematic_advance.php

@@ -56,11 +56,10 @@ if ($action == 'thematic_advance_add' || $action == 'thematic_advance_edit') {
 		$form->addElement('html', '<div id="div_datetime_by_attendance" style="display:block">');	
 	}
 
-	if (count($attendance_select) > 1) {
-		
+	if (count($attendance_select) > 1) {		
 		$form->addElement('select', 'attendance_select', get_lang('Attendances'), $attendance_select, array('id' => 'id_attendance_select', 'onchange' => 'datetime_by_attendance(this.value)'));
 	} else {
-		$form->addElement('html', '<div class="row"><div class="label">'.get_lang('Attendances').'</div><div class="formw"><strong><em>'.get_lang('ThereAreNoAttendancesInsideCourse').'</em></strong></div></div>');
+		$form->addElement('label', get_lang('Attendances'), '<strong><em>'.get_lang('ThereAreNoAttendancesInsideCourse').'</em></strong>');
 	}
 	
 	$form->addElement('html', '<div id="div_datetime_attendance">');
@@ -75,9 +74,7 @@ if ($action == 'thematic_advance_add' || $action == 'thematic_advance_edit') {
 	
 	$form->add_html_editor('content', get_lang('Content'), false, false, array('ToolbarStartExpanded'=>'false', 'ToolbarSet' => 'TrainingDescription', 'Width' => '80%', 'Height' => '150'));	
 	//$form->addElement('textarea', 'content', get_lang('Content'));
-	
-	//$form->addElement('html','<div class="clear" style="margin-top:50px;"></div>');
-	
+		
 	if ($action == 'thematic_advance_add') {
 		$form->addElement('style_submit_button', null, get_lang('Save'), 'id="add_button" class="save"');
 	} else {
@@ -138,8 +135,6 @@ if ($action == 'thematic_advance_add' || $action == 'thematic_advance_edit') {
 	$form->display();
 	
 } else if ($action == 'thematic_advance_list') {
-
-	
 	// thematic advance list		
 	$table = new SortableTable('thematic_advance_list', array('Thematic', 'get_number_of_thematic_advances'), array('Thematic', 'get_thematic_advance_data'));
 	$table->set_additional_parameters($parameters);

main/course_progress/thematic_controller.php

@@ -253,7 +253,7 @@ class ThematicController
         
 		//render to the view
     	$this->view->set_data($data);
-    	$this->view->set_layout('layout_no_header'); 
+    	$this->view->set_layout('layout'); 
     	$this->view->set_template('thematic_plan');		       
     	$this->view->render();
         exit;
@@ -316,7 +316,7 @@ class ThematicController
 		
 		// render to the view
 		$this->view->set_data($data);
-		$this->view->set_layout('layout_no_header'); 
+		$this->view->set_layout('layout'); 
 		$this->view->set_template('thematic_advance');		       
 		$this->view->render();		
 	}

main/inc/ajax/thematic.ajax.php

@@ -28,14 +28,14 @@ switch ($action) {
 		$thematic_plan_data = $thematic->get_thematic_plan_data();
 		$return = $thematic->get_thematic_plan_div($thematic_plan_data);
 		echo $return[$_REQUEST['thematic_id']];
-		break;
-		
-	case 'save_thematic_advance':
-		
+		break;		
+        
+	case 'save_thematic_advance':		
 		if (!api_is_allowed_to_edit(null, true)) {
 			echo '';
 			exit;
-        }        
+        }
+        
 		if (($_REQUEST['start_date_type'] == 1 && empty($_REQUEST['start_date_by_attendance'])) || (!empty($_REQUEST['duration_in_hours']) && !is_numeric($_REQUEST['duration_in_hours'])) ) {	    			
 			if ($_REQUEST['start_date_type'] == 1 && empty($_REQUEST['start_date_by_attendance'])) {
         		$start_date_error = true;
@@ -55,7 +55,7 @@ switch ($action) {
     			$thematic_advance_data = $thematic->get_thematic_advance_list($_REQUEST['thematic_advance_id']);
     			$data['thematic_advance_data'] = $thematic_advance_data;		
     		}	    			
-		} else {    				
+		} else {   				
 			if ($_REQUEST['thematic_advance_token'] == $_SESSION['thematic_advance_token'] && api_is_allowed_to_edit(null, true)) {    	    			
     	    	$thematic_advance_id 	= $_REQUEST['thematic_advance_id'];
     	    	$thematic_id 			= $_REQUEST['thematic_id'];	    			
@@ -80,12 +80,11 @@ switch ($action) {
 				}
 			}
 		}
-		$thematic_advance_data = $thematic->get_thematic_advance_list(null, null, true);
+		$thematic_advance_data = $thematic->get_thematic_advance_list(null, null, true);        
 		$return = $thematic->get_thematic_advance_div($thematic_advance_data);
 		
 		echo $return[$_REQUEST['thematic_id']][$_REQUEST['thematic_advance_id']];
-	break;
-		
+        break;		
 	case 'get_datetime_by_attendance':							
 		$attendance_id = intval($_POST['attendance_id']);
         
@@ -136,13 +135,12 @@ switch ($action) {
 			}
 		} 
 		?>			
-		<div class="row">
-			<div class="label"><?php echo $label ?></div>
-			<div class="formw"><?php echo $input_select ?></div>
+		<div class="control-group">
+			<label class="control-label"><?php echo $label ?></label>
+			<div class="controls"><?php echo $input_select ?></div>
 		</div>			
 		<?php				
-	    break;
-	    
+	    break;	    
 	case 'update_done_thematic_advance':	
 		$thematic_advance_id = intval($_GET['thematic_advance_id']);
 		$total_average = 0;			

main/inc/lib/javascript/jquery.menu.js

@@ -1,12 +0,0 @@
-$(function() {
- $('#navigation a').stop().animate({'marginLeft':'50px'},1000);
- 
- $('#navigation> li').hover(
-  function () {
-   $('a',$(this)).stop().animate({'marginLeft':'1px'},200);
-  },
-  function () {
-   $('a',$(this)).stop().animate({'marginLeft':'50px'},200);
-  }
- );
-});

main/inc/lib/template.lib.php

@@ -350,8 +350,7 @@ class Template extends Smarty {
             'modernizr.js',
 			'jquery.min.js',
 			'chosen/chosen.jquery.min.js',
-			'thickbox.js',
-			'jquery.menu.js',
+			'thickbox.js',			
 			'dtree/dtree.js',
 			'email_links.lib.js.php',
 			'bootstrap/bootstrap.js',

main/template/default/layout/head.tpl

@@ -76,7 +76,8 @@ $(document).scroll(function() {
     }
 });
 
-$(document).ready(function() {       
+$(document).ready(function() {
+
     //Dropdown effect
     $('.dropdown-toggle').dropdown();   
     
@@ -105,6 +106,24 @@ $(document).ready(function() {
             return false;
     });
     
+    //old jquery.menu.js
+    $('#navigation a').stop().animate({
+        'marginLeft':'50px'
+    },1000);
+ 
+    $('#navigation> li').hover(
+        function () {
+            $('a',$(this)).stop().animate({
+                'marginLeft':'1px'
+            },200);
+        },
+        function () {
+            $('a',$(this)).stop().animate({
+                'marginLeft':'50px'
+            },200);
+        }
+    );
+    
     /*
     $(".td_actions").hide();