q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made Webcam omnipresent

master
Gina Häußge 2013-04-01 17:20:25 +02:00
parent 1f06faa167
commit edea3789b2
1 changed files with 324 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
octoprint/templates/index.html
View File

@ -161,14 +161,31 @@
</div>
</div>
<div class="tabbable span8">
<div class="span8">
{% if webcamStream %}
<div class="accordion">
<div class="accordion-group">
<div class="accordion-heading">
<a class="accordion-toggle" data-toggle="collapse" href="#webcam"><i class="icon-eye-open"></i> Webcam</a>
</div>
<div class="accordion-body collapse" id="webcam">
<div class="accordion-inner">
<div id="webcam_container">
<img id="webcam_image" src="{{ webcamStream }}">
</div>
</div>
</div>
</div>
</div>
{% endif %}
<div class="tabbable">
<ul class="nav nav-tabs" id="tabs">
<li class="active"><a href="#temp" data-toggle="tab">Temperature</a></li>
<li><a href="#controls" data-toggle="tab">Controls</a></li>
{% if enableGCodeVisualizer %}<li><a href="#gcode" data-toggle="tab">GCode Viewer</a></li>{% endif %}
<!--<li><a href="#speed" data-toggle="tab">Speed</a></li>-->
<li><a href="#term" data-toggle="tab">Terminal</a></li>
{% if webcamStream %}<li><a href="#webcam" data-toggle="tab">Webcam</a></li>{% endif %}
{% if enableTimelapse %}<li><a href="#timelapse" data-toggle="tab">Timelapse</a></li>{% endif %}
</ul>
<div class="tab-content">
@ -456,13 +473,8 @@
<button class="btn" type="button" id="terminal-send">Send</button>
</div>
</div>
{% if webcamStream %}
<div class="tab-pane" id="webcam">
<div id="webcam_container">
<img id="webcam_image" src="{{ webcamStream }}">
</div>
{% if enableTimelapse %}
<div class="tab-pane" id="timelapse">
<h1>Timelapse Configuration</h1>
<label for="webcam_timelapse_mode">Timelapse Mode</label>
@ -516,12 +528,12 @@
<li data-bind="css: {disabled: listHelper.currentPage() === listHelper.lastPage()}"><a href="#" data-bind="click: listHelper.nextPage">»</a></li>
</ul>
</div>
{% endif %}
</div>
{% endif %}
</div>
</div>
</div>
</div>
<div class="footer">
<ul>
<li><a href="https://github.com/foosel/OctoPrint/"><i class="icon-download"></i> Sourcecode</a></li>