Merge pull request #327 from aopell/develop

Version 7.9
aopell · Jan 24, 2024 · d3cbedd · d3cbedd
2 parents cb9821b + fb6531e
commit d3cbedd
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 14 deletions.
diff --git a/css/all.css b/css/all.css
@@ -650,8 +650,12 @@ the selector matches inside notifications in the new notifs dropdown
     left: calc(50vw - 300px) !important;
 }
 
-._pendo-launcher-badge_ {
-    visibility: var(--help-center-fab-visibility) !important;
+svg:has(+ div.CustomBrandingLogo-vertical-strip-background-color-3_NIE) {
+    display: var(--power-school-logo-display) !important;
+}
+
+div.CustomBrandingLogo-vertical-strip-background-color-3_NIE {
+    display: var(--power-school-logo-display) !important;
 }
 
 .quick-link-wrapper {

diff --git a/css/grades.css b/css/grades.css
@@ -2,6 +2,7 @@
     float: right;
     font-weight: bold;
     font-size: 14px;
+    padding-right: 20px;
 }
 
 tr.item-row td.grade-column div.td-content-wrapper {
@@ -20,6 +21,10 @@ div.tier-injected-score {
     text-align: right;
 }
 
+.gradebook-course.hierarchical-grading-report .gradebook-course-grades .td-content-wrapper {
+    display: block !important;
+}
+
 .grade-column-center {
     text-align: center !important;
     padding-right: 10px !important;

diff --git a/js/api-key.js b/js/api-key.js
@@ -89,6 +89,7 @@
                     let submitButton = document.getElementById("edit-reveal") || document.getElementById("edit-request");
                     submitButton.value = "Reveal Existing Secret";
                     submitButton.parentElement.classList.remove('splus-allow-access');
+                    document.location.search = "showkey";
                 } } ),
             ]),
         ])

diff --git a/js/grades.js b/js/grades.js
@@ -653,17 +653,17 @@ var fetchQueue = [];
                 else if (editDisableReason && !editDisableReason.allCausedBy403) {
                     Logger.error("Editing disabled due to error", editDisableReason);
 
-                    if (confirm("Grade editing has been disabled due to an error. If you are trying to use What If Grades on the grade report page, try going to an individual class gradebook instead. Would you like to report this issue? (It will help us fix it faster!)")) {
-                        window.open(`${BUG_REPORT_FORM_LINK}${encodeURIComponent(JSON.stringify(editDisableReason))}`, "_blank");
+                    if (confirm("Grade editing has been disabled due to an error. If you are trying to use What If Grades on the grade report page, try going to an individual class gradebook instead. If you are consistently getting this error, please reach out to the Schoology Plus Discord server.")) {
+                        // window.open(`${BUG_REPORT_FORM_LINK}${encodeURIComponent(JSON.stringify(editDisableReason))}`, "_blank");
                     }
 
                     document.getElementById("enable-modify").checked = false;
                 }
                 // enabling editing
                 else if (document.getElementById("enable-modify").checked) {
                     if (editDisableReason && editDisableReason.allCausedBy403) {
-                        if (confirm("WARNING!!!\n\nYou have one or more missing assignments for which the total points are unknown due to restrictions put in place by your teacher. Grade editing may work in some categories if this is a weighted gradebook, however it will be disabled in others. We are working on a fix for this issue, but until then please click 'OK' to submit a bug report so we can gague how large this problem is. Thank you!")) {
-                            window.open(`${BUG_REPORT_FORM_LINK}${encodeURIComponent(JSON.stringify(editDisableReason))}`, "_blank");
+                        if (confirm("WARNING!!!\n\nYou have one or more missing assignments for which the total points are unknown due to restrictions put in place by your teacher. Grade editing may work in some categories if this is a weighted gradebook, however it will be disabled in others.")) {
+                            // window.open(`${BUG_REPORT_FORM_LINK}${encodeURIComponent(JSON.stringify(editDisableReason))}`, "_blank");
                         }
                     }
 

diff --git a/js/preload.js b/js/preload.js
@@ -622,25 +622,25 @@ function updateSettings(callback) {
                         element => element.value
                     ).control,
                     new Setting(
-                        "helpCenterFAB",
-                        "Schoology Help Button",
-                        "Controls the visibility of the S button in the bottom right that shows the Schoology Guide Center",
-                        "hidden",
+                        "powerSchoolLogo",
+                        "PowerSchool Logo",
+                        "Controls the visibility of the PowerSchool logo on the navigation bar",
+                        "block",
                         "select",
                         {
                             options: [
                                 {
                                     text: "Show",
-                                    value: "visible"
+                                    value: "block"
                                 },
                                 {
                                     text: "Hide",
-                                    value: "hidden"
+                                    value: "none"
                                 }
                             ]
                         },
                         value => {
-                            setCSSVariable("help-center-fab-visibility", value);
+                            setCSSVariable("power-school-logo-display", value);
                             return value;
                         },
                         function (event) { this.onload(event.target.value) },

diff --git a/manifest.json b/manifest.json
@@ -10,7 +10,7 @@
             "update_url": "https://schoologypl.us/firefox_updates.json"
         }
     },
-    "version": "7.8.6",
+    "version": "7.9",
     "icons": {
         "128": "imgs/[email protected]",
         "64": "imgs/[email protected]",