From 762ea68ec929d374bc1269cb445988ecb5586e65 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 29 Apr 2011 16:45:31 +0200 Subject: [PATCH] Some other fixes in the LP view --- main/inc/lib/banner.lib.php | 12 +- main/newscorm/learnpath.class.php | 498 +++++++++++++------------- main/newscorm/lp_add.php | 5 +- main/newscorm/lp_add_item.php | 2 +- main/newscorm/lp_admin_view.php | 19 +- main/newscorm/lp_build.php | 4 +- main/newscorm/lp_controller.php | 2 +- main/newscorm/lp_edit.php | 15 +- main/newscorm/lp_edit_item.php | 2 +- main/newscorm/lp_edit_item_prereq.php | 2 +- main/newscorm/lp_list.php | 2 +- main/newscorm/lp_move_item.php | 2 +- main/newscorm/lp_view_item.php | 2 +- 13 files changed, 289 insertions(+), 278 deletions(-) diff --git a/main/inc/lib/banner.lib.php b/main/inc/lib/banner.lib.php index 8dd4d2b42d..b17bc90dee 100755 --- a/main/inc/lib/banner.lib.php +++ b/main/inc/lib/banner.lib.php @@ -505,10 +505,14 @@ function show_header_4($interbreadcrumb, $language_file, $nameTools) { $navigation[] = $navigation_item; } // part 2: Interbreadcrumbs. If there is an array $interbreadcrumb defined then these have to appear before the last breadcrumb (which is the tool itself) - if (isset($interbreadcrumb) && is_array($interbreadcrumb)) { + if (isset($interbreadcrumb) && is_array($interbreadcrumb)) { foreach ($interbreadcrumb as $breadcrumb_step) { - $sep = (strrchr($breadcrumb_step['url'], '?') ? '&' : '?'); - $navigation_item['url'] = $breadcrumb_step['url'].$sep.api_get_cidreq(); + if ($breadcrumb_step['url'] != '#') { + $sep = (strrchr($breadcrumb_step['url'], '?') ? '&' : '?'); + $navigation_item['url'] = $breadcrumb_step['url'].$sep.api_get_cidreq(); + } else { + $navigation_item['url'] = '#'; + } $navigation_item['title'] = $breadcrumb_step['name']; // titles for shared folders if ($breadcrumb_step['name'] == 'shared_folder') { @@ -535,6 +539,7 @@ function show_header_4($interbreadcrumb, $language_file, $nameTools) { } } + // part 3: The tool itself. If we are on the course homepage we do not want to display the title of the course because this // is the same as the first part of the breadcrumbs (see part 1) if (isset($nameTools) && $language_file != 'course_home') { // TODO: This condition $language_file != 'course_home' might bring surprises. @@ -545,6 +550,7 @@ function show_header_4($interbreadcrumb, $language_file, $nameTools) { $final_navigation = array(); $counter = 0; + foreach ($navigation as $index => $navigation_info) { if (!empty($navigation_info['title'])) { if ($navigation_info['url'] == '#') { diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php index f6ba344a7a..8b2020137d 100755 --- a/main/newscorm/learnpath.class.php +++ b/main/newscorm/learnpath.class.php @@ -2,13 +2,12 @@ /* For licensing terms, see /license.txt */ /** - * This (abstract?) class defines the parent attributes and methods for Chamilo learnpaths and scorm + * This class defines the parent attributes and methods for Chamilo learnpaths and SCORM * learnpaths. It is used by the scorm class. * * @package chamilo.learnpath * @author Yannick Warnier * @author Julio Montoya Improvements - * @license GNU/GPL */ /** @@ -4558,31 +4557,42 @@ class learnpath { $gradebook = Security :: remove_XSS($_GET['gradebook']); $return .= '
'; $return .= '' . Display :: return_icon('build_learnpath.png', get_lang('Build'),'','32').''; - $return .= '' . Display :: return_icon('move_learnpath_na.png', get_lang('BasicOverview'),'','32').''; + if ($_GET['updateaudio'] == 'true') { + $return .=''.Display::return_icon('move_learnpath.png', get_lang('BasicOverview'),'','32').''; + } else { + $return .= '' . Display :: return_icon('move_learnpath_na.png', get_lang('BasicOverview'),'','32').''; + } + $return .= '' . Display :: return_icon('view_left_right.png', get_lang('Display'),'','32').''; $return .= ' '.Display :: return_icon('i.gif'); $return .= ' '. Display :: return_icon('new_learnigpath_object.png', get_lang('NewStep'),'','32').''; $return .= ' '. Display :: return_icon('add_learnpath_section.png', get_lang('NewChapter'),'','32').''; + if ($_GET['updateaudio'] == 'true') { + $return .= Display::url(Display :: return_icon('upload_audio_na.png', get_lang('UpdateAllAudioFragments'),'','32'),'#'); + } else { + $return .= '' . Display :: return_icon('upload_audio.png', get_lang('UpdateAllAudioFragments'),'','32').''; + } $return .= '' . Display :: return_icon('settings.png', get_lang('CourseSettings'),'','32').''; - $return .= '' . Display :: return_icon('upload_audio.png', get_lang('UpdateAllAudioFragments'),'','32').''; $return .= '
'; } // we need to start a form when we want to update all the mp3 files if ($_GET['updateaudio'] == 'true' AND count($arrLP) <> 0) { $return .= '
'; - $return .= Display :: display_warning_message(get_lang('LeaveEmptyToKeepCurrentFile')); + $return .= Display::return_message(get_lang('LeaveEmptyToKeepCurrentFile'), 'warning'); } $return .= ''; - $return .= "\t" . ''; - $return .= "\t" . ''; - //$return .= "\t" . ''; - $return .= "\t" . ''; - $return .= "\t" . ''; - $return .= "\t" . ''; - $return .= "\t" . ''; + $return .= ''; + $return .= ''; + //$return .= ''; + $return .= ''; + if (!$_GET['updateaudio'] OR $_GET['updateaudio'] <> 'true') { + $return .= ''; + } + $return .= ''; + $return .= ''; for ($i = 0; $i < count($arrLP); $i++) { $title = $arrLP[$i]['title']; @@ -4595,23 +4605,23 @@ class learnpath { $oddclass = 'row_even'; } - $return .= "\t" . ''; + $return .= ''; $icon_name = str_replace(' ', '', $arrLP[$i]['item_type']); if (file_exists('../img/lp_' . $icon_name . '.png')) { - $return .= "\t\t" . ''; + $return .= ''; } else { if (file_exists('../img/lp_' . $icon_name . '.gif')) { - $return .= "\t\t" . ''; + $return .= ''; } else { - //$return .= "\t\t" . ''; - $return .= "\t\t" . ''; + //$return .= ''; + $return .= ''; } } - //$return .= "\t\t" . ''; + //$return .= ''; // The audio column. - $return .= "\t\t" . ''; if ($is_allowed_to_edit) { - $return .= ''; + if (!$_GET['updateaudio'] OR $_GET['updateaudio'] <> 'true') { + $return .= ''; + } $return .= ''; @@ -4681,9 +4692,9 @@ class learnpath { } if (count($arrLP) == 0) { - $return .= "\t" . ''; - $return .= "\t\t" . ''; - $return .= "\t" . ''; + $return .= ''; + $return .= ''; + $return .= ''; } $return .= '
' . get_lang('Title') . ''.get_lang('Description').'' . get_lang('Audio') . '' . get_lang('Move') . '' . get_lang('Actions') . '
' . get_lang('Title') . ''.get_lang('Description').'' . get_lang('Audio') . '' . get_lang('Move') . '' . get_lang('Actions') . '
' . $title . '' . $title . '' . $title . '' . $title . '' . Display::display_icon('folder_document.gif','',array('style'=>'margin-right:3px;')) . $title . '' . $title . '' . Display::display_icon('folder_document.gif','',array('style'=>'margin-right:3px;')) . $title . '' . $title . '' . stripslashes($arrLP[$i]['description']) . '' . stripslashes($arrLP[$i]['description']) . ''; + $return .= ''; if (!$_GET['updateaudio'] OR $_GET['updateaudio'] <> 'true') { if (!empty ($arrLP[$i]['audio'])) { $return .= 'Get the Flash Player to see this player.'; @@ -4637,41 +4647,42 @@ class learnpath { $return .= ''; - - if ($arrLP[$i]['previous_item_id'] != 0) { - - $return .= ''; - $return .= ''; - $return .= ''; - - } else - $return .= ''; - - if ($arrLP[$i]['next_item_id'] != 0) { - $return .= ''; - $return .= ''; - - $return .= ''; - } else - $return .= ''; - - $return .= ''; + + if ($arrLP[$i]['previous_item_id'] != 0) { + $return .= ''; + $return .= ''; + $return .= ''; + } else { + $return .= ''; + } + + if ($arrLP[$i]['next_item_id'] != 0) { + $return .= ''; + $return .= ''; + + $return .= ''; + } else + $return .= ''; + + $return .= ''; if ($arrLP[$i]['item_type'] != 'dokeos_chapter' && $arrLP[$i]['item_type'] != 'dokeos_module') { - $return .= "\t\t\t" . ''; - $return .= ''; + $return .= ''; + $return .= ''; $return .= ''; } else { - $return .= "\t\t\t" . ''; - $return .= ''; + $return .= ''; + $return .= ''; $return .= ''; } - $return .= "\t\t\t" . ''; - $return .= ''; + $return .= ''; + $return .= ''; $return .= ''; $return .= '
' . get_lang('NoItemsInLp') . '
' . get_lang('NoItemsInLp') . '
'; // We need to close the form when we are updating the mp3 files. @@ -4715,9 +4726,8 @@ class learnpath { echo '' . Display :: return_icon('new_learnigpath_object.png', get_lang('NewStep'),'','32').''; echo '' . Display :: return_icon('add_learnpath_section.png', get_lang('NewChapter'),'','32').''; - - echo '' . Display :: return_icon('settings.png', get_lang('CourseSettings'),'','32').''; echo '' . Display :: return_icon('upload_audio.png', get_lang('UpdateAllAudioFragments'),'','32').''; + echo '' . Display :: return_icon('settings.png', get_lang('CourseSettings'),'','32').''; echo ''; } @@ -5254,19 +5264,19 @@ class learnpath { $return .= '
'; $return .= ''; - $return .= "\t" . ''; + $return .= '
'; if ($action != 'move') { - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t" . ''; + $return .= ''; + $return .= ''; + $return .= ''; + $return .= ''; } - $return .= "\t\t" . ''; + $return .= ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; + $return .= ''; $return .= ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; + $return .= ''; - $return .= "\t\t" . ''; + $return .= ''; + $return .= ''; if ($action != 'move') { $id_prerequisite = 0; if (is_array($arrLP)) { @@ -5339,9 +5349,9 @@ class learnpath { } } /*// Commented the prerequisites, only visible in edit (exercise). - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; + $return .= ''; + $return .= '"; */ - $return .= "\t\t" . ''; - /*$return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; + $return .= ''; + /*$return .= ''; + $return .= ''; + $return .= ''; // Remove temporarily the test description. - //$return .= "\t\t\t" . ''; - //$return .= "\t\t\t" . ''; + //$return .= ''; + //$return .= ''; - $return .= "\t\t" . ''; */ + $return .= ''; */ } - $return .= "\t\t" . ''; + $return .= ''; if ($action == 'add') { $return .= ''; } else { $return .= ''; } - $return .= "\t\t" . ''; - $return .= "\t" . '
'; + $return .= ''; $return .= "\t\t\t\t" . '
'; + $return .= ''; $return .= "\t\t\t\t" . ''; - $return .= "\t\t\t" . '
  
