Avoid headers in the layout when there is a modal - refs #7161

Author: Francis Gonzales

main/course_progress/thematic.php

@@ -163,7 +163,7 @@
 
 					$edit_link = '';
 					if (api_is_allowed_to_edit(null, true)) {
-						$edit_link   = '<a class="thickbox" href="index.php?'.api_get_cidreq().'&action=thematic_advance_edit&thematic_id='.$thematic['id'].'&thematic_advance_id='.$thematic_advance['id'].'" >'.Display::return_icon('edit.png',get_lang('EditThematicAdvance'),array(),ICON_SIZE_SMALL).'</a>';
+						$edit_link   = '<a class="thickbox" href="index.php?'.api_get_cidreq().'&action=thematic_advance_edit&thematic_id='.$thematic['id'].'&thematic_advance_id='.$thematic_advance['id'].'&display=no_header" >'.Display::return_icon('edit.png',get_lang('EditThematicAdvance'),array(),ICON_SIZE_SMALL).'</a>';
 						$edit_link  .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_advance_delete&thematic_id='.$thematic['id'].'&thematic_advance_id='.$thematic_advance['id'].'">'.
                                         Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a></center>';
 

main/course_progress/thematic_controller.php

@@ -40,7 +40,8 @@ public function thematic($action) {
 
         $check = Security::check_token('request');
         $thematic_id = isset($_REQUEST['thematic_id']) ? intval($_REQUEST['thematic_id']) : null;
-
+        $displayHeader = (!empty($_REQUEST['display']) && $_REQUEST['display'] === 'no_header') ? false : true;
+ 
         if ($check) {
             switch ($action) {
                 case 'thematic_add':
@@ -248,9 +249,11 @@ public function thematic($action) {
         $data['default_thematic_plan_title'] = $thematic->get_default_thematic_plan_title();
 
         $data['action'] = $action;
+        $layoutName = $displayHeader ? 'layout' : 'layout_no_header';
+       
         // render to the view
         $this->view->set_data($data);
-        $this->view->set_layout('layout');
+        $this->view->set_layout($layoutName);
         $this->view->set_template('thematic');
         $this->view->render();
     }
@@ -357,15 +360,17 @@ public function thematic_advance($action) {
         $thematic = new Thematic();
         $attendance = new Attendance();
         $data = array();
-
+        
+        $displayHeader = (!empty($_REQUEST['display']) && $_REQUEST['display'] === 'no_header') ? false : true;
+  
         // get data for attendance input select		
         $attendance_list = $attendance->get_attendances_list();
         $attendance_select = array();
         $attendance_select[0] = get_lang('SelectAnAttendance');
         foreach ($attendance_list as $attendance_id => $attendance_data) {
             $attendance_select[$attendance_id] = $attendance_data['name'];
         }
-
+       
         $thematic_id = intval($_REQUEST['thematic_id']);
         $thematic_advance_id = intval($_REQUEST['thematic_advance_id']);
 
@@ -459,10 +464,11 @@ public function thematic_advance($action) {
         $data['attendance_select'] = $attendance_select;
         $data['thematic_advance_data'] = $thematic_advance_data;
         $data['calendar_select'] = $calendar_select;
-
+        $layoutName = $displayHeader ? 'layout' : 'layout_no_header';
+        
         // render to the view
         $this->view->set_data($data);
-        $this->view->set_layout('layout');
+        $this->view->set_layout($layoutName);
         $this->view->set_template('thematic_advance');
         $this->view->render();
     }