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 tailog pages IDs #1429

Merged
merged 1 commit into from
Jun 4, 2020
Merged

Fix tailog pages IDs #1429

merged 1 commit into from
Jun 4, 2020

Conversation

XhmikosR
Copy link
Contributor

@XhmikosR XhmikosR commented Jun 4, 2020

Signed-off-by: XhmikosR [email protected]

By submitting this pull request, I confirm the following: {please fill any appropriate checkboxes, e.g: [X]}

{Please ensure that your pull request is for the 'devel' branch!}

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)
  • I have Signed Off all commits. (git commit --signoff)

Fixes #1412

Signed-off-by: XhmikosR <[email protected]>
@XhmikosR XhmikosR added this to the v5.1 milestone Jun 4, 2020
@XhmikosR XhmikosR requested a review from DL6ER June 4, 2020 12:25
DL6ER
DL6ER previously requested changes Jun 4, 2020
Copy link
Member

@DL6ER DL6ER left a comment

Choose a reason for hiding this comment

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

We need the empty <div>s to get proper checkbox styling with icheck-bootstrap.

Your branch:
Screenshot from 2020-06-04 14-32-35

With empty <div> elements as suggested:
Screenshot from 2020-06-04 14-32-24

Comment on lines +15 to +16
<input type="checkbox" checked id="chk1">
<label for="chk1">Automatic scrolling on update</label>
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
<input type="checkbox" checked id="chk1">
<label for="chk1">Automatic scrolling on update</label>
<div>
<input type="checkbox" checked id="chk1">
<label for="chk1">Automatic scrolling on update</label>
</div>

Comment on lines +20 to +21
<input type="checkbox" checked id="chk2">
<label for="chk2">Automatic scrolling on update</label>
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
<input type="checkbox" checked id="chk2">
<label for="chk2">Automatic scrolling on update</label>
<div>
<input type="checkbox" checked id="chk2">
<label for="chk2">Automatic scrolling on update</label>
</div>

Comment on lines +15 to +16
<input type="checkbox" checked id="chk1">
<label for="chk1">Automatic scrolling on update</label>
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
<input type="checkbox" checked id="chk1">
<label for="chk1">Automatic scrolling on update</label>
<div>
<input type="checkbox" checked id="chk1">
<label for="chk1">Automatic scrolling on update</label>
</div>

Comment on lines +20 to +21
<input type="checkbox" checked id="chk2">
<label for="chk2">Automatic scrolling on update</label>
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
<input type="checkbox" checked id="chk2">
<label for="chk2">Automatic scrolling on update</label>
<div>
<input type="checkbox" checked id="chk2">
<label for="chk2">Automatic scrolling on update</label>
</div>

@XhmikosR
Copy link
Contributor Author

XhmikosR commented Jun 4, 2020

As you can see the empty divs are not present in devel

@XhmikosR
Copy link
Contributor Author

XhmikosR commented Jun 4, 2020

You are welcome to fix those separately.

@XhmikosR
Copy link
Contributor Author

XhmikosR commented Jun 4, 2020

Also, these pages do not follow the basic AdminLTE markup, it's not a checkbox issue. They are missing more needed classes, but I don't want to fix them in devel since I fixed those in the AdminLTE 3 branch.

@DL6ER
Copy link
Member

DL6ER commented Jun 4, 2020

The check boxes are broken now. I agree. Fixing them along in this PR will not hurt and I don't see a justification for leaving them broken when changing them.

@XhmikosR
Copy link
Contributor Author

XhmikosR commented Jun 4, 2020

I want to keep my PRs clean. This does one thing. You are welcome to fix the other issues on a separate PR.

@DL6ER DL6ER dismissed their stale review June 4, 2020 13:03

Will be addresses in a separate PR

@DL6ER DL6ER merged commit e5b45cb into devel Jun 4, 2020
@DL6ER DL6ER deleted the fix-tailog-ids branch June 4, 2020 13:04
@PromoFaux PromoFaux mentioned this pull request Jul 5, 2020
@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-5-1-released/35577/1

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.

3 participants