Skip to content

Amélioration Page santé + configuration camera Freebox #80

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.

Sign up for GitHub

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

Merged
zoic21 merged 4 commits into from
Feb 6, 2024
Merged

Amélioration Page santé + configuration camera Freebox #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4ea629
Ajout lien community
JEALG Jan 13, 2024
741d2cd
Modale santé remplacement icône de l'équipement par image du device
JEALG Jan 13, 2024
4e2ecea
mise a jour config Freebox-freeboxcam
JEALG Jan 13, 2024
1a86c2e
Suppression lien community
JEALG Feb 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/config/devices/freebox/rocketcam.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
"name" : "RocketCam",
"manufacturer" : "Freebox",
"configuration": {
"username" : "freeboxcam",
"urlStream": "\/img\/snapshot.cgi?size=4&quality=1",
"cameraStreamAccessUrl" : "rtsp:\/\/#username#:#password#@#ip#\/img\/live",
"cameraStreamAccessUrl" : "http:\/\/#username#:#password#@#ip#\/img\/stream.m3u8",
"protocole": "http"
},
"commands": []
Expand Down
12 changes: 6 additions & 6 deletions desktop/modal/health.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
<?php
foreach ($eqLogics as $eqLogic) {
$opacity = ($eqLogic->getIsEnable()) ? '' : 'disableCard';
if (file_exists(dirname(__FILE__) . '/../../core/config/devices/' . $eqLogic->getConfiguration('device') . '.jpg')) {
$img = '<img class="lazy" src="plugins/camera/core/config/devices/' . $eqLogic->getConfiguration('device') . '.jpg" height="65" width="55" style="' . $opacity . '"/>';
if ($eqLogic->getConfiguration('device') != "" && camera::getImgFilePath($eqLogic->getConfiguration('device')) !== false) {
$img = '<img class="lazy" src="plugins/camera/core/config/devices/' . camera::getImgFilePath($eqLogic->getConfiguration('device')) . '" height="65" width="55" style="' . $opacity . '"/>';
} else {
$img = '<img class="lazy" src="' . $plugin->getPathImgIcon() . '" height="65" width="55" style="' . $opacity . '"/>';
}
Expand Down Expand Up @@ -75,12 +75,12 @@
} else {
echo '<td><span class="label label-danger" style="font-size : 1em; cursor : default;">' . $framerate . '/s</span></td>';
}
echo '<td><span class="label label-info" style="font-size : 1em; cursor : default;">' . $eqLogic->getConfiguration('refreshDelaySlow',1) . '/s</span></td>';
echo '<td><span class="label label-info" style="font-size : 1em; cursor : default;">' . $eqLogic->getConfiguration('refreshDelayFast',1) . '/s</span></td>';

echo '<td><span class="label label-info" style="font-size : 1em; cursor : default;">' . $eqLogic->getConfiguration('refreshDelaySlow', 1) . '/s</span></td>';
echo '<td><span class="label label-info" style="font-size : 1em; cursor : default;">' . $eqLogic->getConfiguration('refreshDelayFast', 1) . '/s</span></td>';
echo '<td><span class="label label-info" style="font-size : 1em; cursor : default;">' . $eqLogic->getConfiguration('maxReccordTime') . 's</span></td>';
echo '<td><span class="label label-info" style="font-size : 1em; cursor : default;">' . $eqLogic->getConfiguration('createtime') . '</span></td></tr>';
}
?>
</tbody>
</table>
</table>
Loading