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

Closes #2010, Adds simple popup to assist with color recognition #2027

Open
wants to merge 6 commits into
base: Development
Choose a base branch
from

Conversation

MuchQuak
Copy link
Collaborator

@MuchQuak MuchQuak commented Jan 6, 2025

Issue #2010

Summary

Hooks into the macrostrat api to pull lat long input when the macrostrat layer is clicked.

First Pass basic

age_macrostrat

Currently Looks Like

updated_info_macro_strat

Still need feedback on what is that popup and then I can design up a style for it.

Pull Request Checklist:

Pre-Approval

  • There is a description section in the pull request that details what the proposed changes do. It can be very brief if need be, but it ought to exist.
  • Hotfixes should be branched off of the master branch and PR'd using the merge option (not squashed) into the hotfix branch.
  • Features and backlog bugs should be merged into the Development branch, NOT master
  • All new text is preferably internationalized (i.e., no end-user-visible text is hard-coded on the PHP pages), and the spreadsheet tracking internationalizations has been updated either with a new row or with checkmarks to existing rows.
  • There are no linter errors
  • New features have responsive design (i.e., look aesthetically pleasing both full screen and with small or mobile screens)
  • Symbiota coding standards have been followed
  • If any files have been reformatted (e.g., by an autoformatter), the reformat is its own, separate commit in the PR
  • Comment which GitHub issue(s), if any does this PR address
  • If this PR makes any changes that would require additional configuration of any Symbiota portals outside of the files tracked in this repository, make sure that those changes are detailed in this document.

Post-Approval

  • It is the code author's responsibility to merge their own pull request after it has been approved
  • If this PR represents a merge into the Development branch, remember to use the squash & merge option
  • If this PR represents a merge into the hotfix branch, remember to use the merge option (i.e., no squash).
  • If this PR represents a merge from the Development branch into the master branch, remember to use the merge option
  • If this PR represents a merge from the hotfix branch into the master branch use the squash & merge option
    • a subsequent PR from master into Development should be made with the merge option (i.e., no squash).
    • Immediately delete the hotfix branch and create a new hotfix branch
    • increment the Symbiota version number in the symbase.php file and commit to the hotfix branch.
  • If the dev team has agreed that this PR represents the last PR going into the Development branch before a tagged release (i.e., before an imminent merge into the master branch), make sure to notify the team and lock the Development branch to prevent accidental merges while QA takes place. Follow the release protocol here.
  • Don't forget to delete your feature branch upon merge. Ignore this step as required.

Thanks for contributing and keeping it clean!

# Issue #2010

# Summary
Hooks into the macrostrat api to pull lat long input when the macrostrat
layer is clicked.
@themerekat
Copy link
Collaborator

Seems to be working, but this raises the question...where is the color key for the macrostrat layers?

@ljwalker
Copy link
Collaborator

ljwalker commented Jan 7, 2025

Requested adjustments:

  • Change "Unit" to "Name" for consistency with data source Keep "Unit" (do not change to "Name").
  • Change "Macrostrat ID" to "Macrostrat matched units" for consistency with data source
  • When styling, decrease font size for "Source" section to minimize space occupied by this information and keep headers bolded.
    Screenshot 2025-01-10 at 2 43 39 PM

<div>
<span><b>Macrostrat ID: </b></span>
<div style="margin-top:1rem">
<span style="font-weight:bold">Macrostrat matched names: </span>
Copy link
Collaborator

Choose a reason for hiding this comment

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

"names" --> "units"

Copy link
Collaborator

@ljwalker ljwalker left a comment

Choose a reason for hiding this comment

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

One adjustment left. Looks wonderful!!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants