0
0
mirror of https://github.com/Doodle3D/doodle3d-connect.git synced 2024-12-26 02:23:48 +01:00

visual changes

This commit is contained in:
Rick Companje 2017-07-11 12:29:15 +02:00
parent 1b08babe31
commit f06b8994f0

View File

@ -22,6 +22,7 @@
<script src="http://code.jquery.com/jquery-1.10.2.min.js"></script> <script src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
<script src="http://code.jquery.com/mobile/1.4.2/jquery.mobile-1.4.2.min.js"></script> <script src="http://code.jquery.com/mobile/1.4.2/jquery.mobile-1.4.2.min.js"></script>
<script src="js/doodle3d-server.min.js" type="text/javascript"></script> <script src="js/doodle3d-server.min.js" type="text/javascript"></script>
<!-- <script src="js/doodle3d-server.js" type="text/javascript"></script> -->
<!-- stylesheets --> <!-- stylesheets -->
<!-- <link href="https://fonts.googleapis.com/css?family=Abel" rel="stylesheet"> --> <!-- <link href="https://fonts.googleapis.com/css?family=Abel" rel="stylesheet"> -->
@ -49,7 +50,7 @@
<div role="main" class="ui-content"> <div role="main" class="ui-content">
<ul data-role="listview" id="boxeslist"> <ul data-role="listview" id="boxeslist">
<li id="findItem"><a href="#find">Help me find my WiFi-Box...</a></li> <li id="findItem"><a href="#find"><img src="img/icons/wifibox-disabled.jpg">Help me find my WiFi-Box...</a></li>
</ul> </ul>
</div> </div>
@ -62,17 +63,72 @@
<a href="../toolbar/" data-rel="back" class="ui-btn ui-btn-left ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a> <a href="../toolbar/" data-rel="back" class="ui-btn ui-btn-left ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>
<h1></h1> <h1></h1>
</div><!-- /header --> </div><!-- /header -->
<!-- data-role="fieldcontain" -->
<div role="main" class="ui-content"> <div role="main" class="ui-content">
<p class="intro"></p>
<ul data-role="listview"> <p class="intro">You selected '<span class="infoWiFiBoxId">...</span>'. What would you like to do next?</p>
<li id="drawItem"><a href="#draw">Draw</a></li>
<li id="printItem"><a href="#print">Print</a></li> <div id="collapsibleApps" data-role="collapsible" data-role="fieldcontain">
<li id="controlItem"><a href="#control">Control</a></li>
<li id="settingsItem" data-icon="gear"><a href="#settings">Settings</a></li>
<li id="updateItem"><a href="#update">Firmware Update<span class="ui-li-count"></span></a></li> <h3>Apps</h3>
<li id="joinNetworkItem"><a href="#join_network">Join network </a></li>
<!-- <li><a href="#yourapp">Your app here?</a></li> --> <ul data-role="listview" data-split-icon="gear" data-split-theme="a">
</ul>
<li id="drawItem">
<a href="#">
<img src="img/icons/sketch.png">
<h2>Doodle3D Sketch</h2>
<p>The classic 3D line-printing app which is installed on your WiFi-Box.</p>
</a>
</li>
<li id="transformItem">
<a href="https://transform.doodle3d.com">
<img src="img/icons/transform.png">
<h2>Doodle3D Transform</h2>
<p>Learn to design and 3D-print your own 3D models by drawing in 2D and transforming them into 3D.</p></a>
</li>
</ul>
</div>
<div id="collapsiblePrinter" data-role="collapsible" data-role="fieldcontain">
<h3>Printer</h3>
<ul data-role="listview" data-split-icon="gear" data-split-theme="a">
<li id="printItem"><a href="#print">
<img src="img/icons/gcode.png" width="80" height="80">
<h2>Print<small></small></h2>
<p>a file was uploaded and is ready for printing</p>
<span class="ui-li-count">1</span></a>
</li>
<li id="controlItem"><a href="#control">Status &amp; Control</a></li>
<!-- <li id="settingsItem" data-icon="gear"><a href="#settings">Settings</a></li> -->
<li id="settingsItem" data-icon="gear"><a href="#settings">Settings</a></li>
<!-- <li id="settingsItem" data-icon="gear"><a href="#settings">Material settings</a></li> -->
</ul>
</div>
<div id="collapsibleWiFiBox" data-role="collapsible" data-role="fieldcontain">
<h3>WiFi-Box</h3>
<ul data-role="listview" data-split-icon="gear" data-split-theme="a">
<!-- <li id="networksettingsItem" data-icon="gear"><a href="#networksettings">Network Settings</a></li> -->
<li id="joinNetworkItem"><a href="#join_network">Join network...</a></li>
<li id="updateItem"><a href="#update">Firmware Update<span class="ui-li-count"></span></a></li>
<!-- <li>
<div data-role="fieldcontain">
<label for="name">WiFi-Box ID:</label>
<input type="text" id="txtWiFiBoxId" name="txtWiFiBoxId" data-mini="true" />
</div>
</li> -->
<!-- <li id="filemanagerItem"><a href="#">File Manager (Doodle3D Sketch)<span class="ui-li-count"></span></a></li> -->
</ul>
</div>
</div><!-- /content --> </div><!-- /content -->
</div><!-- /page --> </div><!-- /page -->
@ -322,16 +378,16 @@
<ul id="lstPrint" data-role="listview" data-inset="true"> <ul id="lstPrint" data-role="listview" data-inset="true">
<li class="boxItem"> <li class="boxItem">
<a href="#"> <a href="#boxes">
<img src="img/icons/wifibox.jpg"> <img src="img/icons/wifibox.jpg">
<h2>...</h2> <h2>WiFi-Box</h2>
<p>...</p> <p>...</p>
</a> </a>
</li> </li>
<li class="printerItem"> <li class="printerItem">
<a href="#settings"> <a href="#settings">
<img src="img/icons/printers/blank.png"> <img src="img/icons/printers/blank.png">
<h2>...</h2> <h2>3D-Printer</h2>
<p>...</p> <p>...</p>
</a> </a>
</li> </li>
@ -353,19 +409,19 @@
<a href="#printSettingsGcode"> <a href="#printSettingsGcode">
<img src="img/icons/gcode.png" width="80" height="80"> <img src="img/icons/gcode.png" width="80" height="80">
<h2>GCODE File</h2> <h2>GCODE File</h2>
<p></p> <p>...</p>
</a> </a>
</li> </li>
</ul> </ul>
<button id="btnPrint" class="ui-shadow ui-btn ui-corner-all">Print</button> <input type="button" id="btnPrint" class="ui-shadow ui-btn ui-corner-all" value="Print">
</div> </div>
</div> </div>
<div data-role="page" id="control"> <div data-role="page" id="control">
<a href="#boxes" id="logo"><img src="img/logo_full.png"></a> <a href="#boxes" id="logo"><img src="img/logo_full.png"></a>
<div data-role="header"> <div data-role="header">
<a href="../toolbar/" data-rel="back" <a id="btnControlBack" href="#"
class="ui-btn ui-btn-left ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a> class="ui-btn ui-btn-left ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>
<h1>Control</h1> <h1>Control</h1>
</div><!-- /header --> </div><!-- /header -->
@ -405,6 +461,26 @@ G1 X100 Y100 ; Move</pre></small></label>
</div> </div>
</div> </div>
<div data-role="page" id="networksettings">
<a href="#boxes" id="logo"><img src="img/logo_full.png"></a>
<div data-role="header">
<a href="../toolbar/" data-rel="back"
class="ui-btn ui-btn-left ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>
<h1>Network Settings for ...</h1>
</div>
<div id="divSettings" role="main" class="ui-content">
<p class="intro">Network Settings... (under construction)</p>
<div data-role="fieldcontain">
<label for="name">WiFi-Box ID:</label>
<input type="text" id="txtWiFiBoxId" name="txtWiFiBoxId" data-mini="true" />
</div>
</div>
</div>
<div data-role="page" id="settings"> <div data-role="page" id="settings">
<a href="#boxes" id="logo"><img src="img/logo_full.png"></a> <a href="#boxes" id="logo"><img src="img/logo_full.png"></a>
<div data-role="header"> <div data-role="header">
@ -414,6 +490,7 @@ G1 X100 Y100 ; Move</pre></small></label>
</div><!-- /header --> </div><!-- /header -->
<div id="divSettings" role="main" class="ui-content"> <div id="divSettings" role="main" class="ui-content">
<!-- <img width="150" style="float:right" src="img/icons/printers/ultimaker2go.png"> -->
<p class="intro">Use this page to select which 3D-printer is connected to your Doodle3D WiFi-Box. You can change settings per printer. Your settings are saved automatically.</p> <p class="intro">Use this page to select which 3D-printer is connected to your Doodle3D WiFi-Box. You can change settings per printer. Your settings are saved automatically.</p>
<label for="name">3D-printer model:</label> <label for="name">3D-printer model:</label>