'; + $return .= ''; + $return .= ''; if ($action == 'move') { - $return .= "\t" . ''; - $return .= "\t" . ''; + $return .= ''; + $return .= ''; } if (is_numeric($extra_info)) { - $return .= "\t" . ''; + $return .= ''; } elseif (is_array($extra_info)) { - $return .= "\t" . ''; + $return .= ''; } - $return .= "\t" . ''; - $return .= "\t" . ''; + $return .= ''; + $return .= ''; $return .= ''; $return .= '
'; @@ -5478,10 +5488,10 @@ class learnpath { } $return .= '
'; - $return .= "\t" . ''; - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; + $return .= ''; + $return .= ''; + $return .= '
'; + $return .= ''; + $return .= ''; + $return .= ''; + $return .= ''; - $return .= "\t\t" . ''; - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; + $return .= ''; + $return .= ''; + $return .= ''; + $return .= ''; - $return .= "\t\t" . ''; + $return .= ''; + $return .= ''; if ($action != 'move') { - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t" . ''; + $return .= ''; + $return .= ''; + $return .= ''; + $return .= ''; $id_prerequisite = 0; if (is_array($arrLP) && count($arrLP) > 0) { foreach ($arrLP as $key => $value) { @@ -5556,10 +5566,10 @@ class learnpath { } } - //$return .= "\t\t" . ''; + //$return .= ''; - //$return .= "\t\t\t" . ''; - //$return .= "\t\t\t" . ''; + //$return .= '"; - //$return .= "\t\t" . ''; - //$return .= "\t\t" . ''; - //$return .= "\t\t" . ''; + //$return .= ''; + //$return .= ''; + //$return .= ''; } - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t" . ''; - $return .= "\t" . '
'; $return .= "\t\t\t\t" . ''; - $return .= "\t\t\t" . '
'; + $return .= '
'; $return .= "\t\t\t\t" . ''; - $return .= "\t\t\t" . '
 
