From 33cf413ce780efd1b7d3626fa75147e15168a241 Mon Sep 17 00:00:00 2001 From: luxagraf Date: Sat, 4 Jan 2025 16:38:17 -0600 Subject: posts: got rid of some old url patterns I don't use --- app/posts/templates/photo_essay_list.html | 47 +++++++++++++++++++++++++++++++ app/posts/urls/__init__old.py | 4 --- app/posts/urls/friends_urls.py | 25 ---------------- app/posts/urls/guide_urls.py | 30 -------------------- app/posts/urls/range_urls.py | 20 ------------- app/posts/urls/trip_urls.py | 25 ---------------- config/base_urls.py | 20 ++++++------- templates/base.html | 6 ++-- 8 files changed, 59 insertions(+), 118 deletions(-) create mode 100644 app/posts/templates/photo_essay_list.html delete mode 100644 app/posts/urls/__init__old.py delete mode 100644 app/posts/urls/friends_urls.py delete mode 100644 app/posts/urls/guide_urls.py delete mode 100644 app/posts/urls/range_urls.py delete mode 100644 app/posts/urls/trip_urls.py diff --git a/app/posts/templates/photo_essay_list.html b/app/posts/templates/photo_essay_list.html new file mode 100644 index 0000000..e8bebfd --- /dev/null +++ b/app/posts/templates/photo_essay_list.html @@ -0,0 +1,47 @@ +{% extends 'base.html' %} +{%block htmlclass%}class="detail single"{% endblock %} +{% load typogrify_tags %} +{% load get_image_by_size %} +{% load html5_datetime %} +{% load pagination_tags %} +{% block pagetitle %} Photos | luxagraf {% endblock %} +{% block metadescription %} Recent Images {% endblock %} +{%block bodyid%}class="photos" id="notes-archive"{%endblock%} +{% block breadcrumbs %}{% include "lib/breadcrumbs.html" with breadcrumbs=breadcrumbs %}{% endblock %} +{% block primary %} +
+
+

Photos

+

I first picked up a camera in the late 1980s and started documenting trips into the mountains, inspired by Galen Rowell. These are ongoing projects, updated regularly.

+
+

Join us. Subscribe to Friends of a Long Year

+ +
+ +
+{% endblock%} +{% block js %} + + +{% endblock %} diff --git a/app/posts/urls/__init__old.py b/app/posts/urls/__init__old.py deleted file mode 100644 index 4993c34..0000000 --- a/app/posts/urls/__init__old.py +++ /dev/null @@ -1,4 +0,0 @@ -from .guide_urls import urlpatterns as guide_urlpatterns -from .reviews_urls import urlpatterns as review_urlpatterns - -urlpatterns = review_urlpatterns + guide_urlpatterns diff --git a/app/posts/urls/friends_urls.py b/app/posts/urls/friends_urls.py deleted file mode 100644 index ca68ca0..0000000 --- a/app/posts/urls/friends_urls.py +++ /dev/null @@ -1,25 +0,0 @@ -from django.urls import path, re_path, include -from django.views.generic.base import RedirectView - -from ..views import friends_views as views - -app_name = "range" - -urlpatterns = [ - # path( - # r'feed.xml', - # views.FriendsRSSFeedView(), - # name="feed" - # ), - # path( - # r'/', - # views.FriendsDetailView.as_view(), - # name="friends-detail" - # ), - path( - r'', - views.FriendsListView.as_view(), - {'page':1}, - name="friends-list" - ), -] diff --git a/app/posts/urls/guide_urls.py b/app/posts/urls/guide_urls.py deleted file mode 100644 index 5e2b37e..0000000 --- a/app/posts/urls/guide_urls.py +++ /dev/null @@ -1,30 +0,0 @@ -from django.urls import path, re_path, include -from django.views.generic.base import RedirectView - -from ..views import guide_views as views - -app_name = "guides" - -urlpatterns = [ - path( - r'', - views.GuideListView.as_view(), - {'page':1}, - name="guide-list" - ), - path( - r'/', - views.GuideListView.as_view(), - name="guide-list" - ), - path( - r'/', - views.GuidePostDetailView.as_view(), - name="guide-post-detail" - ), - path( - r'/', - views.GuideDetailView.as_view(), - name="guide-detail" - ), -] diff --git a/app/posts/urls/range_urls.py b/app/posts/urls/range_urls.py deleted file mode 100644 index 65638ce..0000000 --- a/app/posts/urls/range_urls.py +++ /dev/null @@ -1,20 +0,0 @@ -from django.urls import path, re_path, include -from django.views.generic.base import RedirectView - -from ..views import range_views as views - -app_name = "range" - -urlpatterns = [ - path( - r'', - views.RangeListView.as_view(), - {'page':1}, - name="list" - ), - path( - r'', - views.RangeListView.as_view(), - name="list" - ), -] diff --git a/app/posts/urls/trip_urls.py b/app/posts/urls/trip_urls.py deleted file mode 100644 index 7e9c95f..0000000 --- a/app/posts/urls/trip_urls.py +++ /dev/null @@ -1,25 +0,0 @@ -from django.urls import path, re_path, include -from django.views.generic.base import RedirectView - -from ..views import trip_views as views - -app_name = "trips" - -urlpatterns = [ - path( - r'', - views.TripDetailView.as_view(), - name="detail" - ), - path( - r'/', - views.TripListView.as_view(), - name="list" - ), - path( - r'', - views.TripListView.as_view(), - {'page':1}, - name="list" - ), -] diff --git a/config/base_urls.py b/config/base_urls.py index 2b7d43d..93b90b7 100644 --- a/config/base_urls.py +++ b/config/base_urls.py @@ -45,6 +45,12 @@ urlpatterns = [ #path(r'people/', include('people.urls')), #path(r'work/', include('resume.urls', namespace='resume')), #path(r'//', PageDetailView.as_view()), + #re_path(r'^trip/$', RedirectView.as_view(url='/trips/')), + #path(r'trip/', include('posts.urls.trip_urls')), + #path(r'trips/', include('posts.urls.trip_urls', namespace='trips')), + #re_path(r'^guide/$', RedirectView.as_view(url='/guides/')), + #path(r'guides/', include('posts.urls.guide_urls', namespace='guides')), + #path(r'guide/', include('posts.urls.guide_urls')), re_path(r'^admin/build/.*', builder.views.do_build), path(r'admin/data/', include('utils.urls')), path(r'admin/', admin.site.urls), @@ -60,19 +66,13 @@ urlpatterns = [ path(r'walks/', include('locations.walk_urls')), path(r'locations/', include('locations.urls')), path(r'newsletter/', include('lttr.urls')), - path(r'photos/', include('media.urls')), - path(r'images/', include('posts.urls.photo_essay_urls', namespace='photo-essay-list')), - re_path(r'^trip/$', RedirectView.as_view(url='/trips/')), - path(r'trip/', include('posts.urls.trip_urls')), - path(r'trips/', include('posts.urls.trip_urls', namespace='trips')), - re_path(r'^guide/$', RedirectView.as_view(url='/guides/')), - path(r'guides/', include('posts.urls.guide_urls', namespace='guides')), - path(r'guide/', include('posts.urls.guide_urls')), + #path(r'photos/', include('media.urls')), + path(r'photos/', include('posts.urls.photo_essay_urls', namespace='photo-essay-list')), re_path(r'^essay/$', RedirectView.as_view(url='/essays/')), path(r'essay/', include('posts.urls.essay_urls')), path(r'essays/', include('posts.urls.essay_urls', namespace='essay-list')), - path(r'range/', include('posts.urls.range_urls', namespace='range')), - path(r'friends/', include('posts.urls.friends_urls', namespace='friends')), + #path(r'range/', include('posts.urls.range_urls', namespace='range')), + #path(r'friends/', include('posts.urls.friends_urls', namespace='friends')), path(r'book-notes/', include('books.urls')), path(r'dialogues/', include('sightings.urls', namespace='sightings')), path(r'field-notes/', include('posts.urls.field_note_urls', namespace='fieldnote')), diff --git a/templates/base.html b/templates/base.html index 0bce354..2e4eb8b 100644 --- a/templates/base.html +++ b/templates/base.html @@ -16,7 +16,7 @@ title="Luxagraf RSS feed" href="https://luxagraf.net/rss/"> {%block stylesheet%}{%endblock%} {%block extrahead%}{%endblock%} @@ -29,10 +29,8 @@ {% block breadcrumbs %}{% endblock %} -- cgit v1.2.3-70-g09d2