From 48b69300050b7e098a67c6f5a8833f9fbf8867bc Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Mon, 22 Feb 2016 10:29:16 -0500 Subject: [PATCH] Minor - Change to Bootstrap style - refs BT#10856 #ofj --- main/inc/lib/tracking.lib.php | 52 +++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php index 76580cb43c..cbf9fc984b 100755 --- a/main/inc/lib/tracking.lib.php +++ b/main/inc/lib/tracking.lib.php @@ -4490,7 +4490,9 @@ class Tracking Display::return_icon('session.png', get_lang('Sessions'), array(), ICON_SIZE_SMALL) . ' ' . get_lang('Sessions') ); - $html .= ''; + $html .= '
'; + $html .= '
'; + $html .= ''; $html .= ' '.Display::tag('th', get_lang('Session'), array('width'=>'300px')).' '.Display::tag('th', get_lang('PublishedExercises'), array('width'=>'300px')).' @@ -4498,6 +4500,8 @@ class Tracking '.Display::tag('th', get_lang('AverageExerciseResult'), array('class'=>'head')).' '.Display::tag('th', get_lang('Details'), array('class'=>'head')).' '; + $html .= ''; + $html .= ''; foreach ($course_in_session as $my_session_id => $session_data) { $course_list = $session_data['course_list']; @@ -4574,7 +4578,8 @@ class Tracking $html .= Display::tag('td', $icon); $html .= ''; } - $html .= '

'; + $html .= ''; + $html .= '
'; $html .= Display::div($main_session_graph, array('id'=>'session_graph','class'=>'chart-session', 'style'=>'position:relative; text-align: center;') ); // Checking selected session. @@ -4586,9 +4591,11 @@ class Tracking $html .= Display::tag('h3',$session_data['name'].' - '.get_lang('CourseList')); - $html .= ''; + $html .= '
'; + $html .= '
'; //'.Display::tag('th', get_lang('DoneExercises'), array('class'=>'head')).' $html .= ' + '.Display::tag('th', get_lang('PublishedExercises'), array('class'=>'head')).' @@ -4600,7 +4607,10 @@ class Tracking '.Display::tag('th', get_lang('Score').Display::return_icon('info3.gif', get_lang('ScormAndLPTestTotalAverage'), array ('align' => 'absmiddle', 'hspace' => '3px')), array('class'=>'head')).' '.Display::tag('th', get_lang('LastConnexion'), array('class'=>'head')).' '.Display::tag('th', get_lang('Details'), array('class'=>'head')).' - '; + + + + '; foreach ($course_list as $course_data) { $course_code = $course_data['code']; @@ -4717,7 +4727,7 @@ class Tracking $html .= Display::tag('td', $details, array('align'=>'center')); $html .= ''; } - $html .= '
'.get_lang('Course').'
'; + $html .= ''; } } @@ -4743,18 +4753,22 @@ class Tracking $em = Database::getManager(); $html .= Display::page_subheader($course_info['title']); - $html .= ''; + $html .= '
'; + $html .= '
'; //Course details $html .= ' + - - - - - - - '; + + + + + + + + + '; if (empty($session_id)) { $user_list = CourseManager::get_user_list_from_course_code( @@ -4918,17 +4932,19 @@ class Tracking } else { $html .= ''; } - $html .= '
'.get_lang('Exercises').''.get_lang('Attempts').''.get_lang('BestAttempt').''.get_lang('Ranking').''.get_lang('BestResultInCourse').''.get_lang('Statistics').' '.Display :: return_icon('info3.gif', get_lang('OnlyBestResultsPerStudent'), array('align' => 'absmiddle', 'hspace' => '3px')).'
'.get_lang('Exercises').''.get_lang('Attempts').''.get_lang('BestAttempt').''.get_lang('Ranking').''.get_lang('BestResultInCourse').''.get_lang('Statistics').' '.Display :: return_icon('info3.gif', get_lang('OnlyBestResultsPerStudent'), array('align' => 'absmiddle', 'hspace' => '3px')).'
'.get_lang('NoEx').'
'; + $html .= ''; // LP table results - $html .=''; + $html .= '
'; + $html .='
'; + $html .= ''; $html .= Display::tag('th', get_lang('Learnpaths'), array('class'=>'head', 'style'=>'color:#000')); $html .= Display::tag('th', get_lang('LatencyTimeSpent'), array('class'=>'head', 'style'=>'color:#000')); $html .= Display::tag('th', get_lang('Progress'), array('class'=>'head', 'style'=>'color:#000')); $html .= Display::tag('th', get_lang('Score'), array('class'=>'head', 'style'=>'color:#000')); $html .= Display::tag('th', get_lang('LastConnexion'), array('class'=>'head', 'style'=>'color:#000')); - $html .= ''; + $html .= ''; $list = new LearnpathList( api_get_user_id(), @@ -4986,7 +5002,7 @@ class Tracking '; } - $html .='
'; + $html .=''; if (api_get_setting('allow_skills_tool') === 'true') { $skillsRelUser = $em->getRepository('ChamiloCoreBundle:SkillRelUser')->findBy([ @@ -5034,6 +5050,8 @@ class Tracking '; + } else { + $html .= get_lang('WithoutAchievedSkills'); } $html .= '