From 200f7f85dfd35aa69e01c927384210dfad67fbb2 Mon Sep 17 00:00:00 2001 From: jvs-kialo Date: Wed, 7 Aug 2024 14:38:32 +0200 Subject: [PATCH 1/8] PM-46209 makes group mode wawrning open in a new tab --- lang/en/kialo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/en/kialo.php b/lang/en/kialo.php index 824d17f..aafb116 100644 --- a/lang/en/kialo.php +++ b/lang/en/kialo.php @@ -48,7 +48,7 @@ $string['errors:noguestaccess'] = "Guests cannot access this activity. Please log in."; $string['errors:nopermissiontoview'] = "You do not have permission to view this activity."; $string['errors:resourcelink'] = "Activity cannot be displayed due to an unexpected error. Please try again."; -$string['groupmode_off_info'] = 'Please note that Moodle groups are currently not automatically supported. (More info)'; +$string['groupmode_off_info'] = 'Please note that Moodle groups are currently not automatically supported. (More info)'; $string['groupmode_on_warning'] = 'Moodle groups are currently not automatically supported. If you use the Kialo Moodle Plugin with a course that has multiple groups, all groups will find themselves in the same Kialo discussion.

To manually set up Kialo discussions for each of your groups, please follow the instructions in our help center.

We will release automatic Moodle groups support in Q1 2024. Submit your email address to be notified when it is released.'; $string['hello'] = 'Hello World!'; $string['kialo:addinstance'] = 'Add a new Kialo Discussion'; From 487acd3cfc5d7dc59b4816051fb3575fed236c4f Mon Sep 17 00:00:00 2001 From: jvs-kialo Date: Fri, 9 Aug 2024 17:01:56 +0200 Subject: [PATCH 2/8] PM-46209 make constants Frankenstyle" --- constants.php | 13 ++++++++----- mod_form.php | 6 +++--- settings.php | 6 +++--- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/constants.php b/constants.php index 405d311..bcc7c96 100644 --- a/constants.php +++ b/constants.php @@ -23,8 +23,11 @@ * */ -define("GROUP_HELP_CENTER_LINK", "https://support.kialo-edu.com/en/hc/moodle/#using-the-kialo-plugin-with-moodle-group-mode"); -define("PLUGIN_RELEASE_EMAIL_NOTIFICATION_LINK", "https://fh6m79pud11.typeform.com/to/cYurgy84"); -define("TERMS_LINK", "https://www.kialo-edu.com/terms"); -define("PRIVACY_LINK", "https://www.kialo-edu.com/privacy"); -define("DATA_SECURITY_LINK", "https://support.kialo-edu.com/en/hc/kialo-edu-data-security-and-privacy-plan/"); +define( + "MOD_KIALO_GROUP_HELP_CENTER_LINK", + "https://support.kialo-edu.com/en/hc/moodle/#using-the-kialo-plugin-with-moodle-group-mode" +); +define("MOD_KIALO_PLUGIN_RELEASE_EMAIL_NOTIFICATION_LINK", "https://fh6m79pud11.typeform.com/to/cYurgy84"); +define("MOD_KIALO_TERMS_LINK", "https://www.kialo-edu.com/terms"); +define("MOD_KIALO_PRIVACY_LINK", "https://www.kialo-edu.com/privacy"); +define("MOD_KIALO_DATA_SECURITY_LINK", "https://support.kialo-edu.com/en/hc/kialo-edu-data-security-and-privacy-plan/"); diff --git a/mod_form.php b/mod_form.php index b06db65..bc64bd7 100644 --- a/mod_form.php +++ b/mod_form.php @@ -66,14 +66,14 @@ public function definition() { $text = ''; $text .= get_string("groupmode_off_info", "mod_kialo", [ - "grouphelpcenterlink" => GROUP_HELP_CENTER_LINK, + "grouphelpcenterlink" => MOD_KIALO_GROUP_HELP_CENTER_LINK, ]); } else { $text = ''; $text .= get_string("groupmode_on_warning", "mod_kialo", [ - "grouphelpcenterlink" => GROUP_HELP_CENTER_LINK, - "pluginreleaseemailnotificationlink" => PLUGIN_RELEASE_EMAIL_NOTIFICATION_LINK, + "grouphelpcenterlink" => MOD_KIALO_GROUP_HELP_CENTER_LINK, + "pluginreleaseemailnotificationlink" => MOD_KIALO_PLUGIN_RELEASE_EMAIL_NOTIFICATION_LINK, ]); } $text = "
" . $text . "
"; diff --git a/settings.php b/settings.php index 6d9a5df..c6a706a 100644 --- a/settings.php +++ b/settings.php @@ -39,9 +39,9 @@ 'mod_kialo/acceptterms', new lang_string('acceptterms', 'mod_kialo'), new lang_string('acceptterms_desc', 'mod_kialo', [ - "terms" => TERMS_LINK, - "privacy" => PRIVACY_LINK, - "data_security" => DATA_SECURITY_LINK, + "terms" => MOD_KIALO_TERMS_LINK, + "privacy" => MOD_KIALO_PRIVACY_LINK, + "data_security" => MOD_KIALO_DATA_SECURITY_LINK, ]), 0 ); From 700c4236c9889b33e90f0282572c69e7035bf96a Mon Sep 17 00:00:00 2001 From: jvs-kialo Date: Fri, 9 Aug 2024 17:02:23 +0200 Subject: [PATCH 3/8] PM-46209 remove hello world lang string --- lang/en/kialo.php | 1 - 1 file changed, 1 deletion(-) diff --git a/lang/en/kialo.php b/lang/en/kialo.php index aafb116..d2115c5 100644 --- a/lang/en/kialo.php +++ b/lang/en/kialo.php @@ -50,7 +50,6 @@ $string['errors:resourcelink'] = "Activity cannot be displayed due to an unexpected error. Please try again."; $string['groupmode_off_info'] = 'Please note that Moodle groups are currently not automatically supported. (More info)'; $string['groupmode_on_warning'] = 'Moodle groups are currently not automatically supported. If you use the Kialo Moodle Plugin with a course that has multiple groups, all groups will find themselves in the same Kialo discussion.

