Skip to content
Snippets Groups Projects
Commit 5adad948 authored by Kathrin Osswald's avatar Kathrin Osswald
Browse files

Made changes to icons in course category overview undone as the alignment of... 

Made changes to icons in course category overview undone as the alignment of them were improved in theme Boost (MDL-65357).
parent a4c69ece
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
CHANGES.md
+ 1
− 0
View file @ 5adad948
......@@ -6,6 +6,7 @@ Changes
### Unreleased
* 2020-02-06 - Made changes to icons in course category overview undone as the alignment of them were improved in theme Boost (MDL-65357).
* 2020-01-29 - Adjusted navbar.mustache template due to upstream changes in theme Boost.
* 2020-01-29 - Adjusted columns2.mustache template due to upstream changes in theme Boost.
* 2019-12-20 - Added Behat tests.
......
classes/output/core/course_renderer.php deleted 100644 → 0
+ 0
− 135
View file @ a4c69ece
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Renderers to align Moodle's HTML with that expected by Bootstrap
*
* @package theme_boost_campus
* @copyright 2017 Kathrin Osswald, Ulm University kathrin.osswald@uni-ulm.de
* copyright based on code from theme_boost by 2016 Frédéric Massart - FMCorz.net
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace theme_boost_campus\output\core;
defined('MOODLE_INTERNAL') || die;
use moodle_url;
use html_writer;
global $CFG;
require_once($CFG->dirroot . '/course/renderer.php');
/**
* Extending the course_renderer interface.
*
* @copyright 2017 Kathrin Osswald, Ulm University kathrin.osswald@uni-ulm.de
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package theme_boost_campus
* @category output
*/
class course_renderer extends \core_course_renderer {
/**
* Displays one course in the list of courses.
*
* This is an internal function, to display an information about just one course
* please use {@link core_course_renderer::course_info_box()}
*
* KIZ MODIFICATION: This renderer function is copied and modified from /course/renderer.php
*
* @param \coursecat_helper $chelper various display options
* @param \core_course_list_element|\stdClass $course
* @param string $additionalclasses additional classes to add to the main <div> tag (usually
* depend on the course position in list - first/last/even/odd)
* @return string
*/
protected function coursecat_coursebox(\coursecat_helper $chelper, $course, $additionalclasses = '') {
if (!isset($this->strings->summary)) {
$this->strings->summary = get_string('summary');
}
if ($chelper->get_show_courses() <= self::COURSECAT_SHOW_COURSES_COUNT) {
return '';
}
if ($course instanceof stdClass) {
$course = new \core_course_list_element($course);
}
$content = '';
$classes = trim('coursebox clearfix '. $additionalclasses);
if ($chelper->get_show_courses() >= self::COURSECAT_SHOW_COURSES_EXPANDED) {
$nametag = 'h3';
} else {
$classes .= ' collapsed';
$nametag = 'div';
}
// .coursebox
$content .= html_writer::start_tag('div', array(
'class' => $classes,
'data-courseid' => $course->id,
'data-type' => self::COURSECAT_TYPE_COURSE,
));
$content .= html_writer::start_tag('div', array('class' => 'info'));
// course name
$coursename = $chelper->get_course_formatted_name($course);
$coursenamelink = html_writer::link(new moodle_url('/course/view.php', array('id' => $course->id)),
$coursename, array('class' => $course->visible ? '' : 'dimmed'));
$content .= html_writer::tag($nametag, $coursenamelink, array('class' => 'coursename'));
// If we display course in collapsed form but the course has summary or course contacts, display the link to the info page.
$content .= html_writer::start_tag('div', array('class' => 'moreinfo'));
if ($chelper->get_show_courses() < self::COURSECAT_SHOW_COURSES_EXPANDED) {
if ($course->has_summary() || $course->has_course_contacts() || $course->has_course_overviewfiles()
|| $course->has_custom_fields()) {
$url = new moodle_url('/course/info.php', array('id' => $course->id));
$image = $this->output->pix_icon('i/info', $this->strings->summary);
$content .= html_writer::link($url, $image, array('title' => $this->strings->summary));
// Make sure JS file to expand course content is included.
$this->coursecat_include_js();
}
}
// MODIFICATION START:
// Move the closing div for moreinfo behind the enrolmenticons to group them together in one div.
// MODIFICATION END.
/* ORIGINAL START.
$content .= html_writer::end_tag('div'); // .moreinfo
ORIGINAL END. */
// print enrolmenticons
if ($icons = enrol_get_course_info_icons($course)) {
$content .= html_writer::start_tag('div', array('class' => 'enrolmenticons'));
foreach ($icons as $pixicon) { // pix_icon makes Travis fail.
$content .= $this->render($pixicon);
}
$content .= html_writer::end_tag('div'); // .enrolmenticons
}
// MODIFICATION START:
// Moved div from above to this place.
$content .= html_writer::end_tag('div'); // .moreinfo
// MODIFICATION END.
$content .= html_writer::end_tag('div'); // .info
$content .= html_writer::start_tag('div', array('class' => 'content'));
$content .= $this->coursecat_coursebox_content($chelper, $course);
$content .= html_writer::end_tag('div'); // .content
$content .= html_writer::end_tag('div'); // .coursebox
return $content;
}
}
scss/post.scss
+ 0
− 18
View file @ 5adad948
......@@ -612,24 +612,6 @@ blockquote::before {
font-weight: normal;
}
}
.coursebox {
.moreinfo {
float: left;
margin-left: 21px;
// Put the further information into a new line.
clear: left;
}
.enrolmenticons {
// Align the icons in one line with the information icon.
display: inline;
padding-left: 0.75rem;
// As these icons are just for information and not clickable, make the color gray.
color: $gray-light;
}
.moreinfo a + div.enrolmenticons {
border-left: 2px solid $gray-light;
}
}
/*------------------------------------
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment