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, 37 insertions, 0 deletions

diff --git a/data/templates/products/index.html b/data/templates/products/index.html
new file mode 100644
index 0000000..ba7e08c
--- /dev/null
+++ b/data/templates/products/index.html
@@ -0,0 +1,37 @@
+<table id="producttable" class="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}}};">
+	<legend>New Product</legend>
+	<form action="/products/new" class="form-inline">
+		<div class="form-group">
+			<input class="form-control" name="id" type="number" min="0" placeholder="EAN" />
+			<input class="form-control" name="name" type="text" placeholder="Name" />
+			<select class="form-control" name="category" title="Category">
+				{{{CATEGORIES}}}
+			</select>
+			<input class="form-control" name="memberprice" type="number" step="0.01" min="0.01" placeholder="Memberprice" />
+			<input class="form-control" name="guestprice"  type="number" step="0.01" min="0.01" placeholder="Guestprice" />
+			<button type="submit" class="form-control btn btn-primary"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span></button>
+		</div>
+	</form>
+</div>
+
+<script type="text/javascript">
+$(document).ready(function() {
+    $('#producttable').DataTable({"lengthMenu": [ [25, 50, 100, -1], [25, 50, 100, "All"] ] });
+} );
+</script>