From c007cb69dac6268e1dd4a772ea56623b0a01367c Mon Sep 17 00:00:00 2001
From: luxagraf <sng@luxagraf.net>
Date: Thu, 25 Oct 2018 14:42:17 +0000
Subject: pulled stats from base template, fix layout bug in comments templates

---
 design/templates/base.html             |  3 +-
 design/templates/comments/posted.html  | 16 +++++---
 design/templates/comments/preview.html | 68 ++++++++++++++++++----------------
 3 files changed, 49 insertions(+), 38 deletions(-)

(limited to 'design')

diff --git a/design/templates/base.html b/design/templates/base.html
index cd8a1c5..56eea92 100644
--- a/design/templates/base.html
+++ b/design/templates/base.html
@@ -82,6 +82,7 @@
     </footer>
     </div>
     {% block js %}{% endblock%}
+    {%comment%}
 <!-- Piwik -->
 <script type="text/javascript">
 var _paq = _paq || [];
@@ -98,7 +99,7 @@ _paq.push(['enableLinkTracking']);
 </script>
 <noscript><p><img src="//stats.luxagraf.net/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
 <!-- End Piwik Code -->
-
+{%endcomment%}
 
 </body>
 </html>
diff --git a/design/templates/comments/posted.html b/design/templates/comments/posted.html
index f4aee46..9a478cf 100644
--- a/design/templates/comments/posted.html
+++ b/design/templates/comments/posted.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
+{%block htmlclass%}class="detail"{%endblock%}
 {% block js %}
 <script type="text/javascript">
 
@@ -22,10 +23,13 @@
 </script>
 {% endblock %}
 {% block primary %}
-<main role="main">
-  <h1>Thank you for your comment</h1>
-  <p>Unless you've previously been approved a few times, your comment will be moderated. If we're on the road this can sometimes take a few days, so please be patient.</p>
-  <p><a href="{{comment.content_object.get_absolute_url}}">Return to the page you came from</a> Redirecting in <span id="countdown">5</span></p>
-  
-  </main>
+<main>
+    <article>
+        <header class="post-header">
+        <h1 class="post-title">Thank you for your comment</h1>
+        </header>
+        <p>Unless you've previously been approved a few times, your comment will be moderated. If we're on the road this can sometimes take a few days, so please be patient.</p>
+        <p><a href="{{comment.content_object.get_absolute_url}}">Return to the page you came from</a> Redirecting in <span id="countdown">5</span></p>
+    </article>
+</main>
 {% endblock %}
diff --git a/design/templates/comments/preview.html b/design/templates/comments/preview.html
index 58eba01..8129658 100644
--- a/design/templates/comments/preview.html
+++ b/design/templates/comments/preview.html
@@ -1,38 +1,44 @@
 {% extends "base.html" %}
 {% load i18n %}
 
+{%block htmlclass%}
+class="detail"{%endblock%}
 
 
 {% block primary %}
-        <main role="main" class="archive">
-    <h1 class="comment--form--header-h1">{% trans "Preview your comment" %}</h1>
-  {% load comments %}
-  <form action="{% comment_form_target %}" method="post" class="cform-arc comment--form">{% csrf_token %}
-    {% if next %}<div><input type="hidden" name="next" value="{{ next }}" /></div>{% endif %}
-    {% if form.errors %}
-    <h1>{% if form.errors|length == 1 %}{% trans "Please correct the error below" %}{% else %}{% trans "Please correct the errors below" %}{% endif %}</h1>
-    {% else %}
-      <blockquote>{{ comment|linebreaks }}</blockquote>
-      <p>
-      <input type="submit" name="submit" class="submit-post" value="{% trans "Post your comment" %}" id="submit" /> <h3>{% trans "Or make changes" %}:</h3>
-      </p>
-    {% endif %}
-    {% for field in form %}
-      {% if field.is_hidden %}
-        <div>{{ field }}</div>
-      {% else %}
-        {% if field.errors %}{{ field.errors }}{% endif %}
-        <p
-          {% if field.errors %} class="error"{% endif %}
-          {% ifequal field.name "honeypot" %} style="display:none;"{% endifequal %}>
-          {{ field.label_tag }} {{ field }}
-        </p>
-      {% endif %}
-    {% endfor %}
-    <p class="submit">
-    <input type="submit" name="submit" class="submit-post" value="{% trans "Post" %}" />
-    <input type="submit" name="preview" class="submit-preview" value="{% trans "Preview" %}" />
-    </p>
-  </form>
-  </main>
+<main>
+    <article>
+        <header class="post-header">
+        <h1 class="post-title">{% trans "Preview your comment" %}</h1>
+        </header>
+        {% load comments %}
+        <form action="{% comment_form_target %}" method="post" class="cform-arc comment--form" style="margin-left: 0;">{% csrf_token %}
+            {% if next %}<div><input type="hidden" name="next" value="{{ next }}" /></div>{% endif %}
+            {% if form.errors %}
+            <h3>{% if form.errors|length == 1 %}{% trans "Please correct the error below" %}{% else %}{% trans "Please correct the errors below" %}{% endif %}</h3>
+            {% else %}
+            <blockquote>{{ comment|linebreaks }}</blockquote>
+            <p>
+            <input type="submit" name="submit" class="submit-post" value="{% trans "Post your comment" %}" id="submit" /> <h3>{% trans "Or make changes" %}:</h3>
+            </p>
+            {% endif %}
+            {% for field in form %}
+            {% if field.is_hidden %}
+            <div>{{ field }}</div>
+            {% else %}
+            {% if field.errors %}{{ field.errors }}{% endif %}
+            <p
+            {% if field.errors %} class="error"{% endif %}
+            {% ifequal field.name "honeypot" %} style="display:none;"{% endifequal %}>
+            {{ field.label_tag }} {{ field }}
+            </p>
+            {% endif %}
+            {% endfor %}
+            <p class="submit">
+            <input type="submit" name="submit" class="submit-post" value="{% trans "Post" %}" />
+            <input type="submit" name="preview" class="submit-preview" value="{% trans "Preview" %}" />
+            </p>
+        </form>
+    </article>
+</main>
 {% endblock %}
-- 
cgit v1.2.3