diff --git a/main/newscorm/audiorecorder.inc.php b/main/newscorm/audiorecorder.inc.php index ac401ddb64..82c71c58a4 100644 --- a/main/newscorm/audiorecorder.inc.php +++ b/main/newscorm/audiorecorder.inc.php @@ -11,7 +11,7 @@ $params = "?lzt=swf&lzr=swf8&document_id=".$audio_recorder_item_id."&dbName=".$_SESSION["_course"]["dbName"]."&user_id=".$_SESSION["_user"]["user_id"].'?studentview='.$audio_recorder_studentview ; -list($width, $height) = $audio_recorder_studentview ? array(220, 75) : array(220,140); +list($width, $height) = $audio_recorder_studentview ? array(220, 185) : array(220,140); $path_to_lzx = api_get_setting('service_ppt2lp','path_to_lzx'); diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php index 3a47ae1e4e..8a189903af 100644 --- a/main/newscorm/learnpath.class.php +++ b/main/newscorm/learnpath.class.php @@ -2647,7 +2647,7 @@ class learnpath { //if(empty($parent)){$parent = $this->ordered_items[$this->items[$this->current]->get_previous_index()];} $html .= '
'."\n" ; if($_SESSION["is_courseAdmin"]==1){ - $html.="lp_id."' target='_parent'>".get_lang("BasicOverview")."-lp_id."' style='font-size: 11px' target='_parent'>".get_lang("Advanced")."

"; + $html.="lp_id."' target='_parent'>".get_lang("BasicOverview")." - lp_id."' style='font-size: 11px' target='_parent'>".get_lang("Advanced")."

"; } // " onchange=\"javascript:document.getElementById('toc_$parent').focus();\">\n"; require_once('resourcelinker.inc.php'); @@ -4572,9 +4572,9 @@ class learnpath { $return .= $msg; $return .= '

' . stripslashes($row['title']) . '

'; - $return .= '

' . ((trim($row['description']) == '') ? 'no description' : stripslashes($row['description'])) . '

'; + //$return .= '

' . ((trim($row['description']) == '') ? 'no description' : stripslashes($row['description'])) . '

'; - $return .= '
'; + //$return .= '
'; if($row['item_type'] == TOOL_DOCUMENT) $return .= $this->display_document($row['path'], true, true); @@ -4755,7 +4755,7 @@ class learnpath { $row_doc = Database::fetch_array($res_doc); if($show_title) - $return .= '

' . $row_doc['title'] . ($edit_link ? ' [ Edit this document ]' : '') . '

'; + //$return .= '

' . $row_doc['title'] . ($edit_link ? ' [ Edit this document ]' : '') . '

'; //TODO: add a path filter if($iframe) @@ -5928,59 +5928,75 @@ class learnpath { */ function display_manipulate($item_id, $item_type = TOOL_DOCUMENT) { - $return = '
'; + $return = '
'; - switch($item_type) - { - case 'dokeos_chapter': - case 'chapter': - - $lang = get_lang('TitleManipulateChapter'); - break; - - case 'dokeos_module': - case 'module': - - $lang = get_lang('TitleManipulateModule'); - - break; - - case TOOL_DOCUMENT: - - $lang = get_lang('TitleManipulateDocument'); - - break; + switch($item_type) + { + case 'dokeos_chapter': + case 'chapter': - case TOOL_LINK: - case 'link': - - $lang = get_lang('TitleManipulateLink'); - - break; + $lang = get_lang('TitleManipulateChapter'); + break; - case TOOL_QUIZ: - - $lang = get_lang('TitleManipulateQuiz'); - - break; + case 'dokeos_module': + case 'module': - case TOOL_STUDENTPUBLICATION: - - $lang = get_lang('TitleManipulateStudentPublication'); - - break; - } - - $return .= '

' . $lang . '

'; + $lang = get_lang('TitleManipulateModule'); + + break; + + case TOOL_DOCUMENT: + + $lang = get_lang('TitleManipulateDocument'); + + break; - $return .= 'Edit the current item '.get_lang("Edit").''; - $return .= 'Move the current item '.get_lang("Move").''; + case TOOL_LINK: + case 'link': + + $lang = get_lang('TitleManipulateLink'); + + break; - if($item_type != 'chapter' && $item_type != 'dokeos_chapter' && $item_type != 'module' && $item_type != 'dokeos_module') - $return .= ''.get_lang( '.get_lang("Prerequisites").''; + case TOOL_QUIZ: + + $lang = get_lang('TitleManipulateQuiz'); + + break; - $return .= 'Delete the current item '.get_lang("Delete").''; + case TOOL_STUDENTPUBLICATION: + + $lang = get_lang('TitleManipulateStudentPublication'); + + break; + } + $tbl_lp_item = Database::get_course_table('lp_item'); + + $sql = " + SELECT + description + FROM " . $tbl_lp_item . " as lp + WHERE + lp.id = " . $item_id; + + $result = api_sql_query($sql, __FILE__, __LINE__); + + $s_description=mysql_result($result,0,0); + + $return .= '

' . $lang . '

'; + + $return .= 'Edit the current item '.get_lang("Edit").''; + $return .= 'Move the current item '.get_lang("Move").''; + + if($item_type != 'chapter' && $item_type != 'dokeos_chapter' && $item_type != 'module' && $item_type != 'dokeos_module') + $return .= ''.get_lang( '.get_lang("Prerequisites").''; + + $return .= 'Delete the current item '.get_lang("Delete").''; + + $return .= '

' . ((trim($s_description) == '') ? ''.get_lang("NoDescription").'' : stripslashes(nl2br($s_description))) . '

'; + + $return.="
"; // get the audiorecorder. Use of ob_* functions since there are echos in the file ob_start(); @@ -5993,6 +6009,8 @@ class learnpath { ob_end_clean(); // end of audiorecorder include + $return.="
"; + $return .= '
'; diff --git a/main/newscorm/learnpath.css b/main/newscorm/learnpath.css index b866b73f00..7ebe129516 100644 --- a/main/newscorm/learnpath.css +++ b/main/newscorm/learnpath.css @@ -8,7 +8,7 @@ div.lp_small_form{background:#F8F8F8; border:1px solid #999999; padding:10px;} div.lp_small_form input{font-size:10px;} -div.lp_manipulate{background:#F8F8F8; border-bottom:1px dotted #999999; margin-bottom:10px; padding:3px 0 3px 10px;} +div.lp_manipulate{background:#F8F8F8; border-bottom:1px dotted #999999; margin-bottom:0px; padding:3px 0 3px 10px;} div.lp_manipulate a{padding-right:10px;} diff --git a/main/newscorm/lp_view.php b/main/newscorm/lp_view.php index 984384c2b9..63bed07458 100644 --- a/main/newscorm/lp_view.php +++ b/main/newscorm/lp_view.php @@ -160,7 +160,7 @@ if($_SESSION['oLP']->mode == 'fullscreen'){ - + ';