pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add stream URL to webcam error message for logged in users

Browse source
This commit is contained in:
Gina Häußge 2017-05-19 17:59:54 +02:00
parent 0657160389
commit 0ad09e422d
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/octoprint/static/css/octoprint.css
View file

File diff suppressed because one or more lines are too long

7
src/octoprint/static/less/octoprint.less
View file

@ -555,16 +555,19 @@ ul.dropdown-menu li a {
position: relative;
width: 100%;
padding-bottom: 100%;
pointer-events: none;
.webcam_fixed_ratio {
position: absolute;
transform: rotate(-90deg);
top: 0;
bottom: 0;
pointer-events: none;
.webcam_fixed_ratio_inner {
width: 100%;
height: 100%;
pointer-events: none;
}
}
}
@ -572,8 +575,9 @@ ul.dropdown-menu li a {
.webcam_unrotated {
.webcam_fixed_ratio {
width: 100%;
padding-bottom: 100%;
pointer-events: none;
padding-bottom: 100%;
&.ratio43 {
padding-bottom: 75%;
}
@ -594,6 +598,7 @@ ul.dropdown-menu li a {
bottom: 0;
left: 0;
right: 0;
pointer-events: none;
}
}
}

1
src/octoprint/templates/tabs/control.jinja2
View file

@ -8,6 +8,7 @@
<p><strong>{{ _('Webcam stream not loaded') }}</strong></p>
<p data-bind="visible: !loginState.isAdmin()"><small>{{ _('It might not be configured correctly. To have this fixed, get in touch with an administrator of this OctoPrint instance.') }}</small></p>
<p data-bind="visible: loginState.isAdmin"><small>{{ _('It might not be configured correctly. You can change the URL of the stream under "Settings" > "Webcam & Timelapse" > "Stream URL". If you don\'t have a webcam just set the URL to an empty value.') }}</small></p>
<p data-bind="visible: loginState.isUser"><small>{{ _('Currently configured stream URL') }}: <a target="_blank" rel="noreferrer" data-bind="attr: {href: settings.webcam_streamUrl}, text: settings.webcam_streamUrl"></a></small></p>
</div>
</div>
<div id="webcam_rotator" data-bind="css: { webcam_rotated: settings.webcam_rotate90(), webcam_unrotated: !settings.webcam_rotate90() }">