Merge pull request #209 from trema-tech/dev

Dev
trema-tech · Nov 14, 2024 · 3ce910f · 3ce910f
2 parents 977f33b + 347a8a7
commit 3ce910f
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 17 deletions.
diff --git a/scss/trema/courselist.scss b/scss/trema/courselist.scss
@@ -4,6 +4,7 @@
     max-width: 16rem;
     min-width: 12rem;
     overflow: hidden;
+    border-bottom: none;
     transition: all .3s ease-in-out;
 
     &:hover {
@@ -79,9 +80,22 @@ body#page-enrol-index {
 }
 
 @media (max-width: 769px) {
-    #page .card-see-more .btn {
-        height: auto;
-        font-size: .7rem;
+    #page {
+        .card-see-more .btn {
+            height: auto;
+            font-size: .7rem;
+        }
+        #frontpage-available-course-list {
+            h2 {
+                text-align: center;
+            }
+            .card-deck {
+                justify-content: center;
+                .course-card-view {
+                    width: 100%;
+                }
+            }
+        }
     }
     body#page-enrol-index #region-main {
         padding: 10px 5px !important;

diff --git a/scss/trema/incourse.scss b/scss/trema/incourse.scss
@@ -193,6 +193,3 @@ body.pagelayout-course .section {
 .pagination-sm .page-link {
     padding: 0.25rem 0.5rem !important;
 }
-body.pagelayout-report #page #page-content {
-    max-width: fit-content !important;
-}
diff --git a/scss/trema/login.scss b/scss/trema/login.scss
@@ -101,6 +101,14 @@ body#page-login-index {
             line-height: 1.3rem;
             padding: 10px 20px;
         }
+        .login-form-password .toggle-sensitive-wrapper {
+            input[type="password"] {
+                border-radius: .4rem 0 0 .4rem;
+            }
+            .toggle-sensitive-btn {
+                box-shadow: none;
+            }
+        }
     }
 
     .login-wrapper {

diff --git a/scss/trema/report.scss b/scss/trema/report.scss
@@ -1,8 +1,19 @@
-body.path-admin-reportbuilder {
+body.pagelayout-report,
+body.path-admin-reportbuilder,
+body#page-admin-setting-reportbuildersettings,
+body.path-admin-tool-mfa,
+body.path-admin-report-eventlist,
+body.path-report-participation,
+body.path-report-competency,
+body.path-admin-tool-brickfield,
+body.path-admin-tool-spamcleaner {
     #page {
         div.secondary-navigation {
             max-width: none;
             margin: 0 auto;
+            .navigation .nav-tabs {
+                margin: 0;
+            }
         }
         #page-header {
             margin-top: 1rem;
@@ -46,4 +57,4 @@ body.path-admin-reportbuilder {
             }
         }
     }
-}
+}
diff --git a/templates/core/loginform.mustache b/templates/core/loginform.mustache
@@ -24,8 +24,10 @@
     * canloginasguest - Is guest login allowed?,
     * canloginbyemail - Is login by email allowed?,
     * cansignup - Signup allowed?,
-    * cookieshelpicon - cookies help icon details
+    * showloginform - Hide the standard login form if it not necessary (only OAuth2 for example),
+    * cookieshelpicon - cookies help icon details,
     * error - Any errors in the form?,
+    * info - Info notification to display,
     * forgotpasswordurl - Forgot password url,
     * hasidentityproviders - Flag, set to true to hide identity providers,
     * hasinstructions - Flag, set to true to show instructions,
@@ -36,8 +38,8 @@
     * signupurl - Signup url,
     * errorformatted - Formatted error,
     * logourl - Flag, logo url,
-    * sitename - Name of site.
-    * logintoken - Random token to protect login request.
+    * sitename - Name of site,
+    * logintoken - Random token to protect login request,
     * maintenance - Maintenance message
 
     Example context (json):
@@ -46,14 +48,15 @@
         "canloginasguest": "1",
         "canloginbyemail": false,
         "cansignup": true,
+        "showloginform": true,
         "cookieshelpicon": {
             "heading": "Cookies must be enabled in your browser",
             "text": "<div class=\"no-overflow\">Two cookies are used on this site. Both died..</div>",
             "icon": {
                 "attributes": [
                     {
                         "name": "class",
-                        "value": "iconhelp"
+                        "value": ""
                     },
                     {
                         "name": "alt",
@@ -75,22 +78,24 @@
             "ltr": true
         },
         "error": "",
+        "info": "",
         "forgotpasswordurl": "http://localhost/stable_master/login/forgot_password.php",
         "hasidentityproviders": false,
         "hasinstructions": true,
         "identityproviders": [],
         "instructions": "For full access to this site, you first need to create an account.",
         "instructionsformat": "1",
         "loginurl": "http://localhost/stable_master/login/index.php",
-        "rememberusername": true,
         "signupurl": "http://localhost/stable_master/login/signup.php",
         "cookieshelpiconformatted": "",
         "errorformatted": "",
         "logourl": false,
         "sitename": "Beer & Chips",
         "logintoken": "randomstring",
         "maintenance": "For full access to this site, you need to login in as an admin.",
-        "languagemenu": "Choose language"
+        "languagemenu": "Choose language",
+        "togglepassword": true,
+        "smallscreensonly": true
     }
 }}
 
@@ -226,8 +231,15 @@
     {{#error}}
         document.getElementById('loginerrormessage').focus();
     {{/error}}
+    {{#togglepassword}}
+        require(['core/togglesensitive'], function(ToggleSensitive) {
+            ToggleSensitive.init("password", {{smallscreensonly}});
+        });
+    {{/togglepassword}}
     require(['core_form/submit'], function(Submit) {
         Submit.init("loginbtn");
-        Submit.init("loginguestbtn");
+        {{#canloginasguest}}
+            Submit.init("loginguestbtn");
+        {{/canloginasguest}}
     });
 {{/js}}
diff --git a/templates/lang_menu.mustache b/templates/lang_menu.mustache
@@ -36,6 +36,7 @@
         "children": [
             {
                 "text": "English",
+                "title": "en",
                 "url": "http://example.com",
                 "divider": false
             },
@@ -44,6 +45,7 @@
             },
             {
                 "text": "French",
+                "title": "fr",
                 "url": "http://example.com",
                 "divider": false
             }

diff --git a/version.php b/version.php
@@ -28,8 +28,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2024101401;
-$plugin->release   = '4.5.0.2';
+$plugin->version   = 2024111400;
+$plugin->release   = '4.5.0.3';
 $plugin->maturity  = MATURITY_STABLE;
 $plugin->requires  = 2022021800; // Moodle 4.0 - Build: 20220218.
 $plugin->component = 'theme_trema';