chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[svn r19506] Logic change - Remove frames in learning path display when it is in mode full screen - partial FS#3909

Browse Source
skala
Cristian Fasanando 17 years ago
parent 50df2a278c
commit 2212daef96
2 changed files with 127 additions and 30 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 133
      main/newscorm/lp_view.php
  2. 14
      main/newscorm/scorm_api.php

133
main/newscorm/lp_view.php
Unescape View File

@ -172,20 +172,121 @@ if($_SESSION['oLP']->mode == 'fullscreen')
//set flag to ensure lp_header.php is loaded by this script (flag is unset in lp_header.php) //set flag to ensure lp_header.php is loaded by this script (flag is unset in lp_header.php)
$_SESSION['loaded_lp_view'] = true; $_SESSION['loaded_lp_view'] = true;
?> ?>
<frameset cols="270,*"> <div id="learningPathLeftZone" style="float: left; width: 300px;">
<frameset rows="20,475,95,80,*"> <div id="header">
<frame id="header" src="lp_header.php" border="0" frameborder="0" scrolling="no"/> <div id="learningPathHeader" style="font-size:14px; padding-left: 17px;">
<frame id="toc_id" name="toc_name" class="lp_toc" src="lp_toc.php" border="0" frameborder="0" scrolling="no"/> <table>
<frame id="nav_id" name="nav_name" class="lp_nav" src="lp_nav.php" border="0" frameborder="0" /> <tr>
<frame id="message_id" name="message_name" class="message" src="lp_message.php" border="0" frameborder="0" /> <td>
<frame id="lp_log_id" name="lp_log_name" class="lp_log" src="lp_log.php" border="0" frameborder="0" /> <a href="lp_controller.php?action=return_to_course_homepage" target="_top" onclick="window.parent.API.save_asset();"><img src="../img/lp_arrow.gif" /></a>
</frameset> </td>
<frame id="content_id_blank" name="content_name_blank" src="blank.php" border="0" frameborder="0"> <td>
</frame> <a class="link" href="lp_controller.php?action=return_to_course_homepage" target="_top" onclick="window.parent.API.save_asset();"><?php echo get_lang('CourseHomepageLink'); ?></a>
</frameset><noframes></noframes> </td>
<noframes> </tr>
This page relies heavily on frames. If your browser doesn't support frames, please try to find a better one. Some are available for free and run on multiple platforms. We recommend you try <a href="http://www.mozilla.com/firefox/">Firefox</a>. Get it from its official website by clicking the link. </table>
</noframes> </div>
</div>
<div id="toc_id" name="toc_name" class="lp_toc" style="padding:0;margin:0">
<div id="learningPathToc" style="width:300px;overflow-y:auto;overflow-x:hidden;font-size:8pt;"><?php echo $_SESSION['oLP']->get_html_toc(); ?></div>
</div>
<div id="nav_id" name="nav_name" class="lp_nav">
<?php
$display_mode = $_SESSION['oLP']->mode;
$scorm_css_header=true;
$lp_theme_css=$_SESSION['oLP']->get_theme();
//Setting up the CSS theme if exists
if (!empty($lp_theme_css) && !empty($mycourselptheme) && $mycourselptheme!=-1 && $mycourselptheme== 1 ) {
global $lp_theme_css;
} else {
$lp_theme_css=$my_style;
}
$progress_bar = $_SESSION['oLP']->get_progress_bar('',-1,'',true);
$navigation_bar = $_SESSION['oLP']->get_navigation_bar();
$mediaplayer = $_SESSION['oLP']->get_mediaplayer();
?>
<div id="lp_navigation_elem" class="lp_navigation_elem">
<table border="0" width="100%" style="text-align:center">
<tr>
<td colspan="2" style="font-size:11.5pt">
<div id="media" ><span><?php echo (!empty($mediaplayer))?$mediaplayer:'&nbsp;' ?></span></div>
</td>
</tr>
<tr>
<td><?php echo $progress_bar; ?></td>
<td><?php echo $navigation_bar; ?></td>
</tr>
</table>
</div>
</div>
<div id="message_id" name="message_name" class="message">
<div id="msg_div_id" class="message">
<?php echo $error = $_SESSION['oLP']->error; ?>
</div>
</div>
</div>
<div id="learningPathRightZone">
<iframe id="content_id_blank" name="content_name_blank" src="blank.php" border="0" frameborder="0"></iframe>
</div>
<div id="lp_log_id" name="lp_log_name" class="lp_log">
<div id="log_content">
</div>
<div style="color: white;" onClick="cleanlog();">.</div>
</div>
<script language="JavaScript" type="text/javascript">
// Need to be called after the <head> to be sure window.oxajax is defined
var dokeos_xajax_handler = window.oxajax;
</script>
<script language="JavaScript" type="text/javascript">
<!--
var leftZoneHeightOccupied = 0;
var rightZoneHeightOccupied = 0;
var initialLeftZoneHeight = 0;
var initialRightZoneHeight = 0;
var updateContentHeight = function() {
winHeight = (window.innerHeight != undefined ? window.innerHeight : document.documentElement.clientHeight);
newLeftZoneHeight = winHeight - leftZoneHeightOccupied;
newRightZoneHeight = winHeight - rightZoneHeightOccupied;
if (newLeftZoneHeight <= initialLeftZoneHeight) {
newLeftZoneHeight = initialLeftZoneHeight;
newRightZoneHeight = newLeftZoneHeight + leftZoneHeightOccupied - rightZoneHeightOccupied;
}
if (newRightZoneHeight <= initialRightZoneHeight) {
newRightZoneHeight = initialRightZoneHeight;
newLeftZoneHeight = newRightZoneHeight + rightZoneHeightOccupied - leftZoneHeightOccupied;
}
document.getElementById('learningPathToc').style.height = newLeftZoneHeight + 'px';
document.getElementById('learningPathRightZone').style.height = newRightZoneHeight + 'px';
document.getElementById('content_id').style.height = newRightZoneHeight + 'px';
if (document.body.clientHeight > winHeight) {
document.body.style.overflow = 'auto';
} else {
document.body.style.overflow = 'hidden';
}
};
window.onload = function() {
initialLeftZoneHeight = document.getElementById('learningPathToc').offsetHeight;
initialRightZoneHeight = document.getElementById('learningPathRightZone').offsetHeight;
docHeight = document.body.clientHeight;
leftZoneHeightOccupied = docHeight - initialLeftZoneHeight;
rightZoneHeightOccupied = docHeight - initialRightZoneHeight;
document.body.style.overflow = 'hidden';
updateContentHeight();
}
window.onresize = updateContentHeight;
-->
</script>
<?php <?php
} }
else else
@ -300,8 +401,8 @@ else
</tr> </tr>
<tr valign="middle"> <tr valign="middle">
<td><?php echo $progress_bar; ?></td> <td width="50%"><?php echo $progress_bar; ?></td>
<td><?php echo $navigation_bar; ?></td> <td width="50%"><?php echo $navigation_bar; ?></td>
</tr> </tr>
</table> </table>
</div> </div>