To manually set up Kialo discussions for each of your groups, please follow the instructions in our help center.

We will release automatic Moodle groups support in Q1 2024. Submit your email address to be notified when it is released.'; -$string['hello'] = 'Hello World!'; $string['kialo:addinstance'] = 'Add a new Kialo Discussion'; $string['kialo:kialo_admin'] = 'Granted Admin rights in Kialo discussions'; $string['kialo:view'] = 'View Kialo discussions'; From d7ae0864601a4c8cb3f4b277dc0a914235c8d0ca Mon Sep 17 00:00:00 2001 From: jvs-kialo Date: Mon, 12 Aug 2024 10:28:40 +0200 Subject: [PATCH 4/8] PM-46209 move styles into styles.css --- styles.css | 234 ++++++++++++++++++++++++++++++++ templates/loading_page.mustache | 227 +------------------------------ 2 files changed, 235 insertions(+), 226 deletions(-) create mode 100644 styles.css diff --git a/styles.css b/styles.css new file mode 100644 index 0000000..1c2b155 --- /dev/null +++ b/styles.css @@ -0,0 +1,234 @@ +:root { + --kialo-blue-color: #0069e0; +} + +@font-face { + font-family: Roboto-subset; + font-style: normal; + font-weight: 300; + src: url(data:application/font-woff2;charset=utf-8;base64,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) + format("woff2"); +} + +body, +div, +html, +iframe, +p, +span { + border: 0; + font-size: 100%; + font: inherit; + margin: 0; + padding: 0; + vertical-align: baseline; +} + +body, +html { + height: 100%; +} + +html { + -webkit-text-size-adjust: 100%; +} + +.loading-text { + display: flex; + height: 100%; + align-items: center; + flex-direction: column; + justify-content: center; +} + +.loading-title { + margin: 0 0 8px; + color: #656f7b; + font-family: Roboto-subset, -apple-system, BlinkMacSystemFont, Helvetica, + Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol; + font-size: 33px; + font-weight: 300; + line-height: 1.2; + text-align: center; +} + +.spinner { + animation: spinner-fade-in 1.5s ease-in 1; + overflow: hidden; + position: relative; + margin: 0 auto; +} + +@keyframes spinner-fade-in { + 0% { + opacity: 0; + } + to { + opacity: 1; + } +} + +.spinner--large, +.spinner--large .spinner__circle--1 { + height: 64px; + width: 64px; +} + +.spinner--large .spinner__circle--2 { + height: 48px; + width: 48px; +} + +.spinner--large .spinner__circle--3 { + height: 32px; + width: 32px; +} + +.spinner--large .spinner__arc-inner { + border-width: 3px; +} + +.spinner__circle--1 { + animation: container-rotate 2s linear infinite; + left: 0; + position: absolute; + top: 0; +} + +.spinner__circle--2 { + animation: container-rotate 1.2s linear infinite; + left: 12.5%; + position: absolute; + top: 12.5%; +} + +.spinner__circle--3 { + animation: container-rotate 2s linear infinite; + left: 25%; + position: absolute; + top: 25%; +} + +.spinner__line { + animation: line-center-rotate 4s cubic-bezier(0.4, 0, 0.2, 1) infinite both, + blend-line-color 4s cubic-bezier(0.4, 0, 0.2, 1) infinite both; + border-color: var(--kialo-blue-color); + display: flex; + height: 100%; + position: absolute; + width: 100%; +} + +.spinner__arc { + border-color: inherit; + height: 100%; + overflow: hidden; + position: relative; + width: 50%; +} + +.spinner__arc-inner { + border-color: inherit; + border-bottom-color: transparent; + border-radius: 50%; + border-style: solid; + bottom: 0; + box-sizing: border-box; + height: 100%; + left: 0; + position: absolute; + right: 0; + top: 0; + width: 200%; +} + +.spinner__arc-inner--left { + animation: left-expand-line 1s cubic-bezier(0.4, 0, 0.2, 1) infinite both; + border-right-color: transparent; + transform: rotate(129deg); +} + +.spinner__arc-inner--right { + animation: right-expand-line 1s cubic-bezier(0.4, 0, 0.2, 1) infinite both; + border-left-color: transparent; + left: -100%; + transform: rotate(-129deg); +} + +@keyframes container-rotate { + to { + transform: rotate(1turn); + } +} + +@keyframes line-center-rotate { + 12.5% { + transform: rotate(135deg); + } + 25% { + transform: rotate(270deg); + } + 37.5% { + transform: rotate(405deg); + } + 50% { + transform: rotate(540deg); + } + 62.5% { + transform: rotate(675deg); + } + 75% { + transform: rotate(810deg); + } + 87.5% { + transform: rotate(945deg); + } + to { + transform: rotate(3turn); + } +} + +@keyframes left-expand-line { + 0% { + transform: rotate(130deg); + } + 50% { + transform: rotate(-5deg); + } + to { + transform: rotate(130deg); + } +} + +@keyframes right-expand-line { + 0% { + transform: rotate(-130deg); + } + 50% { + transform: rotate(5deg); + } + to { + transform: rotate(-130deg); + } +} + +@keyframes blend-line-color { + 0% { + border-color: var(--kialo-blue-color); + } + 15% { + border-color: var(--kialo-blue-color); + } + 25% { + border-color: #e6e9eb; + } + 65% { + border-color: #e6e9eb; + } + 75% { + border-color: var(--kialo-blue-color); + } + to { + border-color: var(--kialo-blue-color); + } +} diff --git a/templates/loading_page.mustache b/templates/loading_page.mustache index fe912c2..19063da 100644 --- a/templates/loading_page.mustache +++ b/templates/loading_page.mustache @@ -47,235 +47,10 @@ - {{ htmltitle }} +
From 0319538bdc7a3733a9151af91e3b01879043a5f8 Mon Sep 17 00:00:00 2001 From: jvs-kialo Date: Mon, 12 Aug 2024 14:11:47 +0200 Subject: [PATCH 5/8] PM-46209 fixes direct acces to string --- lang/en/kialo.php | 2 ++ mod_form.php | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lang/en/kialo.php b/lang/en/kialo.php index d2115c5..18fcdde 100644 --- a/lang/en/kialo.php +++ b/lang/en/kialo.php @@ -78,3 +78,5 @@ $string['select_discussion'] = 'Select Discussion'; $string['select_discussion_help'] = 'Opens Kialo in a new tab to select a discussion for this activity. You can create a Kialo account during this process if you don’t already have one.'; $string['termsnotaccepted'] = 'You have to accept Kialo’s Terms of Service before you can enable the Kialo plugin.'; +$string['information_helptext'] = 'Information'; +$string['warning_helptext'] = 'Warning'; diff --git a/mod_form.php b/mod_form.php index bc64bd7..9bdcffd 100644 --- a/mod_form.php +++ b/mod_form.php @@ -64,13 +64,17 @@ public function definition() { // Kialo does not support group mode yet. Show a warning if it is enabled, otherwise show an info. if (groups_get_course_groupmode($COURSE) == NOGROUPS) { $text = ''; + title="' . + get_string("information_helptext", "mod_kialo") . + '" role="img" aria-label="Information">'; $text .= get_string("groupmode_off_info", "mod_kialo", [ "grouphelpcenterlink" => MOD_KIALO_GROUP_HELP_CENTER_LINK, ]); } else { $text = ''; + title="'. + get_string("warning_helptext", "mod_kialo") . + '" role="img" aria-label="Warning">'; $text .= get_string("groupmode_on_warning", "mod_kialo", [ "grouphelpcenterlink" => MOD_KIALO_GROUP_HELP_CENTER_LINK, "pluginreleaseemailnotificationlink" => MOD_KIALO_PLUGIN_RELEASE_EMAIL_NOTIFICATION_LINK, From d9f7f78ee994cea1cd4866d2efe518dac692d213 Mon Sep 17 00:00:00 2001 From: jvs-kialo Date: Mon, 12 Aug 2024 14:29:22 +0200 Subject: [PATCH 6/8] PM-46209 fixes dynamic property access --- tests/classes/user_authenticator_test.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/classes/user_authenticator_test.php b/tests/classes/user_authenticator_test.php index dbe8e0e..a176279 100644 --- a/tests/classes/user_authenticator_test.php +++ b/tests/classes/user_authenticator_test.php @@ -53,6 +53,11 @@ final class user_authenticator_test extends \advanced_testcase { */ private $registrationstub; + /** + * @var userauthenticator + */ + private $userauthenticator; + protected function setUp(): void { parent::setUp(); @@ -60,7 +65,7 @@ protected function setUp(): void { $this->course = $this->getDataGenerator()->create_course(); $this->registrationstub = $this->createStub(RegistrationInterface::class); - $this->user_authenticator = new user_authenticator(); + $this->userauthenticator = new user_authenticator(); // Creates a Kialo activity. $this->module = $this->getDataGenerator()->create_module('kialo', ['course' => $this->course->id]); @@ -76,7 +81,7 @@ protected function setUp(): void { */ protected function authenticate_user(string $userid): UserAuthenticationResultInterface { $loginhint = "{$this->course->id}/$userid"; - return $this->user_authenticator->authenticate($this->registrationstub, $loginhint); + return $this->userauthenticator->authenticate($this->registrationstub, $loginhint); } /** From a5cf3331a259a74ab5812153e40887063f9c7b0e Mon Sep 17 00:00:00 2001 From: jvs-kialo Date: Mon, 12 Aug 2024 14:38:25 +0200 Subject: [PATCH 7/8] PM-46209 moves css out of mustahce --- styles.css | 30 +++++++++--------- templates/loading_page.mustache | 54 ++++++++++++++++----------------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/styles.css b/styles.css index 1c2b155..122f9b4 100644 --- a/styles.css +++ b/styles.css @@ -33,7 +33,7 @@ html { -webkit-text-size-adjust: 100%; } -.loading-text { +.kialo-loading-text { display: flex; height: 100%; align-items: center; @@ -41,7 +41,7 @@ html { justify-content: center; } -.loading-title { +.kialo-loading-title { margin: 0 0 8px; color: #656f7b; font-family: Roboto-subset, -apple-system, BlinkMacSystemFont, Helvetica, @@ -52,7 +52,7 @@ html { text-align: center; } -.spinner { +.kialo-spinner { animation: spinner-fade-in 1.5s ease-in 1; overflow: hidden; position: relative; @@ -68,48 +68,48 @@ html { } } -.spinner--large, -.spinner--large .spinner__circle--1 { +.kialo-spinner--large, +.kialo-spinner--large .kialo-spinner__circle--1 { height: 64px; width: 64px; } -.spinner--large .spinner__circle--2 { +.kialo-spinner--large .kialo-spinner__circle--2 { height: 48px; width: 48px; } -.spinner--large .spinner__circle--3 { +.kialo-spinner--large .kialo-spinner__circle--3 { height: 32px; width: 32px; } -.spinner--large .spinner__arc-inner { +.kialo-spinner--large .kialo-spinner__arc-inner { border-width: 3px; } -.spinner__circle--1 { +.kialo-spinner__circle--1 { animation: container-rotate 2s linear infinite; left: 0; position: absolute; top: 0; } -.spinner__circle--2 { +.kialo-spinner__circle--2 { animation: container-rotate 1.2s linear infinite; left: 12.5%; position: absolute; top: 12.5%; } -.spinner__circle--3 { +.kialo-spinner__circle--3 { animation: container-rotate 2s linear infinite; left: 25%; position: absolute; top: 25%; } -.spinner__line { +.kialo-spinner__line { animation: line-center-rotate 4s cubic-bezier(0.4, 0, 0.2, 1) infinite both, blend-line-color 4s cubic-bezier(0.4, 0, 0.2, 1) infinite both; border-color: var(--kialo-blue-color); @@ -119,7 +119,7 @@ html { width: 100%; } -.spinner__arc { +.kialo-spinner__arc { border-color: inherit; height: 100%; overflow: hidden; @@ -127,7 +127,7 @@ html { width: 50%; } -.spinner__arc-inner { +.kialo-spinner__arc-inner { border-color: inherit; border-bottom-color: transparent; border-radius: 50%; @@ -142,7 +142,7 @@ html { width: 200%; } -.spinner__arc-inner--left { +.kialo-spinner__arc-inner--left { animation: left-expand-line 1s cubic-bezier(0.4, 0, 0.2, 1) infinite both; border-right-color: transparent; transform: rotate(129deg); diff --git a/templates/loading_page.mustache b/templates/loading_page.mustache index 19063da..b82eb03 100644 --- a/templates/loading_page.mustache +++ b/templates/loading_page.mustache @@ -50,50 +50,50 @@ {{ htmltitle }} - + -
+
{{{ extrahtml }}} -

{{ loadingtext }}

-
-
-
-
-
+

{{ loadingtext }}

+
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
From b71cd33385b695c088068815fcc9e4d246cfc72f Mon Sep 17 00:00:00 2001 From: jvs-kialo Date: Mon, 12 Aug 2024 15:18:01 +0200 Subject: [PATCH 8/8] PM-46209 review comments --- mod_form.php | 6 ++---- styles.css | 14 +++++++------- templates/loading_page.mustache | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/mod_form.php b/mod_form.php index 9bdcffd..f485fed 100644 --- a/mod_form.php +++ b/mod_form.php @@ -63,16 +63,14 @@ public function definition() { $mform = $this->_form; // Kialo does not support group mode yet. Show a warning if it is enabled, otherwise show an info. if (groups_get_course_groupmode($COURSE) == NOGROUPS) { - $text = ''; $text .= get_string("groupmode_off_info", "mod_kialo", [ "grouphelpcenterlink" => MOD_KIALO_GROUP_HELP_CENTER_LINK, ]); } else { - $text = ''; $text .= get_string("groupmode_on_warning", "mod_kialo", [ diff --git a/styles.css b/styles.css index 122f9b4..551486c 100644 --- a/styles.css +++ b/styles.css @@ -59,7 +59,7 @@ html { margin: 0 auto; } -@keyframes spinner-fade-in { +@keyframes kialo-spinner-fade-in { 0% { opacity: 0; } @@ -148,20 +148,20 @@ html { transform: rotate(129deg); } -.spinner__arc-inner--right { +.kialo-spinner__arc-inner--right { animation: right-expand-line 1s cubic-bezier(0.4, 0, 0.2, 1) infinite both; border-left-color: transparent; left: -100%; transform: rotate(-129deg); } -@keyframes container-rotate { +@keyframes kialo-container-rotate { to { transform: rotate(1turn); } } -@keyframes line-center-rotate { +@keyframes kialo-line-center-rotate { 12.5% { transform: rotate(135deg); } @@ -188,7 +188,7 @@ html { } } -@keyframes left-expand-line { +@keyframes kialo-left-expand-line { 0% { transform: rotate(130deg); } @@ -200,7 +200,7 @@ html { } } -@keyframes right-expand-line { +@keyframes kialo-right-expand-line { 0% { transform: rotate(-130deg); } @@ -212,7 +212,7 @@ html { } } -@keyframes blend-line-color { +@keyframes kialo-blend-line-color { 0% { border-color: var(--kialo-blue-color); } diff --git a/templates/loading_page.mustache b/templates/loading_page.mustache index b82eb03..b2b460f 100644 --- a/templates/loading_page.mustache +++ b/templates/loading_page.mustache @@ -87,7 +87,7 @@
-
+