'; + $return .= '
 
'; if ($action == 'move') { - $return .= "\t" . ''; - $return .= "\t" . ''; + $return .= ''; + $return .= ''; } if (is_numeric($extra_info)) { - $return .= "\t" . ''; + $return .= ''; } elseif (is_array($extra_info)) { - $return .= "\t" . ''; + $return .= ''; } - $return .= "\t" . ''; - $return .= "\t" . ''; + $return .= ''; + $return .= ''; $return .= '
'; @@ -5686,18 +5696,18 @@ class learnpath { '; $return .= '
'; $return .= '
'; - $return .= "\t" . ''; + $return .= '
'; if ($action != 'move') { - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t" . ''; + $return .= ''; + $return .= ''; + $return .= ''; + $return .= ''; } - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; + $return .= ''; + $return .= ''; - $return .= "\t\t" . ''; - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; + $return .= ''; + $return .= ''; + $return .= ''; + $return .= ''; - $return .= "\t\t" . ''; + $return .= ''; + $return .= ''; if ($action != 'move') { - $return .= "\t\t" . ''; - $return .= "\t\t" . ''; + $return .= ''; + $return .= ''; $id_prerequisite = 0; if (is_array($arrLP)) { foreach ($arrLP as $key => $value) { @@ -5767,31 +5777,31 @@ class learnpath { $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title']; } } - $return .= "\t\t" . ''; + $return .= ''; } - $return .= "\t\t" . ''; + $return .= ''; if ($action == 'add') { $return .= ''; } else { $return .= ''; } - $return .= "\t\t" . ''; - $return .= "\t" . '
'; + $return .= '
'; $return .= "\t\t\t\t" . ''; - $return .= "\t\t\t" . '
'; + $return .= '
'; $return .= "\t\t\t\t" . ''; - $return .= "\t\t\t" . '
  
