diff --git a/publications/templates/authenticated_menu_snippet.html b/publications/templates/authenticated_menu_snippet.html index 20936b8c..ab4dae15 100644 --- a/publications/templates/authenticated_menu_snippet.html +++ b/publications/templates/authenticated_menu_snippet.html @@ -1,5 +1,5 @@
  • - -{% endblock %} +{% endblock navbar %} {% block content %}
    diff --git a/publications/urls.py b/publications/urls.py index 38abd980..6fb4fcf4 100644 --- a/publications/urls.py +++ b/publications/urls.py @@ -10,6 +10,7 @@ from drf_spectacular.views import SpectacularAPIView, SpectacularRedocView from publications.api import router as publications_router +from publications.api import router as publications_router app_name = "optimap" @@ -47,10 +48,10 @@ path("subscriptions/", views.user_subscriptions, name="subscriptions"), path("unsubscribe/", views.unsubscribe, name="unsubscribe"), path("usersettings/", views.user_settings, name="usersettings"), + path("feeds/", views.feeds, name="feeds"), path("feeds/georss//", GeoFeedByGeometry(feed_type_variant="georss"), name="feed-georss-by-slug",), path("feeds/geoatom//", GeoFeedByGeometry(feed_type_variant="geoatom"), name="feed-geoatom-by-slug"), - path("feeds/", views.feeds_list, name="feeds_list"), ] diff --git a/publications/views.py b/publications/views.py index b7c00d90..a4e5feb7 100644 --- a/publications/views.py +++ b/publications/views.py @@ -14,21 +14,17 @@ from django.views.decorators.cache import never_cache from django.urls import reverse import uuid -from django.contrib.gis.serializers import geojson -from django.http import JsonResponse -from django.utils import timezone -from django.utils.timezone import now, get_default_timezone +from django.utils.timezone import get_default_timezone from datetime import datetime import imaplib import time from math import floor from urllib.parse import unquote from django.conf import settings -from django.core.serializers import serialize from publications.models import BlockedEmail, BlockedDomain, Subscription, UserProfile, Publication, GlobalRegion from django.contrib.auth import get_user_model User = get_user_model() -import tempfile, os, glob +import tempfile, os from pathlib import Path from publications.tasks import regenerate_geojson_cache, regenerate_geopackage_cache from osgeo import ogr, osr @@ -527,6 +523,20 @@ def finalize_account_deletion(request): del request.session[USER_DELETE_TOKEN_PREFIX] request.session.modified = True +def feeds(request): + global_feeds = [ + { "title": "Geo RSS", "url": reverse("optimap:georss_feed") }, + { "title": "Geo Atom", "url": reverse("optimap:geoatom_feed") }, + { "title": "W3C Geo", "url": reverse("optimap:w3cgeo_feed") }, + ] + + regions = GlobalRegion.objects.all().order_by("region_type", "name") + + return render(request, "feeds.html", { + "global_feeds": global_feeds, + "regions": regions, + }) + class RobotsView(View): http_method_names = ['get'] def get(self, request): @@ -536,8 +546,3 @@ def get(self, request): ) return response -def feeds_list(request): - regions = GlobalRegion.objects.all().order_by("region_type", "name") - return render(request, - "feeds.html", - {"regions": regions})