L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-67974-311' of git://github.com/sarjona/moodle into MOODLE_311_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2021-03-01 22:33:26 +01:00
parent 217698a385 2ac767233a
commit 241cf14d71
4 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
badges/renderer.php
+9 -4
View File
@@ -322,7 +322,15 @@ class core_badges_renderer extends plugin_renderer_base {
$badgeclass = $ibadge->badgeclass;
$badge = new badge($ibadge->badgeid);
$now = time();
$expiration = isset($issued['expires']) ? $issued['expires'] : $now + 86400;
if (isset($issued['expires'])) {
if (!is_numeric($issued['expires'])) {
$issued['expires'] = strtotime($issued['expires']);
}
$expiration = $issued['expires'];
} else {
$expiration = $now + 86400;
}
$badgeimage = is_array($badgeclass['image']) ? $badgeclass['image']['id'] : $badgeclass['image'];
$languages = get_string_manager()->get_list_of_languages();
@@ -432,9 +440,6 @@ class core_badges_renderer extends plugin_renderer_base {
}
$dl[get_string('dateawarded', 'badges')] = userdate($issued['issuedOn']);
if (isset($issued['expires'])) {
if (!is_numeric($issued['expires'])) {
$issued['expires'] = strtotime($issued['expires']);
}
if ($issued['expires'] < $now) {
$dl[get_string('expirydate', 'badges')] = userdate($issued['expires']) . get_string('warnexpired', 'badges');
theme/boost/scss/moodle/core.scss
+7 -1
View File
@@ -1870,10 +1870,13 @@ ul.badges {
}
.badges li .expireimage {
background-image: url([[pix:i/expired]]);
background-repeat: no-repeat;
background-size: 100px 100px;
width: 100px;
height: 100px;
left: 25px;
top: 0;
top: 15px;
position: absolute;
z-index: 10;
opacity: 0.85;
@@ -1891,6 +1894,9 @@ ul.badges {
margin-bottom: 20px;
.expireimage {
background-image: url([[pix:i/expired]]);
background-repeat: no-repeat;
background-size: 100px 100px;
width: 100px;
height: 100px;
left: 0;
theme/boost/style/moodle.css
+7 -1
View File
@@ -11173,10 +11173,13 @@ ul.badges {
position: relative; }
.badges li .expireimage {
background-image: url([[pix:i/expired]]);
background-repeat: no-repeat;
background-size: 100px 100px;
width: 100px;
height: 100px;
left: 25px;
top: 0;
top: 15px;
position: absolute;
z-index: 10;
opacity: 0.85; }
@@ -11192,6 +11195,9 @@ ul.badges {
margin-top: 17px;
margin-bottom: 20px; }
#badge-image .expireimage {
background-image: url([[pix:i/expired]]);
background-repeat: no-repeat;
background-size: 100px 100px;
width: 100px;
height: 100px;
left: 0;
theme/classic/style/moodle.css
+7 -1
View File
@@ -11383,10 +11383,13 @@ ul.badges {
position: relative; }
.badges li .expireimage {
background-image: url([[pix:i/expired]]);
background-repeat: no-repeat;
background-size: 100px 100px;
width: 100px;
height: 100px;
left: 25px;
top: 0;
top: 15px;
position: absolute;
z-index: 10;
opacity: 0.85; }
@@ -11402,6 +11405,9 @@ ul.badges {
margin-top: 17px;
margin-bottom: 20px; }
#badge-image .expireimage {
background-image: url([[pix:i/expired]]);
background-repeat: no-repeat;
background-size: 100px 100px;
width: 100px;
height: 100px;
left: 0;