'; + $return .= ''; + $return .= ''; if ($action == 'move') { - $return .= "\t" . ''; - $return .= "\t" . ''; + $return .= ''; + $return .= ''; } if (is_numeric($extra_info)) { - $return .= "\t" . ''; + $return .= ''; } elseif (is_array($extra_info)) { - $return .= "\t" . ''; + $return .= ''; } - $return .= "\t" . ''; - $return .= "\t" . ''; + $return .= ''; + $return .= ''; $return .= '
'; $return .= '
'; return $return; @@ -5889,10 +5899,10 @@ class learnpath { $return .= '

' . get_lang('EditCurrentForum') . ' :

'; $return .= '
'; - $return .= "\t" . ''; - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; + $return .= '
'; + $return .= ''; + $return .= ''; + $return .= ''; + $return .= ''; - $return .= "\t\t" . ''; - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; + $return .= ''; + $return .= ''; + $return .= ''; + $return .= ''; - $return .= "\t\t" . ''; + $return .= ''; + $return .= ''; if ($action != 'move') { - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t" . ''; - $return .= "\t\t" . ''; - $return .= "\t\t" . ''; + $return .= ''; + $return .= ''; + $return .= ''; + $return .= ''; + $return .= ''; + $return .= ''; $id_prerequisite = 0; if ($arrLP != null) { @@ -5966,9 +5976,9 @@ class learnpath { } } - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; + $return .= ''; + $return .= '"; - $return .= "\t\t" . ''; + $return .= ''; } - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; + $return .= ''; - $return .= "\t\t" . ''; - $return .= "\t" . '
'; $return .= "\t\t\t\t" . ''; - $return .= "\t\t\t" . '
'; + $return .= '
'; $return .= "\t\t\t\t" . ''; - $return .= "\t\t\t" . '
+ $return .= '
'; + $return .= '
'; if ($action == 'move') { - $return .= "\t" . ''; - $return .= "\t" . ''; + $return .= ''; + $return .= ''; } if (is_numeric($extra_info)) { - $return .= "\t" . ''; + $return .= ''; } elseif (is_array($extra_info)) { - $return .= "\t" . ''; + $return .= ''; } - $return .= "\t" . ''; - $return .= "\t" . ''; + $return .= ''; + $return .= ''; $return .= '
'; $return .= ''; return $return; @@ -6629,18 +6639,18 @@ class learnpath { '; $return .= '
'; $return .= '
'; - $return .= "\t" . ''; + $return .= '
'; if ($action != 'move') { - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t" . ''; + $return .= ''; + $return .= ''; + $return .= ''; + $return .= ''; } - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; + $return .= ''; + $return .= ''; - $return .= "\t\t" . ''; - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; + $return .= ''; + $return .= ''; + $return .= ''; + $return .= ''; - $return .= "\t\t" . ''; + $return .= ''; + $return .= ''; if ($action != 'move') { - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t" . ''; + $return .= ''; + $return .= ''; + $return .= ''; + $return .= ''; $id_prerequisite = 0; if (is_array($arrLP)) { foreach ($arrLP as $key => $value) { @@ -6718,9 +6728,9 @@ class learnpath { } /*// Commented the prerequisites, only visible in edit (link). - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; + $return .= ''; + $return .= '"; */ - $return .= "\t\t" . ''; + $return .= ''; } - $return .= "\t\t" . ''; + $return .= ''; if ($action == 'add') { $return .= ''; } else { $return .= ''; } - $return .= "\t\t" . ''; - $return .= "\t" . '
'; + $return .= '
'; $return .= "\t\t\t\t" . ''; - $return .= "\t\t\t" . '
'; + $return .= '
'; $return .= "\t\t\t\t" . ''; - $return .= "\t\t\t" . '
  
