Simpler settings window layout

css/settingsPopup.css

@@ -1,48 +1,43 @@
 #contentOverlay {
   background-color: rgba(255, 255, 255, 0.65);
-  top: 0px;
-  left: 0px;
-  width: 1024px;
-  height: 100%;
   z-index: 10;
   position: absolute;
-  display:table;
-}
-.contentOverlayHidden {
+  top: 0px;
+  left: 0px;
+  width: 100%;
+  height: 100%;
   display:none;
 }
-#settingsContainer {
-  display: table-cell;
-  /*text-align: center;*/
-  vertical-align: middle;
-}
 #settings {
-  position: relative;
-  background-color: #fff;
-  border: 2px solid #222;
-  border-radius: 15px;
-  -moz-border-radius: 15px;
-  -webkit-border-radius: 15px;
-  z-index: 15;
-  margin: 0 auto;
-  padding: 25px;
-  width: 850px;
-  height: 450px;
+	background-color: #fff;
+	z-index: 15;
+  
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  width: 835px;
+  height: 500px;
+  margin: -250px 0 0 -417.5px;
+  /*padding: 25px;*/
+
   /*overflow: scroll;*/
   /*overflow-y: hidden;*/
   -moz-box-shadow:    0px 2px 6px 0px rgba(16, 16, 16, 0.65);
   -webkit-box-shadow: 0px 2px 6px 0px rgba(16, 16, 16, 0.65);
   box-shadow:         0px 2px 6px 0px rgba(16, 16, 16, 0.65);
+  border: 2px solid #222;
+  border-radius: 15px;
+  -moz-border-radius: 15px;
+  -webkit-border-radius: 15px;
   overflow: hidden;
 }
-
-
 #settings header {
+	margin: 25px 25px 0 25px;
   height: 44px;
 }
 
 div.content {
-  margin: 15px 0px;
+  margin: 15px 25px 25px 25px;
   height: 388px;
   display: table;
 }
@@ -53,7 +48,7 @@ div.content > div {
 
 div.content > div.settings {
   border: 1px solid #333;
-  width: 725px;
+  width: 660px;
   overflow: scroll;
   max-height: 368px;
   overflow-x: hidden;
@@ -63,11 +58,12 @@ div.content > div.buttons {
   display: table-cell;
   vertical-align: bottom;
   width: 125px;
+  
 }
 
 div.content .btnOK {
   width: 85px;
   height: 86px;
   background: url('../img/buttons/btnOk_settings.png') no-repeat;
-  margin: 10px auto;
+  margin: 0 0 0 10px;
 }

index.html

@@ -26,7 +26,9 @@
     }
 
     #debug_textArea {
-      display:none;
+      position:absolute; 
+      bottom: 0; 
+      width: 800px; 
     }
 
     .debugBtn {
@@ -93,22 +95,19 @@
       </div>
     </div>
   </div>
-  <div id="debug_textArea" style="position:absolute; bottom: -600px; width: 800px; height: 600px;">
+  <div id="debug_textArea">
     <textarea rows="5" cols="115" id="textdump"></textarea>
   </div>
   <div id="contentOverlay">
-    <div id="settingsContainer">
-      <div id="settings">
-        <header>
-          <img src="img/settings_lable.png" alt="settings"/>
-        </header>
-        <div class="content">
-          <div class="settings">henk</div>
-          <div class="buttons">
-            <div class="btnOK"></div>
-          </div>
+    <div id="settings">
+      <header>
+        <img src="img/settings_lable.png" alt="settings"/>
+      </header>
+      <div class="content">
+        <div class="settings">henk</div>
+        <div class="buttons">
+          <div class="btnOK"></div>
         </div>
-
       </div>
     </div>
   </div>

js/main.js

@@ -5,7 +5,7 @@ $("#btnSave").css("opacity", "0.3");
 $("#btnInfo").css("opacity", "0.3");
 //$("#btnSettings").css("opacity", "0.3");
 
-//  var debug = true;
+  var debug = true;
 
 var printer =  new Printer(); 
 var updateTemperatureInterval; 

js/settings.js

@@ -2,27 +2,27 @@ var wifiboxURL;//"http://192.168.5.1/cgi-bin/d3dapi";
 
 //these settings are defined in the firmware (conf_defaults.lua) and will be initialized in loadSettings()
 var settings = {
-//  "network.ap.ssid": "d3d-ap-%%MAC_ADDR_TAIL%%",
-//  "network.ap.address": "192.168.10.1",
-//  "network.ap.netmask": "255.255.255.0",
-//  "printer.temperature": 215,
-//  "printer.objectHeight": '???',
-//  "printer.layerHeight": 0.2,
-//  "printer.wallThickness": 0.6,
-//  "printer.speed": 50,
-//  "printer.travelSpeed": 200,
-//  "printer.filamentThickness": 2.89,
-//  "printer.useSubLayers": true,
-//  "printer.firstLayerSlow": true,
-//  "printer.autoWarmUp": true,
-//  "printer.simplify.iterations": 10,
-//  "printer.simplify.minNumPoints": 15,
-//  "printer.simplify.minDistance": 3,
-//  "printer.retraction.enabled": true,
-//  "printer.retraction.speed": 250,
-//  "printer.retraction.minDistance": 1,
-//  "printer.retraction.amount": 2,
-//  "printer.autoWarmUpCommand": "M104 S230 (hardcoded temperature)" 
+"network.ap.ssid": "d3d-ap-%%MAC_ADDR_TAIL%%",
+"network.ap.address": "192.168.10.1",
+"network.ap.netmask": "255.255.255.0",
+"printer.temperature": 215,
+"printer.objectHeight": '???',
+"printer.layerHeight": 0.2,
+"printer.wallThickness": 0.6,
+"printer.speed": 50,
+"printer.travelSpeed": 200,
+"printer.filamentThickness": 2.89,
+"printer.useSubLayers": true,
+"printer.firstLayerSlow": true,
+"printer.autoWarmUp": true,
+"printer.simplify.iterations": 10,
+"printer.simplify.minNumPoints": 15,
+"printer.simplify.minDistance": 3,
+"printer.retraction.enabled": true,
+"printer.retraction.speed": 250,
+"printer.retraction.minDistance": 1,
+"printer.retraction.amount": 2,
+"printer.autoWarmUpCommand": "M104 S230 (hardcoded temperature)" 
 }
 
 var settingsForm = $("#settingsForm");