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

Adding LP author image in the course home see #5486

Browse Source
skala
Julio Montoya 12 years ago
parent e193c7a27b
commit 4fd636a882
4 changed files with 83 additions and 45 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. 6
      main/course_home/activity.php
  2. 56
      main/inc/lib/course_home.lib.php
  3. 55
      main/newscorm/learnpath.class.php
  4. 11
      main/newscorm/lp_view.php

6
main/course_home/activity.php
Unescape View File

@ -73,12 +73,12 @@ if (api_is_allowed_to_edit(null, true) && !api_is_coach()) {
</table>
</div>';
}
$my_list = CourseHome::get_tools_category(TOOL_AUTHORING);
$items = CourseHome::show_tools_category($my_list);
$my_list = CourseHome::get_tools_category(TOOL_AUTHORING);
$items = CourseHome::show_tools_category($my_list);
$content .= return_block(get_lang('Authoring'), $items);
$my_list = CourseHome::get_tools_category(TOOL_INTERACTION);
$list2 = CourseHome::get_tools_category(TOOL_COURSE_PLUGIN);
$my_list = array_merge($my_list,$list2);

56
main/inc/lib/course_home.lib.php
Unescape View File

@ -208,7 +208,7 @@ class CourseHome {
* @param string $course_tool_category contains the category of tools to display:
* "Public", "PublicButHide", "courseAdmin", "claroAdmin"
*/
function show_tool_2column($course_tool_category) {
public static function show_tool_2column($course_tool_category) {
$html = '';
$web_code_path = api_get_path(WEB_CODE_PATH);
$course_tool_table = Database::get_course_table(TABLE_TOOL_LIST);
@ -292,6 +292,7 @@ class CourseHome {
}*/
// check if the published learnpath is visible for student
$published_lp_id = self::get_published_lp_id_from_link($tool['link']);
if (!api_is_allowed_to_edit(null, true) && !learnpath::is_lp_visible_for_student($published_lp_id,api_get_user_id())) {
continue;
}
@ -405,8 +406,8 @@ class CourseHome {
* @return array
*/
public static function get_tools_category($course_tool_category) {
$course_tool_table = Database::get_course_table(TABLE_TOOL_LIST);
public static function get_tools_category($course_tool_category) {
$course_tool_table = Database::get_course_table(TABLE_TOOL_LIST);
$is_platform_admin = api_is_platform_admin();
$all_tools_list = array();
@ -414,7 +415,7 @@ class CourseHome {
$session_id = api_get_session_id();
$course_id = api_get_course_int_id();
$condition_session = api_get_session_condition($session_id, true, true);
switch ($course_tool_category) {
case TOOL_STUDENT_VIEW:
$condition_display_tools = ' WHERE visibility = 1 AND (category = "authoring" OR category = "interaction" OR category = "plugin") ';
@ -505,7 +506,6 @@ class CourseHome {
WHERE tl.on_homepage='1' ";
*/
break;
case TOOL_STUDENT_VIEW:
$sql_links = "SELECT tl.*, tip.visibility
FROM $course_link_table tl
@ -514,7 +514,6 @@ class CourseHome {
tip.c_id = $course_id AND
tl.on_homepage ='1' $condition_session";
break;
case TOOL_ADMIN:
$sql_links = "SELECT tl.*, tip.visibility
FROM $course_link_table tl
@ -523,7 +522,6 @@ class CourseHome {
tip.c_id = $course_id AND
tl.on_homepage='1' $condition_session";
break;
default:
$sql_links = null;
break;
@ -769,18 +767,36 @@ class CourseHome {
$html = '';
if (!empty($items)) {
foreach($items as $item) {
switch($theme) {
foreach ($items as $item) {
switch ($theme) {
case 'activity_big':
$data = '';
$html .= '<div class="span4 course-tool">';
$image = (substr($item['tool']['image'], 0, strpos($item['tool']['image'], '.'))).'.png';
$image = Display::return_icon($image, $item['name'], array('id'=>'toolimage_'.$item['tool']['id']), ICON_SIZE_BIG, false);
$original_image = Display::return_icon($image, $item['name'], array('id'=>'toolimage_'.$item['tool']['id']), ICON_SIZE_BIG, false);
switch($image) {
case 'scormbuilder.png':
$image = $original_image;
$lp_id = self::get_published_lp_id_from_link($tool['link']);
if ($lp_id) {
$lp = new learnpath(api_get_course_id(), $lp_id, api_get_user_id());
$path = $lp->get_preview_image_path(64);
if ($path) {
$image = '<img src="'.$path.'">';
}
}
break;
default:
$image = $original_image;
}
$data .= Display::url($image , $item['url_params']['href'], $item['url_params']);
$html .= Display::div($data, array('class'=>'big_icon')); //box-image reflection
$html .= Display::div('<h4>'.$item['visibility'].$item['extra'].$item['link'].'</h4>', array('class'=>'content'));
$html .= '</div>';
break;
case 'activity':
$html .= '<div class="offset2 span4 course-tool">';
@ -871,13 +887,13 @@ class CourseHome {
*/
public static function translate_tool_name(& $tool) {
static $already_translated_icons = array(
'file_html.gif',
'file_html.gif',
'file_html_na.gif',
'scormbuilder.gif',
'scormbuilder.gif',
'scormbuilder_na.gif',
'blog.gif',
'blog.gif',
'blog_na.gif',
'external.gif',
'external.gif',
'external_na.gif'
);
@ -921,11 +937,11 @@ class CourseHome {
}
static function get_navigation_items($include_admin_tools = false) {
$navigation_items = array();
$navigation_items = array();
$course_id = api_get_course_int_id();
if (!empty($course_id)) {
$course_tools_table = Database :: get_course_table(TABLE_TOOL_LIST);
/* Link to the Course homepage */
@ -962,7 +978,7 @@ class CourseHome {
}
}
}
foreach ($navigation_items as $key => $navigation_item) {
if (strstr($navigation_item['link'], '?')) {
//link already contains a parameter, add course id parameter with &
@ -974,7 +990,7 @@ class CourseHome {
//$navigation_items[$key]['link'] .= $parameter_separator.api_get_cidreq();
$navigation_items[$key]['link'] .= $parameter_separator.'cidReq='.api_get_course_id().'&gidReq=0&id_session='.api_get_session_id();
}
return $navigation_items;
}
@ -1030,7 +1046,7 @@ class CourseHome {
/**
* Show a toolbar with shortcuts to the course tool
*/
function show_navigation_tool_shortcuts($orientation = SHORTCUTS_HORIZONTAL) {
static function show_navigation_tool_shortcuts($orientation = SHORTCUTS_HORIZONTAL) {
$navigation_items = self::get_navigation_items(false);
$html = '';
if (!empty($navigation_items)) {

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

@ -74,6 +74,7 @@ class learnpath {
public $expired_on = '';
public $ref = null;
public $course_int_id;
public $course_info = array();
public function get_course_int_id() {
return isset($this->course_int_id) ? $this->course_int_id : api_get_course_int_id();
@ -101,15 +102,11 @@ class learnpath {
$this->error = 'Course code is empty';
return false;
} else {
$main_table = Database::get_main_table(TABLE_MAIN_COURSE);
$course = Database::escape_string($course);
$sql = "SELECT * FROM $main_table WHERE code = '$course'";
if ($this->debug > 2) { error_log('New LP - learnpath::__construct() '.__LINE__.' - Querying course: '.$sql, 0); }
$res = Database::query($sql);
if (Database::num_rows($res) > 0) {
$this->cc = $course;
$row_course = Database::fetch_array($res);
$course_id = $row_course['id'];
$course_info = api_get_course_info($course);
if (!empty($course_info)) {
$this->cc = $course_info['code'];
$this->course_info = $course_info;
$course_id = $course_info['real_id'];
} else {
$this->error = 'Course code does not exist in database ('.$sql.')';
return false;
@ -2132,7 +2129,7 @@ class learnpath {
}
$text = $percentage . $text_add;
//@todo use Display::display_progress();
$output .= '<div class="progress progress-striped">
$output = '<div class="progress progress-striped">
<div id="progress_bar_value" class="bar" style="width: '.$text.';"></div>
</div>
<div class="progresstext" id="progress_text">' . $text . '</div>';
@ -2258,13 +2255,31 @@ class learnpath {
if ($this->debug > 0) {
error_log('New LP - In learnpath::get_preview_image()', 0);
}
if (!empty ($this->preview_image)) {
if (!empty($this->preview_image)) {
return $this->preview_image;
} else {
return '';
}
}
public function get_preview_image_path($size = null) {
$preview_image = $this->get_preview_image();
if (isset($preview_image) && !empty($preview_image)) {
$image_sys_path = api_get_path(SYS_COURSE_PATH).$this->course_info['path'].'/upload/learning_path/images/';
$image_path = api_get_path(WEB_COURSE_PATH).$this->course_info['path'].'/upload/learning_path/images/';
if (!empty($size)) {
$info = pathinfo($preview_image);
$image_custom_size = $info['filename'].'.'.$size.'.'.$info['extension'];
if (file_exists($image_sys_path.$image_custom_size)) {
return $image_path.$image_custom_size;
}
} else {
return $image_path.$preview_image;
}
}
return false;
}
/**
* Gets the learnpath author
* @return string LP's author
@ -4162,7 +4177,7 @@ class learnpath {
if ($this->debug > 2) {
error_log('New LP - lp updated with new preview author : ' . $this->author, 0);
}
$res = Database::query($sql);
Database::query($sql);
return true;
}
/**
@ -4184,7 +4199,7 @@ class learnpath {
if ($this->debug > 2) {
error_log('New LP - lp updated with new preview hide_toc_frame : ' . $this->author, 0);
}
$res = Database::query($sql);
Database::query($sql);
return true;
} else {
return false;
@ -5052,7 +5067,7 @@ class learnpath {
$elements = array();
$return_audio = null;
for ($i = 0; $i < count($arrLP); $i++) {
$title = $arrLP[$i]['title'];
@ -9037,11 +9052,10 @@ EOD;
if ($img != '') {
$del_file = api_get_path(SYS_COURSE_PATH) . api_get_course_path() . '/upload/learning_path/images/' . $img;
$this->set_preview_image('');
return @ unlink($del_file);
return @unlink($del_file);
} else {
return false;
}
}
/**
@ -9072,8 +9086,9 @@ EOD;
} else {
$file_extension = explode('.', $image_array['name']);
$file_extension = strtolower($file_extension[sizeof($file_extension) - 1]);
$new_file_name = uniqid('') . '.' . $file_extension;
$new_path = $updir . '/' . $new_file_name;
$filename = uniqid('');
$new_file_name = $filename.'.'.$file_extension;
$new_path = $updir.'/'.$new_file_name;
// Resize the image.
$temp = new Image($image_array['tmp_name']);
@ -9096,6 +9111,10 @@ EOD;
if ($result) {
$image_moved = true;
$this->set_preview_image($new_file_name);
//Resize to 32
$temp->resize(64, 64, 0);
$temp->send_image($updir.'/'.$filename.'.64.'.$file_extension);
return true;
}
}

11
main/newscorm/lp_view.php
Unescape View File

@ -275,7 +275,7 @@ if ($_SESSION['oLP']->mode == 'fullscreen') {
Display::display_reduced_header($nameTools);
// Check if audio recorder needs to be in studentview.
if ($_SESSION['status'][$course_code] == 5) {
if (isset($_SESSION['status']) && $_SESSION['status'][$course_code] == 5) {
$audio_recorder_studentview = true;
} else {
$audio_recorder_studentview = false;
@ -369,11 +369,14 @@ echo '<div id="learning_path_main" style="width:100%;height:100%;">';
<div id="author_image">
<div id="author_icon">
<?php
if ($_SESSION['oLP']->get_preview_image()!='') {
if ($_SESSION['oLP']->get_preview_image() != '') {
$picture = getimagesize(api_get_path(SYS_COURSE_PATH).api_get_course_path().'/upload/learning_path/images/'.$_SESSION['oLP']->get_preview_image());
if($picture['1'] < 96) { $style = ' style="padding-top:'.((94 -$picture['1'])/2).'px;" '; }
$style = null;
if ($picture['1'] < 96) {
$style = ' style="padding-top:'.((94 -$picture['1'])/2).'px;" ';
}
$size = ($picture['0'] > 104 && $picture['1'] > 96 )? ' width="104" height="96" ': $style;
$my_path = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/upload/learning_path/images/'.$_SESSION['oLP']->get_preview_image();
$my_path = $_SESSION['oLP']->get_preview_image_path();
echo '<img src="'.$my_path.'">';
} else {
echo Display :: display_icon('unknown_250_100.jpg');

Write Preview
Loading…
Cancel
Save