From f7830f299fc9009ff944b3aea656b44d83c91420 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Wed, 17 Apr 2019 11:38:04 +0100
Subject: Accessibility and images sidebar

---
 pydis_site/apps/home/templatetags/wiki_extra.py    |  1 -
 pydis_site/settings.py                             |  4 +-
 pydis_site/templates/wiki/forms/fields/image.html  |  4 +-
 .../templates/wiki/plugins/images/sidebar.html     | 75 ++++++++++++----------
 4 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/pydis_site/apps/home/templatetags/wiki_extra.py b/pydis_site/apps/home/templatetags/wiki_extra.py
index ca368e2c..e0a27973 100644
--- a/pydis_site/apps/home/templatetags/wiki_extra.py
+++ b/pydis_site/apps/home/templatetags/wiki_extra.py
@@ -99,4 +99,3 @@ def get_field_options(context, field: BoundField):
 @register.filter
 def render_urlpath(value: URLPath):
     return value.path or "/"
-
diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index 58bf5abe..40954566 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -276,6 +276,8 @@ BULMA_SETTINGS = {
     "variables": {
         "primary": "#7289DA",
         "link": "$primary",
+
+        "green": "#21c65c",  # Better contrast with the light text
     }
 }
 
@@ -313,7 +315,7 @@ WIKI_MARKDOWN_KWARGS = {
 }
 
 WIKI_MESSAGE_TAG_CSS_CLASS = {
-    messages.DEBUG: "is-info",
+    messages.DEBUG: "",  # is-info isn't distinctive enough from blurple
     messages.ERROR: "is-danger",
     messages.INFO: "is-primary",
     messages.SUCCESS: "is-success",
diff --git a/pydis_site/templates/wiki/forms/fields/image.html b/pydis_site/templates/wiki/forms/fields/image.html
index afef6889..ce5402be 100644
--- a/pydis_site/templates/wiki/forms/fields/image.html
+++ b/pydis_site/templates/wiki/forms/fields/image.html
@@ -3,7 +3,7 @@
     <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 %}
+          {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
         </label>
       {% endif %}
 
@@ -33,7 +33,7 @@
               <i class="fas fa-image"></i>
             </span>
             <span class="file-label">
-              Upload
+              Choose
             </span>
           </span>
           <span class="file-name"></span>
diff --git a/pydis_site/templates/wiki/plugins/images/sidebar.html b/pydis_site/templates/wiki/plugins/images/sidebar.html
index d206cbaf..3089cc85 100644
--- a/pydis_site/templates/wiki/plugins/images/sidebar.html
+++ b/pydis_site/templates/wiki/plugins/images/sidebar.html
@@ -55,48 +55,55 @@ function add_image(form) {
 
   <button type="button" onClick="add_image(this.form)" name="{{ plugin.slug }}_save" value="1" class="button is-primary is-fullwidth">
     <span class="icon">
-      <i class="fas fa-save"></i>
+      <i class="fas fa-upload"></i>
     </span>
-    <span>Save</span>
+    <span>Upload</span>
   </button>
 {% endif %}
 
 <div class="is-divider"></div>
 
-<div style="max-height: 300px; overflow: auto;">
-  <table class="table table-responsive table-bordered" id="image-list">
-    {% for image in images %}
-      {% with image.current_revision.imagerevision as revision %}
-      {% thumbnail revision.image "50x50" crop="center" as thumb %}
-        <tr>
-          <td style="white-space: nowrap;">
-            <p>{% trans "Image id" %}: {{ image.id }}</p>
-            <p>
-              <a href="javascript:void(insert_image({{ image.id }}))"><span class="fa fa-edit"></span> {% trans "Insert" %}</a><br />
-              {% if image|can_write:user %}
-              <a href="{% url 'wiki:images_add_revision' path=urlpath.path article_id=article.id image_id=image.id %}"><span class="fa fa-upload"></span> {% trans "Replace" %}</a>
-              {% endif %}
-            </p>
-          </td>
-          <td>
-            <div class="thumbnail">
-              <img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" />
-            </div>
-          </td>
-        </tr>
-      {% endthumbnail %}
-      {% endwith %}
-    {% empty %}
-    <tr>
-      <td><em>{% trans "No images found for this article" %}</em></td>
-    </tr>
-    {% endfor %}
-  </table>
-</div>
+{% for image in images %}
+  {% with image.current_revision.imagerevision as revision %}
+    {% thumbnail revision.image "100x100" crop="center" as thumb %}
+      <div class="columns">
+        <div class="column is-half">
+          <img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" title="{{ revision.get_filename }}" />
+        </div>
+        <div class="column is-half has-text-right">
+          <div class="tags is-right">
+            <span class="tag is-dark is-medium">Image ID: {{ image.id }}</span>
+          </div>
+
+          <p>
+            <a class="button is-primary" title="Insert image" href="javascript:void(insert_image({{ image.id }}))">
+              <span class="icon">
+                <i class="fa fa-paste"></i>
+              </span>
+            </a>
+
+            {% if image|can_write:user %}
+              <a class="button is-primary" title="Replace" href="{% url 'wiki:images_add_revision' path=urlpath.path article_id=article.id image_id=image.id %}">
+                <span class="icon">
+                  <i class="fas fa-upload"></i>
+                </span>
+              </a>
+            {% endif %}
+          </p>
+        </div>
+      </div>
+    {% endthumbnail %}
+  {% endwith %}
+{% empty %}
+  <em>No images found for this article</em>
+{% endfor %}
 
 <p>
-  <a href="{% url 'wiki:images_index' path=urlpath.path article_id=article.id %}">
-    {% trans "Manage images" %} &raquo;
+  <a class="button is-primary is-fullwidth" href="{% url 'wiki:images_index' path=urlpath.path article_id=article.id %}">
+    <span>Manage Images</span>
+    <span class="icon">
+      <i class="fas fa-arrow-right"></i>
+    </span>
   </a>
 </p>
 <hr />
-- 
cgit v1.2.3