[svn r16089] Lp Improvements FS#2841

skala
Julio Montoya 18 years ago
parent f943c26121
commit 335d662cf4
  1. 10
      main/css/public_admin/scorm.css
  2. 37
      main/newscorm/display_audiorecorder.php
  3. 8
      main/newscorm/learnpath.class.php
  4. 44
      main/newscorm/lp_author_image.php
  5. 4
      main/newscorm/lp_header.php
  6. 4
      main/newscorm/lp_nav.php
  7. 51
      main/newscorm/lp_view.php

@ -96,9 +96,9 @@
.inner_lp_toc .scorm_title
{
font-weight: bold;
background:#305582;
font-size: 12px;
color: #fff;
background:#ccc;
font-size: 14px;
color: #444;
}
.inner_lp_toc .scorm_title_text
@ -134,7 +134,7 @@
}
/*.scormpage .menu */
.lp_navigation_elem .progresstext{
margin-top: -15px;
margin-top: -20px;
margin-left: 5em;
font-size: normal;
}
@ -180,7 +180,7 @@
#preview_image
{
padding-left: 17px;
text-align:center;
}
#msg_div_id{

@ -31,38 +31,17 @@ $lp_theme_css=$_SESSION['oLP']->get_theme();
$scorm_css_header=true;
include_once('../inc/reduced_header.inc.php');
echo '<html>
<body>';
$html='';
if ($_GET['show_audio'])
{
echo '<div id="preview_image">'."\n";
if ($_SESSION['oLP']->get_preview_image()!='')
echo '<img alt="'.$_SESSION['oLP']->get_author().'" src='.api_get_path(WEB_COURSE_PATH).api_get_course_path().'/upload/learning_path/images/'.$_SESSION['oLP']->get_preview_image().'>';
else
echo Display::display_icon('unknown.jpg',$_SESSION['oLP']->get_author());
echo '</div>';
echo '<div id="audiorecorder"> ';
$audio_recorder_studentview = 'true';
$audio_recorder_item_id = $_SESSION['oLP']->current;
if(api_get_setting('service_visio','active')=='true'){
include('audiorecorder.inc.php');
}
echo '</div>';
// end of audiorecorder include
}
else
{
echo '<div id="preview_image">'."\n";
if ($_SESSION['oLP']->get_preview_image()!='')
echo '<img alt="'.$_SESSION['oLP']->get_author().'" src='.api_get_path(WEB_COURSE_PATH).api_get_course_path().'/upload/learning_path/images/'.$_SESSION['oLP']->get_preview_image().'>';
else
echo Display::display_icon('unknown.jpg',$_SESSION['oLP']->get_author());
echo '</div>';
}
echo '<div id="audiorecorder"> ';
$audio_recorder_studentview = 'true';
$audio_recorder_item_id = $_SESSION['oLP']->current;
if(api_get_setting('service_visio','active')=='true'){
include('audiorecorder.inc.php');
}
echo '</div>';
// end of audiorecorder include
echo '</body></html>';
?>

