vmario/doodle3d-client
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2025-06-11 09:23:17 +02:00
Code Issues Releases Wiki Activity

Merge branch 'feature/printerprofiles' into develop

Browse Source 
Conflicts:
	js_src/gcodeGenerating.js
This commit is contained in:
peteruithoven
2013-12-04 14:00:27 +01:00
parent eb2736afcb ff397700b7
commit 9b802ceea9
10 changed files with 202 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
www/css/settings.css
View File

@ -35,10 +35,34 @@ form fieldset fieldset{
clear: left;
float: left;
}
form fieldset.collapsed {
border-radius: 0;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-width: 1px 0 0 0;
float:none;
}
form fieldset.collapsible {
padding: 0;
}
form fieldset.collapsible div{
margin: 8px;
}
form fieldset legend {
margin-left: 10px;
font-weight: bold;
}
form fieldset.collapsible legend {
padding-left: 10px;
cursor: pointer;
}
form fieldset.expanded legend {
background: transparent url(../img/buttons/expanded.gif) no-repeat center left;
}
form fieldset.collapsed legend {
background: transparent url(../img/buttons/collapsed.gif) no-repeat center left;
}
form label {
min-width: 150px;
display: block;

BIN
www/img/buttons/collapsed.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 106 B

BIN
www/img/buttons/expanded.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 107 B

1
www/index.html
View File

@ -134,6 +134,7 @@
<!--<script src="js/libs/imagesloaded-pkgd.min.js"></script>-->
<!--<script src="../js_src/libs/jquery-joyride-2-1.js"></script>-->
<script src="js/libs/jquery-joyride-2-1.min.js"></script>
<script src="js/libs/jquery-coolfieldset.min.js"></script>
<!--<script src="js/doodle3d-client.js"></script>-->
<script src="js/doodle3d-client.min.js"></script>

68
www/settings.html
View File

@ -12,7 +12,7 @@
<body>
<div class="settingsContainer">
<form id="settingsForm">
<fieldset>
<fieldset id="printerPanel">
<legend>3D printer</legend>
<label for="printerType">Type:</label>
<select id="printerType" name="printer.type">
@ -52,6 +52,29 @@
</select><br/>
<label for="printerBedWidth">Bed width:</label><input id="printerBedWidth" type="number" class="small" name="printer.bed.width">mm<br>
<label for="printerBedHeight">Bed height:</label><input id="printerBedHeight" type="number" class="small" name="printer.bed.height">mm<br>
<fieldset id="gcodePanel">
<legend>GCODE settings</legend>
<div>
<div class="startgcode_left">
<label for="startgcode">Start:</label><br/>
<textarea id="startgcode" class="gcode" name="printer.startcode"></textarea>
</div>
<div>
<label for="endgcode">End:</label><br/>
<textarea id="endgcode" class="gcode" name="printer.endcode"></textarea>
</div>
<small>
The following texts are replaced:
<dl>
<dt>{printingTemp}</dt><dd>Printing temperature</dd>
<dt>{printingBedTemp}</dt><dd>Printing bed temperature</dd>
<dt>{preheatTemp}</dt><dd>Preheat temperature</dd>
<dt>{preheatBedTemp}</dt><dd>Preheat bed temperature</dd>
<dt>{printerType}</dt><dd>Printer type</dd>
</dl>
</small>
</div>
</fieldset>
</fieldset>
<fieldset id="printersettings">
@ -133,49 +156,6 @@
<small id="updateInfo"></small>
</fieldset>
<fieldset id="gcodeSettings">
<legend>GCODE settings</legend>
<small class="intro">GCode settings for all printers that use Marlin firmware</small>
<div class="startgcode_left">
<label for="startgcodeMarlin">Start:</label><br/>
<textarea id="startgcodeMarlin" class="gcode" name="printer.startcode.marlin"></textarea>
</div>
<div>
<label for="endgcodeMarlin">End:</label><br/>
<textarea id="endcodeMarlin" class="gcode" name="printer.endcode.marlin"></textarea>
</div>
<small>
The following texts are replaced:
<dl>
<dt>{printingTemp}</dt><dd>Printing temperature</dd>
<dt>{printingBedTemp}</dt><dd>Printing bed temperature</dd>
<dt>{preheatTemp}</dt><dd>Preheat temperature</dd>
<dt>{preheatBedTemp}</dt><dd>Preheat bed temperature</dd>
</dl>
</small>
</fieldset>
<fieldset id="x3gSettings">
<legend>GCODE settings</legend>
<small class="intro">GCODE settings for Makerbots.</small>
<div class="startgcode_left">
<label for="startgcodeX3G">Start:</label><br/>
<textarea id="startcodeX3G" class="gcode" name="printer.startcode.x3g"></textarea>
</div>
<div>
<label for="endgcodeX3G">End:</label><br/>
<textarea id="endcodeX3G" class="gcode" name="printer.endcode.x3g"></textarea>
</div>
<small>
The following texts are replaced:
<dl>
<dt>{printingTemp}</dt><dd>Printing temperature</dd>
<dt>{printingBedTemp}</dt><dd>Printing bed temperature</dd>
<dt>{preheatTemp}</dt><dd>Preheat temperature</dd>
<dt>{preheatBedTemp}</dt><dd>Preheat bed temperature</dd>
<dt>{printerType}</dt><dd>Printer type</dd>
</dl>
</small>
</fieldset>
<fieldset id="debugPanel">
<legend>Debug</legend>
<input type="button" onclick="settingsWindow.downloadlogs()" name="downloadlogs" value="Download logs" class="button" id="downloadlogs"/>