Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

pull/3683/head
Julio Montoya 5 years ago
commit 168342e81d
  1. 9
      app/Resources/public/css/themes/academica/default.css
  2. 9
      app/Resources/public/css/themes/baby_orange/default.css
  3. 10
      app/Resources/public/css/themes/beach/default.css
  4. 9
      app/Resources/public/css/themes/blue_lagoon/default.css
  5. 13
      app/Resources/public/css/themes/chamilo/default.css
  6. 12
      app/Resources/public/css/themes/chamilo_electric_blue/default.css
  7. 9
      app/Resources/public/css/themes/chamilo_green/default.css
  8. 9
      app/Resources/public/css/themes/chamilo_orange/default.css
  9. 9
      app/Resources/public/css/themes/chamilo_red/default.css
  10. 9
      app/Resources/public/css/themes/chamilo_sport_red/default.css
  11. 17
      app/Resources/public/css/themes/cool_blue/default.css
  12. 9
      app/Resources/public/css/themes/corporate/default.css
  13. 9
      app/Resources/public/css/themes/cosmic_campus/default.css
  14. 9
      app/Resources/public/css/themes/delicious_bordeaux/default.css
  15. 12
      app/Resources/public/css/themes/empire_green/default.css
  16. 9
      app/Resources/public/css/themes/fruity_orange/default.css
  17. 10
      app/Resources/public/css/themes/holi/default.css
  18. 11
      app/Resources/public/css/themes/journal/default.css
  19. 18
      app/Resources/public/css/themes/kiddy/default.css
  20. 17
      app/Resources/public/css/themes/medical/default.css
  21. 9
      app/Resources/public/css/themes/readable/default.css
  22. 9
      app/Resources/public/css/themes/royal_purple/default.css
  23. 9
      app/Resources/public/css/themes/silver_line/default.css
  24. 9
      app/Resources/public/css/themes/simplex/default.css
  25. 9
      app/Resources/public/css/themes/sober_brown/default.css
  26. 9
      app/Resources/public/css/themes/spacelab/default.css
  27. 9
      app/Resources/public/css/themes/steel_grey/default.css
  28. 9
      app/Resources/public/css/themes/tasty_olive/default.css
  29. 4
      plugin/bbb/lib/bbb_plugin.class.php
  30. 4
      plugin/google_meet/src/google_meet_plugin.class.php
  31. 4
      plugin/mindmap/mindmap_plugin.class.php
  32. 2
      plugin/xapi/src/Entity/LrsAuth.php
  33. 2
      plugin/xapi/src/Entity/ToolLaunch.php
  34. 16
      plugin/xapi/src/XApiPlugin.php
  35. 6
      plugin/xapi/tincan/stats.php
  36. 4
      plugin/xapi/tincan/stats_attempts.ajax.php
  37. 6
      plugin/zoom/lib/ZoomPlugin.php

@ -33,12 +33,19 @@
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
position: relative;
}
body {
margin: 0;
margin: 0 0 60px;
font-family: 'Open Sans', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #185B8E;
}

@ -32,12 +32,19 @@
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
position: relative;
}
body {
margin: 0;
margin: 0 0 60px;
font-family: 'Open Sans', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #666666;
}

@ -29,16 +29,22 @@
src: local('Open Sans Bold'), local('OpenSans-Bold'), url(fonts/OpenSans-Bold.woff2) format('woff2'), url(fonts/OpenSans-Bold.woff) format('woff');
}
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
position: relative;
}
body {
margin: 0;
margin: 0 0 60px;
font-family: 'Open Sans', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a {
color: #2E75A3;

@ -33,12 +33,19 @@
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
position: relative;
}
body {
margin: 0;
margin: 0 0 60px;
font-family: 'Open Sans', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #185B8E;
}

@ -6,8 +6,17 @@
* Based on Bootstrap v3
*/
html {
position: relative;
}
body {
margin: 0;
margin: 0 0 60px;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a {
@ -116,4 +125,4 @@ a:focus {
}
.bgfooter a{
color: #ffffff;
}
}

@ -30,6 +30,18 @@
font-weight: 700;
src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../chamilo/fonts/OpenSans-Bold.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Bold.woff) format('woff');
}
html {
position: relative;
}
body {
margin: 0 0 60px;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;

@ -32,12 +32,19 @@
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
position: relative;
}
body {
margin: 0;
margin: 0 0 60px;
font-family: 'Open Sans', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #004600;
}

@ -32,12 +32,19 @@
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
position: relative;
}
body {
margin: 0;
margin: 0 0 60px;
font-family: 'Open Sans', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #666666;

@ -31,14 +31,21 @@
src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../chamilo/fonts/OpenSans-Bold.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Bold.woff) format('woff');
}
html {
position: relative;
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
}
body {
margin: 0;
margin: 0 0 60px;
font-family: 'Open Sans', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #666666;
}

