From 871fcf852b1452674dd512bf1a04c759571502b4 Mon Sep 17 00:00:00 2001
From: Andrew Miner <andrewminer@mac.com>
Date: Thu, 22 Aug 2013 23:51:28 -0700
Subject: [PATCH] Convert crafting output lists to tables

---
 html/crafting.js                |  2 +-
 html/css/main.css               | 13 ++++++++-----
 html/data/industrial_craft.json |  4 ----
 html/index.html                 |  8 ++++----
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/html/crafting.js b/html/crafting.js
index df13f52f2..0de10407e 100644
--- a/html/crafting.js
+++ b/html/crafting.js
@@ -233,7 +233,7 @@ function createManifest() {
         var result = "";
         var count = 0;
         for (var name in object.materials) {
-            result += "<li>" + object.materials[name] + " " + name + "</li>";
+            result += "<tr><td>" + object.materials[name] + "</td><td>" + name + "</td></tr>";
             count += 1
         }
 
diff --git a/html/css/main.css b/html/css/main.css
index 0af20e9b9..98a23d692 100644
--- a/html/css/main.css
+++ b/html/css/main.css
@@ -1,8 +1,16 @@
 .disabled { color: gray; }
 .centered { text-align: center; }
+.crafting_output { margin-left: 10px; min-height: 400px; width: 920px; }
+.crafting_output th { background: #f8f8f8; border-left: 1px solid #bbb; font-weight: bold; padding: 10px; }
+.crafting_output td { background: #f8f8f8; border-left: 1px solid #bbb; padding: 10px; }
 .error { color: red; display: none; font-weight: bold; width: 100%; }
 .hidden { display: none; }
+.manifest { width: 100%; }
+.manifest td { border: 0; padding: 0; width: 75%; }
+.manifest td:first-child { width: 25%; }
 .padded { margin: 10px; }
+.ui-autocomplete { max-height: 400px; overflow-y: auto; overflow-x: hidden; }
+
 
 body { background: url("../images/ice.png"); margin-bottom: 100px; }
 h1 { font-family: 'Press Start 2P', cursive; font-size: 24px; margin-left: 10px; }
@@ -16,9 +24,6 @@ p { margin-left: 10px; margin-right: 10px; }
 #border_bedrock { background: url("../images/bedrock.png"); height: 32px; box-shadow: 2px 0px 4px #444; }
 #crafting { margin-bottom: 64px; }
 #crafting_error { margin-left: 10px; }
-#crafting_output { margin-left: 10px; min-height: 400px; width: 920px; }
-#crafting_output th { background: #f8f8f8; border-left: 1px solid #bbb; font-weight: bold; padding: 10px; }
-#crafting_output td { background: #f8f8f8; border-left: 1px solid #bbb; padding: 10px; }
 #crafting_selector { width: 400px; }
 #footer { background: #3E1D0A; color: white; padding-top: 10px; };
 #footer iframe { display: inline-block; }
@@ -31,5 +36,3 @@ p { margin-left: 10px; margin-right: 10px; }
 #recipebook_table td { background: #f8f8f8; border-left: 1px solid #bbb; padding: 10px; }
 #recipebook_url { width: 600px; }
 #recipebooks { margin-top: 32px; margin-bottom: 32px; }
-
-.ui-autocomplete { max-height: 400px; overflow-y: auto; overflow-x: hidden; }
diff --git a/html/data/industrial_craft.json b/html/data/industrial_craft.json
index 8fb58bdff..791aa521a 100644
--- a/html/data/industrial_craft.json
+++ b/html/data/industrial_craft.json
@@ -82,10 +82,6 @@
             "output": [[1, "String"]],
             "input": [[1, "Wool"]],
             "tools": ["Macerator"]
-        }, {
-            "output": [[1, "Flint"]],
-            "input": [[1, "Gravel"]],
-            "tools": ["Macerator"]
         }, {
             "output": [[1, "Induction Furnace"]],
             "input": [[7, "Copper Ingot"], [1, "Electric Furnace"], [1, "Advanced Machine Block"]],
diff --git a/html/index.html b/html/index.html
index d5fa73922..8661dd86d 100644
--- a/html/index.html
+++ b/html/index.html
@@ -47,7 +47,7 @@
           <input id="tools_included" name="tools_included" type="checkbox"></input>
           <label for="tools_included">include tools</label>
         </p>
-        <table id="crafting_output" class="hidden" cellpadding="0" cellspacing="0">
+        <table id="crafting_output" class="crafting_output hidden" cellpadding="0" cellspacing="0">
           <tr>
             <th width="25%">I already have:</th>
             <th width="25%">You'll need to find:</th>
@@ -55,9 +55,9 @@
             <th width="25%">You'll end up with:</th></tr>
           <tr>
             <td><textarea id="inventory" style="height: 100%; width: 100%" placeholder="2 Oak Log"></textarea></td>
-            <td id="missing_materials">&nbsp;</td>
-            <td id="crafted_items">&nbsp;</td>
-            <td id="leftover_materials">&nbsp;</td>
+            <td><table id="missing_materials" cellpadding="0" cellspacing="0" class="manifest"></table></td>
+            <td><table id="crafted_items" cellpadding="0" cellspacing="0" class="manifest"></table></td>
+            <td><table id="leftover_materials" cellpadding="0" cellspacing="0" class="manifest"></table></td>
           </tr>
         </table>
         <div id="crafting_error" class="error"></div>