Merge branch 'master' into typo

TEAMMATES · Aug 8, 2024 · 71d5467 · 71d5467
2 parents 7fa0151 + 6d4f9f4
commit 71d5467
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/src/web/app/pages-static/contact-page/contact-page.component.html b/src/web/app/pages-static/contact-page/contact-page.component.html
@@ -3,16 +3,21 @@ <h1 class="color-orange">
 </h1>
 <img src="assets/images/contact.png">
 <p>
-  <b>Email:</b> You can contact us at the following email address: <a href="mailto:{{ supportEmail }}">{{ supportEmail }}</a>.
+  <b>Email:</b> You can contact us at the following email address:
+  <a href="mailto:{{ supportEmail }}"><span aria-hidden="true" class="fas fa-envelope"></span>{{ supportEmail }}</a>.
 </p>
 <p>
-  <b>Blog:</b> Visit the <a href="http://teammatesonline.blogspot.sg/" target="_blank" rel="noopener noreferrer">TEAMMATES Blog</a> to see our latest updates and information.
+  <b>Blog:</b> Visit the
+  <a href="http://teammatesonline.blogspot.sg/" target="_blank" rel="noopener noreferrer"><span aria-hidden="true" class="fab fa-blogger"></span>TEAMMATES Blog</a>
+  to see our latest updates and information.
 </p>
 <p>
   <b>Bug reports and feature requests:</b> Any bug reports or feature requests can be submitted to above email address.
 </p>
 <p>
-  <b>Interested in joining us?</b> Visit our <a href="https://github.com/TEAMMATES/teammates" target="_blank" rel="noopener noreferrer">Developer Website</a>.
+  <b>Interested in joining us?</b> Visit our
+  <a href="https://github.com/TEAMMATES/teammates" target="_blank" rel="noopener noreferrer">
+    <span aria-hidden="true" class="fab fa-github"></span>TEAMMATES Github</a>.
 </p>
 <p>
   <b>Becoming a sponsor</b>:

diff --git a/...page/instructor-request-form/__snapshots__/instructor-request-form.component.spec.ts.snap b/...page/instructor-request-form/__snapshots__/instructor-request-form.component.spec.ts.snap
@@ -189,7 +189,16 @@ exports[`InstructorRequestFormComponent should render correctly 1`] = `
       />
     </div>
     <br />
+    <a
+      aria-label="Cancel button"
+      class="btn btn-danger me-3"
+      tmrouterlink="/web/front/home"
+      type="button"
+    >
+       Cancel 
+    </a>
     <button
+      aria-label="Submit form"
       class="btn btn-primary"
       id="submit-button"
       type="submit"

diff --git a/.../pages-static/request-page/instructor-request-form/instructor-request-form.component.html b/.../pages-static/request-page/instructor-request-form/instructor-request-form.component.html
@@ -127,7 +127,10 @@
   <ngb-alert type="danger" [dismissible]="false" *ngIf="serverErrorMessage" class="error-box">
     <strong>Error submitting request:</strong> {{serverErrorMessage}}
   </ngb-alert>
-  <button type="submit" class="btn btn-primary" id="submit-button" [disabled]="!canSubmit">
+  <a type="button" class="btn btn-danger me-3" tmRouterLink="/web/front/home" aria-label="Cancel button">
+    Cancel
+  </a>
+  <button type="submit" class="btn btn-primary" id="submit-button" aria-label="Submit form" [disabled]="!canSubmit">
     {{isLoading ? "Submitting..." : "Submit"}}
   </button>
 </form>