@ -32,12 +32,19 @@
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
position: relative;
}
body {
margin: 0;
margin: 0 0 60px;
font-family: 'Open Sans', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #666666;
}

@ -30,13 +30,20 @@
src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../chamilo/fonts/OpenSans-Bold.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Bold.woff) format('woff');
}
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
position: relative;
}
body {
margin: 0;
font-family: 'Open Sans', sans-serif;
line-height: 1.72222;
margin: 0 0 60px;
font-family: 'Open Sans', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #666666;

@ -30,14 +30,21 @@
src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../chamilo/fonts/OpenSans-Bold.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Bold.woff) format('woff');
}
html {
position: relative;
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
}
body {
margin: 0;
margin: 0 0 60px;
font-family: 'Open Sans', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #666666;
}

@ -31,14 +31,21 @@
src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../chamilo/fonts/OpenSans-Bold.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Bold.woff) format('woff');
}
html {
position: relative;
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
}
body {
margin: 0;
margin: 0 0 60px;
font-family: 'Open Sans', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #185B8E;
}

@ -30,14 +30,21 @@
src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../chamilo/fonts/OpenSans-Bold.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Bold.woff) format('woff');
}
html {
position: relative;
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
}
body {
margin: 0;
margin: 0 0 60px;
font-family: 'Open Sans', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #666666;
}

@ -29,12 +29,20 @@
font-weight: 700;
src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../chamilo/fonts/OpenSans-Bold.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Bold.woff) format('woff');
}
html {
position: relative;
}
body {
margin: 0;
margin: 0 0 60px;
font-family: 'Open Sans', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #666666;
}

@ -32,12 +32,19 @@
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
position: relative;
}
body {
margin: 0;
margin: 0 0 60px;
font-family: 'Open Sans', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #666666;
}

@ -29,16 +29,22 @@
src: local('Open Sans Bold'), local('OpenSans-Bold'), url(fonts/OpenSans-Bold.woff2) format('woff2'), url(fonts/OpenSans-Bold.woff) format('woff');
}
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
position: relative;
}
body {
margin: 0;
margin: 0 0 60px;
font-family: 'Open Sans', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a {
color: #3D91CA;

@ -29,17 +29,22 @@
font-weight: 700;
src: local('Arimo Bold Italic'), local('Arimo-BoldItalic'), url(fonts/Arimo-BoldItalic.woff2) format('woff2');
}
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
position: relative;
}
body {
margin: 0;
margin: 0 0 60px;
font-family: 'Arimo', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #666666;
}

@ -24,15 +24,21 @@
src: local('Roboto Condensed Bold'), local('RobotoCondensed-Bold'), url(fonts/RobotoCondensed-Bold.woff2) format('woff2');
}
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
position: relative;
}
body {
margin: 0;
font-family: 'Roboto Condensed', sans-serif;
line-height: 1.72222;
margin: 0 0 60px;
font-family: 'Roboto Condensed', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #666666;

@ -36,13 +36,20 @@
}
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
position: relative;
}
body {
margin: 0;
font-family: 'Lato', sans-serif;
line-height: 1.72222;
margin: 0 0 60px;
font-family: 'Lato', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #2D9DB5;

@ -28,13 +28,20 @@
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
position: relative;
}
body {
margin: 0;
margin: 0 0 60px;
font-family: 'Roboto Slab', serif;
line-height: 1.72222;
background-color: #E3E3E3;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #666666;
}

@ -32,12 +32,19 @@
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
position: relative;
}
body {
margin: 0;
margin: 0 0 60px;
font-family: 'Open Sans', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #666666;
}

@ -26,12 +26,19 @@
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
position: relative;
}
body {
margin: 0;
margin: 0 0 60px;
font-family: 'Titillium Web', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #666666;
}

@ -26,12 +26,19 @@
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
position: relative;
}
body {
margin: 0;
margin: 0 0 60px;
font-family: 'Lato', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #111111;
}

@ -32,12 +32,19 @@
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
position: relative;
}
body {
margin: 0;
margin: 0 0 60px;
font-family: 'Open Sans', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #666666;
}

@ -33,12 +33,19 @@
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
position: relative;
}
body {
margin: 0;
margin: 0 0 60px;
font-family: 'Open Sans', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #185B8E;
}

@ -32,12 +32,19 @@
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
position: relative;
}
body {
margin: 0;
margin: 0 0 60px;
font-family: 'Open Sans', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #666666;
}

@ -32,12 +32,19 @@
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
position: relative;
}
body {
margin: 0;
margin: 0 0 60px;
font-family: 'Open Sans', sans-serif;
line-height: 1.72222;
}
body > main footer.footer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
}
a{
color: #666666;
}