'; + $return .= ''; + $return .= ''; if ($action == 'move') { - $return .= "\t" . ''; - $return .= "\t" . ''; + $return .= ''; + $return .= ''; } if (is_numeric($extra_info)) { - $return .= "\t" . ''; + $return .= ''; } elseif (is_array($extra_info)) { - $return .= "\t" . ''; + $return .= ''; } - $return .= "\t" . ''; - $return .= "\t" . ''; + $return .= ''; + $return .= ''; $return .= '
'; $return .= '
'; return $return; @@ -6850,14 +6860,14 @@ class learnpath { $return .= '
'; $return .= ''; if ($action != 'move') { - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t" . ''; - } - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; + $return .= ''; + $return .= ''; + $return .= ''; + } + $return .= ''; + $return .= ''; + $return .= ''; - $return .= "\t\t" . ''; - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; + $return .= ''; + $return .= ''; + $return .= ''; + $return .= ''; - $return .= "\t\t" . ''; + $return .= ''; + $return .= ''; if ($action != 'move') { $id_prerequisite = 0; if (is_array($arrLP)) { @@ -6926,9 +6936,9 @@ class learnpath { // Commented the prerequisites, only visible in edit (work). /* - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; + $return .= ''; + $return .= '"; */ - $return .= "\t\t" . ''; + $return .= ''; } - $return .= "\t\t" . ''; + $return .= ''; if ($action == 'add') { $return .= ''; } else { $return .= ''; } - $return .= "\t\t" . ''; + $return .= ''; - $return .= "\t" . '
'; + $return .= '
'; $return .= "\t\t\t\t" . ''; - $return .= "\t\t\t" . '
'; + $return .= '
'; $return .= "\t\t\t\t" . ''; - $return .= "\t\t\t" . '
  
