diff --git a/main/newscorm/img/arrow_down_0.gif b/main/img/arrow_down_0.gif similarity index 100% rename from main/newscorm/img/arrow_down_0.gif rename to main/img/arrow_down_0.gif diff --git a/main/newscorm/img/arrow_down_0.png b/main/img/arrow_down_0.png similarity index 100% rename from main/newscorm/img/arrow_down_0.png rename to main/img/arrow_down_0.png diff --git a/main/newscorm/img/arrow_down_1.gif b/main/img/arrow_down_1.gif similarity index 100% rename from main/newscorm/img/arrow_down_1.gif rename to main/img/arrow_down_1.gif diff --git a/main/newscorm/img/arrow_down_1.png b/main/img/arrow_down_1.png similarity index 100% rename from main/newscorm/img/arrow_down_1.png rename to main/img/arrow_down_1.png diff --git a/main/newscorm/img/arrow_down_2.gif b/main/img/arrow_down_2.gif similarity index 100% rename from main/newscorm/img/arrow_down_2.gif rename to main/img/arrow_down_2.gif diff --git a/main/newscorm/img/arrow_down_2.png b/main/img/arrow_down_2.png similarity index 100% rename from main/newscorm/img/arrow_down_2.png rename to main/img/arrow_down_2.png diff --git a/main/newscorm/img/arrow_up_0.gif b/main/img/arrow_up_0.gif similarity index 100% rename from main/newscorm/img/arrow_up_0.gif rename to main/img/arrow_up_0.gif diff --git a/main/newscorm/img/arrow_up_0.png b/main/img/arrow_up_0.png similarity index 100% rename from main/newscorm/img/arrow_up_0.png rename to main/img/arrow_up_0.png diff --git a/main/newscorm/img/arrow_up_1.gif b/main/img/arrow_up_1.gif similarity index 100% rename from main/newscorm/img/arrow_up_1.gif rename to main/img/arrow_up_1.gif diff --git a/main/newscorm/img/arrow_up_1.png b/main/img/arrow_up_1.png similarity index 100% rename from main/newscorm/img/arrow_up_1.png rename to main/img/arrow_up_1.png diff --git a/main/newscorm/img/arrow_up_2.gif b/main/img/arrow_up_2.gif similarity index 100% rename from main/newscorm/img/arrow_up_2.gif rename to main/img/arrow_up_2.gif diff --git a/main/newscorm/img/arrow_up_2.png b/main/img/arrow_up_2.png similarity index 100% rename from main/newscorm/img/arrow_up_2.png rename to main/img/arrow_up_2.png diff --git a/main/newscorm/img/blanco.png b/main/img/blanco.png similarity index 100% rename from main/newscorm/img/blanco.png rename to main/img/blanco.png diff --git a/main/newscorm/img/css.png b/main/img/css.png similarity index 100% rename from main/newscorm/img/css.png rename to main/img/css.png diff --git a/main/newscorm/img/empty.gif b/main/img/empty2.gif similarity index 100% rename from main/newscorm/img/empty.gif rename to main/img/empty2.gif diff --git a/main/newscorm/img/html.png b/main/img/html.png similarity index 100% rename from main/newscorm/img/html.png rename to main/img/html.png diff --git a/main/newscorm/img/image.png b/main/img/image.png similarity index 100% rename from main/newscorm/img/image.png rename to main/img/image.png diff --git a/main/newscorm/img/join.gif b/main/img/join.gif similarity index 100% rename from main/newscorm/img/join.gif rename to main/img/join.gif diff --git a/main/newscorm/img/joinbottom.gif b/main/img/joinbottom.gif similarity index 100% rename from main/newscorm/img/joinbottom.gif rename to main/img/joinbottom.gif diff --git a/main/newscorm/img/line.gif b/main/img/line.gif similarity index 100% rename from main/newscorm/img/line.gif rename to main/img/line.gif diff --git a/main/newscorm/img/lp.png b/main/img/lp.png similarity index 100% rename from main/newscorm/img/lp.png rename to main/img/lp.png diff --git a/main/newscorm/img/lp_document.png b/main/img/lp_document.png similarity index 100% rename from main/newscorm/img/lp_document.png rename to main/img/lp_document.png diff --git a/main/newscorm/img/lp_dokeos_chapter.png b/main/img/lp_dokeos_chapter.png similarity index 100% rename from main/newscorm/img/lp_dokeos_chapter.png rename to main/img/lp_dokeos_chapter.png diff --git a/main/newscorm/img/lp_dokeos_chapter_add.png b/main/img/lp_dokeos_chapter_add.png similarity index 100% rename from main/newscorm/img/lp_dokeos_chapter_add.png rename to main/img/lp_dokeos_chapter_add.png diff --git a/main/newscorm/img/lp_dokeos_module.png b/main/img/lp_dokeos_module.png similarity index 100% rename from main/newscorm/img/lp_dokeos_module.png rename to main/img/lp_dokeos_module.png diff --git a/main/newscorm/img/lp_dokeos_module_add.png b/main/img/lp_dokeos_module_add.png similarity index 100% rename from main/newscorm/img/lp_dokeos_module_add.png rename to main/img/lp_dokeos_module_add.png diff --git a/main/newscorm/img/lp_dokeos_step_add.png b/main/img/lp_dokeos_step_add.png similarity index 100% rename from main/newscorm/img/lp_dokeos_step_add.png rename to main/img/lp_dokeos_step_add.png diff --git a/main/newscorm/img/lp_folder.png b/main/img/lp_folder.png similarity index 100% rename from main/newscorm/img/lp_folder.png rename to main/img/lp_folder.png diff --git a/main/newscorm/img/lp_link.png b/main/img/lp_link.png similarity index 100% rename from main/newscorm/img/lp_link.png rename to main/img/lp_link.png diff --git a/main/newscorm/img/lp_quiz.png b/main/img/lp_quiz.png similarity index 100% rename from main/newscorm/img/lp_quiz.png rename to main/img/lp_quiz.png diff --git a/main/newscorm/img/lp_student_publication.png b/main/img/lp_student_publication.png similarity index 100% rename from main/newscorm/img/lp_student_publication.png rename to main/img/lp_student_publication.png diff --git a/main/img/lp_thread.gif b/main/img/lp_thread.gif new file mode 100644 index 0000000000..9a0d1cf086 Binary files /dev/null and b/main/img/lp_thread.gif differ diff --git a/main/newscorm/img/minus.gif b/main/img/minus.gif similarity index 100% rename from main/newscorm/img/minus.gif rename to main/img/minus.gif diff --git a/main/newscorm/img/minusbottom.gif b/main/img/minusbottom.gif similarity index 100% rename from main/newscorm/img/minusbottom.gif rename to main/img/minusbottom.gif diff --git a/main/newscorm/img/nolines_minus.gif b/main/img/nolines_minus.gif similarity index 100% rename from main/newscorm/img/nolines_minus.gif rename to main/img/nolines_minus.gif diff --git a/main/newscorm/img/nolines_plus.gif b/main/img/nolines_plus.gif similarity index 100% rename from main/newscorm/img/nolines_plus.gif rename to main/img/nolines_plus.gif diff --git a/main/newscorm/img/plus.gif b/main/img/plus.gif similarity index 100% rename from main/newscorm/img/plus.gif rename to main/img/plus.gif diff --git a/main/newscorm/img/plusbottom.gif b/main/img/plusbottom.gif similarity index 100% rename from main/newscorm/img/plusbottom.gif rename to main/img/plusbottom.gif diff --git a/main/newscorm/dtree.js b/main/newscorm/dtree.js index f74d1c0b64..7bbbd1438e 100644 --- a/main/newscorm/dtree.js +++ b/main/newscorm/dtree.js @@ -84,33 +84,33 @@ function dTree(objName) { this.icon = { - root : 'img/lp.png', + root : '../img/lp.png', - folder : 'img/folder.gif', + folder : '../img/folder.gif', - folderOpen : 'img/folderopen.gif', + folderOpen : '../img/folderopen.gif', - node : 'img/page.gif', + node : '../img/page.gif', - empty : 'img/empty.gif', + empty : '../img/empty2.gif', - line : 'img/line.gif', + line : '../img/line.gif', - join : 'img/join.gif', + join : '../img/join.gif', - joinBottom : 'img/joinbottom.gif', + joinBottom : '../img/joinbottom.gif', - plus : 'img/plus.gif', + plus : '../img/plus.gif', - plusBottom : 'img/plusbottom.gif', + plusBottom : '../img/plusbottom.gif', - minus : 'img/minus.gif', + minus : '../img/minus.gif', - minusBottom : 'img/minusbottom.gif', + minusBottom : '../img/minusbottom.gif', - nlPlus : 'img/nolines_plus.gif', + nlPlus : '../img/nolines_plus.gif', - nlMinus : 'img/nolines_minus.gif' + nlMinus : '../img/nolines_minus.gif' }; diff --git a/main/newscorm/kevin_lp_add.php b/main/newscorm/kevin_lp_add.php index aa4d0a82c6..ad2d5d7016 100644 --- a/main/newscorm/kevin_lp_add.php +++ b/main/newscorm/kevin_lp_add.php @@ -157,12 +157,12 @@ echo ''; echo '

'; - echo ''.get_lang('.get_lang("NewChapter").''; + echo ''.get_lang('.get_lang("NewChapter").''; echo '

'; echo '

'; - echo ''.get_lang('.get_lang("NewStep").''; + echo ''.get_lang('.get_lang("NewStep").''; echo '

'; diff --git a/main/newscorm/kevin_lp_add_item.php b/main/newscorm/kevin_lp_add_item.php index df2383c617..723c7e4bf2 100644 --- a/main/newscorm/kevin_lp_add_item.php +++ b/main/newscorm/kevin_lp_add_item.php @@ -187,12 +187,12 @@ echo '
'; echo '

'; - echo ''.get_lang('.get_lang("NewChapter").''; + echo ''.get_lang('.get_lang("NewChapter").''; echo '

'; echo '

'; - echo ''.get_lang('.get_lang("NewStep").''; + echo ''.get_lang('.get_lang("NewStep").''; echo '

'; diff --git a/main/newscorm/kevin_lp_build.php b/main/newscorm/kevin_lp_build.php index 8ab6d22021..3076db2ff3 100644 --- a/main/newscorm/kevin_lp_build.php +++ b/main/newscorm/kevin_lp_build.php @@ -204,12 +204,12 @@ echo '
'; echo '

'; - echo ''.get_lang('.get_lang("NewChapter").''; + echo ''.get_lang('.get_lang("NewChapter").''; echo '

'; echo '

'; - echo ''.get_lang('.get_lang("NewStep").''; + echo ''.get_lang('.get_lang("NewStep").''; echo '

'; diff --git a/main/newscorm/kevin_lp_edit_item.php b/main/newscorm/kevin_lp_edit_item.php index 2a3cda438a..de6a43f9d8 100644 --- a/main/newscorm/kevin_lp_edit_item.php +++ b/main/newscorm/kevin_lp_edit_item.php @@ -186,12 +186,12 @@ echo '
'; echo '

'; - echo ''.get_lang('.get_lang("NewChapter").''; + echo ''.get_lang('.get_lang("NewChapter").''; echo '

'; echo '

'; - echo ''.get_lang('.get_lang("NewStep").''; + echo ''.get_lang('.get_lang("NewStep").''; echo '

'; diff --git a/main/newscorm/kevin_lp_edit_item_prereq.php b/main/newscorm/kevin_lp_edit_item_prereq.php index d8d6797a74..7868e3ca21 100644 --- a/main/newscorm/kevin_lp_edit_item_prereq.php +++ b/main/newscorm/kevin_lp_edit_item_prereq.php @@ -184,12 +184,12 @@ echo '
'; echo '

'; - echo ''.get_lang('.get_lang("NewChapter").''; + echo ''.get_lang('.get_lang("NewChapter").''; echo '

'; echo '

'; - echo ''.get_lang('.get_lang("NewStep").''; + echo ''.get_lang('.get_lang("NewStep").''; echo '

'; diff --git a/main/newscorm/kevin_lp_move_item.php b/main/newscorm/kevin_lp_move_item.php index 469595e88b..f01d0e92a3 100644 --- a/main/newscorm/kevin_lp_move_item.php +++ b/main/newscorm/kevin_lp_move_item.php @@ -187,12 +187,12 @@ echo '
'; echo '

'; - echo ''.get_lang('.get_lang("NewChapter").''; + echo ''.get_lang('.get_lang("NewChapter").''; echo '

'; echo '

'; - echo ''.get_lang('.get_lang("NewStep").''; + echo ''.get_lang('.get_lang("NewStep").''; echo '

'; diff --git a/main/newscorm/kevin_lp_view_item.php b/main/newscorm/kevin_lp_view_item.php index 1858a7e4e5..dac87049d7 100644 --- a/main/newscorm/kevin_lp_view_item.php +++ b/main/newscorm/kevin_lp_view_item.php @@ -188,12 +188,12 @@ echo '
'; echo '

'; - echo ''.get_lang('.get_lang("NewChapter").''; + echo ''.get_lang('.get_lang("NewChapter").''; echo '

'; echo '

'; - echo ''.get_lang('.get_lang("NewStep").''; + echo ''.get_lang('.get_lang("NewStep").''; echo '

'; diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php index fce98cbffe..d66095d31f 100644 --- a/main/newscorm/learnpath.class.php +++ b/main/newscorm/learnpath.class.php @@ -2554,12 +2554,12 @@ class learnpath { $html .= ' '.stripslashes($title).'' ; + 'return false;" > '.stripslashes($title).'' ; } elseif($item['type']=='dokeos_module' || $item['type']=='dokeos_chapter'){ - $html .= " ".stripslashes($title); + $html .= " ".stripslashes($title); } elseif($item['type']=='dir'){ @@ -4114,7 +4114,7 @@ class learnpath { $return .= "\t" . '' . "\n"; - $return .= "\t\t" . '' . "\n"; + $return .= "\t\t" . '' . "\n"; //$return .= "\t\t" . '' . "\n"; if(api_is_allowed_to_edit()) @@ -4128,7 +4128,7 @@ class learnpath { $return .= '' . "\n"; } else - $return .= "\t\t\t" . '' . "\n"; + $return .= "\t\t\t" . '' . "\n"; if($arrLP[$i]['next_item_id'] != 0) { @@ -4137,7 +4137,7 @@ class learnpath { $return .= '' . "\n"; } else - $return .= "\t\t\t" . '' . "\n"; + $return .= "\t\t\t" . '' . "\n"; $return .= "\t\t" . '' . "\n"; @@ -4237,9 +4237,18 @@ class learnpath { for($i = 0; $i < count($arrLP); $i++) { $menu_page = $_SERVER['PHP_SELF'] . '?cidReq=' . $_GET['cidReq'] . '&action=view_item&id=' . $arrLP[$i]['id'] . '&lp_id=' . $_SESSION['oLP']->lp_id; - - $return .= "\tm.add(" . $arrLP[$i]['id'] . ", " . $arrLP[$i]['parent_item_id'] . ", '" . $arrLP[$i]['title'] . "', '" . $menu_page . "', '', '', 'img/lp_" . $arrLP[$i]['item_type'] . ".png', 'img/lp_" . $arrLP[$i]['item_type'] . ".png');\n"; - + if(file_exists("../img/lp_" . $arrLP[$i]['item_type'] . ".png")) + { + $return .= "\tm.add(" . $arrLP[$i]['id'] . ", " . $arrLP[$i]['parent_item_id'] . ", '" . $arrLP[$i]['title'] . "', '" . $menu_page . "', '', '', '../img/lp_" . $arrLP[$i]['item_type'] . ".png', '../img/lp_" . $arrLP[$i]['item_type'] . ".png');\n"; + } + else if(file_exists("../img/lp_" . $arrLP[$i]['item_type'] . ".gif")) + { + $return .= "\tm.add(" . $arrLP[$i]['id'] . ", " . $arrLP[$i]['parent_item_id'] . ", '" . $arrLP[$i]['title'] . "', '" . $menu_page . "', '', '', '../img/lp_" . $arrLP[$i]['item_type'] . ".gif', '../img/lp_" . $arrLP[$i]['item_type'] . ".gif');\n"; + } + else + { + $return .= "\tm.add(" . $arrLP[$i]['id'] . ", " . $arrLP[$i]['parent_item_id'] . ", '" . $arrLP[$i]['title'] . "', '" . $menu_page . "', '', '', '../img/lp_document.png', '../img/lp_document.png');\n"; + } if($menu < $arrLP[$i]['id']) $menu = $arrLP[$i]['id']; } @@ -4541,6 +4550,20 @@ class learnpath { $return .= $this->display_manipulate($item_id, $row['item_type']); $return .= $this->display_student_publication_form('edit', $item_id, $row); + break; + + case TOOL_FORUM: + + $return .= $this->display_manipulate($item_id, $row['item_type']); + $return .= $this->display_forum_form('edit', $item_id, $row); + + break; + + case TOOL_THREAD: + + $return .= $this->display_manipulate($item_id, $row['item_type']); + $return .= $this->display_thread_form('edit', $item_id, $row); + break; } } @@ -6539,7 +6562,7 @@ function display_thread_form($action = 'add', $id = 0, $extra_info = '') $return .= ''; @@ -6600,7 +6623,7 @@ function display_thread_form($action = 'add', $id = 0, $extra_info = '') ORDER BY path ASC"; $res_doc = api_sql_query($sql_doc, __FILE__, __LINE__); - $return = '
'.get_lang("Document").'
'; + $return = '
'.get_lang("Document").'
'; $return .= '
'; while($row_doc = Database::fetch_array($res_doc)) @@ -6610,7 +6633,7 @@ function display_thread_form($action = 'add', $id = 0, $extra_info = '') $return .= '
'; - $return .= ''; + $return .= ''; if($row_doc['filetype'] == 'file') $return .= '' . $row_doc['title'] . ''; @@ -6643,14 +6666,14 @@ function display_thread_form($action = 'add', $id = 0, $extra_info = '') ORDER BY title ASC"; $res_quiz = api_sql_query($sql_quiz, __FILE__, __LINE__); - $return .= '
'.get_lang("Exercise").'
'; + $return .= '
'.get_lang("Exercise").'
'; $return .= '
'; while($row_quiz = Database::fetch_array($res_quiz)) { $return .= '
'; - $return .= ''; + $return .= ''; $return .= '' . $row_quiz['title'] . ''; //$return .= $row_quiz['title']; @@ -6680,14 +6703,14 @@ function display_thread_form($action = 'add', $id = 0, $extra_info = '') ORDER BY title ASC"; $res_link = api_sql_query($sql_link, __FILE__, __LINE__); - $return .= '
Links
'; + $return .= '
Links
'; $return .= '
' . stripslashes($arrLP[$i]['title']) . '' . stripslashes($arrLP[$i]['title']) . '' . stripslashes($arrLP[$i]['description']) . ''; $return .= ''; - $return .= ''; + $return .= ''; $return .= ''; $return .= '