@ -360,7 +360,9 @@ class BBBPlugin extends Plugin
$destinationDir = api_get_path(SYS_CODE_PATH).'img/icons/';
foreach ($iconsList as $icon) {
$dest = $destinationDir.$icon;
unlink($dest);
if (is_file($dest)) {
@unlink($dest);
}
}
}
}

@ -146,7 +146,9 @@ class GoogleMeetPlugin extends Plugin
$destinationDir = api_get_path(SYS_CODE_PATH).'img/icons/';
foreach ($iconsList as $icon) {
$dest = $destinationDir.$icon;
unlink($dest);
if (is_file($dest)) {
@unlink($dest);
}
}
}

@ -100,7 +100,9 @@ class MindmapPlugin extends Plugin
$destinationDir = api_get_path(SYS_CODE_PATH).'img/icons/';
foreach ($iconsList as $icon) {
$dest = $destinationDir.$icon;
unlink($dest);
if (is_file($dest)) {
@unlink($dest);
}
}
// Deleting course settings and course home icons

@ -2,6 +2,8 @@
/* For licensing terms, see /license.txt */
namespace Chamilo\PluginBundle\Entity\XApi;
use Doctrine\ORM\Mapping as ORM;
/**

@ -21,7 +21,7 @@ class ToolLaunch
/**
* @var int
*
* @ORM\Column(type="integer")
* @ORM\Column(type="integer", name="id")
* @ORM\Id()
* @ORM\GeneratedValue()
*/

@ -2,6 +2,7 @@
/* For licensing terms, see /license.txt */
use Chamilo\PluginBundle\Entity\XApi\LrsAuth;
use Chamilo\PluginBundle\Entity\XApi\SharedStatement;
use Chamilo\PluginBundle\Entity\XApi\ToolLaunch;
use Doctrine\ORM\EntityManager;
@ -331,18 +332,19 @@ class XApiPlugin extends Plugin implements HookPluginInterface
{
$iso = self::findLanguageIso($languageMap->languageTags(), $language);
if (isset($languageMap[$iso])) {
return $languageMap[$iso];
}
$text = current($languageMap);
if (isset($languageMap['und'])) {
return $languageMap['und'];
if (isset($languageMap[$iso])) {
$text = trim($languageMap[$iso]);
} elseif (isset($languageMap['und'])) {
$text = $languageMap['und'];
}
return array_pop($languageMap);
return $text;
}
/**
* @param array $haystack
* @param string $needle
*
* @return string
@ -359,7 +361,7 @@ class XApiPlugin extends Plugin implements HookPluginInterface
}
}
return 'en';
return $haystack[0];
}
public function generateLaunchUrl(

@ -85,10 +85,12 @@ $students = CourseManager::get_student_list_from_course_code(
$content = '';
$content .= '<div class="xapi-students">';
$loadingMessage = Display::returnFontAwesomeIcon('spinner', '', true, 'fa-pulse').' '.get_lang('Loading');
foreach ($students as $studentInfo) {
$content .= Display::panelCollapse(
api_get_person_name($studentInfo['firstname'], $studentInfo['lastname']),
'',
$loadingMessage,
"pnl-student-{$studentInfo['id']}",
[
'class' => 'pnl-student',
@ -133,7 +135,7 @@ $htmlHeadXtra[] = "<script>
var \$self = \$(this)
.addClass('disabled')
.html('<em class=\"fa fa-spinner fa-pulse\"></em> ".get_lang('Loading')."');
.html('".$loadingMessage."');
$.post(
'stats_statements.ajax.php?' + _p.web_cid_query,

@ -38,7 +38,7 @@ $toolLaunch = $em->find(
$student = api_get_user_entity($request->request->getInt('student'));
if (!$toolLaunch || !$student) {
echo Display::return_message(get_lang('NoResults'), 'error');
echo Display::return_message(get_lang('NotAllowed'), 'error');
exit;
}
@ -82,7 +82,7 @@ try {
)
);
} catch (NotFoundException $notFoundException) {
echo Display::return_message($notFoundException->getMessage(), 'error');
echo Display::return_message(get_lang('NoResults'), 'warning');
exit;
} catch (XApiException $exception) {
echo Display::return_message($exception->getMessage(), 'error');

@ -222,7 +222,7 @@ class ZoomPlugin extends Plugin
$dest = $destinationDir.$icon;
copy($src, $dest);
}
$this->install_course_fields_in_all_courses(true, 'zoom_meet.png');
}
@ -255,7 +255,9 @@ class ZoomPlugin extends Plugin
$destinationDir = api_get_path(SYS_CODE_PATH).'img/icons/';
foreach ($iconsList as $icon) {
$dest = $destinationDir.$icon;
unlink($dest);
if (is_file($dest)) {
@unlink($dest);
}
}
}

Loading…
Cancel
Save