Просмотр исходного кода

Merge pull request #1008 from aragonc/10818

PR BT#10818 fix view scorm
José Loguercio 9 лет назад
Родитель
Сommit
9eab8597c1

+ 20 - 12
main/newscorm/learnpath.class.php

@@ -1950,23 +1950,31 @@ class learnpath
         if(empty($idBar)){
             $idBar='control-top';
         }
-        if(empty($display)){
+        /* if(empty($display)){
             $display='display:block';
-        }
+        } */
         $navbar = null;
         $lp_id = $this->lp_id;
         $mycurrentitemid = $this->get_current_item_id();
 
         if ($this->mode == 'fullscreen') {
             $navbar = '
-                  <div id="'.$idBar.'" class="buttons well" style="'.$display.'">
-                    <a href="lp_controller.php?action=stats&'.api_get_cidreq(true).'&lp_id='.$lp_id.'" onclick="window.parent.API.save_asset();return true;" target="content_name_blank" title="stats" id="stats_link"><img border="0" src="../img/btn_stats.png" title="' . get_lang('Reporting') . '"></a>
-                    <a id="scorm-previous" href="#" onclick="switch_item(' . $mycurrentitemid . ',\'previous\');return false;" title="previous"><img border="0" src="../img/btn_previous.png" title="' . get_lang('ScormPrevious') . '"></a>
-                    <a id="scorm-next" href="#" onclick="switch_item(' . $mycurrentitemid . ',\'next\');return false;" title="next"  ><img border="0" src="../img/btn_next.png" title="' . get_lang('ScormNext') . '"></a>.
-                    <a href="lp_controller.php?action=mode&mode=embedded" target="_top" title="embedded mode"><img border="0" src="../img/view_choose.gif" title="'.get_lang('ScormExitFullScreen').'"></a>
-                  </div>';
+                  <span id="'.$idBar.'" class="buttons">
+                    <a class="icon-toolbar" href="lp_controller.php?action=stats&'.api_get_cidreq(true).'&lp_id='.$lp_id.'" onclick="window.parent.API.save_asset();return true;" target="content_name" title="stats" id="stats_link">
+                        <span class="fa fa-info"></span><span class="sr-only">' . get_lang('Reporting') . '</span>
+                    </a>
+                    <a class="icon-toolbar" id="scorm-previous" href="#" onclick="switch_item(' . $mycurrentitemid . ',\'previous\');return false;" title="previous">
+                        <span class="fa fa-chevron-left"></span><span class="sr-only">' . get_lang('ScormPrevious') . '</span>
+                    </a>
+                    <a class="icon-toolbar" id="scorm-next" href="#" onclick="switch_item(' . $mycurrentitemid . ',\'next\');return false;" title="next">
+                        <span class="fa fa-chevron-right"></span><span class="sr-only">' . get_lang('ScormNext') . '</span>
+                    </a>
+                    <a class="icon-toolbar" id="view-embedded" href="lp_controller.php?action=mode&mode=embedded" target="_top" title="embedded mode">
+                        <span class="fa fa-columns"></span><span class="sr-only">' . get_lang('ScormExitFullScreen') . '</span>
+                    </a> 
+                  </span>';
 
-        } else {
+        } else { 
             $navbar = '
                 <span id="'.$idBar.'" class="buttons text-right">
                     <a class="icon-toolbar" href="lp_controller.php?action=stats&'.api_get_cidreq(true).'&lp_id='.$lp_id.'" onclick="window.parent.API.save_asset();return true;" target="content_name" title="stats" id="stats_link">
@@ -5068,13 +5076,13 @@ class learnpath
             $default_view_mode = $row['default_view_mod'];
             $view_mode = $default_view_mode;
             switch ($default_view_mode) {
-                case 'fullscreen':
+                case 'fullscreen': // default with popup
                     $view_mode = 'embedded';
                     break;
-                case 'embedded':
+                case 'embedded': // default view with left menu
                     $view_mode = 'embedframe';
                     break;
-                case 'embedframe':
+                case 'embedframe': //folded menu
                     $view_mode = 'impress';
                     break;
                 case 'impress':

+ 5 - 2
main/newscorm/lp_view.php

@@ -31,7 +31,7 @@ $show_learnpath = true;
 
 api_protect_course_script();
 
-$lp_id = intval($_GET['lp_id']);
+$lp_id = !empty($_GET['lp_id'])?intval($_GET['lp_id']):0;
 $sessionId = api_get_session_id();
 
 // Check if the learning path is visible for student - (LP requisites)
@@ -93,6 +93,9 @@ $(document).ready(function() {
 var chamilo_xajax_handler = window.oxajax;
 </script>';
 
+if ($_SESSION['oLP']->mode == 'embedframe' || $_SESSION['oLP']->get_hide_toc_frame() == 1) {
+    $htmlHeadXtra[] = '';
+}
 
 //Impress js
 if ($_SESSION['oLP']->mode == 'impress') {
@@ -123,7 +126,7 @@ $htmlHeadXtra[] = '<script src="js/documentapi.js" type="text/javascript" langua
 $htmlHeadXtra[] = '<script>
 var sv_user = \'' . api_get_user_id() . '\';
 var sv_course = chamilo_courseCode;
-var sv_sco = \'' . intval($_REQUEST['lp_id']) . '\';
+var sv_sco = \'' . $lp_id . '\';
 </script>'; // FIXME fetch sco and userid from a more reliable source directly in sotrageapi.js
 $htmlHeadXtra[] = '<script type="text/javascript" src="js/storageapi.js"></script>';
 

+ 22 - 3
main/template/default/learnpath/view.tpl

@@ -1,4 +1,4 @@
-<div id="learning_path_main" class="{{ is_allowed_to_edit ? 'lp-view-include-breadcrumb' }}">
+<div id="learning_path_main" class="{{ is_allowed_to_edit ? 'lp-view-include-breadcrumb' }} {{ lp_mode == 'embedframe' ? 'lp-view-collapsed' }}">
     {% if is_allowed_to_edit %}
         <div id="learning_path_breadcrumb_zone" class="hidden-xs">
             {{ breadcrumb }}
@@ -102,8 +102,13 @@
                 <div class="lp-view-zone-container">
                     <div id="lp_navigation_elem" class="navegation-bar pull-right text-right">
                         <a href="#" id="lp-view-expand-toggle" class="icon-toolbar expand" role="button">
-                            <span class="fa fa-expand" aria-hidden="true"></span>
-                            <span class="sr-only">{{ 'Expand'|get_lang }}</span>
+                            {% if lp_mode == 'embedframe' %}
+                                <span class="fa fa-compress" aria-hidden="true"></span>
+                                <span class="sr-only">{{ 'Expand'|get_lang }}</span>
+                            {% else %}
+                                <span class="fa fa-expand" aria-hidden="true"></span>
+                                <span class="sr-only">{{ 'Expand'|get_lang }}</span>
+                            {% endif %}
                         </a>
                         <a id="home-course" href="{{ button_home_url }}" class="icon-toolbar" target="_self" onclick="javascript: window.parent.API.save_asset();">
                             <em class="fa fa-home"></em> <span class="hidden-xs hidden-sm"></span>
@@ -156,6 +161,18 @@
         };
 
         $(document).on('ready', function () {
+            
+            {% if lp_mode == 'embedframe' %}
+                //$('#learning_path_main').addClass('lp-view-collapsed');
+                $('#lp-view-expand-button, #lp-view-expand-toggle').on('click', function (e) {
+                e.preventDefault();
+
+                $('#learning_path_main').toggleClass('lp-view-collapsed');
+
+                $('#lp-view-expand-toggle span.fa').toggleClass('fa-compress');
+                $('#lp-view-expand-toggle span.fa').toggleClass('fa-expand');
+            });
+            {% else %}
             $('#lp-view-expand-button, #lp-view-expand-toggle').on('click', function (e) {
                 e.preventDefault();
 
@@ -164,6 +181,8 @@
                 $('#lp-view-expand-toggle span.fa').toggleClass('fa-expand');
                 $('#lp-view-expand-toggle span.fa').toggleClass('fa-compress');
             });
+            
+            {% endif %}
 
             $('.lp-view-tabs').on('click', '.disabled', function (e) {
                 e.preventDefault();