Merge pull request #793 from IATI/develop

Merge develop into main

README.md

@@ -28,7 +28,7 @@ docker compose -f docker-compose.dev.yml build
 Start the containers in detached mode. This will run migrations and run the Django server. Using in detached (`-d`) mode means that the containers will continue to run in the background - ommitting the `-d` flag will mean that the containers will run only until the command is exited.
 
 ```
-docker compose -f docker-compose.dev.yml up -d
+COMPRESS_ENABLED=1 docker compose -f docker-compose.dev.yml up -d
 ```
 
 See the status of your containers by using

home/templates/home/home_page.html

@@ -9,10 +9,10 @@
 {% endblock %}
 
 {% block content %}
-    {% include 'home/modules/statistics.html' %}
     {% include 'home/modules/getting-started.html' %}
-    {% include 'home/modules/about-iati.html' %}
+    {% include 'home/modules/statistics.html' %}
     {% include 'home/modules/iati-in-action.html' %}
+    {% include 'home/modules/about-iati.html' %}
     {% include 'home/modules/iati-tools.html' %}
     {% include 'home/modules/flexible-features.html' %}
     {% include 'home/modules/news-tweets.html' with notalt=page.flexible_features|length|divisibleby:2 %}

home/templates/home/modules/about-iati.html

@@ -1,7 +1,7 @@
 {% load iati_tags %}
 
-<div class="row">
-    <div class="section-alt-top section-alt-bottom">
+<div class="section">
+    <div class="row">
         <h2 class="section__heading">{{ page.about_iati_title }}</h2>
         {% if page.about_iati_video %}
             <div class="l-2up">

home/templates/home/modules/flexible-features.html

@@ -1,7 +1,7 @@
 {% load wagtailcore_tags responsive %}
 
 {% for child in page.flexible_features %}
-    <div class="{% cycle 'section' 'section-alt' %}">
+    <div class="{% cycle 'section' 'section-alt section-alt-top' %}">
         <div class="row">
             <h2 class="section__heading">{{ child.value.title }}</h2>
             {% if child.value.image %}

home/templates/home/modules/getting-started.html

@@ -1,6 +1,6 @@
 {% load responsive %}
 
-<div class="section">
+<div class="section-alt">
     <div class="row">
         <h2 class="section__heading">{{ page.getting_started_title }}</h2>
         <div class="l-3up">

home/templates/home/modules/iati-in-action.html

@@ -1,6 +1,6 @@
 {% load responsive %}
 
-<div class="section section-alt-bottom">
+<div class="section-alt section-alt-top section-alt-bottom">
     <div class="row">
         <h2 class="section__heading">{{ page.iati_in_action_title }}</h2>
         {% if page.iati_in_action_description %}

home/templates/home/modules/iati-tools.html

@@ -1,7 +1,7 @@
 {% load responsive i18n tool_utils %}
 
-<div class="row">
-    <div class="section-alt">
+<div class="section-alt section-alt-top">
+    <div class="row">
         <h2 class="section__heading">{{ page.iati_tools_title }}</h2>
         {% if page.iati_tools_description %}
             <div class="max-meter is-typeset is-typeset--article">

home/templates/home/modules/news-tweets.html

@@ -3,8 +3,6 @@
 <div {% if not notalt %}class="section-alt-top section-alt-bottom"{% else %}class="section"{% endif %}>
     <div class="row">
         <h2 class="section__heading">{{ page.latest_news_title }}</h2>
-        <div class="l-2up">
-            <div class="l-2up__col">
                 {% for item in page.news %}
                     <article class="listing listing--article listing--article--minor">
                         <aside class="listing__aside">
@@ -31,11 +29,6 @@ <h3 class="listing__heading">{{ item.heading }}</h3>
                     </article>
                 {% endfor %}
                 <a href="{{ page.news_index.url }}" class="button">{{ page.latest_news_link_label }}</a>
-            </div>
-            <div class="l-2up__col">
-                <a class="twitter-timeline" data-height="800" href="https://twitter.com/{{ global.twitter_handle }}?ref_src=twsrc%5Etfw">{{ page.latest_news_tweets_title }} {% trans "by" %} {{ global.twitter_handle }}</a>
-                <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
-            </div>
         </div>
     </div>
 </div>

home/templates/home/modules/statistics.html

@@ -1,5 +1,6 @@
 {% load static responsive iati_tags %}
 
+<div class="section">
 <div class="row">
     <div class="stats stats--standout">
         {% if page.testimonial %}
@@ -30,3 +31,4 @@ <h2 class="stat__heading stat__heading--large" id="stat-publishers" data-inc-dur
         </div>
     </div>
 </div>
+</div>

iati/settings/base.py

@@ -653,3 +653,5 @@
 }
 
 COMPRESS_OFFLINE = True
+
+IATI_STANDARD_LATEST_VERSION = "2.03"

iati/templates/base.html

@@ -39,6 +39,9 @@
         {% block extra_css %}
             {# Override this in templates to add extra stylesheets #}
         {% endblock %}
+
+        {% block html_header_seo %}
+        {% endblock %}
     </head>
 
     <body class="body--message {% block body_class %}{% endblock %}" id="{% block body_id %}{% endblock %}">

iati_standard/models.py

@@ -1,10 +1,12 @@
 """Model definitions for the iati_standard app."""
 
 import os
+import re
 from bs4 import BeautifulSoup
 from datetime import datetime
 
 from django import forms
+from django.conf import settings
 from django.db.models import JSONField
 from django.db import models
 from django.utils.functional import cached_property
@@ -397,10 +399,35 @@ def save(self, *args, **kwargs):
 
 
 class ActivityStandardPage(AbstractGithubPage):
-    """A model for the Activity Standard Page, an IATI reference page."""
+    """A model for the Activity Standard Page, an IATI reference page.
+
+    Used for Standard reference pages like /en/iati-standard/202/
+    And guidance developer pages like /en/guidance/developer/
+    """
 
     template = 'iati_standard/activity_standard_page.html'
 
+    def is_older_version_of_standard(self):
+        """Is it an older version of the standard? Return Boolean."""
+        url = self.get_url()
+        if re.match(r"^\/\w+\/iati-standard\/\d", url):
+            regex = r"^\/\w+\/iati-standard\/" + settings.IATI_STANDARD_LATEST_VERSION.replace(".", "") + r"\/"
+            if not re.match(regex, url):
+                return True
+        return False
+
+    def get_sitemap_urls(self, request=None):
+        """If it's an older version of the standard, we don't want it indexed."""
+        if self.is_older_version_of_standard():
+            return []
+        else:
+            return [
+                {
+                    'location': self.get_full_url(request),
+                    'lastmod': (self.last_published_at or self.latest_revision_created_at),
+                }
+            ]
+
 
 class StandardGuidancePage(AbstractGithubPage):
     """A model for the Standard Guidance Page, an IATI reference page."""

iati_standard/templates/iati_standard/activity_standard_page.html

@@ -23,6 +23,10 @@
 </style>
 {% endblock %}
 
+{% block html_header_seo %}
+{% if page.is_older_version_of_standard %}<meta name="robots" content="noindex, nofollow">{% endif %}
+{% endblock %}
+
 {% block content %}
     {% get_current_language as LANGUAGE_CODE %}
     <div class="hero hero--minor">

patterns/assets/css/modules/_stats.scss

@@ -8,7 +8,6 @@
 }
 
 .stat {
-    background-color: #fff;
     box-shadow: 0 0 50px 0 rgba(0, 0, 0, 0.1);
     .stats--grid & {
         border-left: 3px solid $iati-ocean;