14
main/newscorm/scorm_api.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: scorm_api.php 19487 2009-04-01 22:07:02Z cfasanando $ <?php // $Id: scorm_api.php 19506 2009-04-02 16:43:17Z cfasanando $
/* /*
============================================================================== ==============================================================================
Dokeos - elearning and course management software Dokeos - elearning and course management software
@ -904,7 +904,7 @@ function update_toc(update_action,update_id)
} }
return true; return true;
<?php //} ?> <?php //} ?>
return true; //return true;
} }
/** /**
* Updates the progress bar with the new status. Prevents the need of a page refresh and flickering * Updates the progress bar with the new status. Prevents the need of a page refresh and flickering
@ -1006,18 +1006,14 @@ function switch_item(current_item, next_item){
default: default:
break; break;
} }
var mysrc = 'lp_controller.php?action=content&lp_id='+lms_lp_id+'&item_id='+next_item+'#anchor_'+lms_lp_id; var mysrc = 'lp_controller.php?action=content&lp_id='+lms_lp_id+'&item_id='+next_item;
var cont_f = $("#content_id"); var cont_f = $("#content_id");
if(!cont_f){
logit_lms('In switch - content frame not found',0);
<?php if($oLP->mode == 'fullscreen'){ ?> <?php if($oLP->mode == 'fullscreen'){ ?>
cont_f = window.open(''+mysrc,'content_name','toolbar=0,location=0,status=0,scrollbars=1,resizable=1'); cont_f = window.open(''+mysrc,'content_name','toolbar=0,location=0,status=0,scrollbars=1,resizable=1');
<?php } else { ?> <?php } else { ?>
return false;
<?php } ?>
} else {
cont_f.attr("src",mysrc); cont_f.attr("src",mysrc);
} <?php } ?>
if(lms_lp_type==1 || lms_item_type=='asset'){ if(lms_lp_type==1 || lms_item_type=='asset'){
xajax_start_timer(); xajax_start_timer();

Write Preview
Loading…
Cancel
Save