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

Fix icons and URLs see #7619

Browse Source
1.10.x
Julio Montoya 10 years ago
parent a92829660c
commit f50e730961
2 changed files with 49 additions and 40 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. 23
      main/inc/lib/sessionmanager.lib.php
  2. 62
      main/inc/lib/userportal.lib.php

23
main/inc/lib/sessionmanager.lib.php
Unescape View File

@ -7338,7 +7338,8 @@ class SessionManager
$listOneCourse = array(); $listOneCourse = array();
$listOneCourse['courseId'] = $courseId; $listOneCourse['courseId'] = $courseId;
$listOneCourse['title'] = $courseInfo['title']; $listOneCourse['title'] = $courseInfo['title'];
$listOneCourse['courseCode'] = $courseInfo['code']; //$listOneCourse['courseCode'] = $courseInfo['code'];
$listOneCourse['course'] = $courseInfo;
$listOneCourse['sessionCatList'] = array(); $listOneCourse['sessionCatList'] = array();
$listCat = array(); $listCat = array();
foreach ($listSessionId as $i => $sessionId) { foreach ($listSessionId as $i => $sessionId) {
@ -7475,16 +7476,17 @@ class SessionManager
$listInfo = self::getNamedSessionCourseForCoach($userId); $listInfo = self::getNamedSessionCourseForCoach($userId);
foreach ($listInfo as $i => $listCoursesInfo) { foreach ($listInfo as $i => $listCoursesInfo) {
$courseCode = $listCoursesInfo['courseCode']; $courseInfo = $listCoursesInfo['course'];
$courseTitle = $listCoursesInfo['title']; $courseCode = $listCoursesInfo['course']['code'];
$listParamsCourse = array(); $listParamsCourse = array();
$listParamsCourse['icon'] = '<div style="float:left"> $listParamsCourse['icon'] = '<div style="float:left">
<input style="border:none;" type="button" onclick="$(\'#course-'.$courseCode.'\').toggle(\'fast\')" value="+" /></div>'. <input style="border:none;" type="button" onclick="$(\'#course-'.$courseCode.'\').toggle(\'fast\')" value="+" /></div>'.
Display::return_icon('blackboard.png', $listCoursesInfo['title'], array(), ICON_SIZE_LARGE); Display::return_icon('blackboard.png', $courseInfo['title'], array(), ICON_SIZE_LARGE);
$listParamsCourse['link'] = ''; $listParamsCourse['link'] = '';
$listParamsCourse['title'] = Display::tag( $listParamsCourse['title'] = Display::tag(
'a', 'a',
$listCoursesInfo['title'], $courseInfo['title'],
array('href' => $listParamsCourse['link']) array('href' => $listParamsCourse['link'])
); );
$htmlCourse = '<div class="well" style="border-color:#27587D">'. $htmlCourse = '<div class="well" style="border-color:#27587D">'.
@ -7517,10 +7519,11 @@ class SessionManager
$listParamsSession['icon'] = Display::return_icon('blackboard_blue.png', $sessionName, array(), ICON_SIZE_LARGE); $listParamsSession['icon'] = Display::return_icon('blackboard_blue.png', $sessionName, array(), ICON_SIZE_LARGE);
$listParamsSession['link'] = ''; $listParamsSession['link'] = '';
$linkToCourseSession = api_get_path(WEB_PATH).'courses/'.$courseCode.'/?id_session='.$sessionId; $linkToCourseSession = $courseInfo['course_public_url'].'?id_session='.$sessionId;
$listParamsSession['title'] = $sessionName.'<div style="font-weight:normal; font-style:italic"> $listParamsSession['title'] =
<a href="'.$linkToCourseSession.'"> $sessionName.'<div style="font-weight:normal; font-style:italic">
'.get_lang('GoToCourseInsideSession').'</a></div>'; <a href="'.$linkToCourseSession.'">'.get_lang('GoToCourseInsideSession').'</a>
</div>';
$htmlSession .= '<div style="margin-left:'.$marginShift.'px;">'. $htmlSession .= '<div style="margin-left:'.$marginShift.'px;">'.
CourseManager::course_item_html($listParamsSession, true).'</div>'; CourseManager::course_item_html($listParamsSession, true).'</div>';
} }
@ -7531,6 +7534,4 @@ class SessionManager
return $htmlRes; return $htmlRes;
} }
} }

