diff --git a/main/css/academica/scorm.css b/main/css/academica/scorm.css index 102441c2a3..908b49eb35 100644 --- a/main/css/academica/scorm.css +++ b/main/css/academica/scorm.css @@ -89,7 +89,10 @@ text-decoration: none; font-size: 12px; color: #fff; } - +.inner_lp_toc .scorm_title_text +{ + margin-left: 10px; +} .inner_lp_toc .scorm_status_img{ margin:0px; diff --git a/main/css/baby_orange/scorm.css b/main/css/baby_orange/scorm.css index 78b3b72f96..16f980cd40 100644 --- a/main/css/baby_orange/scorm.css +++ b/main/css/baby_orange/scorm.css @@ -90,7 +90,10 @@ font-weight: normal; color: #fff; } - +.inner_lp_toc .scorm_title_text +{ + margin-left: 10px; +} .inner_lp_toc .scorm_status_img{ diff --git a/main/css/corporate/scorm.css b/main/css/corporate/scorm.css index 513291cdcd..c6d1e5c86f 100644 --- a/main/css/corporate/scorm.css +++ b/main/css/corporate/scorm.css @@ -85,7 +85,10 @@ text-decoration: none; font-size: 12px; color: #FFF; } - +.inner_lp_toc .scorm_title_text +{ + margin-left: 10px; +} .inner_lp_toc .scorm_status_img{ margin:0px; margin-left: -10px; diff --git a/main/css/cosmic_campus/scorm.css b/main/css/cosmic_campus/scorm.css index 6882def835..7a0fac32da 100644 --- a/main/css/cosmic_campus/scorm.css +++ b/main/css/cosmic_campus/scorm.css @@ -101,7 +101,10 @@ font-size: 12px; color: #fff; } - +.inner_lp_toc .scorm_title_text +{ + margin-left: 10px; +} .inner_lp_toc .scorm_status_img{ margin:0px; diff --git a/main/css/dokeos_classic/scorm.css b/main/css/dokeos_classic/scorm.css index 2f4d71b288..3212434092 100644 --- a/main/css/dokeos_classic/scorm.css +++ b/main/css/dokeos_classic/scorm.css @@ -100,7 +100,10 @@ border-left: 15px #FFF solid; color: #fff; } - +.inner_lp_toc .scorm_title_text +{ + margin-left: 10px; +} .inner_lp_toc .scorm_status_img{ margin:0px; margin-left: -10px; diff --git a/main/css/dokeos_classic_2D/scorm.css b/main/css/dokeos_classic_2D/scorm.css index f71bb4ad45..76bf7d0bb3 100644 --- a/main/css/dokeos_classic_2D/scorm.css +++ b/main/css/dokeos_classic_2D/scorm.css @@ -99,7 +99,10 @@ border-left: 15px #FFF solid; font-size: 12px; color: #fff; } - +.inner_lp_toc .scorm_title_text +{ + margin-left: 10px; +} .inner_lp_toc .scorm_status_img{ margin:0px; diff --git a/main/css/medical/scorm.css b/main/css/medical/scorm.css index 2a2895d446..14379641da 100644 --- a/main/css/medical/scorm.css +++ b/main/css/medical/scorm.css @@ -100,7 +100,10 @@ font-size: 12px; color: #fff; } - +.inner_lp_toc .scorm_title_text +{ + margin-left: 10px; +} .inner_lp_toc .scorm_status_img{ margin:0px; diff --git a/main/css/silver_line/scorm.css b/main/css/silver_line/scorm.css index 4e6fe658ef..c61fc0362e 100644 --- a/main/css/silver_line/scorm.css +++ b/main/css/silver_line/scorm.css @@ -84,7 +84,10 @@ text-decoration: none; font-size: 12px; color: #FFF; } - +.inner_lp_toc .scorm_title_text +{ + margin-left: 10px; +} .inner_lp_toc .scorm_status_img{ diff --git a/main/css/sober_brown/scorm.css b/main/css/sober_brown/scorm.css index 1660cb9cb6..a8ad068b41 100644 --- a/main/css/sober_brown/scorm.css +++ b/main/css/sober_brown/scorm.css @@ -97,7 +97,10 @@ height: 100%; font-size: 12px; color: #fff; } - +.inner_lp_toc .scorm_title_text +{ + margin-left: 10px; +} .inner_lp_toc .scorm_status_img { diff --git a/main/newscorm/display_audiorecorder.php b/main/newscorm/display_audiorecorder.php index 77a7582d29..08d58d586a 100644 --- a/main/newscorm/display_audiorecorder.php +++ b/main/newscorm/display_audiorecorder.php @@ -10,8 +10,7 @@ * Script */ //flag to allow for anonymous user - needs to be set before global.inc.php -$use_anonymous = true; - +$use_anonymous = true; require_once('back_compat.inc.php'); require_once('learnpath.class.php'); require_once('scorm.class.php'); @@ -28,20 +27,44 @@ if(isset($_SESSION['lpobject'])) } $charset = $_SESSION['oLP']->encoding; -echo ' - '; +$lp_theme_css=$_SESSION['oLP']->get_theme(); +$scorm_css_header=true; +include_once('../inc/reduced_header.inc.php'); -echo '
'; - - -$audio_recorder_studentview = 'true'; +echo ' + '; +$html=''; -$audio_recorder_item_id = $_SESSION['oLP']->current; -if(api_get_setting('service_visio','active')=='true'){ - include('audiorecorder.inc.php'); +if ($_GET['show_audio']) +{ + $html='
'."\n"; + if ($_SESSION['oLP']->get_preview_image()!='') + $html .=''.$_SESSION['oLP']->get_author().'get_preview_image().'>'; + else + $html .=Display::display_icon('unknown.jpg',$_SESSION['oLP']->get_author()); + $html .='
'; + echo $html; + + echo '
'; + $audio_recorder_studentview = 'true'; + $audio_recorder_item_id = $_SESSION['oLP']->current; + if(api_get_setting('service_visio','active')=='true'){ + include('audiorecorder.inc.php'); + } + echo '
'; + // end of audiorecorder include +} +else +{ + $html='
'."\n"; + if ($_SESSION['oLP']->get_preview_image()!='') + $html .=''.$_SESSION['oLP']->get_author().'get_preview_image().'>'; + else + $html .=Display::display_icon('unknown.jpg',$_SESSION['oLP']->get_author()); + $html .='
'; + echo $html; } -// end of audiorecorder include -echo '
'; +echo ''; ?> \ No newline at end of file diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php index 435e910bce..ee6748c24f 100644 --- a/main/newscorm/learnpath.class.php +++ b/main/newscorm/learnpath.class.php @@ -2478,12 +2478,12 @@ class learnpath { //$parent = $this->items[$this->current]->get_parent(); //if(empty($parent)){$parent = $this->ordered_items[$this->items[$this->current]->get_previous_index()];} $html = '
'."\n" ; - $html.= '
    '.mb_convert_encoding($this->get_name(),$this->encoding,$mych).'
