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

Remove dedicated black/whitelist pages + redesign menu #2266

Merged
merged 7 commits into from
Jul 18, 2022

Conversation

yubiuser
Copy link
Member

  • What does this PR aim to accomplish?:

This PR removes the separate Black/Whitelist pages from the nav menu. They have been there to aid new users and to make the transition pre-v5 -> v5 more easy. It was always planed to remove them at some point.
They have been only a font-end for groups-domais.php where the group column was hidden.

The whole functionality can still be accessed via Group Management -> Domains.

After removing the two entries the menu looked quite empty so I re-structured it a bit. Additional, added a link to our Discourse forum.

  • How does this PR accomplish the above?:

Remove now unused code.


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)

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

Signed-off-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Copy link
Member Author

yubiuser commented Jul 16, 2022

Proposed new menu structure

Logged out:
Bildschirmfoto zu 2022-07-16 11-08-50

Logged in:
Bildschirmfoto zu 2022-07-16 11-08-26

Without password set:
Bildschirmfoto zu 2022-07-16 11-15-32

@yubiuser yubiuser changed the title Remove/black whitelist Remove dedicated black/whitelist pages Jul 16, 2022
@DL6ER
Copy link
Member

DL6ER commented Jul 16, 2022

I propose removing "GROUP" from "GROUP MANAGEMENT", see what I added for branch new/FTL_is_my_new_home:

Screenshot from 2022-07-16 13-02-57

@yubiuser
Copy link
Member Author

That's where I took it from but deliberately added the Group because all the sub menu items deal with the group management. Also management alone is very close to System or Settings

@yubiuser yubiuser marked this pull request as ready for review July 16, 2022 12:18
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser yubiuser added the PR: Code Review Required Open Pull Request, needs code reviewed label Jul 16, 2022
@yubiuser yubiuser requested a review from a team July 16, 2022 12:21
@yubiuser
Copy link
Member Author

Ready for review. I guess there might be more code that could go...

@rdwebdesign
Copy link
Member

There is something wrong with the "Collapsed" menu.

image

I can look into it later (or tomorrow).

Signed-off-by: Christian König <ckoenig@posteo.de>
scripts/pi-hole/php/header.php Outdated Show resolved Hide resolved
style/themes/default-light.css Outdated Show resolved Hide resolved
style/themes/default-dark.css Outdated Show resolved Hide resolved
yubiuser and others added 2 commits July 17, 2022 08:34
Signed-off-by: Christian König <ckoenig@posteo.de>
…me always-true if-clauses

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER changed the title Remove dedicated black/whitelist pages Remove dedicated black/whitelist pages + redesign menu Jul 17, 2022
DL6ER
DL6ER previously approved these changes Jul 17, 2022
@DL6ER DL6ER added PR: Approved Open Pull Request, Approved by required number of reviewers and removed PR: Code Review Required Open Pull Request, needs code reviewed labels Jul 17, 2022
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser yubiuser merged commit ce7d333 into devel Jul 18, 2022
@yubiuser yubiuser deleted the remove/black_whitelist branch July 18, 2022 07:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: Approved Open Pull Request, Approved by required number of reviewers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants