Fix jigerator file output

This commit is contained in:
jaseg 2019-09-29 16:23:32 +02:00
parent e7ec6efd7f
commit 04b34f73c1
2 changed files with 22 additions and 5 deletions

View file

@ -122,7 +122,6 @@ body {
a.btn { a.btn {
display: block; display: block;
font-weight: 700; font-weight: 700;
background-color: #b50000;
border-radius: 0.5em; border-radius: 0.5em;
padding: .4em 1em .4em 1em; padding: .4em 1em .4em 1em;
margin-top: .2em; margin-top: .2em;
@ -132,6 +131,17 @@ a.btn:active, a.btn:hover, a.btn:visited, a.btn:link {
text-decoration: none; text-decoration: none;
} }
a.btn.red {
background-color: #b50000;
color: #fff;
}
a.btn.green {
background-color: #00b500;
color: #fff;
}
.workflow-images { .workflow-images {
display: flex; display: flex;
@ -235,3 +245,7 @@ a.btn:active, a.btn:hover, a.btn:visited, a.btn:link {
.render_output { .render_output {
padding-bottom: 8em; padding-bottom: 8em;
} }
#stl-target {
width: 100%;
}

View file

@ -103,11 +103,12 @@
<div class="render_output"> <div class="render_output">
{% if has_renders %} {% if has_renders %}
<a href="{{url_for('render_download', file='sources.zip')}}" class="btn green render">Download renders</a>
{#
<div class="preview-images"> <div class="preview-images">
<a href="{{url_for('render_download', file='sources.zip')}}" class="render">Download renders</a> <div id="stl-target" class="madeleine"></div>
<div id="stl-target" class="madeleine"></div>
</div> </div>
#}
{% elif 'render_job' in session and not has_renders %} {% elif 'render_job' in session and not has_renders %}
<div class="loading-message"> <div class="loading-message">
<div class="lds-ring"><div></div><div></div><div></div><div></div></div> <div class="lds-ring"><div></div><div></div><div></div><div></div></div>
@ -132,6 +133,7 @@
<div class="copyright">&#169; 2019 jaseg</div> <div class="copyright">&#169; 2019 jaseg</div>
</div> </div>
</div> </div>
{#
{% if has_renders %} {% if has_renders %}
<!-- STL viewer --> <!-- STL viewer -->
<link href="static/Madeleine.js/src/css/Madeleine.css" rel="stylesheet"> <link href="static/Madeleine.js/src/css/Madeleine.css" rel="stylesheet">
@ -144,10 +146,11 @@
var madeleine = new Madeleine({ var madeleine = new Madeleine({
target: 'stl-target', // target div id target: 'stl-target', // target div id
data: '{{url_for('render_download', file='jig.stl')}}', // data path data: '{{url_for('render_download', file='jig.stl')}}', // data path
path: '.' // path to source directory from current html file path: 'static/Madeleine.js/src' // path to source directory from current html file
}); });
}; };
</script> </script>
{% endif %} {% endif %}
#}
</body> </body>
</html> </html>