-
-
Notifications
You must be signed in to change notification settings - Fork 555
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
Include FTL's DNS port in web status and give the temperature its own line #2031
Conversation
Signed-off-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
echo "<span id=\"temperature\"><i class=\"fa fa-fire ";
is now duplicated code. I'd rather put the if ($celsius >= -273.15) {
further down to reduce duplication. Unfortunately, Github doesn't support suggestions if there are also lines deleted in a segment.
I imagine something like
<?php $tempcolor = "text-vivid-blue";
if ($celsius > $temperaturelimit) {
$tempcolor = "text-red";
?><span id="temperature"><i class="fa fa-fire <? echo $tempcolor; ?>"></i>
<?php if ($celsius >= -273.15) { ?>
Temp: <span id="rawtemp" hidden><?php echo $celsius;?></span><span id="tempdisplay"></span>
<?php } else ?>
No temp sensor found<span id="tempdisplay"></span>
<?php } ?></span>
(give or take some typos maybe)
Signed-off-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
I will test this once my review comments on the core PR have been discussed. |
From my point of view, this is fine. |
@bdoner We added a new FTL API endpoint to query for the DNS port. If you want to continue to test, please run
|
Signed-off-by: Christian König <ckoenig@posteo.de>
Checked it out, still running on the tweak/web_status branches for core and web. All seems good :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The icons should be optimized to get class fa-w
and more padding but this is another thing for a follow-up PR. T think @rdwebdesign is already at it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
$pistatus
is never a string
Signed-off-by: DL6ER <dl6er@dl6er.de>
9d0de39
to
f5dd0a2
Compare
I will look at this after the completion of #2031. |
@yubiuser Feel free to merge if you are fine with my latest changes. |
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-13-web-v5-10-and-core-v5-8-released/52254/1 |
* Replicating changes made by other PRs (#2031 and pi-hole/pi-hole#4485) Signed-off-by: rdwebdesign <github@rdwebdesign.com.br> * Use the same messages used in #2031 Signed-off-by: rdwebdesign <github@rdwebdesign.com.br> * Keep the old responses to avoid break things Signed-off-by: rdwebdesign <github@rdwebdesign.com.br> * More comments less variables Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>
* Replicating changes made by other PRs (#2031 and pi-hole/pi-hole#4485) Signed-off-by: rdwebdesign <github@rdwebdesign.com.br> * Use the same messages used in #2031 Signed-off-by: rdwebdesign <github@rdwebdesign.com.br> * Keep the old responses to avoid break things Signed-off-by: rdwebdesign <github@rdwebdesign.com.br> * More comments less variables Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>
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-14-web-v5-11-and-core-v5-9-released/53529/1 |
git rebase
)git commit --signoff
)What does this PR aim to accomplish?:
Reports if FTL is running on another port than 53 in the user-panel in the web interface. Additionally, the temperature info got its own line in the user-panel
Fixes #2030
Needs: pi-hole/pi-hole#4485