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 home welcome

Browse Source
pull/2475/head
Alex Aragón 8 years ago
parent b99aaa338a
commit af344efda7
5 changed files with 83 additions and 51 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. 7
      app/Resources/public/css/base.css
  2. 2
      app/Resources/public/css/themes/chamilo/default.css
  3. 4
      index.php
  4. 75
      main/inc/lib/userportal.lib.php
  5. 6
      main/template/default/layout/layout_2_col.tpl

7
app/Resources/public/css/base.css
Unescape View File

@ -5206,7 +5206,7 @@ div#chat-remote-video video {
position: absolute; position: absolute;
bottom: 0px; bottom: 0px;
right: -10px; right: -10px;
background-color: #9ec6d0a8; background-color: #fd6600;
color: #fff; color: #fff;
padding: 5px 10px; padding: 5px 10px;
font-size: 10px; font-size: 10px;
@ -5223,7 +5223,7 @@ div#chat-remote-video video {
.grid-courses .items .cribbon{ .grid-courses .items .cribbon{
width: 0; width: 0;
height: 0; height: 0;
border-top: 10px solid #337AB7; border-top: 10px solid #333333;
border-right: 10px solid transparent; border-right: 10px solid transparent;
position: absolute; position: absolute;
bottom: -10px; bottom: -10px;
@ -6526,9 +6526,10 @@ ul#toolnavbox-two li a.btn{
margin-right: 10px; margin-right: 10px;
vertical-align: middle; vertical-align: middle;
} }
#homepage-home, .welcome-home-top-temp{ #home-welcome{
display: block; display: block;
width: 100%; width: 100%;
margin-bottom: 20px;
} }
.label-subscribed{ .label-subscribed{
font-size: 12px; font-size: 12px;

2
app/Resources/public/css/themes/chamilo/default.css
Unescape View File

@ -35,7 +35,7 @@ body {
} }
a { a {
color: #0099FF; color: #337AB7;
text-decoration: none; text-decoration: none;
} }
a:hover, a:hover,

4
index.php
Unescape View File

@ -1,5 +1,6 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use ChamiloSession as Session; use ChamiloSession as Session;
/** /**
@ -24,6 +25,7 @@ $header_title = null;
if (!api_is_anonymous()) { if (!api_is_anonymous()) {
$header_title = ' '; $header_title = ' ';
} }
$controller = new IndexManager($header_title); $controller = new IndexManager($header_title);
//Actions //Actions
$loginFailed = isset($_GET['loginFailed']) ? true : isset($loginFailed); $loginFailed = isset($_GET['loginFailed']) ? true : isset($loginFailed);
@ -141,7 +143,7 @@ if (api_get_configuration_value('show_hot_sessions') === true) {
} }
$controller->tpl->assign('hot_courses', $hotCourses); $controller->tpl->assign('hot_courses', $hotCourses);
$controller->tpl->assign('announcements_block', $announcements_block); $controller->tpl->assign('announcements_block', $announcements_block);
$controller->tpl->assign('home_page_block', $controller->return_home_page()); $controller->tpl->assign('home_welcome', $controller->return_home_page());
$controller->tpl->assign('navigation_course_links', $controller->return_navigation_links()); $controller->tpl->assign('navigation_course_links', $controller->return_navigation_links());
$controller->tpl->assign('notice_block', $controller->return_notice()); $controller->tpl->assign('notice_block', $controller->return_notice());
//$controller->tpl->assign('main_navigation_block', $controller->return_navigation_links()); //$controller->tpl->assign('main_navigation_block', $controller->return_navigation_links());

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

@ -87,7 +87,9 @@ class IndexManager
$my_exercise = $exercise_list[0]; $my_exercise = $exercise_list[0];
$url = Display::url( $url = Display::url(
$my_exercise['title'], $my_exercise['title'],
api_get_path(WEB_CODE_PATH).'exercise/overview.php?exerciseId='.$my_exercise['id'].'&cidReq='.$my_exercise['course_code'].'&id_session='.$my_exercise['session_id'] api_get_path(
WEB_CODE_PATH
).'exercise/overview.php?exerciseId='.$my_exercise['id'].'&cidReq='.$my_exercise['course_code'].'&id_session='.$my_exercise['session_id']
); );
$this->tpl->assign('exercise_url', $url); $this->tpl->assign('exercise_url', $url);
$this->tpl->assign( $this->tpl->assign(
@ -228,7 +230,9 @@ class IndexManager
if ($show_create_link) { if ($show_create_link) {
$html .= '<li class="add-course"><a href="'.api_get_path(WEB_CODE_PATH).'create_course/add_course.php">' $html .= '<li class="add-course"><a href="'.api_get_path(WEB_CODE_PATH).'create_course/add_course.php">'
.Display::return_icon('new-course.png', get_lang('CourseCreate')) .Display::return_icon('new-course.png', get_lang('CourseCreate'))
.(api_get_setting('course_validation') == 'true' ? get_lang('CreateCourseRequest') : get_lang('CourseCreate')) .(api_get_setting('course_validation') == 'true' ? get_lang('CreateCourseRequest') : get_lang(
'CourseCreate'
))
.'</a></li>'; .'</a></li>';
} }
@ -239,7 +243,9 @@ class IndexManager
.get_lang('CourseCatalog') .get_lang('CourseCatalog')
.'</a></li>'; .'</a></li>';
} else { } else {
$html .= '<li><a href="'.api_get_path(WEB_CODE_PATH).'dashboard/index.php">'.get_lang('Dashboard').'</a></li>'; $html .= '<li><a href="'.api_get_path(WEB_CODE_PATH).'dashboard/index.php">'.get_lang(
'Dashboard'
).'</a></li>';
} }
} }
$html .= '</ul>'; $html .= '</ul>';
@ -270,7 +276,7 @@ class IndexManager
// Including the page for the news // Including the page for the news
$html = ''; $html = '';
if (!empty($_GET['include']) && preg_match('/^[a-zA-Z0-9_-]*\.html$/', $_GET['include'])) { if (!empty($_GET['include']) && preg_match('/^[a-zA-Z0-9_-]*\.html$/', $_GET['include'])) {
$open = @(string) file_get_contents($this->home.$_GET['include']); $open = @(string)file_get_contents($this->home.$_GET['include']);
$html = api_to_system_encoding($open, api_detect_encoding(strip_tags($open))); $html = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
} else { } else {
// Hiding home top when user not connected. // Hiding home top when user not connected.
@ -305,9 +311,9 @@ class IndexManager
} }
if (trim($home_top_temp) == '' && api_is_platform_admin()) { if (trim($home_top_temp) == '' && api_is_platform_admin()) {
$home_top_temp = '<div class="welcome-mascot">'.get_lang('PortalHomepageDefaultIntroduction').'</div>'; $home_top_temp = get_lang('PortalHomepageDefaultIntroduction');
} else { } else {
$home_top_temp = '<div class="welcome-home-top-temp">'.$home_top_temp.'</div>'; $home_top_temp;
} }
$open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp); $open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
$html = api_to_system_encoding($open, api_detect_encoding(strip_tags($open))); $html = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
@ -324,9 +330,9 @@ class IndexManager
$user_selected_language = api_get_interface_language(); $user_selected_language = api_get_interface_language();
$html = ''; $html = '';
// Notice // Notice
$home_notice = @(string) file_get_contents($this->home.'home_notice_'.$user_selected_language.'.html'); $home_notice = @(string)file_get_contents($this->home.'home_notice_'.$user_selected_language.'.html');
if (empty($home_notice)) { if (empty($home_notice)) {
$home_notice = @(string) file_get_contents($this->home.'home_notice.html'); $home_notice = @(string)file_get_contents($this->home.'home_notice.html');
} }
if (!empty($home_notice)) { if (!empty($home_notice)) {
$home_notice = api_to_system_encoding($home_notice, api_detect_encoding(strip_tags($home_notice))); $home_notice = api_to_system_encoding($home_notice, api_detect_encoding(strip_tags($home_notice)));
@ -358,7 +364,7 @@ class IndexManager
} }
$html = ''; $html = '';
$home_menu = @(string) file_get_contents($this->home.'home_menu_'.$user_selected_language.'.html'); $home_menu = @(string)file_get_contents($this->home.'home_menu_'.$user_selected_language.'.html');
if (!empty($home_menu)) { if (!empty($home_menu)) {
$home_menu_content = '<ul class="nav nav-pills nav-stacked">'; $home_menu_content = '<ul class="nav nav-pills nav-stacked">';
$home_menu_content .= api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu))); $home_menu_content .= api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
@ -568,7 +574,8 @@ class IndexManager
if ($category_has_open_courses) { if ($category_has_open_courses) {
// The category contains courses accessible to anonymous visitors. // The category contains courses accessible to anonymous visitors.
$htmlListCat .= '<li>'; $htmlListCat .= '<li>';
$htmlListCat .= '<a href="'.api_get_self().'?category='.$catLine['code'].'">'.$catLine['name'].'</a>'; $htmlListCat .= '<a href="'.api_get_self(
).'?category='.$catLine['code'].'">'.$catLine['name'].'</a>';
if (api_get_setting('show_number_of_courses') == 'true') { if (api_get_setting('show_number_of_courses') == 'true') {
$htmlListCat .= ' ('.$catLine['nbCourse'].' '.get_lang('Courses').')'; $htmlListCat .= ' ('.$catLine['nbCourse'].' '.get_lang('Courses').')';
} }
@ -577,7 +584,8 @@ class IndexManager
} elseif ($catLine['children_count'] > 0) { } elseif ($catLine['children_count'] > 0) {
// The category has children, subcategories. // The category has children, subcategories.
$htmlListCat .= '<li>'; $htmlListCat .= '<li>';
$htmlListCat .= '<a href="'.api_get_self().'?category='.$catLine['code'].'">'.$catLine['name'].'</a>'; $htmlListCat .= '<a href="'.api_get_self(
).'?category='.$catLine['code'].'">'.$catLine['name'].'</a>';
$htmlListCat .= "</li>"; $htmlListCat .= "</li>";
$thereIsSubCat = true; $thereIsSubCat = true;
} elseif (api_get_setting('show_empty_course_categories') == 'true') { } elseif (api_get_setting('show_empty_course_categories') == 'true') {
@ -696,7 +704,9 @@ class IndexManager
// 2. // 2.
if ($user_identified && !array_key_exists($course['code'], $courses_of_user)) { if ($user_identified && !array_key_exists($course['code'], $courses_of_user)) {
if ($course['subscribe'] == '1') { if ($course['subscribe'] == '1') {
$courses_list_string .= '&nbsp;<a class="btn btn-primary" href="main/auth/courses.php?action=subscribe_course&sec_token='.$stok.'&subscribe_course='.$course['code'].'&category_code='.Security::remove_XSS($_GET['category']).'">'.get_lang('Subscribe').'</a><br />'; $courses_list_string .= '&nbsp;<a class="btn btn-primary" href="main/auth/courses.php?action=subscribe_course&sec_token='.$stok.'&subscribe_course='.$course['code'].'&category_code='.Security::remove_XSS(
$_GET['category']
).'">'.get_lang('Subscribe').'</a><br />';
} else { } else {
$courses_list_string .= '<br />'.get_lang('SubscribingNotAllowed'); $courses_list_string .= '<br />'.get_lang('SubscribingNotAllowed');
} }
@ -1302,9 +1312,13 @@ class IndexManager
if (isset($category[0])) { if (isset($category[0])) {
if ($viewGrid) { if ($viewGrid) {
if ($isCertificateAvailable) { if ($isCertificateAvailable) {
$courses['in_category'][$key1]['student_info']['certificate'] = get_lang('Yes'); $courses['in_category'][$key1]['student_info']['certificate'] = get_lang(
'Yes'
);
} else { } else {
$courses['in_category'][$key1]['student_info']['certificate'] = get_lang('No'); $courses['in_category'][$key1]['student_info']['certificate'] = get_lang(
'No'
);
} }
} else { } else {
if ($isCertificateAvailable) { if ($isCertificateAvailable) {
@ -1577,9 +1591,14 @@ class IndexManager
$course_session['student_info']['certificate'] = null; $course_session['student_info']['certificate'] = null;
if (isset($category[0])) { if (isset($category[0])) {
if ($category[0]->is_certificate_available($user_id)) { if ($category[0]->is_certificate_available($user_id)) {
$course_session['student_info']['certificate'] = Display::label(get_lang('Yes'), 'success'); $course_session['student_info']['certificate'] = Display::label(
get_lang('Yes'),
'success'
);
} else { } else {
$course_session['student_info']['certificate'] = Display::label(get_lang('No')); $course_session['student_info']['certificate'] = Display::label(
get_lang('No')
);
} }
} }
} }
@ -1603,7 +1622,9 @@ class IndexManager
'id' => $session_id, 'id' => $session_id,
]; ];
$session_box = Display::get_session_title_box($session_id); $session_box = Display::get_session_title_box($session_id);
$actions = api_get_path(WEB_CODE_PATH).'session/resume_session.php?id_session='.$session_id; $actions = api_get_path(
WEB_CODE_PATH
).'session/resume_session.php?id_session='.$session_id;
$coachId = $session_box['id_coach']; $coachId = $session_box['id_coach'];
$extraFieldValue = new ExtraFieldValue('session'); $extraFieldValue = new ExtraFieldValue('session');
$imageField = $extraFieldValue->get_values_by_handler_and_field_variable( $imageField = $extraFieldValue->get_values_by_handler_and_field_variable(
@ -1614,7 +1635,9 @@ class IndexManager
$params['category_id'] = $session_box['category_id']; $params['category_id'] = $session_box['category_id'];
$params['title'] = $session_box['title']; $params['title'] = $session_box['title'];
$params['id_coach'] = $coachId; $params['id_coach'] = $coachId;
$params['coach_url'] = api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?a=get_user_popup&user_id='.$coachId; $params['coach_url'] = api_get_path(
WEB_AJAX_PATH
).'user_manager.ajax.php?a=get_user_popup&user_id='.$coachId;
$params['coach_name'] = !empty($session_box['coach']) ? $session_box['coach'] : null; $params['coach_name'] = !empty($session_box['coach']) ? $session_box['coach'] : null;
$params['coach_avatar'] = UserManager::getUserPicture( $params['coach_avatar'] = UserManager::getUserPicture(
$coachId, $coachId,
@ -2248,8 +2271,7 @@ class IndexManager
$userFinished = $userFinished =
$countDependenciesPassed >= $gradeBooksToValidateInDependence && $countDependenciesPassed >= $gradeBooksToValidateInDependence &&
$countCoursesPassedNoDependency >= $minToValidate $countCoursesPassedNoDependency >= $minToValidate;
;
if ($userFinished) { if ($userFinished) {
$badgeList[$id]['finished'] = true; $badgeList[$id]['finished'] = true;
@ -2365,7 +2387,11 @@ class IndexManager
$button = ''; $button = '';
if ($displayButton) { if ($displayButton) {
$button = '<input id="session-view-button-'.intval($id).'" class="btn btn-default btn-sm" type="button" onclick="hideUnhide(\'courseblock-'.intval($id).'\', \'session-view-button-'.intval($id).'\', \'+\', \'-\')" value="+" />'; $button = '<input id="session-view-button-'.intval(
$id
).'" class="btn btn-default btn-sm" type="button" onclick="hideUnhide(\'courseblock-'.intval(
$id
).'\', \'session-view-button-'.intval($id).'\', \'+\', \'-\')" value="+" />';
} }
$icon = Display::return_icon( $icon = Display::return_icon(
@ -2529,7 +2555,9 @@ class IndexManager
*/ */
private static function filterByCategory($courseList, $categoryCode) private static function filterByCategory($courseList, $categoryCode)
{ {
return array_filter($courseList, function ($courseInfo) use ($categoryCode) { return array_filter(
$courseList,
function ($courseInfo) use ($categoryCode) {
if (isset($courseInfo['category_code']) && if (isset($courseInfo['category_code']) &&
$courseInfo['category_code'] === $categoryCode $courseInfo['category_code'] === $categoryCode
) { ) {
@ -2537,6 +2565,7 @@ class IndexManager
} }
return false; return false;
}); }
);
} }
} }

6
main/template/default/layout/layout_2_col.tpl
Unescape View File

@ -19,9 +19,9 @@
{{ sniff_notification }} {{ sniff_notification }}
{% if home_page_block %} {% if home_welcome %}
<article id="homepage-home"> <article id="home-welcome">
{{ home_page_block }} {{ home_welcome }}
</article> </article>
{% endif %} {% endif %}

Write Preview
Loading…
Cancel
Save