merge conflict

1 files changed, 17 insertions, 0 deletions

diff --git a/inventar/templates/upload.html b/inventar/templates/upload.html
new file mode 100644
index 0000000..29a2dbe
--- /dev/null
+++ b/inventar/templates/upload.html
@@ -0,0 +1,17 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block content %}
+	{% if user.is_authenticated %}
+		<h2>Upload new Parent Tree:</h2>
+
+		<form enctype="multipart/form-data" method="post" action="/upload/">{% csrf_token %}
+			{{form}}
+		<input type="submit" value="Submit" />
+		<ul class="path">
+		{% for code in data %}
+			<li>{{ code }}</li>
+		{% endfor %}
+		</ul>
+	{% endif %}
+{% endblock %}