From f27987070e40fcf4b017f91c23c4747373e85c9d Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Mon, 15 Apr 2019 14:56:50 +0100
Subject: Images sidebar work, and allow fields to be rendered without labels

---
 .../templates/wiki/forms/fields/boolean.html       | 29 ++++++++++++++--------
 pydis_site/templates/wiki/forms/fields/char.html   |  2 +-
 pydis_site/templates/wiki/forms/fields/image.html  | 26 ++++++++++---------
 .../wiki/forms/fields/in_place_render.html         | 26 ++++++++++---------
 .../templates/wiki/forms/fields/model_choice.html  | 26 ++++++++++---------
 .../wiki/forms/fields/wiki_slug_render.html        | 26 ++++++++++---------
 6 files changed, 75 insertions(+), 60 deletions(-)

(limited to 'pydis_site/templates/wiki/forms')

diff --git a/pydis_site/templates/wiki/forms/fields/boolean.html b/pydis_site/templates/wiki/forms/fields/boolean.html
index 9d054083..9a8470be 100644
--- a/pydis_site/templates/wiki/forms/fields/boolean.html
+++ b/pydis_site/templates/wiki/forms/fields/boolean.html
@@ -1,15 +1,17 @@
 <div id="div_{{ field.auto_id }}" class="field is-horizontal{% if field.errors %} is-danger{% endif %}">
