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

Convert member organizations and contact member pages #87

Merged
merged 4 commits into from
Oct 23, 2024
Merged

Convert member organizations and contact member pages #87

merged 4 commits into from
Oct 23, 2024

Conversation

molinaro-m
Copy link
Member

this should fix #58 , could require further refinement, uses #85 for left-side images w.r.t. the text

gmantele and others added 4 commits September 30, 2024 10:05
@gmantele
Add a shortcode for floating (left or right) content
0796c88
@gmantele
Add a shortcode for paragraph with a side image (left or right).
ab52d74 
This shortcode is a bit different from the `floating` shortcode. The content
is not floating around the image, but is rather visually put on a separate
column.
@molinaro-m
added org members contacts page member-contacts
48b6e95
@molinaro-m
translation of the member-organizations page
8837e44
@JeremyMcCormick
Copy link
Collaborator

JeremyMcCormick commented Oct 2, 2024 •
edited
Loading

I merged the PR that added the shortcodes separately. Can you review your changes here to make sure they do not conflict? I think maybe you can use the ones that Gregory added.

@molinaro-m
Copy link
Member Author

the other PR I have in place was started from a "pre-shortcode" version of main. This one was built on top of Gregory's work, it shouldn't conflict with current main.
I think we can wait for PR #86 to be merged, as a check, and then move also this one in.

@JeremyMcCormick
Copy link
Collaborator

JeremyMcCormick commented Oct 15, 2024 •
edited
Loading

the other PR I have in place was started from a "pre-shortcode" version of main. This one was built on top of Gregory's work, it shouldn't conflict with current main. I think we can wait for PR #86 to be merged, as a check, and then move also this one in.

Can you rebase out the changes that duplicate what is on main?

I believe git fetch origin && git rebase -i main should work. Then they should disappear.

I verified by hand that some of your changes which add short codes look like what is on main already but this would be better. It should make absolutely sure that there are no conflicts.

@JeremyMcCormick JeremyMcCormick changed the title member organizations and contact member pages translated Port member organizations and contact member pages Oct 15, 2024
@JeremyMcCormick JeremyMcCormick changed the title Port member organizations and contact member pages Convert member organizations and contact member pages Oct 15, 2024
@molinaro-m
Copy link
Member Author

not sure what happened
I suppose my git skills are lacking
but the recipe you suggested bring in no changes, a push simply states nothing to do

@JeremyMcCormick
Copy link
Collaborator

not sure what happened

I suppose my git skills are lacking

but the recipe you suggested bring in no changes, a push simply states nothing to do

You can just mark the first two commits that add the shortcodes as "d" (drop) in the rebase to remove them entirely - then force push (git push -f). That should clean it up. Then recheck your local Hugo site to make sure it looks okay.

JeremyMcCormick
JeremyMcCormick approved these changes Oct 16, 2024
View reviewed changes
Copy link
Collaborator

@JeremyMcCormick JeremyMcCormick left a comment

Choose a reason for hiding this comment

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

Page content looks fine.

However, I just noticed that about/member-contacts is not linked from the navigation menus, only from about/what_is_ivoa.

I'll approve this PR, but you may want to add a link to the navigation menu for that page so it is more easily accessible.

@molinaro-m molinaro-m merged commit 77a3201 into main Oct 23, 2024
1 check passed
@molinaro-m molinaro-m deleted the iss58 branch October 23, 2024 11:10
@molinaro-m molinaro-m mentioned this pull request Oct 23, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JeremyMcCormick JeremyMcCormick JeremyMcCormick approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Link member contacts from "about" menu
3 participants
@molinaro-m @JeremyMcCormick @gmantele