62
main/inc/lib/userportal.lib.php
Unescape View File

@ -1363,8 +1363,7 @@ class IndexManager
} }
} }
$special_courses = ''; $specialCourses = '';
$loadDirs = $this->load_directories_preview; $loadDirs = $this->load_directories_preview;
// If we're not in the history view... // If we're not in the history view...
@ -1387,6 +1386,7 @@ class IndexManager
); );
$listCourse = api_get_course_info_by_id($listCourseCodeId['real_id']); $listCourse = api_get_course_info_by_id($listCourseCodeId['real_id']);
$listCoursesInfo[] = array( $listCoursesInfo[] = array(
'course' => $listCourse,
'code' => $listCourseCodeId['code'], 'code' => $listCourseCodeId['code'],
'id' => $listCourseCodeId['real_id'], 'id' => $listCourseCodeId['real_id'],
'title' => $listCourse['title'], 'title' => $listCourse['title'],
@ -1432,17 +1432,16 @@ class IndexManager
} else { } else {
$htmlCategory .= '<div class="session-view-row" >'; $htmlCategory .= '<div class="session-view-row" >';
} }
$coursesInfo = $listCourse['course'];
$htmlCategory .= self::getHtmlForCourse( $htmlCategory .= self::getHtmlForCourse(
$listCourse['courseId'], $coursesInfo,
$listCourse['title'],
$listCourse['courseCode'],
$userCategoryId, $userCategoryId,
1, 1,
$loadDirs $loadDirs
); );
// list of session category // list of session category
$htmlSessionCategory = '<div class="session-view-row" style="display:none;" id="courseblock-'.$listCourse['courseId'].'">'; $htmlSessionCategory = '<div class="session-view-row" style="display:none;" id="courseblock-'.$coursesInfo['real_id'].'">';
foreach ($listCourse['sessionCatList'] as $j => $listCategorySession) { foreach ($listCourse['sessionCatList'] as $j => $listCategorySession) {
// add session category // add session category
$htmlSessionCategory .= self::getHtmlSessionCategory( $htmlSessionCategory .= self::getHtmlSessionCategory(
@ -1458,7 +1457,7 @@ class IndexManager
$listSession['sessionId'], $listSession['sessionId'],
$listSession['sessionName'], $listSession['sessionName'],
$listCategorySession['catSessionId'], $listCategorySession['catSessionId'],
$listCourse['courseCode'] $coursesInfo
); );
$htmlSession .= '</div>'; $htmlSession .= '</div>';
$sessionCount++; $sessionCount++;
@ -1484,9 +1483,7 @@ class IndexManager
$htmlCategory .= '<div class="session-view-well well">'; $htmlCategory .= '<div class="session-view-well well">';
} }
$htmlCategory .= self::getHtmlForCourse( $htmlCategory .= self::getHtmlForCourse(
$listCourse['id'], $listCourse['course'],
$listCourse['title'],
$listCourse['code'],
$userCategoryId, $userCategoryId,
0, 0,
$loadDirs $loadDirs
@ -1524,7 +1521,7 @@ class IndexManager
$icon = Display::return_icon( $icon = Display::return_icon(
'folder_yellow.png', 'folder_yellow.png',
$title, $title,
array('class' => 'sessionView', 'width' => 24), array('class' => 'sessionView'),
ICON_SIZE_LARGE ICON_SIZE_LARGE
); );
return "<div class='session-view-user-category'>$icon<span>$title</span></div>"; return "<div class='session-view-user-category'>$icon<span>$title</span></div>";
@ -1532,16 +1529,26 @@ class IndexManager
/** /**
* return HTML code for course display in session view * return HTML code for course display in session view
* @param $id * @param array $courseInfo
* @param $title
* @param $code
* @param $userCategoryId * @param $userCategoryId
* @param bool $displayButton * @param bool $displayButton
* @param $loadDirs * @param $loadDirs
* @return string * @return string
*/ */
private static function getHtmlForCourse($id, $title, $code, $userCategoryId, $displayButton = false, $loadDirs) private static function getHtmlForCourse(
{ $courseInfo,
$userCategoryId,
$displayButton = false,
$loadDirs
) {
if (empty($courseInfo)) {
return '';
}
$id = $courseInfo['real_id'];
$title = $courseInfo['title'];
$code = $courseInfo['code'];
$class = 'session-view-lvl-6'; $class = 'session-view-lvl-6';
if ($userCategoryId != 0 && !$displayButton) { if ($userCategoryId != 0 && !$displayButton) {
$class = 'session-view-lvl-7'; $class = 'session-view-lvl-7';
@ -1560,11 +1567,11 @@ class IndexManager
$icon = Display::return_icon( $icon = Display::return_icon(
'blackboard.png', 'blackboard.png',
$title, $title,
array('class' => 'sessionView', 'width' => 24), array('class' => 'sessionView'),
ICON_SIZE_LARGE ICON_SIZE_LARGE
); );
$courseLink = api_get_path(WEB_COURSE_PATH).$code.'/index.php?id_session=0'; $courseLink = $courseInfo['course_public_url'].'?id_session=0';
// get html course params // get html course params
// ['right_actions'] ['teachers'] ['notifications'] // ['right_actions'] ['teachers'] ['notifications']
@ -1603,7 +1610,7 @@ class IndexManager
$icon = Display::return_icon( $icon = Display::return_icon(
'folder_blue.png', 'folder_blue.png',
$title, $title,
array('class' => 'sessionView', 'width' => 24), array('class' => 'sessionView'),
ICON_SIZE_LARGE ICON_SIZE_LARGE
); );
@ -1617,17 +1624,18 @@ class IndexManager
/** /**
* return HTML code for session * return HTML code for session
* @param $id * @param int $id session id
* @param $title * @param string $title session title
* @param $categotySessionId * @param int $categorySessionId
* @param $courseCode * @param array $courseInfo
*
* @return string * @return string
*/ */
private static function getHtmlForSession($id, $title, $categotySessionId, $courseCode) private static function getHtmlForSession($id, $title, $categorySessionId, $courseInfo)
{ {
$html = ''; $html = '';
if ($categotySessionId == 0) { if ($categorySessionId == 0) {
$class1 = 'session-view-lvl-2'; // session $class1 = 'session-view-lvl-2'; // session
$class2 = 'session-view-lvl-4'; // got to course in session link $class2 = 'session-view-lvl-4'; // got to course in session link
} else { } else {
@ -1638,10 +1646,10 @@ class IndexManager
$icon = Display::return_icon( $icon = Display::return_icon(
'blackboard_blue.png', 'blackboard_blue.png',
$title, $title,
array('class' => 'sessionView', 'width' => 24), array('class' => 'sessionView'),
ICON_SIZE_LARGE ICON_SIZE_LARGE
); );
$courseLink = api_get_path(WEB_COURSE_PATH).$courseCode.'/index.php?id_session='.intval($id); $courseLink = $courseInfo['course_public_url'].'?id_session='.intval($id);
$html .= "<span class='$class1 session-view-session'>$icon$title</span>"; $html .= "<span class='$class1 session-view-session'>$icon$title</span>";
$html .= '<div class="'.$class2.' session-view-session-go-to-course-in-session"> $html .= '<div class="'.$class2.' session-view-session-go-to-course-in-session">

Write Preview
Loading…
Cancel
Save