From 617e5cfa6ff5a113a326fa22bc1562c852eb7127 Mon Sep 17 00:00:00 2001 From: Alexander Bias Date: Mon, 15 Jul 2024 20:58:22 +0200 Subject: [PATCH] Development: Rename master branch to main, please update your clones. --- CHANGES.md | 1 + README.md | 2 +- lang/en/theme_boost_union.php | 6 +++--- templates/advertisementtiles.mustache | 2 +- templates/slider.mustache | 6 +++--- .../behat/theme_boost_union_looksettings_scss.feature | 10 +++++----- tests/behat/theme_boost_union_tasks.feature | 2 +- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 4c0476d1602..3716ac787ac 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ Changes ### Unreleased +* 2024-07-15 - Development: Rename master branch to main, please update your clones. * 2024-07-13 - Upgrade: Make the \theme_boost_union\task\purge_cache task non-blocking as this has been deprecated in Moodle core. * 2024-07-13 - Bugfix: Adopt fix for MDL-82397 before its integration into Moodle core, relates to #691. * 2024-07-12 - Upgrade: Adapt the course index icon feature visually to the new icon sizes. diff --git a/README.md b/README.md index a655d92d308..0896f6b893a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ moodle-theme_boost_union ======================== -[![Moodle Plugin CI](https://github.com/moodle-an-hochschulen/moodle-theme_boost_union/workflows/Moodle%20Plugin%20CI/badge.svg?branch=master)](https://github.com/moodle-an-hochschulen/moodle-theme_boost_union/actions?query=workflow%3A%22Moodle+Plugin+CI%22+branch%3Amaster) +[![Moodle Plugin CI](https://github.com/moodle-an-hochschulen/moodle-theme_boost_union/workflows/Moodle%20Plugin%20CI/badge.svg?branch=main)](https://github.com/moodle-an-hochschulen/moodle-theme_boost_union/actions?query=workflow%3A%22Moodle+Plugin+CI%22+branch%3Amain) Theme Boost Union is an enhanced child theme of Boost which is intended, on the one hand, to make Boost simply more configurable and, on the other hand, to provide helpful additional features for the daily Moodle operation of admins, teachers and students. diff --git a/lang/en/theme_boost_union.php b/lang/en/theme_boost_union.php index 809bad3d471..1c2fa2eb024 100644 --- a/lang/en/theme_boost_union.php +++ b/lang/en/theme_boost_union.php @@ -92,15 +92,15 @@ // ... ... Setting: External SCSS Github API user. $string['extscssgithubuser'] = 'External SCSS Github API user'; $string['extscssgithubuser_desc'] = 'The Github API user or organization which owns the private Github repository.'; -$string['extscssgithubuser_example'] = 'Example: If you can see the file in your Github account on https://github.com/moodle-an-hochschulen/moodle-theme_boost_union-extscsstest/blob/master/extscss.scss, the user will be moodle-an-hochschulen.'; +$string['extscssgithubuser_example'] = 'Example: If you can see the file in your Github account on https://github.com/moodle-an-hochschulen/moodle-theme_boost_union-extscsstest/blob/main/extscss.scss, the user will be moodle-an-hochschulen.'; // ... ... Setting: External SCSS Github API repository. $string['extscssgithubrepo'] = 'External SCSS Github API repository'; $string['extscssgithubrepo_desc'] = 'The private Github repository where the SCSS files are located.'; -$string['extscssgithubrepo_example'] = 'Example: If you can see the file in your Github account on https://github.com/moodle-an-hochschulen/moodle-theme_boost_union-extscsstest/blob/master/extscss.scss, the repository will be moodle-theme_boost_union-extscsstest.'; +$string['extscssgithubrepo_example'] = 'Example: If you can see the file in your Github account on https://github.com/moodle-an-hochschulen/moodle-theme_boost_union-extscsstest/blob/main/extscss.scss, the repository will be moodle-theme_boost_union-extscsstest.'; // ... ... Setting: External Pre SCSS Github file path. $string['extscssgithubprefilepath'] = 'External Pre SCSS Github file path'; $string['extscssgithubprefilepath_desc'] = 'The path within the private Github repository where the Pre SCSS file is located.'; -$string['extscssgithubfilepath_example'] = 'Example: If you can see the file in your Github account on https://github.com/moodle-an-hochschulen/moodle-theme_boost_union-extscsstest/blob/master/extscss.scss, the file path will be /extscss.scss.'; +$string['extscssgithubfilepath_example'] = 'Example: If you can see the file in your Github account on https://github.com/moodle-an-hochschulen/moodle-theme_boost_union-extscsstest/blob/main/extscss.scss, the file path will be /extscss.scss.'; // ... ... Setting: External Post SCSS Github file path. $string['extscssgithubpostfilepath'] = 'External Post SCSS Github file path'; $string['extscssgithubpostfilepath_desc'] = 'The path within the private Github repository where the Post SCSS file is located.'; diff --git a/templates/advertisementtiles.mustache b/templates/advertisementtiles.mustache index a0ccabeb3df..804a26169f5 100644 --- a/templates/advertisementtiles.mustache +++ b/templates/advertisementtiles.mustache @@ -57,7 +57,7 @@ { "title": "", "content": "This text is shown in light font color", - "backgroundimageurl": "https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/master/tests/fixtures/login_bg1.jpg", + "backgroundimageurl": "https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/main/tests/fixtures/login_bg1.jpg", "linktitle": "", "link": "", "no": 3, diff --git a/templates/slider.mustache b/templates/slider.mustache index 1d735472f8e..3cc2214c826 100644 --- a/templates/slider.mustache +++ b/templates/slider.mustache @@ -61,7 +61,7 @@ }, "slides": [ { - "backgroundimageurl": "https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/master/tests/fixtures/login_bg1.jpg", + "backgroundimageurl": "https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/main/tests/fixtures/login_bg1.jpg", "backgroundimagealt": "The background image 1", "captionorcontent": true, "caption": "The caption 1", @@ -77,7 +77,7 @@ "slideto": 0 }, { - "backgroundimageurl": "https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/master/tests/fixtures/login_bg2.jpg", + "backgroundimageurl": "https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/main/tests/fixtures/login_bg2.jpg", "backgroundimagealt": "The background image 2", "captionorcontent": true, "caption": "The caption 2", @@ -93,7 +93,7 @@ "slideto": 1 }, { - "backgroundimageurl": "https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/master/tests/fixtures/login_bg3.jpg", + "backgroundimageurl": "https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/main/tests/fixtures/login_bg3.jpg", "backgroundimagealt": "The background image 3", "captionorcontent": true, "caption": "The caption 3", diff --git a/tests/behat/theme_boost_union_looksettings_scss.feature b/tests/behat/theme_boost_union_looksettings_scss.feature index 072a9e46e2f..8c6a7dd2ebd 100644 --- a/tests/behat/theme_boost_union_looksettings_scss.feature +++ b/tests/behat/theme_boost_union_looksettings_scss.feature @@ -63,8 +63,8 @@ Feature: Configuring the theme_boost_union plugin for the "SCSS" tab on the "Loo Examples: | urlfield | url | - | External Pre SCSS download URL | https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/master/tests/fixtures/extscss.scss | - | External Post SCSS download URL | https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/master/tests/fixtures/extscss.scss | + | External Pre SCSS download URL | https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/main/tests/fixtures/extscss.scss | + | External Post SCSS download URL | https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/main/tests/fixtures/extscss.scss | @javascript Scenario Outline: Setting: External SCSS - Add external SCSS from Github API to the theme @@ -153,7 +153,7 @@ Feature: Configuring the theme_boost_union plugin for the "SCSS" tab on the "Loo Examples: | url | | https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/broken/tests/fixtures/extscss.scss | - | https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/master/tests/fixtures/extscss-invalid.scss | + | https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/main/tests/fixtures/extscss-invalid.scss | @javascript Scenario Outline: Setting: External SCSS - Add an external SCSS code with Bootstrap variables to the theme and validate it @@ -176,5 +176,5 @@ Feature: Configuring the theme_boost_union plugin for the "SCSS" tab on the "Loo Examples: | validate | shouldornot | url | - | yes | should | https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/master/tests/fixtures/extscss-with-variables.scss | - | no | should not | https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/master/tests/fixtures/extscss-with-variables.scss | + | yes | should | https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/main/tests/fixtures/extscss-with-variables.scss | + | no | should not | https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/main/tests/fixtures/extscss-with-variables.scss | diff --git a/tests/behat/theme_boost_union_tasks.feature b/tests/behat/theme_boost_union_tasks.feature index 4f31700598f..7370ccd5af8 100644 --- a/tests/behat/theme_boost_union_tasks.feature +++ b/tests/behat/theme_boost_union_tasks.feature @@ -14,7 +14,7 @@ Feature: Running tasks in the theme_boost_union plugin Given the following config values are set as admin: | config | value | plugin | | extscsssource | 1 | theme_boost_union | - | extscssurlpost | https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/master/tests/fixtures/extscss.scss | theme_boost_union | + | extscssurlpost | https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/main/tests/fixtures/extscss.scss | theme_boost_union | When I log in as "admin" And I am on "Course 1" course homepage And I should see "Course 1" in the "#page-header .page-header-headings" "css_element"