From 27315dacdc76e07ee910e31fe65c9357de34bcaf Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Mon, 21 Sep 2020 16:10:56 +0300
Subject: Move guides and categories getting logic to utils for better
 testability

---
 pydis_site/templates/guides/category.html |  2 +-
 pydis_site/templates/guides/guide.html    | 16 ++++++++--------
 pydis_site/templates/guides/guides.html   |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'pydis_site/templates')

diff --git a/pydis_site/templates/guides/category.html b/pydis_site/templates/guides/category.html
index f70a668f..b5cd9ce0 100644
--- a/pydis_site/templates/guides/category.html
+++ b/pydis_site/templates/guides/category.html
@@ -32,7 +32,7 @@
                         <a href="/guides/category/{{ category_name }}/{{ guide }}/">
                                 <span class="is-size-4 has-text-weight-bold">{{ data.title.0 }}</span>
                         </a>
-                        <p class="is-italic">{{ data.short_description.0 }}</p>
+                        <p class="is-italic">{{ data.shortdescription.0 }}</p>
                     </div>
                 {% endfor %}
             </div>
diff --git a/pydis_site/templates/guides/guide.html b/pydis_site/templates/guides/guide.html
index 8f841c53..bab82415 100644
--- a/pydis_site/templates/guides/guide.html
+++ b/pydis_site/templates/guides/guide.html
@@ -4,9 +4,9 @@
 {% block title %}{{ metadata.title|first }}{% endblock %}
 {% block head %}
 
-  <meta property="og:title" content="Python Discord - {{ metadata.title|first }}" />
+  <meta property="og:title" content="Python Discord - {{ guide.metadata.title|first }}" />
   <meta property="og:type" content="website" />
-  <meta property="og:description" content="{{ metadata.shortdescription }}" />
+  <meta property="og:description" content="{{ guide.metadata.shortdescription|first }}" />
   <link rel="stylesheet" href="{% static "css/guides/guide.css" %}">
   <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.2.0/build/styles/default.min.css">
   <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.2.0/build/highlight.min.js"></script>
@@ -21,10 +21,10 @@
             <nav class="breadcrumb is-pulled-left" aria-label="breadcrumbs">
                 <ul>
                     <li><a href="/guides">Guides</a></li>
-                    {% if category_data.name is not None %}
-                        <li><a href="/guides/category/{{ category_data.name }}">{{ category_data.title }}</a></li>
+                    {% if category_data.raw_name is not None %}
+                        <li><a href="/guides/category/{{ category_data.raw_name }}">{{ category_data.name }}</a></li>
                     {% endif %}
-                    <li class="is-active"><a href="#">{{ metadata.title|first }}</a></li>
+                    <li class="is-active"><a href="#">{{ guide.metadata.title|first }}</a></li>
                 </ul>
             </nav>
         </div>
@@ -33,13 +33,13 @@
     <section class="section">
         <div class="content">
             <div class="container">
-                <h1 class="title">{{ metadata.title|first }}</h1>
+                <h1 class="title">{{ guide.metadata.title|first }}</h1>
                 <div class="columns is-variable is-8">
                     <div class="column is-two-thirds">
-                        {{ guide|safe }}
+                        {{ guide.guide|safe }}
                         <p class="has-text-weight-light is-size-7">
                             <strong>Last modified:</strong> {{ last_modified }}<br/>
-                            <strong>Contributors:</strong> {{ metadata.contributors|join:", " }}
+                            <strong>Contributors:</strong> {{ guide.metadata.contributors|join:", " }}
                         </p>
                     </div>
                     <div class="column">
diff --git a/pydis_site/templates/guides/guides.html b/pydis_site/templates/guides/guides.html
index 66878048..0e6f2073 100644
--- a/pydis_site/templates/guides/guides.html
+++ b/pydis_site/templates/guides/guides.html
@@ -29,9 +29,9 @@
                             <i class="fab fa-python is-size-3 is-black has-icon-padding" aria-hidden="true"></i>
                         </span>
                         <a href="{{ guide }}/">
-                                <span class="is-size-4 has-text-weight-bold">{{ data.name.0 }}</span>
+                                <span class="is-size-4 has-text-weight-bold">{{ data.title.0 }}</span>
                         </a>
-                        <p class="is-italic">{{ data.short_description.0 }}</p>
+                        <p class="is-italic">{{ data.shortdescription.0 }}</p>
                     </div>
                 {% endfor %}
                 {% for category, data in categories.items %}
-- 
cgit v1.2.3