'; + $return .= ''; if ($action == 'move') { - $return .= "\t" . ''; - $return .= "\t" . ''; + $return .= ''; + $return .= ''; } if (is_numeric($extra_info)) { - $return .= "\t" . ''; + $return .= ''; } elseif (is_array($extra_info)) { - $return .= "\t" . ''; + $return .= ''; } - $return .= "\t" . ''; - $return .= "\t" . ''; + $return .= ''; + $return .= ''; $return .= '
'; $return .= ''; return $return; @@ -7197,21 +7207,21 @@ class learnpath { $return .= '

' . $title . '

'; $return .= '
'; $return .= ''; - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t" . ''; + $return .= ''; + $return .= ''; + $return .= ''; + $return .= ''; // It said these lines of code - see SVN#11724 and SVN#10770 - //$return .= "\t\t" . ''; - //$return .= "\t\t\t" . ''; - //$return .= "\t\t\t" . ''; - //$return .= "\t\t" . ''; - $return .= "\t\t" . ''; - $return .= "\t\t\t" . ''; - $return .= "\t\t" . ''; - $return .= "\t\t" . '
'; - $return .= "\t" . ''; - $return .= "\t" . ''; + //$return .= ''; + //$return .= ''; + //$return .= ''; + //$return .= ''; + $return .= ''; + $return .= ''; + $return .= ''; + $return .= ''; + $return .= ''; + $return .= ''; $return .= '
'; $return .= ''; return $return; diff --git a/main/newscorm/lp_add.php b/main/newscorm/lp_add.php index 9417b4c8fd..0e8e529186 100755 --- a/main/newscorm/lp_add.php +++ b/main/newscorm/lp_add.php @@ -101,10 +101,9 @@ if (!empty($gradebook) && $gradebook=='view') { ); } -$interbreadcrumb[] = array('url' => 'lp_controller.php?action=list', 'name' => get_lang('_learning_path')); -$interbreadcrumb[] = array('url' => '#', 'name' => get_lang('_add_learnpath')); +$interbreadcrumb[] = array('url' => 'lp_controller.php?action=list', 'name' => get_lang('LearningPaths')); -Display::display_header(null, 'Path'); +Display::display_header(get_lang('_add_learnpath'), 'Path'); echo '
'; echo ''.Display::return_icon('back.png', get_lang('ReturnToLearningPaths'),'','32').''; diff --git a/main/newscorm/lp_add_item.php b/main/newscorm/lp_add_item.php index 147f70deed..cac638c112 100755 --- a/main/newscorm/lp_add_item.php +++ b/main/newscorm/lp_add_item.php @@ -201,7 +201,7 @@ if (!empty($gradebook) && $gradebook == 'view') { ); } -$interbreadcrumb[] = array('url' => 'lp_controller.php?action=list', 'name' => get_lang('_learning_path')); +$interbreadcrumb[] = array('url' => 'lp_controller.php?action=list', 'name' => get_lang('LearningPaths')); $interbreadcrumb[] = array('url' => api_get_self()."?action=build&lp_id=$learnpath_id", 'name' => stripslashes("{$therow['name']}")); switch($_GET['type']) { diff --git a/main/newscorm/lp_admin_view.php b/main/newscorm/lp_admin_view.php index 124bd91f9f..33bec7bff8 100755 --- a/main/newscorm/lp_admin_view.php +++ b/main/newscorm/lp_admin_view.php @@ -88,9 +88,13 @@ if (!empty($gradebook) && $gradebook == 'view') { ); } -$interbreadcrumb[] = array('url' => 'lp_controller.php?action=list', 'name' => get_lang('_learning_path')); - -$interbreadcrumb[] = array('url' => api_get_self()."?action=admin_view&lp_id=$learnpath_id", "name" => stripslashes("{$therow['name']}")); +$interbreadcrumb[] = array('url' => 'lp_controller.php?action=list', 'name' => get_lang('LearningPaths')); +$interbreadcrumb[] = array('url' => api_get_self()."?action=build&lp_id=$learnpath_id", "name" => stripslashes("{$therow['name']}")); +if (isset($_REQUEST['updateaudio'])) { + $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('UpdateAllAudioFragments')); +} else { + $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('BasicOverview')); +} // Theme calls. $show_learn_path = true; @@ -129,21 +133,16 @@ function confirmation(name) switch ($_GET['action']) { case 'edit_item': - if (isset($is_success) && $is_success === true) { Display::display_confirmation_message(get_lang('_learnpath_item_edited')); } else { echo $_SESSION['oLP']->display_edit_item($_GET['id']); } - break; - case 'delete_item': - if (isset($is_success) && $is_success === true) { Display::display_confirmation_message(get_lang('_learnpath_item_deleted')); } - break; } @@ -166,9 +165,7 @@ if (isset($_POST['save_audio'])) { if (count($lp_items_to_remove_audio)>0) { $sql = "UPDATE $tbl_lp_item SET audio = '' WHERE id IN (".$in.")"; $result = Database::query($sql); - } - - + } // Uploading the audio files. foreach ($_FILES as $key => $value) { diff --git a/main/newscorm/lp_build.php b/main/newscorm/lp_build.php index 45f03cc469..5ded762aa8 100755 --- a/main/newscorm/lp_build.php +++ b/main/newscorm/lp_build.php @@ -107,13 +107,13 @@ if (!empty($gradebook) && $gradebook == 'view') { 'name' => get_lang('ToolGradebook') ); } -$interbreadcrumb[] = array('url' => 'lp_controller.php?action=list', 'name' => get_lang('_learning_path')); +$interbreadcrumb[] = array('url' => 'lp_controller.php?action=list', 'name' => get_lang('LearningPaths')); $interbreadcrumb[] = array('url' => api_get_self()."?action=build&lp_id=$learnpath_id", "name" => stripslashes("{$therow['name']}")); // Theme calls. $lp_theme_css=$_SESSION['oLP']->get_theme(); $show_learn_path = true; -Display::display_header(get_lang('LearningPath'), 'Path'); +Display::display_header('', 'Path'); //api_display_tool_title($therow['name']); diff --git a/main/newscorm/lp_controller.php b/main/newscorm/lp_controller.php index 31ee93265a..cdaaacaa8f 100755 --- a/main/newscorm/lp_controller.php +++ b/main/newscorm/lp_controller.php @@ -33,7 +33,7 @@ $language_file[] = 'registration'; // Including the global initialization file. require_once '../inc/global.inc.php'; -$htmlHeadXtra[] = api_get_jquery_js(); //jQuery +$htmlHeadXtra[] = api_get_jquery_js(); if (api_get_setting('show_glossary_in_documents') == 'ismanual' || api_get_setting('show_glossary_in_documents') == 'isautomatic' ) { $htmlHeadXtra[] = ''; -Display::display_header(null, 'Path'); +Display::display_header(get_lang('CourseSettings'), 'Path'); // Action links echo '
'; @@ -60,10 +58,11 @@ echo ' '.Display::return_icon('add_learnpath_section.png', get_lang('NewChapter'),'','32').''; -echo ''.Display::return_icon('scorms.png',get_lang('ReturnToLearningPaths'),'','32').''; - echo ''.Display::return_icon('upload_audio.png', get_lang('UpdateAllAudioFragments'),'','32').''; +echo Display::url(Display::return_icon('settings_na.png', get_lang('CourseSettings'),'','32'), '#'); +//echo ''.Display::return_icon('scorms_na.png',get_lang('ReturnToLearningPaths'),'','32').''; + echo '
'; $defaults=array(); diff --git a/main/newscorm/lp_edit_item.php b/main/newscorm/lp_edit_item.php index 9c1318876d..9892c0b440 100755 --- a/main/newscorm/lp_edit_item.php +++ b/main/newscorm/lp_edit_item.php @@ -94,7 +94,7 @@ if (!empty($gradebook) && $gradebook == 'view') { 'name' => get_lang('ToolGradebook') ); } -$interbreadcrumb[] = array('url' => 'lp_controller.php?action=list', 'name' => get_lang('_learning_path')); +$interbreadcrumb[] = array('url' => 'lp_controller.php?action=list', 'name' => get_lang('LearningPaths')); $interbreadcrumb[] = array('url' => api_get_self()."?action=build&lp_id=$learnpath_id", 'name' => stripslashes("{$therow['name']}")); // Theme calls. diff --git a/main/newscorm/lp_edit_item_prereq.php b/main/newscorm/lp_edit_item_prereq.php index 206ffc623f..a803a9ec2e 100755 --- a/main/newscorm/lp_edit_item_prereq.php +++ b/main/newscorm/lp_edit_item_prereq.php @@ -89,7 +89,7 @@ if (!empty($gradebook) && $gradebook == 'view') { ); } -$interbreadcrumb[] = array('url' => 'lp_controller.php?action=list', 'name' => get_lang('_learning_path')); +$interbreadcrumb[] = array('url' => 'lp_controller.php?action=list', 'name' => get_lang('LearningPaths')); $interbreadcrumb[] = array('url' => api_get_self()."?action=build&lp_id=$learnpath_id", 'name' => stripslashes("{$therow['name']}")); diff --git a/main/newscorm/lp_list.php b/main/newscorm/lp_list.php index 062709aa61..cdfa6a9f6b 100755 --- a/main/newscorm/lp_list.php +++ b/main/newscorm/lp_list.php @@ -37,7 +37,7 @@ function confirmation(name) { {return false;} } "; -$nameTools = get_lang(ucfirst(TOOL_LEARNPATH)); +$nameTools = get_lang('LearningPaths'); event_access_tool(TOOL_LEARNPATH); if (!$is_allowed_in_course) api_not_allowed(); diff --git a/main/newscorm/lp_move_item.php b/main/newscorm/lp_move_item.php index c01ca0e5bb..825f4cd31a 100755 --- a/main/newscorm/lp_move_item.php +++ b/main/newscorm/lp_move_item.php @@ -111,7 +111,7 @@ if (!empty($gradebook) && $gradebook == 'view') { ); } -$interbreadcrumb[] = array('url' => 'lp_controller.php?action=list', 'name' => get_lang('_learning_path')); +$interbreadcrumb[] = array('url' => 'lp_controller.php?action=list', 'name' => get_lang('LearningPaths')); $interbreadcrumb[] = array('url' => api_get_self()."?action=build&lp_id=$learnpath_id", 'name' => stripslashes("{$therow['name']}")); // Theme calls diff --git a/main/newscorm/lp_view_item.php b/main/newscorm/lp_view_item.php index 77184380ee..583ae8f8a6 100755 --- a/main/newscorm/lp_view_item.php +++ b/main/newscorm/lp_view_item.php @@ -111,7 +111,7 @@ if (!empty($gradebook) && $gradebook == 'view') { ); } -$interbreadcrumb[] = array('url' => 'lp_controller.php?action=list', 'name' => get_lang('_learning_path')); +$interbreadcrumb[] = array('url' => 'lp_controller.php?action=list', 'name' => get_lang('LearningPaths')); $interbreadcrumb[] = array('url' => api_get_self()."?action=build&lp_id=$learnpath_id", 'name' => stripslashes("{$therow['name']}")); // Theme calls