Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Edit markbooks, questions & specifications text #1198

Merged
merged 4 commits into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/components/pages/AssignmentProgress.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ export function AssignmentProgress({user}: {user: RegisteredUserDTO}) {
return <>
<Container>
<TitleAndBreadcrumb
currentPageTitle={siteSpecific("Assignment Progress", "My markbook")}
currentPageTitle={siteSpecific("Assignment Progress", "Markbook")}
subTitle={"Track your group performance" + (isPhy ? " by question" : "")}
help={pageHelp}
modalId="help_modal_assignment_progress"
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/pages/ExamSpecifications.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export const ExamSpecifications = ({stageFilter, examBoardFilter}: ExamSpecifica
}, [examBoardTab, stageTab]);

return <Container>
<TitleAndBreadcrumb currentPageTitle={"Exam specifications"} />
<TitleAndBreadcrumb currentPageTitle={"Specifications"} />
<MetaDescription description={metaDescription} />
{stageTabs}
<Row>
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/pages/QuestionFinder.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ export const QuestionFinder = withRouter(({location}: RouteComponentProps) => {
</div>;

return <Container id="finder-page" className={classNames("mb-5", {"question-finder-container": isPhy})}>
<TitleAndBreadcrumb currentPageTitle={siteSpecific("Question Finder", "Practice questions")} help={pageHelp}/>
<TitleAndBreadcrumb currentPageTitle={siteSpecific("Question Finder", "Questions")} help={pageHelp}/>
<MetaDescription description={metaDescription}/>
<CanonicalHrefElement/>
<PageFragment fragmentId={"question_finder_intro"} ifNotFound={RenderNothing} />
Expand Down
6 changes: 3 additions & 3 deletions src/app/components/site/cs/HeaderCS.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ export const HeaderCS = () => {

<NavigationSection title="Resources">
<LinkItem to="/topics">Topics</LinkItem>
<LinkItem to={PATHS.QUESTION_FINDER}>Practice questions</LinkItem>
<LinkItem to={PATHS.QUESTION_FINDER}>Questions</LinkItem>
<LinkItem to="/glossary">Glossary</LinkItem>
<LinkItem to={"/exam_specifications"}>Exam specifications</LinkItem>
<LinkItem to={"/exam_specifications"}>Specifications</LinkItem>
</NavigationSection>

<NavigationSection title="Students">
Expand Down Expand Up @@ -100,7 +100,7 @@ export const HeaderCS = () => {
<LinkItem to="/groups">Teaching groups</LinkItem>
<LinkItem to={PATHS.SET_ASSIGNMENTS}>Manage assignments</LinkItem>
<LinkItem to="/set_tests">Manage tests</LinkItem>
<LinkItem to={PATHS.ASSIGNMENT_PROGRESS}>My markbook</LinkItem>
<LinkItem to={PATHS.ASSIGNMENT_PROGRESS}>Markbook</LinkItem>
<LinkItem to={PATHS.MY_ASSIGNMENTS}>Work to do {<MenuBadge count={assignmentsCount} message="incomplete assignments" />}</LinkItem>
</>
:
Expand Down
2 changes: 1 addition & 1 deletion src/app/services/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,7 @@ export const ADMIN_CRUMB = {title: "Admin", to: "/admin"};
export const EVENTS_CRUMB = {title: "Events", to: "/events"};
export const ASSIGNMENT_PROGRESS_CRUMB = siteSpecific(
{title: "Assignment Progress", to: "/assignment_progress"},
{title: "My markbook", to: "/my_markbook"}
{title: "Markbook", to: "/my_markbook"}
);

export const UserFacingRole: {[role in UserRole]: string} = {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/test/testUtils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export const navigateToAssignmentProgress = async () => {
isPhy ?
await followHeaderNavLink("Teach", "Assignment Progress")
:
await followHeaderNavLink("My Ada", "My markbook");
await followHeaderNavLink("My Ada", "Markbook");
};

// Open a given tab in the account page.
Expand Down