Merge branch 'MDL-80303-main' of https://github.com/roland04/moodle

This commit is contained in:
Sara Arjona
2024-12-03 15:55:50 +01:00
17 changed files with 2250 additions and 3371 deletions
+1 -1
View File
@@ -64,7 +64,7 @@ if (trim($forum->intro) != '') {
echo $OUTPUT->box($introcontent, 'generalbox', 'intro');
}
echo html_writer::div(forum_get_subscribe_link($forum, $modcontext), 'subscribelink');
echo html_writer::div(forum_get_subscribe_link($forum, $modcontext), 'subscribelink text-end');
$numdiscussions = course_get_format($course)->get_course()->numdiscussions;
if ($numdiscussions < 1) {
@@ -53,7 +53,8 @@
"id": 35,
"header": {
"name": "Section title",
"url": "#"
"url": "#",
"headinglevel": 3
},
"cmlist": {
"cms": [
@@ -83,7 +84,8 @@
"id": 36,
"header": {
"name": "Section 2 title",
"url": "#"
"url": "#",
"headinglevel": 3
},
"cmlist": {
"cms": [
@@ -139,7 +141,8 @@
"id": 37,
"header": {
"name": "Single Section Example",
"url": "#"
"url": "#",
"headinglevel": 3
},
"cmlist": {
"cms": [
@@ -169,7 +172,7 @@
<div id="course-format-{{uniqid}}">
<h2 class="accesshide">{{{title}}}</h2>
{{{completionhelp}}}
<ul class="{{format}}" data-for="course_sectionlist">
<ul class="{{format}} section-list" data-for="course_sectionlist">
{{#initialsection}}
{{$ core_courseformat/local/content/section }}
{{> core_courseformat/local/content/section }}
@@ -188,7 +191,7 @@
{{> core_courseformat/local/content/sectionnavigation }}
{{/ core_courseformat/local/content/sectionnavigation }}
{{/sectionnavigation}}
<ul class="{{format}}">
<ul class="{{format}} section-list">
{{#singlesection}}
{{$ core_courseformat/local/content/section }}
{{> core_courseformat/local/content/section }}
@@ -38,7 +38,7 @@
</div>
{{/showsettings}}
<div class="sitetopic">
<ul class="topics frontpage" data-for="course_sectionlist">
<ul class="topics section-list frontpage" data-for="course_sectionlist">
{{#sections}}
{{> core_courseformat/local/content/section }}
{{/sections}}
@@ -32,7 +32,8 @@
"name": "Section title",
"title": "<a href=\"http://moodle/course/view.php?id=5#section-0\">Section title</a>",
"url": "#",
"ishidden": true
"ishidden": true,
"headinglevel": 3
},
"cmlist": {
"cms": [
@@ -39,7 +39,7 @@
}
}}
<li
class="activity activity-wrapper {{module}} modtype_{{module}} {{extraclasses}} {{#hasinfo}}hasinfo{{/hasinfo}} {{#indent}}indented{{/indent}}"
class="activity {{module}} modtype_{{module}} {{extraclasses}} {{#hasinfo}}hasinfo{{/hasinfo}} {{#indent}}indented{{/indent}}"
id="{{anchor}}"
data-for="cmitem"
data-id="{{id}}"
+1 -1
View File
@@ -1627,7 +1627,7 @@ class core_course_renderer extends plugin_renderer_base {
$subtext = get_string('subscribe', 'forum');
}
$suburl = new moodle_url('/mod/forum/subscribe.php', array('id' => $forum->id, 'sesskey' => sesskey()));
$output .= html_writer::tag('div', html_writer::link($suburl, $subtext), array('class' => 'subscribelink'));
$output .= html_writer::tag('div', html_writer::link($suburl, $subtext), ['class' => 'subscribelink text-end']);
}
$coursemodule = get_coursemodule_from_instance('forum', $forum->id);
+2
View File
@@ -18,6 +18,8 @@ $breadcrumb-divider-rtl: "◀" !default;
@import "moodle/calendar";
@import "moodle/contentbank";
@import "moodle/course";
@import "moodle/coursemanagement";
@import "moodle/courselisting";
@import "moodle/drawer";
@import "moodle/filemanager";
@import "moodle/message";
+4
View File
@@ -333,6 +333,10 @@ $blocks-plus-gutter: $blocks-column-width + ( $grid-gutter-width * 0.5 );
color: $text-muted;
}
.block_tree .tree_item.branch {
margin-left: 8px;
}
//
// Fake blocks
//
+13 -50
View File
@@ -221,18 +221,6 @@ button.btn-close,
padding: 0;
}
.section li.movehere a {
display: block;
width: 100%;
height: 2rem;
border: 2px dashed $gray-800;
}
.editing .course-content .hidden.sectionname {
visibility: hidden;
display: initial;
}
.inline,
.inline-list li {
display: inline;
@@ -1024,40 +1012,6 @@ tr.flagged-tag a {
left: 50%;
}
.mod-indent-outer {
display: table;
}
.mod-indent {
display: table-cell;
}
.label .mod-indent {
float: left;
padding-top: 20px;
}
.activity.label.modtype_label .mod-indent {
float: none;
}
@include media-breakpoint-up(sm) {
$mod-indent-size: 30px;
/* Creates a series of .mod-indent-# rule declarations based on indent size and number of indent levels. */
@for $i from 1 through 16 {
$width: ($i * $mod-indent-size);
.mod-indent-#{$i} {
width: $width;
}
}
.mod-indent-huge {
width: (16 * $mod-indent-size);
}
}
/* Audio player size in 'block' mode (can only change width, height is hardcoded in JS) */
.resourcecontent .mediaplugin_mp3 object {
height: 25px;
@@ -2045,6 +1999,19 @@ dd:after {
left: 0;
right: auto;
white-space: nowrap;
position: absolute;
top: 0;
font-size: $font-size-sm;
padding: .1em .4em;
text-decoration: none;
z-index: 9999;
border: $alert-border-width solid transparent;
width: fit-content;
@include alert-variant(
shift-color($info, $alert-bg-scale),
shift-color($info, $alert-border-scale),
shift-color($info, $alert-color-scale)
);
}
@include media-breakpoint-up(sm) {
input {
@@ -2085,10 +2052,6 @@ dd:after {
}
}
h3.sectionname .inplaceeditable.inplaceeditingon .editinstructions {
margin-top: -20px;
}
/** Chart area. */
.chart-area {
@include media-breakpoint-up(lg) {
File diff suppressed because it is too large Load Diff
+162
View File
@@ -0,0 +1,162 @@
/*
* Course listings and course summary styles.
*/
#page-course-pending .singlebutton,
#page-course-index .singlebutton,
#page-course-index-category .singlebutton,
#page-course-editsection .singlebutton {
text-align: center;
}
#page-admin-course-manage #movecourses td img {
margin: 0 .22em;
vertical-align: text-bottom;
}
#page-course-pending .pendingcourserequests {
margin-bottom: 1em;
}
#page-course-pending .pendingcourserequests .singlebutton {
display: inline;
}
#page-course-pending .pendingcourserequests .cell {
padding: 0 5px;
}
#page-course-pending .pendingcourserequests .cell.c6 {
white-space: nowrap;
}
.coursebox {
display: flex;
flex-direction: column;
.info {
display: flex;
align-items: center;
}
}
#frontpage-available-course-list,
#frontpage-course-list,
.course-search-result {
margin-top: $spacer * 0.5;
.coursebox {
padding: $spacer * 0.5;
border: $border-width solid $border-color;
margin-bottom: $spacer * 0.5;
@include border-radius();
}
}
.subcategories,
#frontpage-category-names,
#frontpage-category-combo {
.coursebox > .info > .coursename a {
display: block;
background-image: url([[pix:moodle|i/course]]);
background-size: $icon-width $icon-height;
background-repeat: no-repeat;
padding-left: 21px;
}
}
.coursebox > .info > .coursename {
font-size: $font-size-base;
font-weight: normal;
margin: 5px;
padding: 0;
}
.coursebox .content .teachers li {
list-style-type: none;
padding: 0;
margin: 0;
}
.coursebox .customfieldname,
.coursebox .customfieldseparator {
font-weight: $font-weight-bold;
}
.coursebox .content .coursefile {
max-width: 100px;
}
.coursebox .content .courseimage img {
max-width: 100px;
max-height: 100px;
}
.coursebox .content .coursecat,
.coursebox .content .summary,
.coursebox .content .courseimage,
.coursebox .content .coursefile,
.coursebox .content .teachers,
.coursebox.remotecoursebox .remotecourseinfo,
.coursebox .content .customfields-container {
margin: 15px 5px 5px;
padding: 0;
}
.category-browse {
.coursebox .content .coursecat,
.coursebox .content .summary,
.coursebox .content .courseimage,
.coursebox .content .coursefile,
.coursebox .content .teachers,
.coursebox.remotecoursebox .remotecourseinfo,
.coursebox .content .customfields-container {
margin-top: 0;
}
}
.coursebox.collapsed > .content {
display: none;
}
.courses > .paging.paging-morelink {
text-align: center;
padding: $spacer;
}
.course_category_tree .category .numberofcourse {
font-size: $font-size-sm;
}
.course_category_tree .category > .info > .categoryname {
margin: 5px;
font-size: $font-size-base;
font-weight: normal;
padding: 2px 18px;
}
.course_category_tree .category.with_children > .info > .categoryname {
background-image: url([[pix:moodle|t/expanded]]);
background-size: $icon-width $icon-height;
background-repeat: no-repeat;
background-position: center left;
}
.course_category_tree .category.with_children.collapsed > .info > .categoryname {
background-image: url([[pix:moodle|t/collapsed]]);
}
/* rtl:raw:
.course_category_tree .category.with_children.collapsed > .info > .categoryname {
background-image:url([[pix:moodle|t/collapsed_rtl]]);
}
*/
.course_category_tree .category.collapsed > .content {
display: none;
}
.course_category_tree .category > .content {
padding-left: 16px;
}
#page-course-index-category .categorypicker {
margin: 10px 0 20px;
}
@@ -0,0 +1,329 @@
/*
* Course management page styles.
*/
#course-category-listings {
margin-bottom: 0;
/** Two column layout */
&.columns-2 {
> #course-listing > div {
position: relative;
left: -1px;
}
}
/** Three column layout */
&.columns-3 > #course-listing > div {
height: 100%;
}
> div > div {
min-height: 300px;
> ul.ml > li:first-child > div {
border-top: 0;
}
}
h3 {
margin: 0;
padding: 0.4rem 0.6rem 0.3rem;
}
h4 {
margin: 1rem 0 0;
padding: 0.6rem 1rem 0.5rem;
}
.moodle-actionmenu {
white-space: nowrap;
}
.listing-actions {
text-align: center;
> .moodle-actionmenu {
display: inline-block;
}
}
ul.ml {
list-style: none;
margin: 1rem 0;
ul.ml {
margin: 0;
}
}
.listitem {
&[data-selected='1'] {
border-left: calc(#{$list-group-border-width} + 5px) solid map-get($theme-colors, 'primary');
padding-left: calc(#{$list-group-item-padding-x} - 5px);
}
&:hover {
z-index: 2;
}
}
.item-actions {
margin-right: 1em;
display: inline-block;
&.show .menu {
img {
width: 12px;
max-width: none;
}
}
.menu-action-text {
vertical-align: inherit;
}
}
.listitem {
> div {
> .float-start {
float: left;
}
> .float-end {
float: right;
text-align: right;
}
.item-actions {
.action-show {
display: none;
}
.action-hide {
display: inline;
}
}
.without-actions {
color: $course-cat-without-actions-color;
}
.idnumber {
margin-right: 2em;
}
}
// The category or course is hidden.
&[data-visible="0"] {
color: $text-muted;
> div {
> a {
color: $text-muted;
}
.item-actions {
.action-show {
display: inline;
}
.action-hide {
display: none;
}
}
}
}
&.highlight {
background-color: $body-bg;
> div,
> div:hover,
&[data-selected='1'] > div {
background-color: $table-hover-bg;
}
}
}
#course-listing {
.listitem {
.categoryname {
display: inline-block;
margin-left: 1em;
color: $course-listing-color;
}
.coursename {
display: inline-block;
flex-basis: 10rem;
}
}
> .firstpage .listitem:first-child > div .item-actions .action-moveup,
> .lastpage .listitem:last-child > div .item-actions .action-movedown {
display: none;
}
.bulk-action-checkbox {
margin: -2px 6px 0 0;
}
}
#category-listing {
.listitem.collapsed > ul.ml {
display: none;
}
.listitem {
&:first-child > div .item-actions .action-moveup,
&:last-child > div .item-actions .action-movedown {
display: none;
}
}
.course-count {
color: $course-listing-color;
margin-right: 2rem;
min-width: 3.5em;
display: inline-block;
}
.bulk-action-checkbox {
margin-right: -3px;
}
.category-listing > ul > .listitem:first-child {
position: relative;
}
.category-bulk-actions {
margin: 0 0.5em 0.5em;
position: relative;
}
}
.detail-pair {
> * {
display: inline-block;
}
.pair-key {
font-weight: bold;
vertical-align: top;
span {
margin-right: 1rem;
display: block;
}
}
.pair-value select {
max-width: 100%;
}
}
.bulk-actions .detail-pair {
> * {
display: block;
width: 100%;
}
}
.listing-pagination {
text-align: center;
.yui3-button {
@include button-variant($info, $info);
border: 0;
margin: 0.4rem 0.2rem 0.45rem;
font-size: 10.4px;
&.active-page {
@include button-variant($primary, $primary);
}
}
}
.listing-pagination-totals {
text-align: center;
&.dimmed {
color: $text-muted;
margin: 0.4rem 1rem 0.45rem;
}
}
.select-a-category .notifymessage,
.select-a-category .alert {
margin: 1em;
}
}
#course-category-listings #course-listing .listitem .drag-handle {
display: none;
}
.jsenabled #course-category-listings #course-listing .listitem .drag-handle {
display: inline-block;
margin: 0 6px 0 0;
cursor: pointer;
}
/** Management header styling **/
.course-being-dragged-proxy {
border: 0;
color: $link-color;
vertical-align: middle;
padding: 0 0 0 4em;
}
.course-being-dragged {
opacity: 0.5;
}
/**
* Display sizes:
* Large displays 1200 +
* Default displays 980 1199
* Tablets 768 979
* Small tablets and large phones 481 767
* Phones 0 480
*/
@media (min-width: 1200px) and (max-width: 1600px) {
#course-category-listings.columns-3 {
background-color: $body-bg;
border: 0;
#category-listing,
#course-listing {
width: 50%;
}
#category-listing > div,
#course-listing > div,
#course-detail > div {
background-color: $body-bg;
}
#course-detail {
width: 100%;
margin-top: 1em;
}
}
}
@media (max-width: 1199px) {
#course-category-listings.columns-2,
#course-category-listings.columns-3 {
border: 0;
#category-listing,
#course-listing,
#course-detail {
width: 100%;
margin: 0 0 1em;
}
}
}
+10
View File
@@ -60,3 +60,13 @@
.path-course-view li.activity form.togglecompletion img {
max-width: none; /* The width is 0 so ensure we don't end up with a relative max-width */
}
//
// Deprecated since Moodle 5.0.
//
// In 6.0 all YUI section spinners wont be needed.
.course-content .stateready .section .spinner {
@include deprecated-styles();
display: none;
}
+718 -1084
View File
File diff suppressed because it is too large Load Diff
+49
View File
@@ -0,0 +1,49 @@
/*
* Course page styles (specific for Classic theme).
*/
// Single section navigation
.course-content .single-section .section-navigation {
display: block;
padding: 0.5em;
margin-bottom: -0.5em;
.title {
font-weight: bold;
font-size: 108%;
clear: both;
}
.mdl-left {
font-weight: normal;
float: left;
margin-right: 1em;
.larrow {
margin-right: 0.1em;
}
}
.mdl-right {
font-weight: normal;
float: right;
margin-left: 1em;
.rarrow {
margin-left: 0.1em;
}
}
.mdl-bottom {
margin-top: 0;
}
}
// Activity navigation
.activity-navigation {
.row {
align-items: center;
}
#prev-activity-link,
#next-activity-link {
white-space: pre-wrap;
}
}
+3
View File
@@ -1,6 +1,9 @@
// Import Boost Core moodle CSS
@import "../../boost/scss/moodle";
// Import Specific Classic theme moodle CSS
@import "classic/course.scss";
img.userpicture {
margin-right: 0.5rem;
}
File diff suppressed because it is too large Load Diff