@ -1912,9 +1912,10 @@ class learnpath {
* @param string Mode in which we want the values
* @param integer Progress value to display (optional but mandatory if used in abstract context)
* @param string Text to display near the progress value (optional but mandatory in abstract context)
* @param boolean true if it comes from a Diplay LP view
* @return string HTML string containing the progress bar
*/
function get_progress_bar($mode='',$percentage=-1,$text_add='')
function get_progress_bar($mode='',$percentage=-1,$text_add='',$from_lp=false)
{
global $lp_theme_css;
@ -1937,7 +1938,10 @@ class learnpath {
//Default progress bar config
$factor=1.5;
$progress_height='16';
if ($from_lp)
$progress_height='25';
else
$progress_height='16';
$size = str_replace('%','',$percentage);
$output = ''

@ -0,0 +1,44 @@
<?php //$id: $
/**
* Script that displays the header frame for lp_view.php
* @package dokeos.learnpath
* @author
*/
/**
* Script
*/
$use_anonymous = true;
require_once('back_compat.inc.php');
require_once('learnpath.class.php');
require_once('scorm.class.php');
require_once('aicc.class.php');
if(isset($_SESSION['lpobject']))
{
$oLP = unserialize($_SESSION['lpobject']);
if(is_object($oLP)){
$_SESSION['oLP'] = $oLP;
}else{
die('Could not instanciate lp object');
}
} /*
$charset = $_SESSION['oLP']->encoding;
$lp_theme_css=$_SESSION['oLP']->get_theme();
*/
$scorm_css_header=true;
include_once('../inc/reduced_header.inc.php');
echo '<html>
<body>';
echo '<div id="preview_image">';
if ($_SESSION['oLP']->get_preview_image()!='')
echo '<img alt="'.$_SESSION['oLP']->get_author().'" src="'.api_get_path(WEB_COURSE_PATH).api_get_course_path().'/upload/learning_path/images/'.$_SESSION['oLP']->get_preview_image().'">';
else
echo Display::display_icon('unknown.jpg',$_SESSION['oLP']->get_author());
echo '</div>';
?>
</body>
</html>

@ -59,9 +59,9 @@ $interbreadcrumb[] = array("url"=>"./lp_controller.php?action=view&lp_id=".$path
$noPHP_SELF = true;
$lp_theme_css=$_SESSION['oLP']->get_theme();
include('../inc/reduced_header.inc.php');
echo '<div style="padding-left: 17px;">';
echo '<div style="padding-top: 10px; padding-left: 17px;">';
echo '<a class="link" href="./lp_controller.php?action=return_to_course_homepage" target="_top" onclick="window.parent.API.save_asset();">'.get_lang('CourseHomepageLink').'</a>';
echo '</div>';
echo '</div>';
?>
</body>
</html>

@ -58,7 +58,9 @@ if(isset($_SESSION['lpobject']))
$lp_theme_css=$my_style;
}
$progress_bar = $_SESSION['oLP']->get_progress_bar();
//$progress_bar = $_SESSION['oLP']->get_progress_bar();
$progress_bar = $_SESSION['oLP']->get_progress_bar('',-1,'',true);
$navigation_bar = $_SESSION['oLP']->get_navigation_bar(); }
session_write_close();
?>

@ -174,39 +174,30 @@ else
//set flag to ensure lp_header.php is loaded by this script (flag is unset in lp_header.php)
$_SESSION['loaded_lp_view'] = true;
$audio_record_width='';
if ($displayAudioRecorder || $_SESSION['oLP']->get_preview_image()!='')
{
if ($displayAudioRecorder)
$audio_record_width='170,';
else
$audio_record_width='120,';
}
if ($displayAudioRecorder)
$audio_record_width='120,';
else
{
$audio_record_width='';
}
$audio_record_width='120,';
?>
<frameset cols="270,*">
<frameset rows="20,<?php echo $audio_record_width; ?>50,20,*,20">
<frame id="header" src="lp_header.php" border="0" frameborder="0" scrolling="no"/>
<?php
if ($displayAudioRecorder || $_SESSION['oLP']->get_preview_image()!='')
{
if($displayAudioRecorder) //if audio recorder is required (set a few lines above)
echo '<frame id="audiorecorder_id" name="audiorecorder_name" src="display_audiorecorder.php?show_audio=1" border="0" frameborder="0" scrolling="no"/>';
else
echo '<frame id="audiorecorder_id" name="audiorecorder_name" src="display_audiorecorder.php?show_audio=0" border="0" frameborder="0" scrolling="no"/>';
}
?>
<frame id="nav_id" name="nav_name" class="lp_nav" src="lp_nav.php" border="0" frameborder="0" />
<frame id="message_id" name="message_name" class="message" src="lp_message.php" border="0" frameborder="0" />
<frame id="toc_id" name="toc_name" class="lp_toc" src="lp_toc.php" border="0" frameborder="0" scrolling="no"/>
<frame id="lp_log_id" name="lp_log_name" class="lp_log" src="lp_log.php" border="0" frameborder="0" />
</frameset>
<frame id="content_id" name="content_name" src="<?php echo $src; ?>" border="0" frameborder="0">
</frame>
<frameset cols="270,*">
<frameset rows="30,120,<?php echo $audio_record_width; ?>50,500,*,20">
<frame id="header" src="lp_header.php" border="0" frameborder="0" scrolling="no"/>
<frame id="author_image" name="author_image" class="lp_author_image" src="lp_author_image.php" border="0" frameborder="0" />
<?php
if($displayAudioRecorder) //if audio recorder is required (set a few lines above)
echo '<frame id="audiorecorder_id" name="audiorecorder_name" src="display_audiorecorder.php" border="0" frameborder="0" scrolling="no"/>';
?>
<frame id="nav_id" name="nav_name" class="lp_nav" src="lp_nav.php" border="0" frameborder="0" />
<frame id="message_id" name="message_name" class="message" src="lp_message.php" border="0" frameborder="0" />
<frame id="toc_id" name="toc_name" class="lp_toc" src="lp_toc.php" border="0" frameborder="0" scrolling="no"/>
<frame id="lp_log_id" name="lp_log_name" class="lp_log" src="lp_log.php" border="0" frameborder="0" />
</frameset>
<frame id="content_id" name="content_name" src="<?php echo $src; ?>" border="0" frameborder="0">
</frame>
</frameset>
<noframes>
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.
</noframes>

Loading…
Cancel
Save