summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/jrnl/admin.py3
-rw-r--r--app/jrnl/views.py8
-rw-r--r--app/locations/admin.py8
-rw-r--r--app/locations/migrations/0004_location_child.py19
-rw-r--r--app/locations/migrations/0005_auto_20180629_1714.py18
-rw-r--r--app/locations/migrations/0006_auto_20180629_1739.py18
-rw-r--r--app/locations/models.py1
-rw-r--r--app/locations/urls.py5
-rw-r--r--app/locations/views.py28
-rw-r--r--design/sass/_global.scss14
-rw-r--r--design/templates/details/location.html92
11 files changed, 199 insertions, 15 deletions
diff --git a/app/jrnl/admin.py b/app/jrnl/admin.py
index 9a39114..e77b931 100644
--- a/app/jrnl/admin.py
+++ b/app/jrnl/admin.py
@@ -29,13 +29,12 @@ class EntryAdmin(OSMGeoAdmin):
search_fields = ['title', 'body_markdown']
prepopulated_fields = {"slug": ('title',)}
list_filter = ('pub_date', 'enable_comments', 'status', 'location__state__country__lux_region')
- filter_horizontal = ('field_notes','books')
+ filter_horizontal = ('field_notes', 'books')
fieldsets = (
('Entry', {
'fields': (
'title',
'body_markdown',
- #'body_html',
('pub_date', 'status'),
'slug',
'point'
diff --git a/app/jrnl/views.py b/app/jrnl/views.py
index 01167db..94d887c 100644
--- a/app/jrnl/views.py
+++ b/app/jrnl/views.py
@@ -4,11 +4,12 @@ from django.views.generic.dates import YearArchiveView, MonthArchiveView
from django.contrib.syndication.views import Feed
from django.shortcuts import get_object_or_404
from django.conf import settings
+from django.db.models import Q
from utils.views import PaginatedListView
from .models import Entry, HomepageCurrator
-from locations.models import CheckIn, Country, Region
+from locations.models import CheckIn, Country, Region, Location
from sightings.models import Sighting
@@ -82,7 +83,10 @@ class EntryDetailView(DetailView):
def get_context_data(self, **kwargs):
context = super(EntryDetailView, self).get_context_data(**kwargs)
- context['wildlife'] = Sighting.objects.filter(location=self.get_object().location).order_by('ap_id', 'ap__apclass__kind').distinct("ap")
+ context['wildlife'] = Sighting.objects.filter(
+ Q(location=self.get_object().location) |
+ Q(location__in=Location.objects.filter(parent=self.get_object().location))
+ ).order_by('ap_id', 'ap__apclass__kind').distinct("ap")
return context
diff --git a/app/locations/admin.py b/app/locations/admin.py
index b538657..4adb836 100644
--- a/app/locations/admin.py
+++ b/app/locations/admin.py
@@ -161,10 +161,11 @@ admin.site.register(State, StateAdmin)
class LocationAdmin(OSMGeoAdmin):
- list_display = ('name', 'slug', 'state', 'pub_date')
+ list_display = ('name', 'pub_date', 'parent', 'state', 'slug')
prepopulated_fields = {'slug': ('name',)}
search_fields = ('name', 'state')
- ordering = ('name',)
+ ordering = ('pub_date', 'name')
+ list_filter = ('pub_date', 'state__country__lux_region', 'state')
save_as = True
search_fields = ['name']
list_select_related = True
@@ -174,7 +175,8 @@ class LocationAdmin(OSMGeoAdmin):
'name',
'slug',
'pub_date',
- 'state'
+ 'state',
+ 'parent'
),
'classes': ('show', 'extrapretty')
}),
diff --git a/app/locations/migrations/0004_location_child.py b/app/locations/migrations/0004_location_child.py
new file mode 100644
index 0000000..94fd324
--- /dev/null
+++ b/app/locations/migrations/0004_location_child.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.0.1 on 2018-06-29 17:11
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('locations', '0003_auto_20180307_1027'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='location',
+ name='child',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='locations.Location'),
+ ),
+ ]
diff --git a/app/locations/migrations/0005_auto_20180629_1714.py b/app/locations/migrations/0005_auto_20180629_1714.py
new file mode 100644
index 0000000..04b6f49
--- /dev/null
+++ b/app/locations/migrations/0005_auto_20180629_1714.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0.1 on 2018-06-29 17:14
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('locations', '0004_location_child'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='location',
+ old_name='child',
+ new_name='childof',
+ ),
+ ]
diff --git a/app/locations/migrations/0006_auto_20180629_1739.py b/app/locations/migrations/0006_auto_20180629_1739.py
new file mode 100644
index 0000000..f47b6e9
--- /dev/null
+++ b/app/locations/migrations/0006_auto_20180629_1739.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0.1 on 2018-06-29 17:39
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('locations', '0005_auto_20180629_1714'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='location',
+ old_name='childof',
+ new_name='parent',
+ ),
+ ]
diff --git a/app/locations/models.py b/app/locations/models.py
index f9a3e5b..b4ee6f7 100644
--- a/app/locations/models.py
+++ b/app/locations/models.py
@@ -121,6 +121,7 @@ class Location(models.Model):
slug = models.SlugField()
pub_date = models.DateTimeField('Date published')
geometry = models.MultiPolygonField(srid=4326)
+ parent = models.ForeignKey('self', on_delete=models.CASCADE, blank=True, null=True)
class Meta:
ordering = ('-pub_date',)
diff --git a/app/locations/urls.py b/app/locations/urls.py
index abe9f0a..5faefc1 100644
--- a/app/locations/urls.py
+++ b/app/locations/urls.py
@@ -6,6 +6,11 @@ app_name = "locations"
urlpatterns = [
path(
+ r'<str:country>/<str:state>/<str:slug>/',
+ views.LocationDetail.as_view(),
+ name="location-detail"
+ ),
+ path(
r'mapdata/',
views.MapDataList.as_view(),
name="mapdata"
diff --git a/app/locations/views.py b/app/locations/views.py
index c463eac..3a93c0d 100644
--- a/app/locations/views.py
+++ b/app/locations/views.py
@@ -1,12 +1,15 @@
from django.shortcuts import render_to_response
from django.template import RequestContext
-from jrnl.models import Entry
-from locations.models import Country, Region, Route
-from projects.shortcuts import render_to_geojson
-
from django.views.generic import ListView
+from django.views.generic.detail import DetailView
from django.conf import settings
+from django.db.models import Q
+
+from jrnl.models import Entry
+from projects.shortcuts import render_to_geojson
+from sightings.models import Sighting
+from .models import Country, Region, Route, Location
def map_list(request):
context = {
@@ -79,3 +82,20 @@ def data_json(request, id):
mimetype='application/json',
pretty_print=True
)
+
+
+class LocationDetail(DetailView):
+ model = Location
+ template_name = "details/location.html"
+
+ def get_context_data(self, **kwargs):
+ context = super(LocationDetail, self).get_context_data(**kwargs)
+ context['entry_list'] = Entry.objects.filter(
+ Q(location=self.get_object()) |
+ Q(location__in=Location.objects.filter(parent=self.get_object()))
+ )
+ context['sighting_list'] = Sighting.objects.filter(
+ Q(location=self.get_object()) |
+ Q(location__in=Location.objects.filter(parent=self.get_object()))
+ ).order_by('ap_id', 'ap__apclass__kind').distinct("ap")
+ return context
diff --git a/design/sass/_global.scss b/design/sass/_global.scss
index 4990554..c5b7ca2 100644
--- a/design/sass/_global.scss
+++ b/design/sass/_global.scss
@@ -70,9 +70,6 @@ object, embed, video {
img {
max-width: 100%;
- max-width:98%;
- padding:1%; /* A percentage that, when doubled and added to the above, makes 100%. */
- background: $brown;
}
h1 {
@@ -80,7 +77,6 @@ h1 {
@include fontsize(36);
font-weight: normal;
}
-
//************** Universals ************************
.hide {
display: none;
@@ -117,6 +113,16 @@ h1 {
.small {
font-size: 90%;
}
+.hed {
+ @include fancy_sans;
+ @include fontsize(24);
+ font-weight: 500;
+ @include breakpoint(beta) {
+ text-align: left;
+ @include fontsize(32);
+ }
+}
+
.subhead {
font-style: italic;
font-weight: 400;
diff --git a/design/templates/details/location.html b/design/templates/details/location.html
new file mode 100644
index 0000000..8f906e5
--- /dev/null
+++ b/design/templates/details/location.html
@@ -0,0 +1,92 @@
+{% extends 'base.html' %}
+{% load typogrify_tags %}
+{% load get_image_by_size %}
+{% load get_image_width %}
+
+{% block pagetitle %}{{object.name|title|smartypants|safe}} | Luxagraf, a travelogue | {% if object.country_name == "United States" %}{{object.location_name|smartypants|safe}}, {{object.state_name}}{%else%}{{object.location_name|smartypants|safe}}, {{object.country_name}}{%endif%}){% endblock %}
+
+{% block metadescription %}{{object.meta_description|striptags|safe}}{% endblock %}
+{%block extrahead%}
+ <link rel="canonical" href="http://luxagraf.net{{object.get_absolute_url}}" />
+{%endblock%}
+{%block htmlclass%}{% with object.template_name as t %}
+class="{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%endif%}{%if t == 2 or t == 3 %} dark{%endif%}"{%endwith%}{%endblock%}
+{% block primary %}
+ <article role="main">
+ <header>
+ <h1>{{object.name}}</h1>
+ </header>
+ <div class="post-body">
+ {% for object in entry_list %}
+ {% if forloop.first %}<div class="featured-entry">
+ <article class="h-entry hentry" itemscope itemType="http://schema.org/Article">
+ <div class="post--image">
+ <a href="{{object.get_absolute_url}}" title="{{object.title}}">{% if object.featured_image %}
+ <img src="{% for size in object.featured_image.sizes.all%}{% if size.name == 'featured_jrnl'%}{% get_image_by_size object.featured_image size.name %}{%endif%}{%endfor%}" alt="{{image.alt}} photographed by {% if image.photo_credit_source %}{{image.photo_credit_source}}{%else%}luxagraf{%endif%}" />
+ </a>{%else%}
+ <img src="{{object.get_image_url}}" alt="{{ object.title }}" class="u-photo post-image" itemprop="image" />
+ </a>{%endif%}
+ </div>
+ <h2 class="p-name entry-title post--title" itemprop="headline"><a href="{{object.get_absolute_url}}" class="u-url" title="{%if object.title_keywords%}{{object.title_keywords}}{%else%}{{object.title}}{%endif%}">{{object.title|safe|smartypants|widont}}</a></h2>
+ <p class="p-author author hide" itemprop="author"><span class="byline-author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Scott Gilbertson</span></span></p>
+ <time class="dt-published published dt-updated post--date" datetime="{{object.pub_date|date:'c'}}">{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
+ <p>
+ <span class="p-location h-adr adr post--location" itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
+ {% if object.country.name == "United States" %}<span class="p-locality locality">{{object.location.name|smartypants|safe}}</span>, <a class="p-region region" href="/jrnl/united-states/" title="travel writing from the United States">{{object.state.name}}</a>, <span class="p-country-name">U.S.</span>{%else%}<span class="p-region">{{object.location.name|smartypants|safe}}</span>, <a class="p-country-name country-name" href="/jrnl/{{object.country.slug}}/" title="travel writing from {{object.country.name}}">{{object.country.name}}</a>{%endif%}
+ </span> &ndash;
+ <span class="p-summary entry-summary hyphenate" itemprop="description">
+ {{object.dek|safe}}
+ </span>
+ </p>
+ </article>
+ </div> {% else %}
+ <article class="h-entry hentry {% cycle 'odd' 'even' %} {% cycle 'first' 'second' 'third' %}" itemscope itemType="http://schema.org/Article">
+ <div class="post--image">
+ <a href="{{object.get_absolute_url}}" title="{{object.title}}"><img src="{{object.get_image_url}}" alt="{{ object.title }}" class="u-photo post-image" itemprop="image" /></a>
+ </div>
+ <h2 class="p-name entry-title post--title" itemprop="headline"><a href="{{object.get_absolute_url}}" class="u-url" title="{%if object.title_keywords%}{{object.title_keywords}}{%else%}{{object.title}}{%endif%}">{{object.title|safe|smartypants|widont}}</a></h2>
+ <p class="p-author author hide" itemprop="author"><span class="byline-author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Scott Gilbertson</span></span></p>
+ <time class="dt-published published dt-updated post--date" datetime="{{object.pub_date|date:'c'}}">{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
+ <p>
+ <span class="p-location h-adr adr post--location" itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
+ {% if object.country.name == "United States" %}<span class="p-locality locality">{{object.location.name|smartypants|safe}}</span>, <a class="p-region region" href="/jrnl/united-states/" title="travel writing from the United States">{{object.state.name}}</a>, <span class="p-country-name">U.S.</span>{%else%}<span class="p-region">{{object.location.name|smartypants|safe}}</span>, <a class="p-country-name country-name" href="/jrnl/{{object.country.slug}}/" title="travel writing from {{object.country.name}}">{{object.country.name}}</a>{%endif%}
+ </span> &ndash;
+ <span class="p-summary entry-summary hyphenate" itemprop="description">
+ {{object.dek|safe}}
+ </span>
+ </p>
+ </article> {% endif %}{% endfor %}
+ </div>
+ {% if entry.field_notes %}<div id="field-notes" class="" >
+ <h3>Field Notes</h3>
+ <ul>{% for entry in entry_list %}
+ {% for obj in entry.field_notes.all %}
+ <li><a href="{% url 'sketches:detail' year=obj.pub_date.year month=obj.pub_date|date:"m" slug=obj.slug %}">{{obj}}</a></li>
+ {% endfor %} {% endfor %}</ul>
+ </div>{% endif %}
+ {% if sighting_list %}
+ <div class="sightings">
+ <h2 class="hed">Birds and Mammals seen {{object}}</h2> {% for object in sighting_list %}
+ <article class="{% cycle 'odd' 'even' %} {% cycle 'first' 'second' 'third' %}">
+ {% if object.ap.image %}<div class="post--image">
+ <a href="{{object.ap.get_absolute_url}}" title="{{object.ap}}">
+ <img src="{% get_image_by_size object.ap.image 'pic5' %}" />
+ </a>
+ </div>{%endif%}
+ <h3 class="post--title"><a href="{{object.ap.get_absolute_url}}" title="{%if object.title_keywords%}{{object.title_keywords}}{%else%}{{object.ap}}{%endif%}">{{object.ap|safe|smartypants|widont}}</a> (<span class="sci">{{object.ap.scientific_name}}</span>)</h3>
+ <time class="post--date" datetime="{{object.pub_date|date:'c'}}">Seen: {{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
+ <p>
+ <span class="hide sighting location place post--location" itemscope itemtype="http://schema.org/Place">Loc:
+ {% if object.country.name == "United States" %}<span class="p-locality locality">{{object.location.name|smartypants|safe}}</span>, {{object.state.name}}, <span class="p-country-name">U.S.</span>{%else%}<span class="p-region">{{object.location.name|smartypants|safe}}</span>, {{object.country.name}}</a>{%endif%}
+ </span>
+ </p>
+ </article> {% endfor %}
+ </div>{%endif%}
+ {% for entry in entry_list %}{% if forloop.first %}
+ <div id="recommended-reading" >
+ <h3 class="hed">Recommended Reading</h3>
+ <ul>{% endif %}{% for obj in entry.books.all %}
+ <li><a href="{% url 'books:detail' slug=obj.slug %}"><img src="{{obj.get_small_image_url}}" /></a></li>{% endfor %}
+ {% if forloop.last%}</ul>
+ </div>{%endif%}{% endfor %}
+{% endblock %}
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2025-04-05 02:13:58 +0000