chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Implementing drag and drop when editing a LP see BT#4297 (some bugs still remaining ... )

Browse Source
skala
Julio Montoya 13 years ago
parent c8a4787cb4
commit a673f5578e
13 changed files with 428 additions and 257 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 30
      main/css/base.css
  2. BIN
      main/img/icons/16/delete.png
  3. BIN
      main/img/icons/16/edit.png
  4. BIN
      main/img/icons/16/forumthread.png
  5. BIN
      main/img/icons/16/move_everywhere.png
  6. BIN
      main/img/icons/22/move_everywhere.png
  7. 11
      main/inc/ajax/lp.ajax.php
  8. 78
      main/inc/lib/document.lib.php
  9. 23
      main/inc/lib/javascript/dtree/dtree.css
  10. 371
      main/newscorm/learnpath.class.php
  11. 140
      main/newscorm/lp_add_item.php
  12. 31
      main/newscorm/lp_admin_view.php
  13. 1
      main/newscorm/lp_controller.php

30
main/css/base.css
Unescape View File

@ -1981,12 +1981,13 @@ input.maininput:focus {
/* LP tool*/
div.lp_resource {
padding:5px 10px;
/* width:380px; */
.lp_resource {
padding:5px 10px;
list-style-type: none;
margin: 0;
padding: 0;
float:left;
width:70%;
}
.lp_resource_element, .lp_resource_element_no_link {
@ -2000,15 +2001,30 @@ div.lp_resource {
text-shadow: 0 1px 1px #F6F6F6;
margin:5px;
padding:5px;
list-style: none outside none;
}
.lp_resource_element_new {
background-image:-moz-linear-gradient(top,#fefefe,#eee);
background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fdfdfd),color-stop(1,#eee));
border: 1px solid #CCCCCC;
color: #444444;
cursor: pointer;
font-weight: bold;
text-decoration: none;
text-shadow: 0 1px 1px #F6F6F6;
margin:5px;
padding:5px;
list-style: none outside none;
}
.doc_resource {
margin:6px;
}
div.lp_tree {
height: 100%;
overflow: auto;
/* overflow: auto;*/
padding: 3px 10px 3px 0;
}
@ -2224,10 +2240,11 @@ div.admin_section h4 {
}
#lp_item_list {
width:90%;
margin:0px;
}
#lp_item_list, #lp_item_list li {
list-style-type: none;
float:left;
}
#lp_item_list ul, #lp_item_list li{
@ -2240,11 +2257,12 @@ div.admin_section h4 {
}
#lp_item_list .empty {
height:20px;
height:5px;
}
#lp_item_list .item_data {
padding:5px 0px 5px 0px;
float:left;
}
.ui-state-highlight {

BIN
main/img/icons/16/delete.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 881 B

After

Width:  |  Height:  |  Size: 792 B

BIN
main/img/icons/16/edit.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 645 B

BIN
main/img/icons/16/forumthread.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
main/img/icons/16/move_everywhere.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 659 B

BIN
main/img/icons/22/move_everywhere.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 831 B

11
main/inc/ajax/lp.ajax.php
Unescape View File

@ -9,8 +9,18 @@ api_protect_course_script(true);
$action = $_REQUEST['a'];
$course_id = api_get_course_int_id();
$tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
switch ($action) {
case 'add_lp_item':
if (api_is_allowed_to_edit(null, true)) {
if ($_SESSION['oLP']) {
//Updating the lp.modified_on
$_SESSION['oLP']->set_modified_on();
echo $_SESSION['oLP']->add_item($_REQUEST['parent_id'], $_REQUEST['previous_id'], $_REQUEST['type'], $_REQUEST['id'], $_REQUEST['title']);
}
}
break;
case 'update_lp_item_order':
if (api_is_allowed_to_edit(null, true)) {
$new_order = $_POST['new_order'];
@ -23,7 +33,6 @@ switch ($action) {
$new_array[$i]['parent_id'] = intval($parent_id);
$i++;
}
$tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
$counter = 1;
for ($i=0; $i < count($new_array); $i++) {
$params = array();

78
main/inc/lib/document.lib.php
Unescape View File

@ -2436,17 +2436,14 @@ class DocumentManager {
return $html;
}
function get_document_preview($course_info, $lp_id = false, $target = '', $session_id = 0) {
$course_info = api_get_course_info($course_info['code']);
function get_document_preview($course_info, $lp_id = false, $target = '', $session_id = 0, $add_move_button = false) {
$course_info = api_get_course_info($course_info['code']);
if (empty($course_info) || !is_array($course_info)) {
return '';
}
$user_id = api_get_user_id();
$user_id = api_get_user_id();
$user_in_course = false;
if (api_is_platform_admin()) {
$user_in_course = true;
}
@ -2477,8 +2474,7 @@ class DocumentManager {
}
}
}
$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
$tbl_doc = Database::get_course_table(TABLE_DOCUMENT);
$tbl_item_prop = Database::get_course_table(TABLE_ITEM_PROPERTY);
@ -2569,7 +2565,7 @@ class DocumentManager {
$new_array[$label] = array('id' => 0, 'files' => $resources_sorted);
$write_result = self::write_resources_tree($course_info, $session_id, $new_array, 0, $lp_id, $target);
$write_result = self::write_resources_tree($course_info, $session_id, $new_array, 0, $lp_id, $target, $add_move_button);
$return .= $write_result ;
@ -2581,7 +2577,7 @@ class DocumentManager {
$('.doc_folder').mouseover(function() {
var my_id = this.id.split('_')[2];
$('#'+my_id).show();
});
});
$('.close_div').click(function() {
var course_id = this.id.split('_')[2];
@ -2619,7 +2615,7 @@ class DocumentManager {
* @param integer Enables the tree display by shifting the new elements a certain distance to the right
* @return string The HTML list
*/
public function write_resources_tree($course_info, $session_id, $resources_sorted, $num = 0, $lp_id = false, $target = '') {
public function write_resources_tree($course_info, $session_id, $resources_sorted, $num = 0, $lp_id = false, $target = '', $add_move_button = false) {
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
$img_path = api_get_path(WEB_IMG_PATH);
@ -2661,30 +2657,32 @@ class DocumentManager {
}
$onclick = '';
if ($lp_id) {
$onclick = 'onclick="javascript: testResources(\'' . $resource['id'] . '\',\'img_' . $resource['id'] . '\')"';
$onclick = 'onclick="javascript: testResources(\'res_' . $resource['id'] . '\',\'img_' . $resource['id'] . '\')"';
}
$return .= '<div class="doc_resource">';
$return .= '<div class="doc_folder" id="doc_id_'.$resource['id'].'" style="margin-left:'.($num * 18).'px; margin-right:5px;">';
if ($lp_id) {
$return .= '<img style="cursor: pointer;" src="'.$img_path.'nolines_plus.gif" align="absmiddle" id="img_' . $resource['id'] . '" '.$onclick.' >';
} else {
$return .= '<span style="margin-left:16px">&nbsp;</span>';
}
$return .= '<img alt="" src="'.$img_path.'lp_folder.gif" title="" align="absmiddle" />&nbsp;';
$return .= '<span '.$onclick.' style="cursor: pointer;" >'.$title.'</span>';
$return .= '</div>
<div style="display: none;" id="'.$resource['id'].'">';
if (isset($resource['files'])) {
$return .= self::write_resources_tree($course_info, $session_id, $resource['files'], $num +1, $lp_id, $target);
}
$return .= '</div></div>';
$return .= '<ul class="lp_resource">';
$return .= '<div class="doc_folder" id="doc_id_'.$resource['id'].'" style="margin-left:'.($num * 18).'px; margin-right:5px;">';
if ($lp_id) {
$return .= '<img style="cursor: pointer;" src="'.$img_path.'nolines_plus.gif" align="absmiddle" id="img_' . $resource['id'] . '" '.$onclick.' >';
} else {
$return .= '<span style="margin-left:16px">&nbsp;</span>';
}
$return .= '<img alt="" src="'.$img_path.'lp_folder.gif" title="" align="absmiddle" />&nbsp;';
$return .= '<span '.$onclick.' style="cursor: pointer;" >'.$title.'</span>';
$return .= '</div>
<div style="display: none;" id="res_'.$resource['id'].'">';
if (isset($resource['files'])) {
$return .= self::write_resources_tree($course_info, $session_id, $resource['files'], $num +1, $lp_id, $target, $add_move_button);
}
$return .= '</div>';
$return .= '</ul>';
} else {
if (!is_array($resource)) {
//if (isset($resource)) {
//var_dump($resource);
if (!is_array($resource)) {
$resource = base64_decode($resource);
// It's a file.
$icon = choose_image($resource);
@ -2712,11 +2710,19 @@ class DocumentManager {
$img = $img_path.'icons/16/default_small.gif';
}
$link = Display::url('<img alt="" src="'.$img.'" title="" />&nbsp;' . $my_file_title, $url, array('target' => $target));
$return .= '<div class="doc_resource"><div style="margin-left:' . (($num +1) * 18) . 'px;margin-right:5px;">';
$link = Display::url('<img alt="" src="'.$img.'" title="" />&nbsp;' . $my_file_title, $url, array('target' => $target));
$return .= '<li class="doc_resource lp_resource_element" data_id="'.$key.'" data_type="document" title="'.$my_file_title.'" >';
$return .= '<div style="margin-left:' . (($num +1) * 18) . 'px;margin-right:5px;">';
if ($add_move_button) {
$return .= '<a class="moved" href="#">';
$return .= Display::return_icon('move_everywhere.png', get_lang('Move'), array(), ICON_SIZE_TINY);
$return .= '</a> ';
}
$return .= $link;
$return .= '</div></div>';
$return .= '</div></li>';
}
}
}

23
main/inc/lib/javascript/dtree/dtree.css
Unescape View File

@ -9,9 +9,22 @@
.dtree img{border:0; margin-right:5px; vertical-align:middle;}
.dtree a{color:#000000; font-weight:normal; text-decoration:none;}
.dtree a.node,
.dtree a.nodeSel{padding:1px 2px 1px 2px; white-space: nowrap;}
.dtree a.node:hover, .dtree a.nodeSel:hover{color:#000000; text-decoration:none;}
.dtree a.nodeSel{background:#F8F8F8; border:1px dashed #999999;}
.dtree a.node,
.dtree a.nodeSel{padding:1px 2px 1px 2px; white-space: nowrap;}
.dtree a.node:hover, .dtree a.nodeSel:hover{color:#000000; text-decoration:none;}
.dtree a.nodeSel{background:#F8F8F8; border:1px dashed #999999;}
.dtree .clip{overflow:hidden;}
.dtree .clip{overflow:hidden;}
/*
.dTreeNode {
background-image: -moz-linear-gradient(center top , #FEFEFE, #EEEEEE);
border: 1px solid #CCCCCC;
color: #444444;
cursor: pointer;
font-weight: bold;
margin: 0px 5px 2px 5px;
padding: 5px;
text-decoration: none;
text-shadow: 0 1px 1px #F6F6F6;
}*/

371
main/newscorm/learnpath.class.php
Unescape View File

@ -4744,51 +4744,18 @@ class learnpath {
* @param int $lp_id
* @return string
*/
public function overview() {
$course_id = api_get_course_int_id();
public function overview() {
$is_allowed_to_edit = api_is_allowed_to_edit(null,true);
if ($this->debug > 0) {
error_log('New LP - In learnpath::overview()', 0);
}
global $charset, $_course;
global $_course;
$_SESSION['gradebook'] = isset($_GET['gradebook']) ? Security :: remove_XSS($_GET['gradebook']) : null;
$return = '';
$tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
$sql = "SELECT * FROM " . $tbl_lp_item . "
WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
$result = Database::query($sql);
$arrLP = array ();
while ($row = Database :: fetch_array($result)) {
$row['title'] = Security :: remove_XSS($row['title']);
$row['description'] = Security :: remove_XSS($row['description']);
$arrLP[] = array (
'id' => $row['id'],
'item_type' => $row['item_type'],
'title' => $row['title'],
'path' => $row['path'],
'description' => $row['description'],
'parent_item_id' => $row['parent_item_id'],
'previous_item_id' => $row['previous_item_id'],
'next_item_id' => $row['next_item_id'],
'max_score' => $row['max_score'],
'min_score' => $row['min_score'],
'mastery_score' => $row['mastery_score'],
'prerequisite' => $row['prerequisite'],
'display_order' => $row['display_order'],
'audio' => $row['audio']
);
}
$this->tree_array($arrLP);
$arrLP = $this->arrMenu;
unset ($this->arrMenu);
$update_audio = isset($_GET['updateaudio']) ? $_GET['updateaudio'] : null;
if ($is_allowed_to_edit) {
$token = Security::get_token();
$update_audio = isset($_GET['updateaudio']) ? $_GET['updateaudio'] : null;
if ($is_allowed_to_edit) {
$gradebook = isset($_GET['gradebook']) ? Security :: remove_XSS($_GET['gradebook']) : null;
$return .= '<div class="actions">';
@ -4802,10 +4769,7 @@ class learnpath {
$return .= '<a href="lp_controller.php?cidReq=' . Security :: remove_XSS($_GET['cidReq']) . '&action=view&lp_id=' . $this->lp_id . '">' . Display :: return_icon('view_left_right.png', get_lang('Display'),'',ICON_SIZE_MEDIUM).'</a>';
$return .= ' '.Display :: return_icon('i.gif');
$return .= '<a href="' . api_get_self() . '?cidReq=' . Security :: remove_XSS($_GET['cidReq']) . '&amp;gradebook=' . $gradebook . '&amp;action=add_item&amp;type=step&amp;lp_id=' . $_SESSION['oLP']->lp_id . '" title="' . get_lang('NewStep') . '">
'. Display :: return_icon('new_learnigpath_object.png', get_lang('NewStep'),'',ICON_SIZE_MEDIUM).'</a>';
/*$return .= '<a href="' . api_get_self() . '?cidReq=' . Security :: remove_XSS($_GET['cidReq']) . '&amp;gradebook=' . $gradebook . '&amp;action=add_item&amp;type=chapter&amp;lp_id=' . $_SESSION['oLP']->lp_id . '" title="' . get_lang('NewChapter') . '">
'. Display :: return_icon('add_learnpath_section.png', get_lang('NewChapter'),'',ICON_SIZE_MEDIUM).'</a>';*/
'. Display :: return_icon('new_learnigpath_object.png', get_lang('NewStep'),'',ICON_SIZE_MEDIUM).'</a>';
if ($update_audio == 'true') {
$return .= Display::url(Display :: return_icon('upload_audio_na.png', get_lang('UpdateAllAudioFragments'),'',ICON_SIZE_MEDIUM),'#');
} else {
@ -4816,21 +4780,76 @@ class learnpath {
}
// we need to start a form when we want to update all the mp3 files
if ($update_audio == 'true' AND count($arrLP) <> 0) {
$return .= '<form action="' . api_get_self() . '?cidReq=' . Security :: remove_XSS($_GET['cidReq']) . '&amp;updateaudio=' . Security :: remove_XSS($_GET['updateaudio']) .'&amp;action=' . Security :: remove_XSS($_GET['action']) . '&amp;lp_id=' . $_SESSION['oLP']->lp_id . '" method="post" enctype="multipart/form-data" name="updatemp3" id="updatemp3">';
//$return .= Display::return_message(get_lang('LeaveEmptyToKeepCurrentFile'), 'warning');
if ($update_audio == 'true') {
$return .= '<form action="' . api_get_self() . '?cidReq=' . Security :: remove_XSS($_GET['cidReq']) . '&amp;updateaudio=' . Security :: remove_XSS($_GET['updateaudio']) .'&amp;action=' . Security :: remove_XSS($_GET['action']) . '&amp;lp_id=' . $_SESSION['oLP']->lp_id . '" method="post" enctype="multipart/form-data" name="updatemp3" id="updatemp3">';
}
$return .= '<div id="message"></div>';
$return_audio = '<table class="data_table">';
$return_audio .= '<tr>';
$return_audio .= '<th width="60%">' . get_lang('Title') . '</th>';
$return_audio .= '<th>' . get_lang('Audio') . '</th>';
//$return_audio .= '<th>' . get_lang('Actions') . '</th>';
$return_audio .= '<th>' . get_lang('Audio') . '</th>';
$return_audio .= '</tr>';
$elements = array();
if ($update_audio != 'true') {
$return .= '<div class="span12">';
$return .= self::return_new_tree($update_audio);
$return .='</div>';
$return .= Display::div(Display::url(get_lang('Save'), '#', array('id'=>'listSubmit', 'class'=>'btn')), array('style'=>'float:left; margin-top:15px;width:100%'));
} else {
$return_audio .= self::return_new_tree($update_audio);
$return .= $return_audio.'</table>';
}
// We need to close the form when we are updating the mp3 files.
if ($update_audio == 'true') {
$return .= '<div style="margin:40px 0; float:right;"><button class="save" type="submit" name="save_audio" id="save_audio">' . get_lang('SaveAudioAndOrganization') . '</button></div>'; // TODO: What kind of language variable is this?
}
// We need to close the form when we are updating the mp3 files.
if ($update_audio == 'true' && count($arrLP) != 0) {
$return .= '</form>';
}
return $return;
}
public function return_new_tree($update_audio = 'false') {
$is_allowed_to_edit = api_is_allowed_to_edit(null,true);
$course_id = api_get_course_int_id();
$tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
$sql = "SELECT * FROM $tbl_lp_item
WHERE c_id = $course_id AND lp_id = ".$this->lp_id;
$result = Database::query($sql);
$arrLP = array ();
while ($row = Database :: fetch_array($result)) {
$row['title'] = Security :: remove_XSS($row['title']);
$row['description'] = Security :: remove_XSS($row['description']);
$arrLP[] = array (
'id' => $row['id'],
'item_type' => $row['item_type'],
'title' => $row['title'],
'path' => $row['path'],
'description' => $row['description'],
'parent_item_id' => $row['parent_item_id'],
'previous_item_id' => $row['previous_item_id'],
'next_item_id' => $row['next_item_id'],
'max_score' => $row['max_score'],
'min_score' => $row['min_score'],
'mastery_score' => $row['mastery_score'],
'prerequisite' => $row['prerequisite'],
'display_order' => $row['display_order'],
'audio' => $row['audio']
);
}
$this->tree_array($arrLP);
$arrLP = $this->arrMenu;
unset ($this->arrMenu);
$elements = array();
for ($i = 0; $i < count($arrLP); $i++) {
$title = $arrLP[$i]['title'];
if (($i % 2) == 0) {
@ -4887,22 +4906,22 @@ class learnpath {
if ($is_allowed_to_edit) {
if (!$update_audio OR $update_audio <> 'true') {
$move_icon .= '<a class="moved" href="#">';
$move_icon .= Display::return_icon('move.png', get_lang('Move'), array(), 24);
$move_icon .= Display::return_icon('move_everywhere.png', get_lang('Move'), array(), ICON_SIZE_TINY);
$move_icon .= '</a>';
}
if ($arrLP[$i]['item_type'] != 'dokeos_chapter' && $arrLP[$i]['item_type'] != 'dokeos_module') {
$edit_icon .= '<a href="' . api_get_self() . '?cidReq=' . Security :: remove_XSS($_GET['cidReq']) . '&amp;action=edit_item&amp;view=build&amp;id=' . $arrLP[$i]['id'] . '&amp;lp_id=' . $this->lp_id . '&amp;path_item=' . $arrLP[$i]['path'] . '">';
$edit_icon .= '<img style="margin:1px;" alt="" src="../img/edit.png" title="' . get_lang('_edit_learnpath_module') . '" />';
$edit_icon .= '<a href="' . api_get_self() . '?cidReq=' . Security :: remove_XSS($_GET['cidReq']) . '&amp;action=edit_item&amp;view=build&amp;id=' . $arrLP[$i]['id'] . '&amp;lp_id=' . $this->lp_id . '&amp;path_item=' . $arrLP[$i]['path'] . '">';
$edit_icon .= Display::return_icon('edit.png', get_lang('_edit_learnpath_module'), array(), ICON_SIZE_TINY);
$edit_icon .= '</a>';
} else {
$edit_icon .= '<a href="' . api_get_self() . '?cidReq=' . Security :: remove_XSS($_GET['cidReq']) . '&amp;action=edit_item&amp;id=' . $arrLP[$i]['id'] . '&amp;lp_id=' . $this->lp_id . '&amp;path_item=' . $arrLP[$i]['path'] . '">';
$edit_icon .= '<img style="margin:1px;" alt="" src="../img/edit.png" title="' . get_lang('_edit_learnpath_module') . '" />';
$edit_icon .= '<a href="' . api_get_self() . '?cidReq=' . Security :: remove_XSS($_GET['cidReq']) . '&amp;action=edit_item&amp;id=' . $arrLP[$i]['id'] . '&amp;lp_id=' . $this->lp_id . '&amp;path_item=' . $arrLP[$i]['path'] . '">';
$edit_icon .= Display::return_icon('edit.png', get_lang('_edit_learnpath_module'), array(), ICON_SIZE_TINY);
$edit_icon .= '</a>';
}
$delete_icon .= '<a href="' . api_get_self() . '?cidReq=' . Security :: remove_XSS($_GET['cidReq']) . '&amp;action=delete_item&amp;id=' . $arrLP[$i]['id'] . '&amp;lp_id=' . $this->lp_id . '" onClick="return confirmation(\'' . addslashes($title) . '\');">';
$delete_icon .= '<img style="margin:1px;" alt="" src="../img/delete.png" title="' . get_lang('_delete_learnpath_module') . '" />';
$delete_icon .= ' <a href="' . api_get_self() . '?cidReq=' . Security :: remove_XSS($_GET['cidReq']) . '&amp;action=delete_item&amp;id=' . $arrLP[$i]['id'] . '&amp;lp_id=' . $this->lp_id . '" onClick="return confirmation(\'' . addslashes($title) . '\');">';
$delete_icon .= Display::return_icon('delete.png', get_lang('_delete_learnpath_module'), array(), ICON_SIZE_TINY);
$delete_icon .= '</a>';
}
if ($update_audio != 'true') {
@ -4924,11 +4943,9 @@ class learnpath {
//Getting list of parents
for($j = 0; $j < $arrLP[$i]['depth']; $j++) {
foreach($arrLP as $item) {
if ($item['id'] == $parent_id) {
if ($item['id'] == $parent_id) {
if ($item['parent_item_id'] == 0) {
$parent_id = $item['id'];
//$parent_arrays[] = $parent_id;
$parent_id = $item['id'];
break;
} else {
$parent_id = $item['parent_item_id'];
@ -4942,9 +4959,9 @@ class learnpath {
}
}
}
if (!empty($parent_arrays)) {
$parent_arrays = array_reverse($parent_arrays);
$value_to_insert = array();
$parent_arrays = array_reverse($parent_arrays);
$val = '$elements';
$x = 0;
foreach($parent_arrays as $item) {
@ -4955,8 +4972,7 @@ class learnpath {
}
$x++;
}
$val .= "";
$generated_array = null;
$val .= "";
$code_str = $val."[".$arrLP[$i]['id']."][\"load_data\"] = '".$arrLP[$i]['id']."' ; ";
eval($code_str);
} else {
@ -4964,67 +4980,40 @@ class learnpath {
$elements[$parent_id]['children'][$arrLP[$i]['id']]['type'] = $arrLP[$i]['item_type'];
}
}
}
//@todo move this somewhere else
function print_recursive($elements, $default_data, $default_content) {
$return = '';
foreach($elements as $key => $item) {
if (isset($item['load_data']) || empty($item['data'])) {
$item['data'] = $default_data[$item['load_data']];
$item['type'] = $default_content[$item['load_data']]['item_type'];
}
$sub_list = '';
if (isset($item['type']) && $item['type'] == 'dokeos_chapter') {
$sub_list = Display::tag('li', '', array('class'=>'sub_item empty')); // empty value
}
if (empty($item['children'])) {
$sub_list = Display::tag('ul', $sub_list, array('id'=>'UL_'.$key, 'class'=>'record li_container'));
$return .= Display::tag('li', Display::div($item['data'], array('class'=>'item_data')).$sub_list, array('id'=>$key, 'class'=>'record li_container'));
} else {
//sections
if (isset($item['children'])) {
$data = print_recursive($item['children'], $default_data, $default_content);
}
/*foreach($item['children'] as $my_key => $sub_item) {
$sub_list .= Display::tag('li', $sub_item['data'], array('id'=>$my_key,'class'=>'record item'));
}*/
$sub_list = Display::tag('ul', $sub_list.$data, array('id'=>'UL_'.$key, 'class'=>'record li_container'));
$return .= Display::tag('li', Display::div($item['data'], array('class'=>'item_data')).$sub_list, array('id'=>$key, 'class'=>'record li_container'));
}
}
return $return;
}
}
if ($update_audio != 'true') {
$return .= '<div class="span12"><ul id="lp_item_list">';
$return .= print_recursive($elements, $default_data, $default_content);
$return .='</ul></div>';
$return .= Display::div(Display::url(get_lang('Save'), '#', array('id'=>'listSubmit', 'class'=>'btn')), array('style'=>'float:left; margin-top:15px;width:100%'));
} else {
$return .= $return_audio.'</table>';
}
/*
if (count($arrLP) == 0) {
$return .= '<tr>';
$return .= '<td colspan="4">' . get_lang('NoItemsInLp') . '</td>';
$return .= '</tr>';
}*/
// We need to close the form when we are updating the mp3 files.
$return = '<ul id="lp_item_list" class="well">';
$return .= self::print_recursive($elements, $default_data, $default_content);
$return .= '</ul>';
if ($update_audio == 'true') {
$return .= '<div style="margin:40px 0; float:right;"><button class="save" type="submit" name="save_audio" id="save_audio">' . get_lang('SaveAudioAndOrganization') . '</button></div>'; // TODO: What kind of language variable is this?
}
// We need to close the form when we are updating the mp3 files.
if ($update_audio == 'true' && count($arrLP) != 0) {
$return .= '</form>';
$return = $return_audio;
}
return $return;
}
function print_recursive($elements, $default_data, $default_content) {
$return = '';
foreach($elements as $key => $item) {
if (isset($item['load_data']) || empty($item['data'])) {
$item['data'] = $default_data[$item['load_data']];
$item['type'] = $default_content[$item['load_data']]['item_type'];
}
$sub_list = '';
if (isset($item['type']) && $item['type'] == 'dokeos_chapter') {
$sub_list = Display::tag('li', '', array('class'=>'sub_item empty')); // empty value
}
if (empty($item['children'])) {
$sub_list = Display::tag('ul', $sub_list, array('id'=>'UL_'.$key, 'class'=>'record li_container'));
$return .= Display::tag('li', Display::div($item['data'], array('class'=>'item_data')).$sub_list, array('id'=>$key, 'class'=>'record li_container'));
} else {
//sections
if (isset($item['children'])) {
$data = self::print_recursive($item['children'], $default_data, $default_content);
}
$sub_list = Display::tag('ul', $sub_list.$data, array('id'=>'UL_'.$key, 'class'=>'record li_container'));
$return .= Display::tag('li', Display::div($item['data'], array('class'=>'item_data')).$sub_list, array('id'=>$key, 'class'=>'record li_container'));
}
}
return $return;
}
@ -5063,6 +5052,7 @@ class learnpath {
$return .= "\tm.config.useLines = true;\n";
$return .= "\tm.config.useSelection = true;\n";
$return .= "\tm.config.useStatustext = false;\n\n";
$menu = 0;
$parent = '';
@ -5154,6 +5144,7 @@ class learnpath {
$array = array('dir' => $dir, 'filepath' => $filepath);
return $array;
}
/**
* Create a new document //still needs some finetuning
* @param array $_course
@ -6988,14 +6979,14 @@ class learnpath {
reset($arrLP);
}
$return .= "\t\t\t\t" . '</select>';
$return .= '</select>';
$return .= '</td>';
$return .= '</tr>';
$return .= '<tr>';
$return .= '<td class="label"><label for="previous">' . get_lang('Position') . '</label></td>';
$return .= '<td class="input">';
$return .= "\t\t\t\t" . '<select id="previous" name="previous" style="width:100%;" size="1" class="learnpath_item_form">';
$return .= '<select id="previous" name="previous" style="width:100%;" size="1" class="learnpath_item_form">';
$return .= '<option class="top" value="0">' . get_lang('FirstPosition') . '</option>';
for ($i = 0; $i < count($arrLP); $i++) {
if ($arrLP[$i]['parent_item_id'] == $parent_item_id && $arrLP[$i]['id'] != $id) {
@ -7028,7 +7019,7 @@ class learnpath {
}
}
$arrHide = array ();
$arrHide = array();
for ($i = 0; $i < count($arrLP); $i++) {
if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') {
if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
@ -7038,28 +7029,7 @@ class learnpath {
}
}
/*// Commented the prerequisites, only visible in edit (link).
$return .= '<tr>';
$return .= '<td class="label"><label for="idPrerequisites">'.get_lang('Prerequisites').'</label></td>';
$return .= '<td class="input"><select name="prerequisites" id="prerequisites" class="learnpath_item_form"><option value="0">'.get_lang('NoPrerequisites').'</option>';
foreach($arrHide as $key => $value) {
if ($key == $s_selected_position && $action == 'add') {
$return .= '<option value="'.$key.'" selected="selected">'.$value['value'].'</option>';
}
elseif ($key == $id_prerequisite && $action == 'edit') {
$return .= '<option value="'.$key.'" selected="selected">'.$value['value'].'</option>';
}
else {
$return .= '<option value="'.$key.'">'.$value['value'].'</option>';
}
}
$return .= "</select></td>";
*/
$return .= '</tr>';
}
$return .= '<tr>';
@ -7070,6 +7040,7 @@ class learnpath {
}
$return .= '</tr>';
$return .= '</table>';
if ($action == 'move') {
$return .= '<input name="title" type="hidden" value="' . $item_title . '" />';
$return .= '<input name="description" type="hidden" value="' . $item_description . '" />';
@ -7077,8 +7048,7 @@ class learnpath {
if (is_numeric($extra_info)) {
$return .= '<input name="path" type="hidden" value="' . $extra_info . '" />';
}
elseif (is_array($extra_info)) {
} elseif (is_array($extra_info)) {
$return .= '<input name="path" type="hidden" value="' . $extra_info['path'] . '" />';
}
$return .= '<input name="type" type="hidden" value="' . TOOL_LINK . '" />';
@ -7669,7 +7639,7 @@ class learnpath {
public function get_documents() {
$course_info = api_get_course_info();
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
$document_tree = DocumentManager::get_document_preview($course_info, $this->lp_id);
$document_tree = DocumentManager::get_document_preview($course_info, $this->lp_id, null, 0, true);
return $document_tree;
}
@ -7694,29 +7664,36 @@ class learnpath {
$res_quiz = Database::query($sql_quiz);
$res_hot = Database::query($sql_hot);
$return = '<div class="lp_resource">';
$return .= '<div class="lp_resource_element">';
$return = '<ul class="lp_resource">';
$return .= '<li class="lp_resource_element">';
$return .= '<img alt="" src="../img/new_test_small.gif" style="margin-right:5px;" title="" />';
$return .= '<a href="' . api_get_path(REL_CODE_PATH) . 'exercice/exercise_admin.php?lp_id=' . $this->lp_id . '">' . get_lang('NewExercise') . '</a>';
$return .= '</div>';
$return .= '</li>';
// Display quizhotpotatoes.
while ($row_hot = Database :: fetch_array($res_hot)) {
$return .= '<div class="lp_resource_element">';
// Display quizhotpotatoes.
$return .= '<li>';
$return .= '<img alt="hp" src="../img/hotpotatoes_s.png" style="margin-right:5px;" title="" width="18px" height="18px" />';
$return .= '<a href="' . api_get_self() . '?cidReq=' . Security :: remove_XSS($_GET['cidReq']) . '&amp;action=add_item&amp;type=' . TOOL_HOTPOTATOES . '&amp;file=' . $row_hot['id'] . '&amp;lp_id=' . $this->lp_id . '">' . ((!empty ($row_hot['comment'])) ? $row_hot['comment'] : Security :: remove_XSS($row_hot['title'])) . '</a>';
$return .= '</div>';
$return .= '</li>';
}
while ($row_quiz = Database :: fetch_array($res_quiz)) {
$return .= '<div class="lp_resource_element">';
$return .= '<li class="lp_resource_element" data_id="'.$row_quiz['id'].'" data_type="quiz" title="'.$row_quiz['title'].'" >';
$return .= '<img alt="" src="../img/quizz_small.gif" style="margin-right:5px;" title="" />';
$return .= '<a class="moved" href="#">';
$return .= Display::return_icon('move_everywhere.png', get_lang('Move'), array(), ICON_SIZE_TINY);
$return .= '</a> ';
$return .= '<a href="' . api_get_self() . '?cidReq=' . Security :: remove_XSS($_GET['cidReq']) . '&amp;action=add_item&amp;type=' . TOOL_QUIZ . '&amp;file=' . $row_quiz['id'] . '&amp;lp_id=' . $this->lp_id . '">' .
Security :: remove_XSS(cut($row_quiz['title'], 80)).'</a>';
$return .= '</div>';
Security :: remove_XSS(cut($row_quiz['title'], 80)).
'</a>';
$return .= '</li>';
}
$return .= '</div>';
$return .= '</ul>';
return $return;
}
@ -7734,25 +7711,31 @@ class learnpath {
$sql_link = "SELECT id, title FROM $tbl_link WHERE c_id = ".$course_id." $condition_session ORDER BY title ASC";
$res_link = Database::query($sql_link);
$return = '<div class="lp_resource">';
$return .= '<div class="lp_resource_element">';
$return = '<ul class="lp_resource">';
$return .= '<li class="lp_resource_element">';
$return .= '<img alt="" src="../img/linksnew.gif" style="margin-right:5px;width:16px" title="" />';
$return .= '<a href="' . api_get_path(REL_CODE_PATH) . 'link/link.php?' . api_get_cidreq() . '&action=addlink&amp;lp_id=' . $this->lp_id . '" title="' . get_lang('LinkAdd') . '">' . get_lang('LinkAdd') . '</a>';
$return .= '</div>';
$return .= '</li>';
$course_info = api_get_course_info();
while ($row_link = Database :: fetch_array($res_link)) {
$item_visibility = api_get_item_visibility($course_info, TOOL_LINK, $row_link['id'], $session_id);
if ($item_visibility != 2) {
$return .= '<div class="lp_resource_element">';
$return .= '<li class="lp_resource_element" data_id="'.$row_link['id'].'" data_type="'.TOOL_LINK.'" title="'.$row_link['title'].'" >';
$return .= '<img alt="" src="../img/lp_link.gif" style="margin-right:5px;" title="" />';
$return .= '<a class="moved" href="#">';
$return .= Display::return_icon('move_everywhere.png', get_lang('Move'), array(), ICON_SIZE_TINY);
$return .= '</a> ';
$return .= '<a href="' . api_get_self() . '?cidReq=' . Security :: remove_XSS($_GET['cidReq']) . '&amp;action=add_item&amp;type=' . TOOL_LINK . '&amp;file=' . $row_link['id'] . '&amp;lp_id=' . $this->lp_id . '">'.
$row_link['title'].
'</a>';
$return .= '</div>';
$return .= '</li>';
}
}
$return .= '</div>';
$return .= '</ul>';
return $return;
}
@ -7787,46 +7770,60 @@ class learnpath {
$a_forums = get_forums();
//$return .= '<div class="lp_resource_header"' . " onclick=\"javascript: if(document.getElementById('forums').style.display == 'block') {document.getElementById('forums').style.display = 'none';} else {document.getElementById('forums').style.display = 'block';}\"" . '><img alt="" src="../img/lp_forum.gif" style="margin-right:5px;" title="" />' . get_lang('Forums') . '</div>';
$return = '<div class="lp_resource">';
$return = '<ul class="lp_resource">';
$return .= '<div class="lp_resource_element">';
//First add link
$return .= '<li class="lp_resource_element">';
$return .= '<img alt="" src="../img/forum_new_small.gif" style="margin-right:5px;" title="" />';
$return .= '<a href="' . api_get_path(REL_CODE_PATH) . 'forum/index.php?' . api_get_cidreq() . '&action=add&amp;content=forum&amp;origin=learnpath&amp;lp_id=' . $this->lp_id . '" title="' . get_lang('CreateANewForum') . '">' . get_lang('CreateANewForum') . '</a>';
$return .= '</div>';
$return .= '</li>';
$return .= '<script>
function toggle_forum(forum_id){
if(document.getElementById("forum_"+forum_id+"_content").style.display == "none"){
document.getElementById("forum_"+forum_id+"_content").style.display = "block";
document.getElementById("forum_"+forum_id+"_opener").src = "' . api_get_path(WEB_IMG_PATH) . 'remove.gif";
} else {
document.getElementById("forum_"+forum_id+"_content").style.display = "none";
document.getElementById("forum_"+forum_id+"_opener").src = "' . api_get_path(WEB_IMG_PATH) . 'add.gif";
}
}
</script>';
foreach ($a_forums as $forum) {
$return .= '<div class="lp_resource_element_no_link">';
$return .= '<script type="text/javascript">
function toggle_forum(forum_id){
if(document.getElementById("forum_"+forum_id+"_content").style.display == "none"){
document.getElementById("forum_"+forum_id+"_content").style.display = "block";
document.getElementById("forum_"+forum_id+"_opener").src = "' . api_get_path(WEB_IMG_PATH) . 'remove.gif";
} else {
document.getElementById("forum_"+forum_id+"_content").style.display = "none";
document.getElementById("forum_"+forum_id+"_opener").src = "' . api_get_path(WEB_IMG_PATH) . 'add.gif";
}
}
</script>';
foreach ($a_forums as $forum) {
$return .= '<li class="lp_resource_element" data_id="'.$forum['forum_id'].'" data_type="'.TOOL_FORUM.'" title="'.$forum['forum_title'].'" >';
if (!empty($forum['forum_id'])) {
$return .= '<img alt="" src="../img/lp_forum.gif" style="margin-right:5px;" title="" />';
$return .= '<a class="moved" href="#">';
$return .= Display::return_icon('move_everywhere.png', get_lang('Move'), array(), ICON_SIZE_TINY);
$return .= ' </a>';
$return .= '<a style="cursor:hand" onclick="javascript: toggle_forum(' . $forum['forum_id'] . ')" style="vertical-align:middle">
<img src="' . api_get_path(WEB_IMG_PATH) . 'add.gif" id="forum_' . $forum['forum_id'] . '_opener" align="absbottom" />
</a>
<a href="' . api_get_self() . '?cidReq=' . Security :: remove_XSS($_GET['cidReq']) . '&amp;action=add_item&amp;type=' . TOOL_FORUM . '&amp;forum_id=' . $forum['forum_id'] . '&amp;lp_id=' . $this->lp_id . '" style="vertical-align:middle">' . Security :: remove_XSS($forum['forum_title']) . '</a>
<ul style="display:none" id="forum_' . $forum['forum_id'] . '_content">';
<a href="' . api_get_self() . '?cidReq=' . Security :: remove_XSS($_GET['cidReq']) . '&amp;action=add_item&amp;type=' . TOOL_FORUM . '&amp;forum_id=' . $forum['forum_id'] . '&amp;lp_id=' . $this->lp_id . '" style="vertical-align:middle">' . Security :: remove_XSS($forum['forum_title']) . '</a>';
}
$return .= '</li>';
$return .= '<div style="display:none" id="forum_' . $forum['forum_id'] . '_content">';
$a_threads = get_threads($forum['forum_id']);
if (is_array($a_threads)) {
foreach ($a_threads as $thread) {
$return .= '<li><a href="' . api_get_self() . '?cidReq=' . Security :: remove_XSS($_GET['cidReq']) . '&amp;action=add_item&amp;type=' . TOOL_THREAD . '&amp;thread_id=' . $thread['thread_id'] . '&amp;lp_id=' . $this->lp_id . '">' . Security :: remove_XSS($thread['thread_title']) . '</a></li>';
$return .= '<li class="lp_resource_element" data_id="'.$thread['thread_id'].'" data_type="'.TOOL_THREAD.'" title="'.$thread['thread_title'].'" >';
$return .= Display::return_icon('forumthread.png', get_lang('Thread'), array(), ICON_SIZE_TINY);
$return .= '&nbsp;<a class="moved" href="#">';
$return .= Display::return_icon('move_everywhere.png', get_lang('Move'), array(), ICON_SIZE_TINY);
$return .= ' </a>';
$return .= '<a href="' . api_get_self() . '?cidReq=' . Security :: remove_XSS($_GET['cidReq']) . '&amp;action=add_item&amp;type=' . TOOL_THREAD . '&amp;thread_id=' . $thread['thread_id'] . '&amp;lp_id=' . $this->lp_id . '">' . Security :: remove_XSS($thread['thread_title']) . '</a>';
$return .= '</li>';
}
}
$return .= '</ul></div>';
$return .= '</div>';
}
$return .= '</div>';
$return .= '</ul>';
return $return;
}

140
main/newscorm/lp_add_item.php
Unescape View File

@ -23,8 +23,139 @@ include 'learnpath_functions.inc.php';
include 'resourcelinker.inc.php';
$language_file = 'learnpath';
$ajax_url = api_get_path(WEB_AJAX_PATH).'lp.ajax.php';
$htmlHeadXtra[] = '
<script type="text/javascript">
<script>
var newOrderData= "";
function processChildren(parentId) {
//Loop through the children of the UL element defined by the parentId
var ulParentID= "UL_" + parentId;
$("#" + ulParentID).children().each(function () {
/*Only process elements with an id attribute (in order to skip the blank,
unmovable <li> elements.*/
if ($(this).attr("id")) {
/*Build a string of data with the childs ID and parent ID,
using the "|" as a delimiter between the two IDs and the "^"
as a record delimiter (these delimiters were chosen in case the data
involved includes more common delimiters like commas within the content)
*/
newOrderData= newOrderData + $(this).attr("id") + "|" + parentId + "^";
//Determine if this child is a containter
if ($(this).is(".container")) {
//Process the child elements of the container
processChildren($(this).attr("id"));
}
}
}); //end of children loop
} //end of processChildren function
$(function() {
$(".item_data").live("mouseover", function(event) {
$(".button_actions", this).show();
});
$(".item_data").live("mouseout", function() {
$(".button_actions",this).hide();
});
$(".button_actions").hide();
$( ".lp_resource" ).sortable({
items: ".lp_resource_element ",
handle: ".moved", //only the class "moved"
cursor: "move",
connectWith: "#lp_item_list",
placeholder: "ui-state-highlight", //defines the yellow highlight
});
$("#lp_item_list").sortable({
items: "li",
handle: ".moved", //only the class "moved"
cursor: "move",
placeholder: "ui-state-highlight", //defines the yellow highlight
update: function(event, ui) {
//Walk through the direct descendants of the lp_item_list <ul>
$("#lp_item_list").children().each(function () {
/*Only process elements with an id attribute (in order to skip the blank,
unmovable <li> elements.*/
if ($(this).attr("id")) {
/*Build a string of data with the child s ID and parent ID,
using the "|" as a delimiter between the two IDs and the "^"
as a record delimiter (these delimiters were chosen in case the data
involved includes more common delimiters like commas within the content)
*/
newOrderData= newOrderData + $(this).attr("id") + "|" + "0" + "^";
//Determine if this child is a containter
if ($(this).is(".li_container")) {
//Process the child elements of the container
processChildren($(this).attr("id"));
}
}
}); //end of lp_item_list children loop
var order = "new_order="+ newOrderData + "&a=update_lp_item_order";
$.post("'.$ajax_url.'", order, function(reponse){
$("#message").html(reponse);
});
},
receive: function(event, ui) {
var id = $(ui.item).attr("data_id");
var type = $(ui.item).attr("data_type");
var title = $(ui.item).attr("title");
if (ui.item.parent()[0]) {
var parent_id = $(ui.item.parent()[0]).attr("id");
var previous_id = $(ui.item.prev()).attr("id");
if (parent_id) {
parent_id = parent_id.split("_")[1];
var params = {
"a": "add_lp_item",
"id": id,
"parent_id": parent_id,
"previous_id": previous_id,
"type": type,
"title" : title
};
$.ajax({
type: "GET",
url: "'.$ajax_url.'",
data: params,
async: false,
success: function(data) {
if (data == -1) {
} else {
$(ui.item).attr("id", data);
$(ui.item).addClass("lp_resource_element_new");
$(ui.item).removeClass("lp_resource_element");
$(ui.item).removeClass("doc_resource");
}
}
});
}
}
}
});
});
var temp = false;
var load_default_template = '. ((isset($_POST['submit']) || empty($_SERVER['QUERY_STRING'])) ? 'false' : 'true' ) .';
@ -247,7 +378,7 @@ $(document).ready(function() {
echo $_SESSION['oLP']->build_action_menu();
echo '<div class="row-fluid" style="overflow:hidden">';
echo '<div class="span3">';
echo '<div class="span4">';
// Show the template list.
if ($type == 'document' && !isset($_GET['file'])) {
@ -255,7 +386,7 @@ if ($type == 'document' && !isset($_GET['file'])) {
$style = ($count_items > 12) ? ' style="height:250px;width:230px;overflow-x : auto; overflow-y : scroll;" ' : ' class="lp_tree" ';
echo '<div '.$style.'>';
// Build the tree with the menu items in it.
echo $_SESSION['oLP']->build_tree();
echo $_SESSION['oLP']->build_tree();
echo '</div>';
// Show the template list.
echo '<p style="border-bottom:1px solid #ddd; margin:0; padding:2px;"></p>';
@ -264,7 +395,8 @@ if ($type == 'document' && !isset($_GET['file'])) {
} else {
echo '<div class="lp_tree">';
// Build the tree with the menu items in it.
echo $_SESSION['oLP']->build_tree();
//echo $_SESSION['oLP']->build_tree();
echo $_SESSION['oLP']->return_new_tree();
echo '</div>';
}
echo '</div>';

31
main/newscorm/lp_admin_view.php
Unescape View File

@ -168,23 +168,20 @@ $(function() {
/*Only process elements with an id attribute (in order to skip the blank,
unmovable <li> elements.*/
if ($(this).attr("id"))
{
/*Build a string of data with the child's ID and parent ID,
using the "|" as a delimiter between the two IDs and the "^"
as a record delimiter (these delimiters were chosen in case the data
involved includes more common delimiters like commas within the content)
*/
newOrderData= newOrderData + $(this).attr("id") + "|" + parentId + "^";
//Determine if this child is a containter
if ($(this).is(".container"))
{
//Process the child elements of the container
processChildren($(this).attr("id"));
}
}
if ($(this).attr("id")) {
/*Build a string of data with the child's ID and parent ID,
using the "|" as a delimiter between the two IDs and the "^"
as a record delimiter (these delimiters were chosen in case the data
involved includes more common delimiters like commas within the content)
*/
newOrderData= newOrderData + $(this).attr("id") + "|" + parentId + "^";
//Determine if this child is a containter
if ($(this).is(".container")) {
//Process the child elements of the container
processChildren($(this).attr("id"));
}
}
}); //end of children loop
} //end of processChildren function
});

1
main/newscorm/lp_controller.php
Unescape View File

@ -8,7 +8,6 @@
* @author Yannick Warnier <ywarnier@beeznest.org>
*/
use \ChamiloSession as Session;
$debug = 0;

Write Preview
Loading…
Cancel
Save