-  <div class="field-label">
-    <label class="label {% if field.errors %} is-danger{% endif %}">
-      {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
-    </label>
+  {% if render_labels %}
+    <div class="field-label">
+      <label class="label {% if field.errors %} is-danger{% endif %}">
+        {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
+      </label>
 
-    {% if field.help_text %}
-      <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
-        {{ field.help_text|safe }}
-      </p>
-    {% endif %}
-  </div>
+      {% if field.help_text %}
+        <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
+          {{ field.help_text|safe }}
+        </p>
+      {% endif %}
+    </div>
+  {% endif %}
 
   <div class="field-body">
     <div class="field">
@@ -25,8 +27,13 @@
                {% if field.min_length %}minlength="{{ field.min_length }}"{% endif %}
                {% if field.empty_value %}placeholder="{{ field.empty_value }}"{% endif %}
         />
+
         <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
-          &nbsp;
+          {% if not render_labels %}
+            {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
+          {% else %}
+            &nbsp;
+          {% endif %}
         </label>
       </div>
 
diff --git a/pydis_site/templates/wiki/forms/fields/char.html b/pydis_site/templates/wiki/forms/fields/char.html
index 4c48d300..83600dae 100644
--- a/pydis_site/templates/wiki/forms/fields/char.html
+++ b/pydis_site/templates/wiki/forms/fields/char.html
@@ -1,5 +1,5 @@
 <div id="div_{{ field.auto_id }}" class="field is-horizontal{% if field.errors %} is-danger{% endif %}">
-  {% if not is_markitup %}
+  {% if render_labels and not is_markitup %}
     <div class="field-label">
       {% if field.label %}
         <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
diff --git a/pydis_site/templates/wiki/forms/fields/image.html b/pydis_site/templates/wiki/forms/fields/image.html
index 47e115fe..8591f547 100644
--- a/pydis_site/templates/wiki/forms/fields/image.html
+++ b/pydis_site/templates/wiki/forms/fields/image.html
@@ -1,17 +1,19 @@
 <div id="div_{{ field.auto_id }}" class="field is-horizontal{% if field.errors %} is-danger{% endif %}">
-  <div class="field-label">
-    {% if field.label %}
-      <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
-        IN PLACE RENDER: {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
-      </label>
-    {% endif %}
+  {% if render_labels %}
+    <div class="field-label">
+      {% if field.label %}
+        <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
+          IN PLACE RENDER: {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
+        </label>
+      {% endif %}
 
-    {% if field.help_text %}
-      <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
-        {{ field.help_text|safe }}
-      </p>
-    {% endif %}
-  </div>
+      {% if field.help_text %}
+        <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
+          {{ field.help_text|safe }}
+        </p>
+      {% endif %}
+    </div>
+  {% endif %}
 
   <div class="field-body">
     <div class="field">
diff --git a/pydis_site/templates/wiki/forms/fields/in_place_render.html b/pydis_site/templates/wiki/forms/fields/in_place_render.html
index 47e115fe..8591f547 100644
--- a/pydis_site/templates/wiki/forms/fields/in_place_render.html
+++ b/pydis_site/templates/wiki/forms/fields/in_place_render.html
@@ -1,17 +1,19 @@
 <div id="div_{{ field.auto_id }}" class="field is-horizontal{% if field.errors %} is-danger{% endif %}">
-  <div class="field-label">
-    {% if field.label %}
-      <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
-        IN PLACE RENDER: {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
-      </label>
-    {% endif %}
+  {% if render_labels %}
+    <div class="field-label">
+      {% if field.label %}
+        <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
+          IN PLACE RENDER: {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
+        </label>
+      {% endif %}
 
-    {% if field.help_text %}
-      <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
-        {{ field.help_text|safe }}
-      </p>
-    {% endif %}
-  </div>
+      {% if field.help_text %}
+        <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
+          {{ field.help_text|safe }}
+        </p>
+      {% endif %}
+    </div>
+  {% endif %}
 
   <div class="field-body">
     <div class="field">
diff --git a/pydis_site/templates/wiki/forms/fields/model_choice.html b/pydis_site/templates/wiki/forms/fields/model_choice.html
index c6cd53ab..58c55e04 100644
--- a/pydis_site/templates/wiki/forms/fields/model_choice.html
+++ b/pydis_site/templates/wiki/forms/fields/model_choice.html
@@ -1,19 +1,21 @@
 {% load wiki_extra %}
 
 <div id="div_{{ field.auto_id }}" class="field is-horizontal{% if field.errors %} is-danger{% endif %}">
-  <div class="field-label">
-    {% if field.label %}
-      <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
-        {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
-      </label>
-    {% endif %}
+  {% if render_labels %}
+    <div class="field-label">
+      {% if field.label %}
+        <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
+          {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
+        </label>
+      {% endif %}
 
-    {% if field.help_text %}
-      <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
-        {{ field.help_text|safe }}
-      </p>
-    {% endif %}
-  </div>
+      {% if field.help_text %}
+        <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
+          {{ field.help_text|safe }}
+        </p>
+      {% endif %}
+    </div>
+  {% endif %}
 
   <div class="field-body">
     <div class="field">
diff --git a/pydis_site/templates/wiki/forms/fields/wiki_slug_render.html b/pydis_site/templates/wiki/forms/fields/wiki_slug_render.html
index c87fda7a..ff5c8528 100644
--- a/pydis_site/templates/wiki/forms/fields/wiki_slug_render.html
+++ b/pydis_site/templates/wiki/forms/fields/wiki_slug_render.html
@@ -1,19 +1,21 @@
 {% load wiki_extra %}
 
 <div id="div_{{ field.auto_id }}" class="field is-horizontal{% if field.errors %} is-danger{% endif %}">
-  <div class="field-label">
-    {% if field.label %}
-      <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
-        {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
-      </label>
-    {% endif %}
+  {% if render_labels %}
+    <div class="field-label">
+      {% if field.label %}
+        <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
+          {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
+        </label>
+      {% endif %}
 
-    {% if field.help_text %}
-      <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
-        {{ field.help_text|safe }}
-      </p>
-    {% endif %}
-  </div>
+      {% if field.help_text %}
+        <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
+          {{ field.help_text|safe }}
+        </p>
+      {% endif %}
+    </div>
+  {% endif %}
 
   <div class="field-body">
     <div class="field has-addons">
-- 
cgit v1.2.3