Merge pull request #194 from trema-tech/dev

Dev
trema-tech · May 23, 2024 · c49e2fb · c49e2fb
2 parents 7623775 + f301c7c
commit c49e2fb
Show file tree

Hide file tree

Showing 114 changed files with 974 additions and 565 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Trema Theme for Moodle LMS
 ==========================
 
 ![PHP](https://img.shields.io/badge/PHP-v7.4%20to%20v8.2-blue.svg)
-![Moodle](https://img.shields.io/badge/Moodle-v4.0%20to%20v4.3-orange.svg)
+![Moodle](https://img.shields.io/badge/Moodle-v4.0%20to%20v4.4-orange.svg)
 [![GitHub Issues](https://img.shields.io/github/issues/trema-tech/moodle-theme_trema.svg)](https://github.com/trema-tech/moodle-theme_trema/issues)
 [![Contributions welcome](https://img.shields.io/badge/contributions-welcome-green.svg)](#contributing)
 [![License](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](#license)
@@ -29,16 +29,14 @@ Trema Theme for Moodle LMS
   - [Contributors](#contributors)
 - [Motivation for this theme](#motivation-for-this-theme)
 - [License](#license)
-- [Donate](#donate)
 
 # Basic Overview
 
 The Trema theme is a free, responsive Moodle theme that offers a clean and modern design. One unique aspect of the Trema theme is its ability to display course information in a grid format, which can be particularly useful for sites with many courses. Additionally, it includes options for a customizable frontpage, login page, and footer. Overall, the Trema theme for Moodle aims to provide a visually appealing and user-friendly interface for Moodle users. The main goal for this theme is to not need another site for information/advertising/marketing.
 
-All features from Boost (native Moodle theme) plus these Trema features:  
-
-- Frontpage 
-  - Configurable optional image banner or content slider with texts. 
+All features from Boost (native Moodle theme) plus these Trema features:
+- Frontpage
+  - Configurable optional image banner or content slider with texts.
   - Banner title spacing.
   - Banner title text options for uppercase, lowercase, and capitalized.
   - Create up to six beautiful cards with custom content with icons.
@@ -50,23 +48,23 @@ All features from Boost (native Moodle theme) plus these Trema features:
   - Removable Moodle and Trema branding.
   - Configurable footer background opacity and color.
 - Font and colors
-  - Primary, secondary, navbar, body background, Log In button,  drawer, and footer colors.
+  - Primary, secondary, navbar, body background, Log In button, drawer, and footer colors.
   - Choose from 15 different fonts for the site, page titles, and headings.
   - Site text options for uppercase, lowercase, and capitalized.
-  - Automatic font color selection. 
+  - Automatic font color selection.
 - General
   - Customizable page background image.
-  - Selectable link style 
+  - Selectable link style.
   - Primary menu items can be hidden (Home, Dashboard, My Courses, and Site Administration).
-  - The primary menu can be aligned to the left, center or to the right.
+  - The primary menu can be aligned to the left, center or the right.
   - Removable Log out link.
   - Custom favicon.
   - Exclusive Admin Dashboard with interesting site information for admins.
   - Optional decorative Trema Lines.
-  - Enable a softer look by rounding some corners for buttons, cards, secondary navbars, etc...
+  - Enable a softer look by rounding some corners for buttons, cards, secondary navbars, etc.
 - Course cards
   - Show contacts and categories.
-  - Course summary is available as a Moodle dialog, a popover, or as a link.
+  - Course summary is available as a Moodle dialogue, a popover, or as a link.
   - Show or hide courses in hidden categories.
 - Course
   - Show activity navigation buttons.
@@ -165,7 +163,7 @@ There are no known security considerations at this time.
 
 ### How can I get answers to other questions?
 
-Got a burning question that is not covered here? If you can't find your answer, submit your question in the Moodle forums or open a new issue on Github at:
+Got a burning question that is not covered here? If you can't find your answer, submit your question in the Moodle forums or open a new issue on GitHub at:
 
 https://github.com/trema-tech/moodle-theme_trema/issues
 
@@ -193,7 +191,7 @@ The development of this theme was motivated by our own experience in Moodle LMS
 
 Copyright © 2019-2024 Rodrigo Mady and TNG Consulting Inc.
 
-This file is part of Moodle - http://moodle.org/
+This file is part of Moodle - https://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
@@ -206,14 +204,6 @@ 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/>.
-
-[(Back to top)](#table-of-contents)
-
-# Donate
-
-[Please donate](https://www.paypal.com/donate/?hosted_button_id=6FBZMX8PFPS3Y&source=qr) to help us to improve Theme Trema:
-
-![QR Code](https://user-images.githubusercontent.com/8494871/150807066-84f999f6-5227-4dc7-9781-b949ed485a3a.png)
+along with Moodle.  If not, see <https://www.gnu.org/licenses/>.
 
 [(Back to top)](#table-of-contents)
diff --git a/classes/output/core/course_renderer.php b/classes/output/core/course_renderer.php
@@ -247,19 +247,18 @@ protected function coursecat_coursebox_content(coursecat_helper $chelper, $cours
         $content .= '<h3 class="h5 card-title m-1">' . $coursenamelink . '</h4>';
         $content .= html_writer::end_tag('div');
 
-        $content .= html_writer::start_tag('div', ['class' => 'card-block text-center']);
-
         // Print enrolmenticons.
+        $content .= html_writer::start_tag('div', ['class' => 'enrolmenticon']);
         if ($icons = enrol_get_course_info_icons($course)) {
             foreach ($icons as $pixicon) {
                 $content .= $this->render($pixicon);
             }
         }
+        $content .= html_writer::end_tag('div'); // End enrolment icon.
 
         $content .= html_writer::start_tag('div', ['class' => 'pull-right']);
         $content .= html_writer::end_tag('div'); // End pull-right.
 
-        $content .= html_writer::end_tag('div'); // End card-block.
 
         // Display course contacts. See core_course_list_element::get_course_contacts().
         if ($showcardcontact && $course->has_course_contacts()) {

diff --git a/classes/privacy/provider.php b/classes/privacy/provider.php
@@ -28,9 +28,7 @@
 
 namespace theme_trema\privacy;
 
-use \core_privacy\local\metadata\collection;
-
-defined('MOODLE_INTERNAL') || die();
+use core_privacy\local\metadata\collection;
 
 /**
  * The trema theme stores a user preference data.
@@ -42,8 +40,7 @@ class provider implements
     // This plugin has data.
     \core_privacy\local\metadata\provider,
     // This plugin has some sitewide user preferences to export.
-    \core_privacy\local\request\user_preference_provider
-{
+    \core_privacy\local\request\user_preference_provider {
 
     /** The user preferences for the course index. */
     const DRAWER_OPEN_INDEX = 'drawer-open-index';

diff --git a/fonts/Alegreya-ExtraBold.ttf b/fonts/Alegreya-ExtraBold.ttf
diff --git a/fonts/Alegreya-ExtraBoldItalic.ttf b/fonts/Alegreya-ExtraBoldItalic.ttf
diff --git a/fonts/Alegreya-Medium.ttf b/fonts/Alegreya-Medium.ttf
diff --git a/fonts/Alegreya-MediumItalic.ttf b/fonts/Alegreya-MediumItalic.ttf
diff --git a/fonts/Alegreya-SemiBold.ttf b/fonts/Alegreya-SemiBold.ttf
diff --git a/fonts/Alegreya-SemiBoldItalic.ttf b/fonts/Alegreya-SemiBoldItalic.ttf
diff --git a/fonts/EBGaramond-ExtraBold.ttf b/fonts/EBGaramond-ExtraBold.ttf
diff --git a/fonts/EBGaramond-ExtraBoldItalic.ttf b/fonts/EBGaramond-ExtraBoldItalic.ttf
diff --git a/fonts/EBGaramond-Medium.ttf b/fonts/EBGaramond-Medium.ttf
diff --git a/fonts/EBGaramond-MediumItalic.ttf b/fonts/EBGaramond-MediumItalic.ttf
diff --git a/fonts/EBGaramond-SemiBold.ttf b/fonts/EBGaramond-SemiBold.ttf
diff --git a/fonts/EBGaramond-SemiBoldItalic.ttf b/fonts/EBGaramond-SemiBoldItalic.ttf
diff --git a/fonts/Lato-Black.ttf b/fonts/Lato-Black.ttf
diff --git a/fonts/Lato-BlackItalic.ttf b/fonts/Lato-BlackItalic.ttf
diff --git a/fonts/Lato-Bold.ttf b/fonts/Lato-Bold.ttf
diff --git a/fonts/Lato-BoldItalic.ttf b/fonts/Lato-BoldItalic.ttf
diff --git a/fonts/Lato-Italic.ttf b/fonts/Lato-Italic.ttf
diff --git a/fonts/Lato-Light.ttf b/fonts/Lato-Light.ttf
diff --git a/fonts/Lato-LightItalic.ttf b/fonts/Lato-LightItalic.ttf
diff --git a/fonts/Lato-Regular.ttf b/fonts/Lato-Regular.ttf
diff --git a/fonts/Lato-Thin.ttf b/fonts/Lato-Thin.ttf
diff --git a/fonts/Lato-ThinItalic.ttf b/fonts/Lato-ThinItalic.ttf
diff --git a/fonts/Montserrat-ExtraBold.ttf b/fonts/Montserrat-ExtraBold.ttf
diff --git a/fonts/Montserrat-ExtraBoldItalic.ttf b/fonts/Montserrat-ExtraBoldItalic.ttf
diff --git a/fonts/Montserrat-ExtraLight.ttf b/fonts/Montserrat-ExtraLight.ttf
diff --git a/fonts/Montserrat-ExtraLightItalic.ttf b/fonts/Montserrat-ExtraLightItalic.ttf
diff --git a/fonts/Montserrat-Medium.ttf b/fonts/Montserrat-Medium.ttf
diff --git a/fonts/Montserrat-MediumItalic.ttf b/fonts/Montserrat-MediumItalic.ttf
diff --git a/fonts/Montserrat-SemiBold.ttf b/fonts/Montserrat-SemiBold.ttf
diff --git a/fonts/Montserrat-SemiBoldItalic.ttf b/fonts/Montserrat-SemiBoldItalic.ttf
diff --git a/fonts/Montserrat-Thin.ttf b/fonts/Montserrat-Thin.ttf
diff --git a/fonts/Montserrat-ThinItalic.ttf b/fonts/Montserrat-ThinItalic.ttf
diff --git a/fonts/NotoSans-ExtraBold.ttf b/fonts/NotoSans-ExtraBold.ttf
diff --git a/fonts/NotoSans-ExtraBoldItalic.ttf b/fonts/NotoSans-ExtraBoldItalic.ttf
diff --git a/fonts/NotoSans-ExtraLight.ttf b/fonts/NotoSans-ExtraLight.ttf
diff --git a/fonts/NotoSans-ExtraLightItalic.ttf b/fonts/NotoSans-ExtraLightItalic.ttf
diff --git a/fonts/NotoSans-Medium.ttf b/fonts/NotoSans-Medium.ttf
diff --git a/fonts/NotoSans-MediumItalic.ttf b/fonts/NotoSans-MediumItalic.ttf
diff --git a/fonts/NotoSans-SemiBold.ttf b/fonts/NotoSans-SemiBold.ttf
diff --git a/fonts/NotoSans-SemiBoldItalic.ttf b/fonts/NotoSans-SemiBoldItalic.ttf
diff --git a/fonts/NotoSans-Thin.ttf b/fonts/NotoSans-Thin.ttf
diff --git a/fonts/NotoSans-ThinItalic.ttf b/fonts/NotoSans-ThinItalic.ttf
diff --git a/fonts/OpenSans-Bold.ttf b/fonts/OpenSans-Bold.ttf
diff --git a/fonts/OpenSans-BoldItalic.ttf b/fonts/OpenSans-BoldItalic.ttf
diff --git a/fonts/OpenSans-ExtraBold.ttf b/fonts/OpenSans-ExtraBold.ttf
diff --git a/fonts/OpenSans-ExtraBoldItalic.ttf b/fonts/OpenSans-ExtraBoldItalic.ttf
diff --git a/fonts/OpenSans-Italic.ttf b/fonts/OpenSans-Italic.ttf
diff --git a/fonts/OpenSans-Light.ttf b/fonts/OpenSans-Light.ttf
diff --git a/fonts/OpenSans-LightItalic.ttf b/fonts/OpenSans-LightItalic.ttf
diff --git a/fonts/OpenSans-Medium.ttf b/fonts/OpenSans-Medium.ttf
diff --git a/fonts/OpenSans-MediumItalic.ttf b/fonts/OpenSans-MediumItalic.ttf
diff --git a/fonts/OpenSans-Regular.ttf b/fonts/OpenSans-Regular.ttf
diff --git a/fonts/OpenSans-SemiBold.ttf b/fonts/OpenSans-SemiBold.ttf
diff --git a/fonts/OpenSans-SemiBoldItalic.ttf b/fonts/OpenSans-SemiBoldItalic.ttf
diff --git a/fonts/PlayfairDisplay-Black.ttf b/fonts/PlayfairDisplay-Black.ttf
diff --git a/fonts/PlayfairDisplay-BlackItalic.ttf b/fonts/PlayfairDisplay-BlackItalic.ttf
diff --git a/fonts/PlayfairDisplay-Bold.ttf b/fonts/PlayfairDisplay-Bold.ttf
diff --git a/fonts/PlayfairDisplay-BoldItalic.ttf b/fonts/PlayfairDisplay-BoldItalic.ttf
diff --git a/fonts/PlayfairDisplay-ExtraBold.ttf b/fonts/PlayfairDisplay-ExtraBold.ttf
diff --git a/fonts/PlayfairDisplay-ExtraBoldItalic.ttf b/fonts/PlayfairDisplay-ExtraBoldItalic.ttf
diff --git a/fonts/PlayfairDisplay-Italic.ttf b/fonts/PlayfairDisplay-Italic.ttf
diff --git a/fonts/PlayfairDisplay-Medium.ttf b/fonts/PlayfairDisplay-Medium.ttf
diff --git a/fonts/PlayfairDisplay-MediumItalic.ttf b/fonts/PlayfairDisplay-MediumItalic.ttf
diff --git a/fonts/PlayfairDisplay-Regular.ttf b/fonts/PlayfairDisplay-Regular.ttf
diff --git a/fonts/PlayfairDisplay-SemiBold.ttf b/fonts/PlayfairDisplay-SemiBold.ttf
diff --git a/fonts/PlayfairDisplay-SemiBoldItalic.ttf b/fonts/PlayfairDisplay-SemiBoldItalic.ttf
diff --git a/fonts/Poppins-ExtraBold.ttf b/fonts/Poppins-ExtraBold.ttf
diff --git a/fonts/Poppins-ExtraBoldItalic.ttf b/fonts/Poppins-ExtraBoldItalic.ttf
diff --git a/fonts/Poppins-ExtraLight.ttf b/fonts/Poppins-ExtraLight.ttf
diff --git a/fonts/Poppins-ExtraLightItalic.ttf b/fonts/Poppins-ExtraLightItalic.ttf
diff --git a/fonts/Poppins-Medium.ttf b/fonts/Poppins-Medium.ttf
diff --git a/fonts/Poppins-MediumItalic.ttf b/fonts/Poppins-MediumItalic.ttf
diff --git a/fonts/Poppins-SemiBold.ttf b/fonts/Poppins-SemiBold.ttf
diff --git a/fonts/Poppins-SemiBoldItalic.ttf b/fonts/Poppins-SemiBoldItalic.ttf
diff --git a/fonts/Poppins-Thin.ttf b/fonts/Poppins-Thin.ttf
diff --git a/fonts/Poppins-ThinItalic.ttf b/fonts/Poppins-ThinItalic.ttf
diff --git a/fonts/Roboto-Medium.ttf b/fonts/Roboto-Medium.ttf
diff --git a/fonts/Roboto-MediumItalic.ttf b/fonts/Roboto-MediumItalic.ttf
diff --git a/lang/de/theme_trema.php b/lang/de/theme_trema.php
@@ -34,8 +34,8 @@
 $string['alert'] = 'Alarm';
 $string['cachedef_dashboardadmin'] = 'Cache für das Admin dashboard';
 $string['card'] = 'Karte';
-$string['cardicon_desc'] = 'Eine Liste aller Font-Awesome-Icons steht hier: <a href="https://fontawesome.com/v6/icons/" target="_blank">https://fontawesome.com/v6/icons/</a>';
 $string['cardicon'] = 'Karten-Icon';
+$string['cardicon_desc'] = 'Eine Liste aller Font-Awesome-Icons steht hier: <a href="https://fontawesome.com/v6/icons/" target="_blank">https://fontawesome.com/v6/icons/</a>';
 $string['cardiconcolor'] = 'Karten-Icon Farbe';
 $string['cardlink'] = 'Karten-Link';
 $string['cardsubtitle'] = 'Karten-Untertitel';
@@ -47,25 +47,25 @@
 $string['defaultfooter_defaultdesc'] = 'Standartinhalt für Startseiten-Fußbereich';
 $string['defaultfooter_desc'] = 'Standartinhalt für Fußbereich';
 $string['defaultfooter'] = 'Fußbereich';
-$string['defaultfrontpagebody_desc'] = 'Standartinhalt für Body der Startseite';
 $string['defaultfrontpagebody'] = 'Body Startseite';
+$string['defaultfrontpagebody_desc'] = 'Standartinhalt für Body der Startseite';
 $string['diskusage'] = 'Moodledata Festplattennutzung';
-$string['enableadmindashboard_desc'] = 'Deaktivieren um den Bereich unter dem Admin dashboard zu verstecken: <img class="img-responsive" src="{$a}"/>';
 $string['enableadmindashboard'] = 'Aktiviere Admin Dashboard';
-$string['favicon_desc'] = 'Favicon hochladen. (.ico Datei)';
+$string['enableadmindashboard_desc'] = 'Deaktivieren um den Bereich unter dem Admin dashboard zu verstecken: <img class="img-responsive" src="{$a}"/>';
 $string['favicon'] = 'Eigenes Favicon';
+$string['favicon_desc'] = 'Favicon hochladen. (.ico Datei)';
 $string['footertitle'] = 'Theme Trema';
-$string['frontpagebanner_desc'] = 'Bilddatei für Startseitenbanner hochladen. Ersetzt das Standartbild eines Waldes.';
 $string['frontpagebanner'] = 'Startseitenbanner';
-$string['frontpagebuttonclass_desc'] = 'Der Stil kann durch verwenden einer anderen Klasse  verändert werden.';
+$string['frontpagebanner_desc'] = 'Bilddatei für Startseitenbanner hochladen. Ersetzt das Standartbild eines Waldes.';
 $string['frontpagebuttonclass'] = 'Startseiten-Button HTML-Klasse';
-$string['frontpagebuttonhref_desc'] = 'Startseiten-Button href-Attribut eingeben';
+$string['frontpagebuttonclass_desc'] = 'Der Stil kann durch verwenden einer anderen Klasse  verändert werden.';
 $string['frontpagebuttonhref'] = 'Startseiten-Button href';
+$string['frontpagebuttonhref_desc'] = 'Startseiten-Button href-Attribut eingeben';
 $string['frontpagebuttontext'] = 'Text Startseiten-Button';
 $string['frontpagecards'] = 'Startseiten-Karten';
 $string['frontpagecontent'] = 'Inhalt der Startseite';
-$string['frontpageenablecards_desc'] = 'Deaktivieren um den Bereich unterhalb zu verstecken: <img class="img-responsive" src="{$a}">';
 $string['frontpageenablecards'] = 'Startseiten-Karten aktivieren';
+$string['frontpageenablecards_desc'] = 'Deaktivieren um den Bereich unterhalb zu verstecken: <img class="img-responsive" src="{$a}">';
 $string['frontpagesubtitle'] = 'Untertitel der Startseite';
 $string['frontpagetitle'] = 'Titel der Startseite';
 $string['image'] = 'Bild {$a}';
@@ -74,19 +74,19 @@
 $string['loginpagestyle'] = 'Stil der Anmeldeseite';
 $string['numberofcards'] = 'Anzahl der Karten';
 $string['pluginname'] = 'Trema';
-$string['primarycolor_desc'] = 'Hauptfarbe.';
 $string['primarycolor'] = 'Erste Farbe';
+$string['primarycolor_desc'] = 'Hauptfarbe.';
 $string['privacy:metadata'] = 'Das Trema Theme speichert keinerlei Nutzerdaten.';
 $string['region-side-admin'] = 'Nur Administratoren';
 $string['rememberusername'] = 'Nutzer merken';
-$string['secondarycolor_desc'] = 'Die zweite Farbe';
 $string['secondarycolor'] = 'Zweite Farbe';
+$string['secondarycolor_desc'] = 'Die zweite Farbe';
 $string['seemore'] = 'Mehr erfahren';
 $string['styleguide'] = 'Style Guide';
 $string['subtitle'] = 'Untertitel';
 $string['summarybutton_text'] = 'Kursbeschreibung';
 $string['summarycourselink_text'] = 'Zum Kurs';
-$string['summarytype_desc'] = 'Wähle ob die Kurs-Info modal oder als Pop-Over geöffnet wird.';
 $string['summarytype'] = 'Kurs-Info Typ';
+$string['summarytype_desc'] = 'Wähle ob die Kurs-Info modal oder als Pop-Over geöffnet wird.';
 $string['title'] = 'Titel';
 $string['total'] = 'Summe';