summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/builder/base.py4
-rw-r--r--app/builder/views.py4
-rw-r--r--app/posts/build.py21
-rw-r--r--app/posts/models.py23
-rw-r--r--app/posts/templates/posts/fieldnote_archive_list_date.html43
-rw-r--r--app/posts/templates/posts/fieldnote_detail.html95
-rw-r--r--app/posts/templates/posts/fieldnote_list.html41
-rw-r--r--app/posts/urls/field_note_urls.py39
-rw-r--r--app/posts/views/__init__.py19
-rw-r--r--app/posts/views/field_note_views.py38
-rw-r--r--config/base_urls.py4
11 files changed, 320 insertions, 11 deletions
diff --git a/app/builder/base.py b/app/builder/base.py
index b41bbba..fabea6e 100644
--- a/app/builder/base.py
+++ b/app/builder/base.py
@@ -74,7 +74,7 @@ class BuildNew():
self.write_file(path, response.content)
def build_year_view(self, url, paginate_by=99999):
- years = self.model.objects.dates('pub_date', 'year')
+ years = self.get_model_queryset().dates('pub_date', 'year')
for year in years:
year = year.strftime('%Y')
qs = self.model.objects.filter(
@@ -88,7 +88,7 @@ class BuildNew():
)
def build_month_view(self, url, paginate_by=99999):
- months = self.model.objects.dates('pub_date', 'month')
+ months = self.get_model_queryset().dates('pub_date', 'month')
for m in months:
year = m.strftime('%Y')
month = m.strftime('%m')
diff --git a/app/builder/views.py b/app/builder/views.py
index d70eb4b..cbb33fb 100644
--- a/app/builder/views.py
+++ b/app/builder/views.py
@@ -8,9 +8,9 @@ from sightings.build import builder as sightings_builder
from photos.build import builder as photo_builder
#from notes.build import builder as notes_builder
from pages.build import builder as page_builder
-from fieldnotes.build import builder as fieldnotes_builder
+#from fieldnotes.build import builder as fieldnotes_builder
from photos.build import dailybuilder
-from posts.build import src_builder, guide_builder
+from posts.build import src_builder, guide_builder, fieldnotes_builder
options = {
'writing': BuildWriting,
diff --git a/app/posts/build.py b/app/posts/build.py
index 77611f9..80d5a11 100644
--- a/app/posts/build.py
+++ b/app/posts/build.py
@@ -41,3 +41,24 @@ class BuildGuide(BuildNew):
def guide_builder():
j = BuildGuide("posts", "post")
j.build()
+
+
+
+class BuildFieldNotes(BuildNew):
+
+ def get_model_queryset(self):
+ return self.model.objects.filter(post_type=PostType.FIELD_NOTE).filter(status__exact=1).order_by('-pub_date')
+
+ def build(self):
+ self.build_detail_view()
+ self.build_list_view(
+ base_path=reverse("fieldnotes:list"),
+ paginate_by=24
+ )
+ self.build_year_view("fieldnotes:list_year")
+ self.build_month_view("fieldnotes:list_month")
+
+
+def fieldnotes_builder():
+ j = BuildFieldNotes("posts", "post")
+ j.build()
diff --git a/app/posts/models.py b/app/posts/models.py
index fc40475..31e96b0 100644
--- a/app/posts/models.py
+++ b/app/posts/models.py
@@ -101,6 +101,8 @@ class Post(models.Model):
return reverse('essays:detail', kwargs={"slug": self.slug})
if self.post_type == 3:
return reverse('src:detail', kwargs={"slug": self.slug})
+ if self.post_type == 5:
+ return reverse('fieldnote:detail', kwargs={"year": self.pub_date.year, "month": self.pub_date.strftime("%m"), "slug": self.slug})
def comment_period_open(self):
return self.enable_comments and datetime.datetime.today() - datetime.timedelta(30) <= self.pub_date
@@ -142,6 +144,13 @@ class Post(models.Model):
'''Get the site's latitude.'''
return self.point.y
+ @property
+ def sitemap_priority(self):
+ if self.post_type in [0,1,4,5]:
+ return 1.0
+ else:
+ return 0.7
+
def save(self, *args, **kwargs):
created = self.pk is None
if not created:
@@ -167,11 +176,11 @@ class Post(models.Model):
self.featured_image.sizes.add(s)
self.featured_image.sizes.add(ss)
self.featured_image.save()
- #if old.title != self.title or old.slug != self.slug:
- # related, c = RelatedPost.objects.get_or_create(model_name=self.get_content_type(), entry_id = self.id, pub_date=self.pub_date)
- # related.title = self.title
- # related.slug = self.slug
- # related.save()
+ if old.title != self.title or old.slug != self.slug:
+ related, c = RelatedPost.objects.get_or_create(model_name=self.get_content_type(), entry_id = self.id, pub_date=self.pub_date)
+ related.title = self.title
+ related.slug = self.slug
+ related.save()
super(Post, self).save(*args, **kwargs)
@@ -217,7 +226,6 @@ def post_save_events(sender, update_fields, created, instance, **kwargs):
class PostSitemap(Sitemap):
changefreq = "never"
- priority = 1.0
protocol = "https"
def items(self):
@@ -226,6 +234,9 @@ class PostSitemap(Sitemap):
def lastmod(self, obj):
return obj.pub_date
+ def priority(self, obj):
+ return obj.sitemap_priority
+
"""
for p in src:
diff --git a/app/posts/templates/posts/fieldnote_archive_list_date.html b/app/posts/templates/posts/fieldnote_archive_list_date.html
new file mode 100644
index 0000000..5d6865f
--- /dev/null
+++ b/app/posts/templates/posts/fieldnote_archive_list_date.html
@@ -0,0 +1,43 @@
+{% extends 'base.html' %}
+{% load typogrify_tags %}
+{% load html5_datetime %}
+{% block pagetitle %} Field Notes | luxagraf {% endblock %}
+{% block metadescription %} Rough notes and sketches from the field {% endblock %}
+{%block bodyid%}id="field-notes"{%endblock%}
+
+{% block primary %}
+ <ul class="bl" id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
+ <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> &rarr; </li>
+ <li>{% if month or year %}<a href="{% url 'fieldnotes:list' %}">Field Notes</a> &rarr;{%else%}Field Notes{%endif%}</li>
+ <li>{% if not month %}{{year|date:"Y"}}{%else%}<a href="/field-notes/{{month|date:"Y"}}/">{{month|date:"Y"}}</a> &rarr;{%endif%}</li>
+ {% if month %}<li itemprop="title">{{month|date:"F"}}</li>{% endif %}
+ </ul>
+ <main role="main" id="essay-archive" class="essay-archive archive-list">
+ <div class="essay-intro">
+ <h2>Field Notes {% if month or year %}{% if month %} from {{month|date:"F"}} {{month|date:"Y"}}{%else%} from {{year|date:"Y"}}{%endif%}{%endif%}</h2>
+ <p>Quick notes, sketches and images from the road. This is the semi-orgnized brain dump that comes before the more organized <a href="/jrnl/" title="read the journal">journal entries</a> and <a href="/essays/" title="read essays">essays</a>. If I used social media this is the stuff I'd probably put there, but I prefer to put it here, even if it means a lot few people read it.</p>
+ </div>
+ <ul class="fancy-archive-list">{% for object in object_list %}{% if object.slug != 'about' %}
+ <li class="h-entry hentry" itemscope itemType="http://schema.org/Article">
+ <a href="{{object.get_absolute_url}}">
+ {% if object.featured_image %}<div class="circle-img-wrapper"><img src="{{object.featured_image.get_thumbnail_url}}" alt="{{object.featured_image.alt}}" /></div>{%endif%}
+ <span class="date dt-published">{{object.pub_date|date:"F d, Y"}}</span>
+ <a href="{{object.get_absolute_url}}">
+ <h2>{{object.title|safe|smartypants|widont}}</h2>
+ {% if object.subtitle %}<h3 class="p-summary">{{object.subtitle|safe|smartypants|widont}}</h3>{%endif%}
+ </a>
+ {% if object.location %}<h4 class="p-location h-adr post-location" itemprop="geo" itemscope itemtype="http://data-vocabulary.org/Geo">
+ <span class="p-locality">{{object.location.name|smartypants|safe}}</span>,
+ <span class="p-region">{{object.location.state_name}}</span>,
+ <span class="p-country-name">{{object.location.country_name}}</span>
+ <data class="p-latitude" value="{{object.latitude}}"></data>
+ <data class="p-longitude" value="{{object.longitude}}"></data>
+ </h4>{% endif %}
+ </li>
+ {%endif%}{%endfor%}</ul>
+ </main>
+
+{% endblock %}
+
+
+
diff --git a/app/posts/templates/posts/fieldnote_detail.html b/app/posts/templates/posts/fieldnote_detail.html
new file mode 100644
index 0000000..d1c648b
--- /dev/null
+++ b/app/posts/templates/posts/fieldnote_detail.html
@@ -0,0 +1,95 @@
+{% extends 'base.html' %}
+{% load typogrify_tags %}
+{% load html5_datetime %}
+{% load month_number_to_name %}
+{% block pagetitle %}{{object.title|title|smartypants|safe}} - Luxagraf, Field Notes{% endblock %}
+
+{% block metadescription %}{{object.body_html|striptags|safe|truncatewords:30}}{% endblock %}
+{%block extrahead%}
+ <link rel="canonical" href="http://luxagraf.net{{object.get_absolute_url}}" />
+ <meta name="ICBM" content="{{object.latitude}}, {{object.longitude}}" />
+ <meta name="geo.position" content="{{object.latitude}}; {{object.longitude}}" />
+ <meta name="geo.placename" content="{% if object.location.country.name == "United States" %}{{object.location.name|smartypants|safe}}, {{object.state.name}}{%else%}{{object.location.name|smartypants|safe}}, {{object.country.name}}{%endif%}">
+ <meta name="geo.region" content="{{object.country.iso2}}{%if object.state.code != '' %}-{{object.state.code}}{%endif%}">
+{%endblock%}
+{% block bodyid %}class="notes--permalin detail" id="archive-{% if month %}{{month|month_number_to_name}}{%endif%}{{year}}"{%endblock%}
+{% block breadcrumbs %}{% include "lib/breadcrumbs.html" with breadcrumbs=breadcrumbs %}{% endblock %}
+{% block primary %}<main role="main">
+ <article class="h-entry hentry {% with object.get_template_name_display as t %}{%if t == "double" or t == "double-dark" %} post--article--double{%endif%}{%endwith%}" itemscope itemType="http://schema.org/BlogPosting">
+ <header id="header" class="post-header {% with object.get_template_name_display as t %}{%if t == "double" or t == "double-dark" %}post--header--double{%endif%}{%endwith%}">
+ <h1 class="p-name entry-title post-title" itemprop="headline">{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|smartypants|safe}}{%else%}{{object.title|smartypants|safe}}{%endif%}</h1>
+ {% if object.subtitle %}<h2 class="post-subtitle">{{object.subtitle|smartypants|safe}}</h2>{%endif%}
+ <div class="post-linewrapper">
+ {% if object.location %}<div class="p-location h-adr adr post-location" itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
+ <h3 class="h-adr" itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">{% if object.location.country_name == "United States" %}<span class="p-locality locality" itemprop="addressLocality">{{object.location.name|smartypants|safe}}</span>, <a class="p-region region" href="/jrnl/united-states/" title="travel writing from the United States">{{object.location.state_name|safe}}</a>, <span class="p-country-name" itemprop="addressCountry">U.S.</span>{%else%}<span class="p-region" itemprop="addressRegion">{{object.location.name|smartypants|safe}}</span>, <a class="p-country-name country-name" href="/jrnl/{{object.location.country_slug}}/" title="travel writing from {{object.location.country_name}}"><span itemprop="addressCountry">{{object.location.country_name|safe}}</span></a>{%endif%}</h3>
+ &ndash;&nbsp;<a href="" onclick="showMap({{object.latitude}}, {{object.longitude}}, { type:'point', lat:'{{object.latitude}}', lon:'{{object.longitude}}'}); return false;" title="see a map">Map</a>
+ </div>{%endif%}
+ <time class="dt-published published dt-updated post-date" datetime="{{object.pub_date|date:'c'}}" itemprop="datePublished">{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
+ <span class="hide" itemprop="author" itemscope itemtype="http://schema.org/Person">by <a class="p-author h-card" href="/about"><span itemprop="name">Scott Gilbertson</span></a></span>
+ </div>
+ </header>
+ <div class="e-content">
+ {{object.body_html|safe|smartypants}}
+ </div>
+ <span class="p-author h-card">
+ <data class="p-name" value="Scott Gilbertson"></data>
+ <data class="u-url" value="https://luxagraf.net/"></data>
+ </span>
+ <footer>
+ {%comment%}<p class="note--date">
+ <a class="u-url" href="{{object.get_absolute_url}}" rel="bookmark"><time class="dt-published" datetime="{{object.pub_date|html5_datetime}}">{{object.pub_date|date:"F j, Y"}}</time></a>
+ </p>{%endcomment%}
+ {% comment %} {% if object.twitter_id %}
+ <ul class="note--actions">
+ <li><a rel="syndication" class="u-syndication" href="https://twitter.com/luxagraf/status/{{object.twitter_id}}">View on Twitter</a></li>
+ <li>
+ <indie-action do="reply" with="{{SITE_URL}}{{object.get_absolute_url}}"><a href="https://twitter.com/intent/tweet?in_reply_to={{object.twitter_id}}">Reply</a></indie-action>
+ </li>
+ <li>
+ <indie-action do="post" with="{{SITE_URL}}{{object.get_absolute_url}}">
+ <a href="https://twitter.com/intent/retweet?tweet_id={{object.twitter_id}}">Retweet</a>
+ </indie-action>
+ </li>
+ <li>
+ <indie-action do="bookmark" with="{{SITE_URL}}{{object.get_absolute_url}}">
+ <a href="https://twitter.com/intent/favorite?tweet_id={{object.twitter_id}}">Favourite</a>
+ </indie-action>
+ </li>
+ </ul>{% endif %}{% endcomment %}
+ </footer>
+
+
+ {% with object.get_next_published as next %}
+ {% with object.get_previous_published as prev %}
+ <nav id="page-navigation">
+ <ul>{% if prev%}
+ <li rel="previous" id="next"><span class="bl">Previous:</span>
+ <a href="{{ prev.get_absolute_url }}" rel="prev" title=" {{prev.title}}">{{prev.title|safe}}</a>
+ </li>{%endif%}{% if next%}
+ <li rel="next" id="prev"><span class="bl">Next:</span>
+ <a href="{{ next.get_absolute_url }}" rel="next" title=" {{next.title}}">{{next.title|safe}}</a>
+ </li>{%endif%}
+ </ul>
+ </nav>{%endwith%}{%endwith%}
+ </article>
+</main>
+{% endblock %}
+
+{% block js %}
+<script>
+document.addEventListener("DOMContentLoaded", function(event) {
+ var leaflet = document.createElement('script');
+ leaflet.src = "/media/js/leaflet-master/leaflet-mod.js";
+ document.body.appendChild(leaflet);
+ leaflet.onload = function(){
+ var detail = document.createElement('script');
+ detail.src = "/media/js/detail.min.js";
+ document.body.appendChild(detail);
+ detail.onload = function(){
+ createMap();
+ var open = false;
+ }
+ }
+});
+</script>
+{%endblock%}
diff --git a/app/posts/templates/posts/fieldnote_list.html b/app/posts/templates/posts/fieldnote_list.html
new file mode 100644
index 0000000..1cf4f9e
--- /dev/null
+++ b/app/posts/templates/posts/fieldnote_list.html
@@ -0,0 +1,41 @@
+{% extends 'base.html' %}
+{% load typogrify_tags %}
+{% load get_next %}
+{% load html5_datetime %}
+{% load pagination_tags %}
+{% block pagetitle %} Field Notes | luxagraf {% endblock %}
+{% block metadescription %}Rough notes and sketches from the field {% endblock %}
+{%block bodyid%}id="field-notes"{%endblock%}
+{% block breadcrumbs %}{% include "lib/breadcrumbs.html" with breadcrumbs=breadcrumbs %}{% endblock %}
+{% block primary %}<main role="main" id="essay-archive" class="essay-archive archive-list">
+ <div class="essay-intro">
+ <h2>Field Notes</h2>
+ <p>Quick notes, sketches, and images from the road. This is the semi-organized brain dump that comes before the more organized <a href="/jrnl/" title="read the journal">journal entries</a>. If I used social media this is the stuff I'd probably put there, but I prefer to put it here, even if it means a lot fewer people read it.</p>
+ </div>
+ {% autopaginate object_list 30 %}
+ <ul class="fancy-archive-list">{% for object in object_list %}
+ <li class="h-entry hentry" itemscope itemType="http://schema.org/Article">
+ <a href="{{object.get_absolute_url}}" class="u-url">
+ {% if object.featured_image %}<div class="circle-img-wrapper"><img src="{{object.featured_image.get_thumbnail_url}}" alt="{{object.featured_image.alt}}" class="u-photo" /></div>{%endif%}
+ <span class="datei">Field Note: </span><span class="date dt-published">{{object.pub_date|date:"F d, Y"}}</span>
+ <a href="{{object.get_absolute_url}}">
+ <h2>{{object.title|safe|smartypants|widont}}</h2>
+ {% if object.subtitle %}<h3 class="p-summary">{{object.subtitle|safe|smartypants|widont}}</h3>{%endif%}
+ </a>
+ {% if object.location %}<h4 class="p-location h-adr post-location" itemprop="geo" itemscope itemtype="http://data-vocabulary.org/Geo">
+ <span class="p-locality">{{object.location.name|smartypants|safe}}</span>,
+ <span class="p-region">{{object.location.state_name}}</span>,
+ <span class="p-country-name">{{object.location.country_name}}</span>
+ <data class="p-latitude" value="{{object.latitude}}"></data>
+ <data class="p-longitude" value="{{object.longitude}}"></data>
+ </h4>{% endif %}
+ </li>
+ {%endfor%}</ul>
+ </main>
+ <nav aria-label="page navigation" class="pagination">
+ {% paginate %}
+ </nav>
+{% endblock %}
+
+
+
diff --git a/app/posts/urls/field_note_urls.py b/app/posts/urls/field_note_urls.py
new file mode 100644
index 0000000..bf16c50
--- /dev/null
+++ b/app/posts/urls/field_note_urls.py
@@ -0,0 +1,39 @@
+from django.urls import path, re_path
+
+from ..views import field_note_views as views
+
+app_name = "fieldnotes"
+
+urlpatterns = [
+ re_path(
+ r'(?P<year>[0-9]{4})/$',
+ views.FieldNoteYearArchiveView.as_view(),
+ name="list_year"
+ ),
+ path(
+ r'',
+ views.FieldNoteListView.as_view(),
+ {'page': 1},
+ name="list"
+ ),
+ path(
+ r'<int:page>/',
+ views.FieldNoteListView.as_view(),
+ name="list"
+ ),
+ path(
+ r'<int:year>/<int:month>/<str:slug>.txt',
+ views.FieldNoteDetailViewTXT.as_view(),
+ name="detail-txt"
+ ),
+ path(
+ r'<int:year>/<int:month>/<str:slug>',
+ views.FieldNoteDetailView.as_view(),
+ name="detail"
+ ),
+ path(
+ r'<int:year>/<int:month>/',
+ views.FieldNoteMonthArchiveView.as_view(month_format='%m'),
+ name="list_month"
+ ),
+]
diff --git a/app/posts/views/__init__.py b/app/posts/views/__init__.py
index e69de29..5fd984c 100644
--- a/app/posts/views/__init__.py
+++ b/app/posts/views/__init__.py
@@ -0,0 +1,19 @@
+from django.contrib.syndication.views import Feed
+
+from ..models import Post
+
+class PostRSSFeedView(Feed):
+ title = "Luxagraf: Topographical Writings"
+ link = "https://luxagraf.net/"
+ description = "Latest postings to luxagraf.net"
+ description_template = 'feeds/blog_description.html'
+
+ def items(self):
+ return Post.objects.filter(status__exact=1).order_by('-pub_date')[:10]
+
+ def item_pubdate(self, item):
+ """
+ Takes an item, as returned by items(), and returns the item's
+ pubdate.
+ """
+ return item.pub_date
diff --git a/app/posts/views/field_note_views.py b/app/posts/views/field_note_views.py
new file mode 100644
index 0000000..8b2c78c
--- /dev/null
+++ b/app/posts/views/field_note_views.py
@@ -0,0 +1,38 @@
+from django.views.generic.dates import YearArchiveView, MonthArchiveView
+from django.views.generic.detail import DetailView
+
+from utils.views import PaginatedListView, LuxDetailView
+
+from ..models import Post, PostType
+
+
+class FieldNoteListView(PaginatedListView):
+ model = Post
+ template_name = "posts/fieldnote_list.html"
+ """
+ Return a list of Notes in reverse chronological order
+ """
+ queryset = Post.objects.filter(post_type=PostType.FIELD_NOTE,status=1).order_by('-pub_date')
+
+
+class FieldNoteDetailView(LuxDetailView):
+ model = Post
+ slug_field = "slug"
+
+
+class FieldNoteDetailViewTXT(FieldNoteDetailView):
+ template_name = "posts/entry_detail.txt"
+
+
+class FieldNoteYearArchiveView(YearArchiveView):
+ queryset = Post.objects.filter(post_type=PostType.FIELD_NOTE,status=1)
+ date_field = "pub_date"
+ template_name = "posts/fieldnote_archive_list_date.html"
+ make_object_list = True
+
+
+class FieldNoteMonthArchiveView(MonthArchiveView):
+ queryset = Post.objects.filter(post_type=PostType.FIELD_NOTE,status=1)
+ date_field = "pub_date"
+ make_object_list = True
+ template_name = "posts/fieldnote_archive_list_date.html"
diff --git a/config/base_urls.py b/config/base_urls.py
index 24c85df..906f7e6 100644
--- a/config/base_urls.py
+++ b/config/base_urls.py
@@ -18,6 +18,7 @@ import products.views
from locations.views import MapDataList
from income.views import MonthlyInvoiceView, DownloadMonthlyInvoiceView
+from posts.views import PostRSSFeedView
admin.autodiscover()
@@ -36,6 +37,7 @@ urlpatterns = [
path(r'admin/', admin.site.urls),
path(r'luximages/insert/', utils.views.insert_image),
path(r'luxproduct/insert/', products.views.insert_products),
+ path(r'feed.xml', PostRSSFeedView(),name="feed"),
path(r'sitemap.xml', sitemap, {'sitemaps': sitemaps}),
path(r'links/', include('links.urls')),
path(r'newsletter/', include('lttr.urls')),
@@ -54,7 +56,7 @@ urlpatterns = [
path(r'book-notes/', include('books.urls')),
path(r'people/', include('people.urls')),
path(r'dialogues/', include('sightings.urls', namespace='sightings')),
- path(r'field-notes/', include('fieldnotes.urls', namespace='fieldnotes')),
+ path(r'field-notes/', include('posts.urls.field_note_urls', namespace='fieldnote')),
path(r'src/', include('posts.urls.src_urls', namespace='src')),
#path(r'essays/', include('essays.urls', namespace='essays')),
path(r'work/', include('resume.urls', namespace='resume')),
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2025-04-03 20:18:39 +0000