Refactor form handling and improve group retrieval in game views

base/templates/base/form.html

@@ -1,16 +1,18 @@
 {% for error in form.non_field_errors %}<article class="message error">{{ error }}</article>{% endfor %}
 <form method="post" {% if action %}action="{% url action %}"{% endif %}>
     {% csrf_token %}
-    <fieldset>
-        {% for field in form %}
-            <label>
-                {{ field.label }}
-                {{ field }}
-                {% if field.errors %}
-                    <small id="{{ field.errors.field_id }}_error" class="form-error">{{ field.errors|join:", " }}</small>
-                {% endif %}
-            </label>
-        {% endfor %}
-    </fieldset>
+    {% for field in form %}
+        <fieldset>
+            {% if field.id_for_label %}
+                <label for="{{ field.id_for_label }}">{{ field.label }}</label>
+            {% else %}
+                <legend>{{ field.label }}</legend>
+            {% endif %}
+            {{ field }}
+            {% if field.errors %}
+                <small id="{{ field.errors.field_id }}_error" class="form-error">{{ field.errors|join:", " }}</small>
+            {% endif %}
+        </fieldset>
+    {% endfor %}
     <input type="submit" {% if submit %}value="{{ submit }}"{% endif %}>
 </form>