Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost

files/routes/asset_submissions.py

@@ -251,6 +251,7 @@ def approve_hat(v, name):
 	if not description_regex.fullmatch(description):
 		return {"error": "Invalid description!"}, 400
 
+	hat.price = int(request.values.get('price'))
 	hat.name = new_name
 	hat.description = description
 	g.db.add(hat)

files/templates/default.html

@@ -336,7 +336,7 @@
 
 		</div>
 		{% block sidebar %}
-			{% if has_sidebar and (home or sub and p) %}
+			{% if has_sidebar and (home or p) %}
 				{% include "sidebar_" + SITE_NAME + ".html" %}
 			{% endif %}
 		{% endblock %}

files/templates/submit_hats.html

@@ -48,6 +48,10 @@
 								</label>
 							</div>
 
+							<div id="hat-design-reference-block" class="mt-3">
+								<a href="/i/hat-template.png" class="font-weight-bold">Hat Template</a> &mdash; 100x130px (do not resize), circle is profile picture, do not include circle in final submission.
+							</div>
+
 							<label class="mt-3" for="name">Name</label>
 							<input autocomplete="off" type="text" id="name" class="form-control" name="name" maxlength="50" pattern='[a-zA-Z0-9\-() ,_]{1,50}' required>