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

db_queries.php: use the same color scheme from Dashboard #2517

Merged
merged 2 commits into from Feb 2, 2023

Conversation

rdwebdesign
Copy link
Member

What does this PR aim to accomplish?

Use a single color scheme and similar order for both pages (dashboard and db_queries):

  • Blue (aqua) for Total queries;
  • Red for Queries blocked;
  • Yellow for Percentage Blocked;

Dashboard colors:
dashboard

Long-term data > Query log (db_queries.php):
db_queries_same_colors

How does this PR accomplish the above?

Replacing the colors on db_queries.php page.

Link documentation PRs if any are needed to support this PR

none


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code and I have tested my changes.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)
  6. I have checked that another pull request for this purpose does not exist.
  7. I have considered, and confirmed that this submission will be valuable to others.
  8. I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  9. I give this submission freely, and claim no ownership to its content.

  • I have read the above and my PR is ready for review. Check this box to confirm

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

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

Do you want to use the same wording as well?

L127 would need a change then too.

db_queries.php Outdated Show resolved Hide resolved
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

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

Being a Stickler:
At the dashboard Total queries -> Total Queries

@rdwebdesign
Copy link
Member Author

rdwebdesign commented Feb 2, 2023

I don't want to fix the Dashboard here because there are other similar "mixed case" items and I don't think this is related to this PR.

If we want to follow a standard, we first need to decide where we want "Capitalize Every Word" and where we want to "Capitalize only the first letter of each sentence" and then fix it everywhere.

Currently there is no standard:

mixedcase

Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

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

Keep the dashboard as it is. It's a mess organically grown.

@rdwebdesign rdwebdesign merged commit 68212a8 into devel Feb 2, 2023
@rdwebdesign rdwebdesign deleted the db_queries_same_colors branch February 2, 2023 23:14
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-ftl-v5-21-web-v5-18-4-and-core-v5-15-4-released/61096/1

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.

None yet

3 participants