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

diff --git a/data/templates/users/import-pgp.html b/data/templates/users/import-pgp.html
new file mode 100644
index 0000000..57a5d64
--- /dev/null
+++ b/data/templates/users/import-pgp.html
@@ -0,0 +1,22 @@
+<h2>Import PGP Keys</h2>
+
+<div style="display: {{{STEP1}}}">
+	<form action="#" method="POST" enctype="multipart/form-data" class="form-horizontal">
+		<div class="control-group">
+			<label class="control-label" for="file">Archive File (zip, tar.gz, ...) containing PGP keys</label>
+			<div class="controls">
+				<input type="file" accept="text/csv" name="file"></input>
+				<input type="hidden" name="step" value="1"></input>
+			</div>
+		</div>
+
+		<button class="btn btn-primary" type="submit">Import</button>
+	</form>
+</div>
+
+
+<div style="display: {{{STEP2}}}">
+	<p>The following keys have been found in the archive and imported into the keyring:</p>
+
+	{{{DATA}}}
+</div>