Skip to content

Commit 95e260c

Browse files
AngelFQCAngelFQC
committed
Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x
2 parents 915fa57 + 38efd2f commit 95e260c

22 files changed

+418
-313
lines changed

‎app/Resources/public/css/base.css

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2419,14 +2419,6 @@ div.admin_section h4 {
24192419
background: #FAFAFA;
24202420
}
24212421

2422-
.question-result .page-header {
2423-
margin-top: 20px;
2424-
}
2425-
2426-
.question-result h2.page-header {
2427-
font-size: 25px;
2428-
}
2429-
24302422
.question_row_score .title-score .total h3 {
24312423
margin: 0;
24322424
font-size: 22px;
@@ -8650,14 +8642,6 @@ main[dir="rtl"] .radio-inline input[type=radio]{
86508642
margin: 0;
86518643
}
86528644

8653-
.question-result .page-header {
8654-
margin-top: 20px;
8655-
}
8656-
8657-
.question-result h2.page-header {
8658-
font-size: 20px;
8659-
}
8660-
86618645
.dl-horizontal dt {
86628646
float: left;
86638647
width: 120px;
@@ -8720,14 +8704,6 @@ main[dir="rtl"] .radio-inline input[type=radio]{
87208704
margin: 0;
87218705
}
87228706

8723-
.question-result .page-header {
8724-
margin-top: 20px;
8725-
}
8726-
8727-
.question-result h2.page-header {
8728-
font-size: 20px;
8729-
}
8730-
87318707
.navbar-nav .open .dropdown-menu .user-header {
87328708
width: 100%;
87338709
}
@@ -10148,7 +10124,37 @@ ul.dropdown-menu.inner > li > a {
1014810124
.summary-course .list-info .text-color{
1014910125
color: #0A649F;
1015010126
}
10151-
10127+
.question-result h3{
10128+
margin-top: 0;
10129+
margin-bottom: 10px;
10130+
font-size: 20px;
10131+
font-weight: bold;
10132+
}
10133+
.question-result .user-avatar,
10134+
.question-result .user-info{
10135+
text-align: center;
10136+
}
10137+
.question-result .user-avatar img{
10138+
border-radius: 10px;
10139+
}
10140+
.group-data .list-data .item{
10141+
width: 150px;
10142+
display: inline-block;
10143+
font-weight: bold;
10144+
}
10145+
.badge-username{
10146+
font-weight: bold;
10147+
}
10148+
.badge-item{
10149+
padding-top: 10px;
10150+
padding-bottom: 10px;
10151+
}
10152+
.badge-item .msg{
10153+
border: 1px solid #cdcdcd;
10154+
padding: 10px;
10155+
border-radius: 5px;
10156+
background-color: #f3f3f3;
10157+
}
1015210158
@media (min-width: 768px) {
1015310159
.clear-rows-6-4-3 .col-sm-6:nth-child(2n+1) {
1015410160
clear: left;

‎documentation/changelog.html

Lines changed: 164 additions & 137 deletions
Large diffs are not rendered by default.

‎documentation/dependencies.html

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -62,47 +62,52 @@ <h2>Dependencies - client-side</h2>
6262
<ul>
6363
<li>PC with a minimum of 512MB or any tablet or smartphone</li>
6464
<li>We recommend a Pentium-I as a minimum processor capability for PCs</li>
65-
<li>Works on Windows XP (SP3 recommended) and later versions, Linux (any version with a graphical interface), Mac OS (any version), FreeBSD, Android, iOS and pretty much any other operating system with a graphical interface you might think about</li>
65+
<li>Works on Windows 8 and later versions, Linux (any version with a graphical interface), Mac OSX (any version), FreeBSD, Android, iOS and pretty much any other operating system with a graphical interface you might think about</li>
6666
<li>Any modern browser (IE10 and inferior *excluded*).</li>
67-
<li>Optional: Flash plugin (only required for a few features like the videoconference plugins)</li>
67+
<li>Optional: Flash plugin (only required if WebRTC is not supported by your browser)</li>
6868
<li>Optional: Java applet capability (only required for some plugins)</li>
6969
</ul>
7070

7171
<h2>Dependencies - server-side</h2>
7272
<ul>
7373
<li>Apache 2+</li>
74-
<li>PHP 5.5 or higher with MySQL bindings (mysqlnd is recommended for PHP 5). Now also supports PHP up to 7.2. If you use PHP 5, we highly recommend PHP 5.6. Otherwise, please use the latest stable PHP version available.</li>
74+
<li>PHP 5.6 or higher with MySQL bindings. Now also supports PHP up to 7.3.</li>
7575
<li>MySQL 5.6+ or any version of MariaDB database server</li>
76-
<li>php-intl package (for international behaviour support)</li>
77-
<li>php-gd package (for images resizing/cropping)</li>
78-
<li>php-mbstring package (for international behaviour support)</li>
79-
<li>php-imagick</li>
80-
<li>php-curl (only required for a feature in the links tool and an optional installer check)</li>
81-
<li>php-mcrypt (only required for a feature in the survey tool)</li>
76+
<li>php-curl</li>
77+
<li>php-dom (usually available by default)</li>
78+
<li>php-fileinfo (usually available by default)</li>
79+
<li>php-gd or php-imagick (for images resizing/cropping)</li>
80+
<li>php-intl (for international behaviour support)</li>
81+
<li>php-json</li>
82+
<li>php-mbstring</li>
83+
<li>php-mysql</li>
84+
<li>php-soap (for web services)</li>
85+
<li>php-xml</li>
86+
<li>php-zip</li>
8287
<li>php-ldap (only required for connection to a LDAP server)</li>
83-
<li>php-xapian (only required for full-text indexing and search)</li>
8488
</ul><br />
8589
<a name="included_dependencies"></a>
8690
<h2>Included Dependencies</h2>
8791
<ul>
8892
<li>EZpdf and MPDF</li>
89-
<li>FCKEditor (previously HTMLArea) </li>
90-
<li>FormValidator </li>
93+
<li>CKEditor (previously FCKeditor, previously HTMLArea) </li>
94+
<li>FormValidator (own version)</li>
9195
<li>iCalCreator</li>
92-
<li>kSes </li>
93-
<li>MIMETex </li>
94-
<li>MP3Player </li>
95-
<li>PCLZip </li>
96-
<li>PEAR::HTML_Common </li>
97-
<li>PEAR::HTML_QuickForm </li>
96+
<li>kSes</li>
97+
<li>mathjax</li>
98+
<li>MIMETex</li>
99+
<li>MP3Player</li>
100+
<li>Mediaplayer</li>
101+
<li>PCLZip</li>
102+
<li>PEAR::HTML_Common</li>
103+
<li>PEAR::HTML_QuickForm</li>
98104
<li>PEAR::HTML_Table</li>
99105
<li>PEAR::OLE</li>
100106
<li>PEAR::Pager</li>
101107
<li>PEAR::Spreadsheet_Excel_Writer</li>
102-
<li>PECL</li>
103-
<li>PHPMailer </li>
108+
<li>PHPMailer</li>
104109
<li>WCAG_Rendering</li>
105-
<li>xajax </li>
110+
<li>xajax</li>
106111
<li>jQuery</li>
107112
<li>Others (see composer.json)</li>
108113
</ul>

‎documentation/installation_guide.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ <h2><a name="1._Pre-requisites"></a>1. Pre-requisites</h2>
7878
<ul>
7979
<li><span style="font-weight: bold;">Apache 2.2+</span></li>
8080
<li><span style="font-weight: bold;">MySQL 5.6+ or MariaDB 5+</span></li>
81-
<li><span style="font-weight: bold;">PHP 5.5+ (7.2 recommended for greater efficiency)</span></li>
81+
<li><span style="font-weight: bold;">PHP 5.6+ (7.2+ recommended for greater efficiency)</span></li>
8282
</ul>
8383
<br />
8484
All these pieces of software are free software and freely available. <br /><br />

‎documentation/installation_guide_es_ES.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ <h2><a id="1._Pre-requisites"></a>1. Prerrequisitos</h2>
8888
<ul>
8989
<li><span style="font-weight: bold;">Apache 2.2+</span></li>
9090
<li><span style="font-weight: bold;">MySQL 5.6+ o MariaDB 5+</span></li>
91-
<li><span style="font-weight: bold;">PHP 5.5+ (7.2 recomendado para mayor eficiencia)</span></li>
91+
<li><span style="font-weight: bold;">PHP 5.6+ (7.2+ recomendado para mayor eficiencia)</span></li>
9292
</ul>
9393
<p>
9494
Todo este software es software de código abierto y está disponible libremente.

‎documentation/installation_guide_fr_FR.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ <h2><a name="1._Pre-requisites"></a>1. Prérequis</h2>
8080

8181
Chamilo est un système de gestion de l'apprentissage (LMS) qui fonctionne
8282
principallement sur base d'un <span style="font-weight: bold;">serveur web (Apache 2.2+)</span>, de <span style="font-weight: bold;">MySQL 5.6+ ou de MariaDB 5+
83-
(5 ou 10)</span> et de <span style="font-weight: bold;">PHP 5.5+</span> (7.1 recommandé). <br />
83+
(5 ou 10)</span> et de <span style="font-weight: bold;">PHP 5.6+</span> (7.2+ recommandé). <br />
8484

8585

8686
<br />

‎documentation/installation_guide_it_IT.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ <h1>Guida di installazione di Chamilo LMS 1.9</h1>
7373
<p class="p8"><span class="s1"></span><br></p>
7474
<p class="p2"><span class="s1"><b>Chamilo</b> può essere installato indifferentemente su server Windows, Linux, Mac OS X e Unix. Tuttavia raccomandiamo l’utilizzo di server Linux per sfruttarne al meglio le caratteristiche di flessibilità, controllo remoto e scalabilità.</span></p>
7575
<p class="p3"><span class="s1"></span><br></p>
76-
<p class="p2"><span class="s1"><b>Chamilo</b> è principalmente un <b>LMS (Learning Management System)</b> che gira sulla piattaforma composta da <b>Apache (1.3,2.0 or 2.2)</b>, <b>MySQL 5.6+ (o MariaDB</b>) e <b>PHP 5.5 (7.1 consigliato)</b>, meglio nota come piattaforma <b>AMP</b>.</span></p>
76+
<p class="p2"><span class="s1"><b>Chamilo</b> è principalmente un <b>LMS (Learning Management System)</b> che gira sulla piattaforma composta da <b>Apache (1.3,2.0 or 2.2)</b>, <b>MySQL 5.6+ (o MariaDB</b>) e <b>PHP 5.6 (7.2+ consigliato)</b>, meglio nota come piattaforma <b>AMP</b>.</span></p>
7777
<p class="p3"><span class="s1"></span><br></p>
7878
<p class="p2"><span class="s1">Tutti questi software sono gratuiti e liberamente scaricabili.</span></p>
7979
<p class="p3"><span class="s1"></span><br></p>

‎documentation/readme.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,20 @@ <h1>About Chamilo</h1>
5555

5656
<p>Technically, Chamilo is a web application written in PHP that stores data in a MySQL database.
5757
Users access it using a web browser.
58-
The first stable version of Chamilo, 1.8.6.2 Salto, was based on the Dokeos(TM) 1.8.6.1 code and is
59-
meant to be the next software step for institutions currently using Dokeos.
58+
The first stable version of Chamilo, 1.8.6.2 Salto, was based on the Dokeos(TM) 1.8.6.1 code and
59+
can be used to upgrade institutions away from Dokeos or Claroline 1.*.
6060
</p>
6161

6262

6363
<p>If you would like to know more or help develop this software, please visit<br />
64-
our homepage at <a href="http://www.chamilo.org">https://chamilo.org</a></p>
64+
our homepage at <a href="https://chamilo.org">https://chamilo.org</a></p>
6565
<h1>SCORM</h1>
6666
Chamilo imports and manages SCORM 1.2 contents.<br />
6767
For more information on SCORM normalisation, see http://www.adlnet.org<br />
6868
Chamilo does not implement the full set of SCORM 1.2 specifications, as many are not mandatory.
6969
Check our website for more details.<br />
70+
<h1>IMS/LTI</h1>
71+
Since version 1.11.10, Chamilo also fully supports IMS/LTI 1, 1.1, 1.1.1, Outcomes and Deep Linking.
7072

7173
<h1>License</h1>
7274

‎main/auth/courses_categories.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -380,9 +380,9 @@ class="btn btn-default panel_popover"
380380
$name = $value['firstname'].' '.$value['lastname'];
381381
$html .= '<div class="popover-teacher">';
382382
$html .= '<a href="'.$value['url'].'" class="ajax" data-title="'.$name.'" title="'.$name.'">
383-
<img src="'.$value['avatar'].'" alt="'.get_lang('UserPicture').'"/></a>';
383+
<img src="'.$value['avatar'].'" title="'.$name.'" alt="'.get_lang('UserPicture').'"/></a>';
384384
$html .= '<div class="teachers-details"><h5>
385-
<a href="'.$value['url'].'" class="ajax" data-title="'.$name.'">'
385+
<a href="'.$value['url'].'" class="ajax" data-title="'.$name.'" title="'.$name.'">'
386386
.$name.'</a></h5></div>';
387387
$html .= '</div>';
388388
}
@@ -392,10 +392,10 @@ class="btn btn-default panel_popover"
392392
$name = $value['firstname'].' '.$value['lastname'];
393393
if ($length > 2) {
394394
$html .= '<a href="'.$value['url'].'" class="ajax" data-title="'.$name.'" title="'.$name.'">
395-
<img src="'.$value['avatar'].'" alt="'.get_lang('UserPicture').'"/></a>';
395+
<img src="'.$value['avatar'].'" title="'.$name.'" alt="'.get_lang('UserPicture').'"/></a>';
396396
} else {
397397
$html .= '<a href="'.$value['url'].'" class="ajax" data-title="'.$name.'" title="'.$name.'">
398-
<img src="'.$value['avatar'].'" alt="'.get_lang('UserPicture').'"/></a>';
398+
<img src="'.$value['avatar'].'" title="'.$name.'" alt="'.get_lang('UserPicture').'"/></a>';
399399
$html .= '<div class="teachers-details"><h5>
400400
<a href="'.$value['url'].'" class="ajax" data-title="'.$name.'">'
401401
.$name.'</a></h5><p>'.get_lang('Teacher').'</p></div>';

‎main/exercise/exercise.class.php

Lines changed: 21 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5966,6 +5966,8 @@ public function showExerciseResultHeader(
59665966
$trackExerciseInfo
59675967
) {
59685968
$start_date = null;
5969+
$tpl = new Template(null, false, false, false, false, false, false);
5970+
59695971
if (isset($trackExerciseInfo['start_date'])) {
59705972
$start_date = api_convert_and_format_date($trackExerciseInfo['start_date']);
59715973
}
@@ -5978,19 +5980,17 @@ public function showExerciseResultHeader(
59785980
if (api_is_teacher() || api_is_platform_admin(true, true)) {
59795981
$userFullName = '<a href="'.$user_data['profile_url'].'" title="'.get_lang('GoToStudentDetails').'">'.$user_data['complete_name'].'</a>';
59805982
}
5981-
$array[] = [
5982-
'title' => get_lang('Name'),
5983-
'content' => $userFullName,
5984-
];
5985-
$array[] = [
5986-
'title' => get_lang('Username'),
5987-
'content' => $user_data['username'],
5983+
5984+
$data = [
5985+
'name_url' => $userFullName,
5986+
'complete_name' => $user_data['complete_name'],
5987+
'username' => $user_data['username'],
5988+
'avatar' => $user_data['avatar_medium'],
5989+
'url' => $user_data['profile_url']
59885990
];
5991+
59895992
if (!empty($user_data['official_code'])) {
5990-
$array[] = [
5991-
'title' => get_lang('OfficialCode'),
5992-
'content' => $user_data['official_code'],
5993-
];
5993+
$data['code'] = $user_data['official_code'];
59945994
}
59955995
}
59965996
// Description can be very long and is generally meant to explain
@@ -6002,43 +6002,32 @@ public function showExerciseResultHeader(
60026002
}
60036003
*/
60046004
if (!empty($start_date)) {
6005-
$array[] = ['title' => get_lang('StartDate'), 'content' => $start_date];
6005+
$data['start_date'] = $start_date;
60066006
}
60076007

60086008
if (!empty($duration)) {
6009-
$array[] = ['title' => get_lang('Duration'), 'content' => $duration];
6009+
$data['duration'] = $duration;
60106010
}
60116011

60126012
if (!empty($ip)) {
6013-
$array[] = ['title' => get_lang('IP'), 'content' => $ip];
6013+
$data['ip'] = $ip;
60146014
}
60156015

6016-
$icon = Display::return_icon(
6017-
'test-quiz.png',
6018-
get_lang('Result'),
6019-
null,
6020-
ICON_SIZE_MEDIUM
6021-
);
60226016

6023-
$html = '<div class="question-result">';
60246017
if (api_get_configuration_value('save_titles_as_html')) {
6025-
$html .= $this->get_formated_title();
6026-
$html .= Display::page_header(get_lang('Result'));
6018+
$data['title'] = $this->get_formated_title().get_lang('Result');
60276019
} else {
6028-
$html .= Display::page_header(
6029-
$icon.PHP_EOL.$this->exercise.' : '.get_lang('Result')
6030-
);
6020+
$data['title'] = PHP_EOL.$this->exercise.' : '.get_lang('Result');
60316021
}
60326022

60336023
$hide = api_get_configuration_value('hide_user_info_in_quiz_result');
60346024

6035-
if ($hide === false) {
6036-
$html .= Display::description($array);
6037-
}
6025+
$tpl->assign('hide', $hide);
6026+
$tpl->assign('data', $data);
6027+
$layoutTemplate = $tpl->get_template('exercise/partials/result_exercise.tpl');
6028+
$content = $tpl->fetch($layoutTemplate);
60386029

6039-
$html .= "</div>";
6040-
6041-
return $html;
6030+
return $content;
60426031
}
60436032

60446033
/**

0 commit comments

Comments
 (0)