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 alignment of Email field and Dynamic rowspan #18859

Open
wants to merge 4 commits into
base: 10.0/bugfixes
Choose a base branch
from

Conversation

eduardomozart
Copy link
Contributor

@eduardomozart eduardomozart commented Jan 30, 2025

Checklist before requesting a review

Please delete options that are not relevant.

  • I have read the CONTRIBUTING document.
  • I have performed a self-review of my code.
  • I have added tests that prove my fix is effective or that my feature works.
  • This change requires a documentation update.

Description

My GLPI instance doesn't support timezones =( So it's not displayed on Simplified UI, only a warning message is shown on Central UI, but as this warning isn't show to the user, it creates an odd situation where the missing Timezone field makes E-mail field overlaps:

image

This PR fixes this alignment by creating an empty TR (this approach is already taken by other parts of this same PHP function).

image

It also vertical align the "Emails" field on both UIs.

Before this PR:

SCR-20250130-pyth

  • It fixes # (issue number, if applicable)
  • Here is a brief description of what this PR does

Screenshots (if appropriate):

cedric-anne
cedric-anne previously approved these changes Feb 5, 2025
Comment on lines +3274 to +3275
} else {
echo "<tr class='tab_bg_1'><td colspan='2'></td></tr>";
Copy link
Member

Choose a reason for hiding this comment

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

Result seems to be different depending on the following condition : if ($extauth|| !Session::haveRight("password_update", "1")) {. Indeed the code from line 3267 to 3272 seems to indicate that it may require an additional placeholder.

Could you check ?

@cedric-anne cedric-anne self-requested a review February 5, 2025 21:12
@cedric-anne cedric-anne dismissed their stale review February 6, 2025 10:58

Not 100% sure of the proposed chnages.

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.

2 participants