Merge branch 'feature/calender-frontend' of https://github.com/pennla…

…bs/office-hours-queue into feature/calender-frontend
pennlabs · Aug 25, 2024 · 32e5b93 · 32e5b93
2 parents 7904ed4 + f32432d
commit 32e5b93
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/frontend/components/Calendar/InstructorCalendar/InstructorCalendarModals.tsx b/frontend/components/Calendar/InstructorCalendar/InstructorCalendarModals.tsx
@@ -241,7 +241,7 @@ export const EditEventModal = (props: EditEventProps) => {
                                 title={`Delete ${
                                     occurrence.event.rule ? "Recurring " : ""
                                 }Event`}
-                                occurrenceText="Cancel This Event"
+                                occurrenceText="Delete This Event"
                                 eventText={
                                     occurrence.event.rule
                                         ? "Delete All Events"

diff --git a/frontend/components/Guide/InstructorGuideContent.tsx b/frontend/components/Guide/InstructorGuideContent.tsx
@@ -155,7 +155,10 @@ export const Calendar = ({ ref }) => (
                 You can add events to your course calendar by visiting the
                 Calendar page on the Course page sidebar. Simply drag on the
                 Calendar to indicate the time of the event and fill in any
-                relevant information.
+                relevant information. You can only edit the course calendar via
+                the Calendar page reached from the course home page (the
+                instructor view).The Calendar linked from the dashboard is a
+                read-only view of all enrolled courses (the student view).
             </p>
             <p>
                 If the event is recurring, select so and make sure to indicate

diff --git a/frontend/components/Guide/StudentGuideContent.tsx b/frontend/components/Guide/StudentGuideContent.tsx
@@ -55,9 +55,9 @@ export const Calendar = ({ ref }) => (
             <p>
                 Your instructor may have placed your office hours on the course
                 calendar. You can view the calendar either on the sidebar on the
-                home page or the Calendar page linked on the sidebar. You can
-                also see additional information such as event location by
-                clicking on the event.
+                Dashboard (on desktop ony) or the Calendar page linked on the
+                navbar. You can also see additional information such as event
+                location by clicking on the event card.
             </p>
             <p>
                 You can filter the courses that you see events for by visiting