Merge branch 'master' into better_inventory

 Conflicts:
	README
	data/templates/products/entry.html
	docker/Dockerfile
	docker/init.sh
	src/database/database.vala
	src/database/db-interface.vala
	src/pdf-stock/Makefile
	src/pdf-stock/pdf-stock-interface.vala
	src/pdf-stock/pdf-stock.vala
	src/web/Makefile
	src/web/main.vala
	templates/menu.html
	templates/products/index.html

1 files changed, 0 insertions, 22 deletions

diff --git a/templates/products/index.html b/templates/products/index.html
deleted file mode 100644
index 668a44e..0000000
--- a/templates/products/index.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<table class="sortable table table-bordered table-striped table-condensed">
-	<thead>
-		<tr><th>EAN</th><th>Name</th><th>Category</th><th>Amount</th><th>Memberprice</th><th>Guestprice</th></tr>
-	</thead>
-	<tbody>
-		{{{DATA}}}
-	</tbody>
-</table>
-
-<div id="newproduct" style="display: {{{NEWPRODUCT}}};">
-	<form action="/products/new" class="form-horizontal">
-		<legend>New Product</legend>
-		<input class="input-medium" name="id" type="number" min="0" placeholder="EAN" />
-		<input class="input-medium" name="name" type="text" placeholder="Name" />
-		<select name="category" title="Category">
-			{{{CATEGORIES}}}
-		</select>
-		<input class="input-medium" name="memberprice" type="number" step="0.01" min="0.01" placeholder="Memberprice" />
-		<input class="input-medium" name="guestprice"  type="number" step="0.01" min="0.01" placeholder="Guestprice" />
-		<button type="submit" class="btn btn-primary"><i class="icon-plus"></i></button>
-	</form>
-</div>