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.

Sign up for GitHub

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

Jump to bottom

Split Navigation and Search pages #1352

Merged
merged 18 commits into from
Jul 13, 2023
Merged

Split Navigation and Search pages #1352

merged 18 commits into from
Jul 13, 2023

Conversation

LisaFC
Copy link
Collaborator

@LisaFC LisaFC commented Jan 9, 2023 •
edited by chalin
Loading

@LisaFC
Copy link
Collaborator Author

LisaFC commented Jan 9, 2023

Work so far splits the pages and fixes the couple of internal links that the split broke. There is also the possibility of it breaking external links, though sadly I'm pretty sure you can't redirect to/from anchors....

@LisaFC LisaFC added user guide Improvements to user guide cleanup/refactoring labels Jan 9, 2023
chalin
chalin reviewed Mar 8, 2023
View reviewed changes
Copy link
Collaborator

@chalin chalin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for working on this. See inline for a few nits.

userguide/content/en/docs/adding-content/navigation.md Outdated Show resolved Hide resolved
userguide/content/en/docs/adding-content/navigation.md Outdated Show resolved Hide resolved
userguide/content/en/docs/adding-content/search.md Outdated Show resolved Hide resolved
@LisaFC LisaFC changed the title WIP: split Navigation and Search pages Split Navigation and Search pages Mar 8, 2023
@LisaFC
Copy link
Collaborator Author

LisaFC commented Mar 8, 2023

Don't think there's anything else I need to do here so I am un-WIP-ing it. @chalin @geriom @emckean want to take a look?

@chalin
Copy link
Collaborator

chalin commented Mar 8, 2023

LGTM aside from the nits identified above. The link checker seems happy, so that's good. (The issue of title font color on the homepage is fixed via #1467, FYI.)

@deining deining self-requested a review June 12, 2023 18:49
deining
deining approved these changes Jun 12, 2023
View reviewed changes
Copy link
Collaborator

@deining deining left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

LisaFC and others added 8 commits July 12, 2023 15:14
@LisaFC @chalin
Update userguide/content/en/docs/adding-content/navigation.md
5d0ec6c 
Co-authored-by: Patrice Chalin <chalin@users.noreply.github.com>
@LisaFC @chalin
Update userguide/content/en/docs/adding-content/navigation.md
d48c1a1 
Co-authored-by: Patrice Chalin <chalin@users.noreply.github.com>
@LisaFC @chalin
Update userguide/content/en/docs/adding-content/search.md
0deafea 
Co-authored-by: Patrice Chalin <chalin@users.noreply.github.com>
@LisaFC
Update _index.md
0128cde 
Resolve merge issues
@LisaFC
More merge fixing
886d33e
@LisaFC
Update search.md
3fdf5ab
@LisaFC
more merge fixing
3f2931a
@LisaFC
Fixing merge conflicts
13dbd7b
@LisaFC
Copy link
Collaborator Author

LisaFC commented Jul 12, 2023

Finally got around to fixing the merge conflicts here - @chalin @geriom or anyone else, can you be my second approver? Thanks!

chalin
chalin requested changes Jul 13, 2023
View reviewed changes
Copy link
Collaborator

@chalin chalin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new Search page is missing changes that were applied to the "Site search options" section since this PR was created: the most obvious are the updates to the config file names, but there could be more. @LisaFC - did you recopy the "Site search options" section from @HEAD?

@LisaFC
Copy link
Collaborator Author

LisaFC commented Jul 13, 2023

I thought I did but possibly it got lost in the merge. Let me add those in again. Thanks for spotting!

@LisaFC
Copy link
Collaborator Author

LisaFC commented Jul 13, 2023

Hang on, I've realized they're in the intro, which I didn't change because I rewrote it. Let me fix the file names.

chalin
chalin approved these changes Jul 13, 2023
View reviewed changes
Copy link
Collaborator

@chalin chalin left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks! (I've confirmed that no updates were lost.)

@chalin chalin merged commit 7f39b82 into main Jul 13, 2023
5 checks passed
@chalin chalin deleted the LisaFC-navigation branch July 13, 2023 16:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chalin chalin chalin approved these changes

@deining deining deining approved these changes

Assignees
No one assigned
Labels
cleanup/refactoring user guide Improvements to user guide
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Split navigation and search docs in user guide
3 participants
@LisaFC @chalin @deining