mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-12 11:49:49 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-76145-401' of https://github.com/meirzamoodle/moodle into MOODLE_401_STABLE

Browse Source
This commit is contained in:
Andrew Nicols 2022-12-06 13:36:16 +08:00
commit fa309d0650
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
course/classes/management_renderer.php
View File

@ -640,7 +640,7 @@ class core_course_management_renderer extends plugin_renderer_base {
$viewcourseurl = new moodle_url($this->page->url, array('courseid' => $course->id));
$html = html_writer::start_tag('li', $attributes);
$html .= html_writer::start_div('clearfix');
$html .= html_writer::start_div('d-flex flex-wrap');
if ($category->can_resort_courses()) {
// In order for dnd to be available the user must be able to resort the category children..
@ -656,8 +656,10 @@ class core_course_management_renderer extends plugin_renderer_base {
'for' => 'courselistitem' . $course->id));
$html .= html_writer::end_div();
$html .= html_writer::end_div();
$html .= html_writer::link($viewcourseurl, $text, array('class' => 'float-left coursename aalink'));
$html .= html_writer::start_div('float-right');
$html .= html_writer::link(
$viewcourseurl, $text, array('class' => 'text-break col pl-0 mb-2 coursename aalink')
);
$html .= html_writer::start_div('flex-shrink-0 ml-auto');
if ($course->idnumber) {
$html .= html_writer::tag('span', s($course->idnumber), array('class' => 'text-muted idnumber'));
}
@ -766,7 +768,7 @@ class core_course_management_renderer extends plugin_renderer_base {
$action['attributes']['role'] = 'button';
$actionshtml[] = $this->output->action_icon($action['url'], $action['icon'], null, $action['attributes']);
}
return html_writer::span(join('', $actionshtml), 'course-item-actions item-actions');
return html_writer::span(join('', $actionshtml), 'course-item-actions item-actions mr-0');
}
/**
@ -967,6 +969,9 @@ class core_course_management_renderer extends plugin_renderer_base {
}
$yuigridclass = "col-sm";
if (in_array($size, [4, 5, 7])) {
$yuigridclass = "col-12 col-lg-6";
}
if (is_null($class)) {
$class = $yuigridclass . ' ' . $bootstrapclass;

1
theme/boost/scss/moodle/course.scss
View File

@ -1003,6 +1003,7 @@ span.editinstructions {
.coursename {
display: inline-block;
flex-basis: 10rem;
}
}

3
theme/boost/style/moodle.css
View File

@ -14576,7 +14576,8 @@ span.editinstructions {
margin-left: 1em;
color: #a1a1a8; }
#course-category-listings #course-listing .listitem .coursename {
display: inline-block; }
display: inline-block;
flex-basis: 10rem; }
#course-category-listings #course-listing > .firstpage .listitem:first-child > div .item-actions .action-moveup,
#course-category-listings #course-listing > .lastpage .listitem:last-child > div .item-actions .action-movedown {
display: none; }

3
theme/classic/style/moodle.css
View File

@ -14576,7 +14576,8 @@ span.editinstructions {
margin-left: 1em;
color: #a1a1a8; }
#course-category-listings #course-listing .listitem .coursename {
display: inline-block; }
display: inline-block;
flex-basis: 10rem; }
#course-category-listings #course-listing > .firstpage .listitem:first-child > div .item-actions .action-moveup,
#course-category-listings #course-listing > .lastpage .listitem:last-child > div .item-actions .action-movedown {
display: none; }