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

Fix the overlapping filter settings and the customize options #8316

Merged
merged 3 commits into from
Sep 23, 2024

Conversation

MichelGabriel
Copy link
Contributor

This PR fixes the overlapping filter settings and the customize options dropdown on the User Interface page. The 2 buttons (save and delete) got an improvement alignment.

Further improvements:

  • spacing between title and UI config name
  • fix paddings on smaller screens
  • whitespace between buttons and inputs

Before the changes

gn-config-overlap

After the changes

gn-config-no-overlap

Checklist

  • I have read the contribution guidelines
  • Pull request provided for main branch, backports managed with label
  • Good housekeeping of code, cleaning up comments, tests, and documentation
  • Clean commit history broken into understandable chucks, avoiding big commits with hundreds of files, cautious of reformatting and whitespace changes
  • Clean commit messages, longer verbose messages are encouraged
  • API Changes are identified in commit messages
  • Testing provided for features or enhancements using automatic tests
  • User documentation provided for new features or enhancements in manual
  • Build documentation provided for development instructions in README.md files
  • Library management using pom.xml dependency management. Update build documentation with intended library use and library tutorials or documentation

…ptions dropdown on the `User Interface` page. The 2 buttons (save and delete) got an improvement alignment.

Further improvements:
- spacing between title and UI config name
- fix paddings on smaller screens
- whitespace between buttons and inputs
@josegar74 josegar74 added this to the 4.4.6 milestone Aug 28, 2024
@josegar74
Copy link
Member

@MichelGabriel in some window widths the buttons are not well aligned:

buttons-1

buttons-2

@MichelGabriel
Copy link
Contributor Author

I added a fix. The buttons are now always below the 2 input boxes

gn-config-buttons-below

@fxprunayre fxprunayre merged commit 0d73e4f into geonetwork:main Sep 23, 2024
6 checks passed
@geonetworkbuild
Copy link
Collaborator

The backport to 4.2.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply c6ff0b9a58... These changes fix the overlapping filter settings and the customize options dropdown on the `User Interface` page. The 2 buttons (save and delete) got an improvement alignment.
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging web-ui/src/main/resources/catalog/components/admin/uiconfig/partials/uiconfig.html
Auto-merging web-ui/src/main/resources/catalog/templates/admin/settings/ui.html
CONFLICT (content): Merge conflict in web-ui/src/main/resources/catalog/templates/admin/settings/ui.html

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.2.x 4.2.x
# Navigate to the new working tree
cd .worktrees/backport-4.2.x
# Create a new branch
git switch --create backport-8316-to-4.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c6ff0b9a585d525ef84f11355179e3c2e37f5c4e,03c507507b88b509b9f871ccb34a6b41cf2874c8,5eb0eb6baee807e4427f5eb7a19a02d8205298ca
# Push it to GitHub
git push --set-upstream origin backport-8316-to-4.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.2.x

Then, create a pull request where the base branch is 4.2.x and the compare/head branch is backport-8316-to-4.2.x.

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

Successfully merging this pull request may close these issues.

4 participants