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

Merge remote-tracking branch 'origin/1.11.x' into 1.11.x

Browse Source
pull/3173/head
Yannick Warnier 6 years ago
parent 91710709ef 23ac2b2875
commit ad032e3aa5
3 changed files with 82 additions and 56 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. 45
      app/Resources/public/css/base.css
  2. 53
      main/exercise/exercise.class.php
  3. 40
      main/template/default/exercise/partials/result_exercise.tpl

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

@ -2419,14 +2419,6 @@ div.admin_section h4 {
background: #FAFAFA;
}
.question-result .page-header {
margin-top: 20px;
}
.question-result h2.page-header {
font-size: 25px;
}
.question_row_score .title-score .total h3 {
margin: 0;
font-size: 22px;
@ -8650,14 +8642,6 @@ main[dir="rtl"] .radio-inline input[type=radio]{
margin: 0;
}
.question-result .page-header {
margin-top: 20px;
}
.question-result h2.page-header {
font-size: 20px;
}
.dl-horizontal dt {
float: left;
width: 120px;
@ -8720,14 +8704,6 @@ main[dir="rtl"] .radio-inline input[type=radio]{
margin: 0;
}
.question-result .page-header {
margin-top: 20px;
}
.question-result h2.page-header {
font-size: 20px;
}
.navbar-nav .open .dropdown-menu .user-header {
width: 100%;
}
@ -10148,7 +10124,28 @@ ul.dropdown-menu.inner > li > a {
.summary-course .list-info .text-color{
color: #0A649F;
}
<<<<<<< HEAD
.question-result h3{
margin-top: 0;
margin-bottom: 10px;
font-size: 20px;
font-weight: bold;
}
.question-result .user-avatar,
.question-result .user-info{
text-align: center;
}
.question-result .user-avatar img{
border-radius: 10px;
}
.group-data .list-data .item{
width: 150px;
display: inline-block;
font-weight: bold;
}
=======
>>>>>>> 23bad83a744482179b36bc14365ed0c1bef45a2c
@media (min-width: 768px) {
.clear-rows-6-4-3 .col-sm-6:nth-child(2n+1) {
clear: left;

53
main/exercise/exercise.class.php
Unescape View File

@ -5966,6 +5966,8 @@ class Exercise
$trackExerciseInfo
) {
$start_date = null;
$tpl = new Template(null, false, false, false, false, false, false);
if (isset($trackExerciseInfo['start_date'])) {
$start_date = api_convert_and_format_date($trackExerciseInfo['start_date']);
}
@ -5978,19 +5980,17 @@ class Exercise
if (api_is_teacher() || api_is_platform_admin(true, true)) {
$userFullName = '<a href="'.$user_data['profile_url'].'" title="'.get_lang('GoToStudentDetails').'">'.$user_data['complete_name'].'</a>';
}
$array[] = [
'title' => get_lang('Name'),
'content' => $userFullName,
];
$array[] = [
'title' => get_lang('Username'),
'content' => $user_data['username'],
$data = [
'name_url' => $userFullName,
'complete_name' => $user_data['complete_name'],
'username' => $user_data['username'],
'avatar' => $user_data['avatar_medium'],
'url' => $user_data['profile_url']
];
if (!empty($user_data['official_code'])) {
$array[] = [
'title' => get_lang('OfficialCode'),
'content' => $user_data['official_code'],
];
$data['code'] = $user_data['official_code'];
}
}
// Description can be very long and is generally meant to explain
@ -6002,43 +6002,32 @@ class Exercise
}
*/
if (!empty($start_date)) {
$array[] = ['title' => get_lang('StartDate'), 'content' => $start_date];
$data['start_date'] = $start_date;
}
if (!empty($duration)) {
$array[] = ['title' => get_lang('Duration'), 'content' => $duration];
$data['duration'] = $duration;
}
if (!empty($ip)) {
$array[] = ['title' => get_lang('IP'), 'content' => $ip];
$data['ip'] = $ip;
}
$icon = Display::return_icon(
'test-quiz.png',
get_lang('Result'),
null,
ICON_SIZE_MEDIUM
);
$html = '<div class="question-result">';
if (api_get_configuration_value('save_titles_as_html')) {
$html .= $this->get_formated_title();
$html .= Display::page_header(get_lang('Result'));
$data['title'] = $this->get_formated_title().get_lang('Result');
} else {
$html .= Display::page_header(
$icon.PHP_EOL.$this->exercise.' : '.get_lang('Result')
);
$data['title'] = PHP_EOL.$this->exercise.' : '.get_lang('Result');
}
$hide = api_get_configuration_value('hide_user_info_in_quiz_result');
if ($hide === false) {
$html .= Display::description($array);
}
$tpl->assign('hide', $hide);
$tpl->assign('data', $data);
$layoutTemplate = $tpl->get_template('exercise/partials/result_exercise.tpl');
$content = $tpl->fetch($layoutTemplate);
$html .= "</div>";
return $html;
return $content;
}
/**

40
main/template/default/exercise/partials/result_exercise.tpl
Unescape View File

@ -0,0 +1,40 @@
{% if hide != true %}
<div class="question-result">
<div class="panel panel-default">
<div class="panel-body">
<h3>{{ data.title }}</h3>
<div class="row">
<div class="col-md-3">
<div class="user-avatar">
<img src="{{ data.avatar }}">
</div>
<div class="user-info">
<strong>{{ data.name_url }}</strong><br>
</div>
</div>
<div class="col-md-9">
<div class="group-data">
<div class="list-data username">
<span class="item">{{ 'Username'|get_lang }}</span>
<i class="fa fa-user" aria-hidden="true"></i> {{ data.username }}
</div>
<div class="list-data start-date">
<span class="item">{{ 'StartDate'|get_lang }}</span>
<i class="fa fa-calendar" aria-hidden="true"></i> {{ data.start_date }}
</div>
<div class="list-data duration">
<span class="item">{{ 'Duration'|get_lang }}</span>
<i class="fa fa-clock-o" aria-hidden="true"></i> {{ data.duration }}
</div>
<div class="list-data ip">
<span class="item">{{ 'IP'|get_lang }}</span>
<i class="fa fa-laptop" aria-hidden="true"></i> {{ data.ip }}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
{% endif %}
Write Preview
Loading…
Cancel
Save