'; + $html.= '
'.mb_convert_encoding($this->get_name(),$this->encoding,$mych).'
'; // build, display if(api_is_allowed_to_edit()) { - $html.="

    ".mb_convert_encoding(get_lang("Build"),$this->encoding,$mych)." | ".mb_convert_encoding(get_lang("BasicOverview"),$this->encoding,$mych)." | ".mb_convert_encoding(get_lang("Display"),$this->encoding,$mych)."

"; + $html.='

'."".mb_convert_encoding(get_lang("Build"),$this->encoding,$mych)." | ".mb_convert_encoding(get_lang("BasicOverview"),$this->encoding,$mych)." | ".mb_convert_encoding(get_lang("Display"),$this->encoding,$mych).'

'; unset($mych); } // " onchange=\"javascript:document.getElementById('toc_$parent').focus();\">\n"; diff --git a/main/newscorm/lp_header.php b/main/newscorm/lp_header.php index d1f2d7a0a7..dd66360f52 100644 --- a/main/newscorm/lp_header.php +++ b/main/newscorm/lp_header.php @@ -57,9 +57,11 @@ if($show_link) // else we don't display get_lang(ucfirst(TOOL_LEARNPATH)) in the breadcrumb since the learner accessed it directly from the course homepage $interbreadcrumb[] = array("url"=>"./lp_controller.php?action=view&lp_id=".$path_id,'name'=>$path_name); $noPHP_SELF = true; -$lp_theme_css=$_SESSION['oLP']->get_theme(); +echo $lp_theme_css=$_SESSION['oLP']->get_theme(); include('../inc/reduced_header.inc.php'); +echo '
'; echo ''.get_lang('CourseHomepageLink').''; +echo '
'; ?> \ No newline at end of file diff --git a/main/newscorm/lp_nav.php b/main/newscorm/lp_nav.php index 21b09dd4e7..20841afb6a 100644 --- a/main/newscorm/lp_nav.php +++ b/main/newscorm/lp_nav.php @@ -64,18 +64,7 @@ session_write_close(); ?> -'."\n"; -if ($_SESSION['oLP']->get_preview_image()!='') - $html .='get_preview_image().'>'; -if ($_SESSION['oLP']->get_author()!='') -{ - $html .='
'.get_lang('Author').': '.$_SESSION['oLP']->get_author(); -} -$html .='
'; -echo $html; -?>
diff --git a/main/newscorm/lp_view.php b/main/newscorm/lp_view.php index 6831a7b5a6..9d5d7f2931 100644 --- a/main/newscorm/lp_view.php +++ b/main/newscorm/lp_view.php @@ -172,20 +172,36 @@ else $audio_recorder_studentview = false; } //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; + $audio_record_width=''; + if ($displayAudioRecorder || $_SESSION['oLP']->get_preview_image()!='') + { + if ($displayAudioRecorder) + $audio_record_width='220,'; + else + $audio_record_width='120,'; + } + else + { + $audio_record_width=''; + } ?> - + '; + if ($displayAudioRecorder || $_SESSION['oLP']->get_preview_image()!='') + { + if($displayAudioRecorder) //if audio recorder is required (set a few lines above) + echo ''; + else + echo ''; + } ?> - - - - + + +