From fa9d7e9be081e0ab54d07342fb9a24196c7b3966 Mon Sep 17 00:00:00 2001
From: ElnuDev <elnu@elnu.com>
Date: Sun, 2 Jul 2023 21:25:55 -0700
Subject: [PATCH] Add challenge content footer

---
 styles/sass/style.scss              |  16 ++---
 templates/copyright-years.html.tera |   1 +
 templates/index.html.tera           | 103 +++++++++++++++-------------
 3 files changed, 63 insertions(+), 57 deletions(-)
 create mode 100644 templates/copyright-years.html.tera

diff --git a/styles/sass/style.scss b/styles/sass/style.scss
index b927255..d6783da 100644
--- a/styles/sass/style.scss
+++ b/styles/sass/style.scss
@@ -108,6 +108,14 @@ input[type=number] {
 
   & > div {
     overflow: scroll;
+    display: flex;
+    flex-direction: column;
+    gap: 1em;
+
+    footer {
+      margin-top: auto;
+      text-align: center;
+    }
   }
 
   #challenge {
@@ -121,19 +129,11 @@ input[type=number] {
 
 #submissions {
   grid-area: submissions;
-  display: flex;
-  flex-direction: column;
-  gap: 1em;
 
   background: rgba(0, 0, 0, 0.125);
   $gap: 0.5em;
   padding: $gap;
 
-  footer {
-    margin-top: auto;
-    text-align: center;
-  }
-
   & > div {
     width: 100%;
     column-count: 3;
diff --git a/templates/copyright-years.html.tera b/templates/copyright-years.html.tera
new file mode 100644
index 0000000..abc881b
--- /dev/null
+++ b/templates/copyright-years.html.tera
@@ -0,0 +1 @@
+© {% set year = now() | date(format="%Y") | int %}{{ settings.copyright_start }}{% if year != settings.copyright_start %}–{{ year }}{% endif %}
\ No newline at end of file
diff --git a/templates/index.html.tera b/templates/index.html.tera
index 128dd6a..3837301 100644
--- a/templates/index.html.tera
+++ b/templates/index.html.tera
@@ -65,57 +65,62 @@
             </a>
         </nav>
         <div id="challenge">
-            <h1>Welcome to Tegaki Tuesday #{{ challenge }}!</h1>
-            {% if content.japanese %}
-            <div lang="ja">
-                <script>
-                    let kyujitai = false;
-                    function kyujitaiToggle() {
-                        document.querySelectorAll("[data-kyujitai]").forEach(segment => {
-                            let newText = segment.getAttribute("data-kyujitai");
-                            segment.setAttribute("data-kyujitai", segment.firstChild.data);
-                            segment.firstChild.data = newText;
-                        })
-                        kyujitai = !kyujitai;
-                    }
-                </script>
-                <button onclick="kyujitaiToggle(); this.innerHTML = kyujitai ? '新字体' : '旧字体'">旧字体</button>
-                {% for line in content.japanese %}
-                    {% for subline in line %}
-                        <p>
-                            {%- for word in subline -%}
-                                {%- if word.dictionary -%}
-                                    <a href="{{ word.dictionary }}" target="_blank"{% if word.pos %} class="{{ word.pos }}" title="{{ word.pos }}"{% endif %}>
-                                {%- endif -%}
-                                {% for segment in word.text -%}
-                                    <ruby{% if segment.kyujitai %} data-kyujitai="{{ segment.kyujitai }}"{% endif %}>{{ segment.kanji }}<rp>(</rp><rt>{{ segment.furigana | safe }}</rt><rp>)</rp></ruby>
+            <div>
+                <h1>Welcome to Tegaki Tuesday #{{ challenge }}!</h1>
+                {% if content.japanese %}
+                <div lang="ja">
+                    <script>
+                        let kyujitai = false;
+                        function kyujitaiToggle() {
+                            document.querySelectorAll("[data-kyujitai]").forEach(segment => {
+                                let newText = segment.getAttribute("data-kyujitai");
+                                segment.setAttribute("data-kyujitai", segment.firstChild.data);
+                                segment.firstChild.data = newText;
+                            })
+                            kyujitai = !kyujitai;
+                        }
+                    </script>
+                    <button onclick="kyujitaiToggle(); this.innerHTML = kyujitai ? '新字体' : '旧字体'">旧字体</button>
+                    {% for line in content.japanese %}
+                        {% for subline in line %}
+                            <p>
+                                {%- for word in subline -%}
+                                    {%- if word.dictionary -%}
+                                        <a href="{{ word.dictionary }}" target="_blank"{% if word.pos %} class="{{ word.pos }}" title="{{ word.pos }}"{% endif %}>
+                                    {%- endif -%}
+                                    {% for segment in word.text -%}
+                                        <ruby{% if segment.kyujitai %} data-kyujitai="{{ segment.kyujitai }}"{% endif %}>{{ segment.kanji }}<rp>(</rp><rt>{{ segment.furigana | safe }}</rt><rp>)</rp></ruby>
+                                    {%- endfor -%}
+                                    {%- if word.dictionary -%}
+                                        </a>
+                                    {%- endif -%}
                                 {%- endfor -%}
-                                {%- if word.dictionary -%}
-                                    </a>
-                                {%- endif -%}
-                            {%- endfor -%}
-                        </p>
+                            </p>
+                        {% endfor %}
                     {% endfor %}
-                {% endfor %}
+                </div>
+                {% endif %}
+                {{ content.text | safe }}
+                {% if content.translation %}
+                    <p>
+                        Translation
+                        {% if content.translation.author %}by {{ content.translation.author }}{% endif %}
+                        {% if content.translation.site %} via
+                            {% if content.translation.site.link %}
+                                <a href="{{ content.translation.site.link }}" target="_blank">{{ content.translation.site.name }}</a>
+                            {% else %}
+                                {{ content.translation.site.name }}
+                            {% endif %}
+                        {%- endif -%}
+                    </p>
+                {%- endif -%}
+                {%- if content.suggester -%}
+                    <p><em>This challenge was suggested by <strong>{{ content.suggester }}</strong> using the <code>-h suggest</code> command.</code></em></p>
+                {%- endif -%}
             </div>
-            {% endif %}
-            {{ content.text | safe }}
-            {% if content.translation %}
-                <p>
-                    Translation
-                    {% if content.translation.author %}by {{ content.translation.author }}{% endif %}
-                    {% if content.translation.site %} via
-                        {% if content.translation.site.link %}
-                            <a href="{{ content.translation.site.link }}" target="_blank">{{ content.translation.site.name }}</a>
-                        {% else %}
-                            {{ content.translation.site.name }}
-                        {% endif %}
-                    {%- endif -%}
-                </p>
-            {%- endif -%}
-            {%- if content.suggester -%}
-                <p><em>This challenge was suggested by <strong>{{ content.suggester }}</strong> using the <code>-h suggest</code> command.</code></em></p>
-            {%- endif -%}
+            <footer>
+                Copyright {% include "copyright-years" %} Tegaki Tuesday. All rights reserved. 字ちゃん mascot art by <a href="https://twitter.com/bellumela" target="_blank">@bellumela</a>.
+            </footer>
         </div>
         <div id="submissions">
             <script>
@@ -146,7 +151,7 @@
                 {% endfor %}
             </div>
             <footer>
-                Submissions are copyright © {% set year = now() | date(format="%Y") | int %}{{ settings.copyright_start }}{% if year != settings.copyright_start %}–{{ year }}{% endif %} their respective submitters, and are licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank">Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</a> license. 
+                Submissions are copyright {% include "copyright-years" %} their respective submitters, and are licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank">Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</a> license. 
             </footer>
         </div>
     </div>