diff options
| -rw-r--r-- | app/sightings/views.py | 4 | ||||
| -rw-r--r-- | design/templates/archives/sightings.html | 4 | ||||
| -rw-r--r-- | design/templates/details/sighting.html | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/app/sightings/views.py b/app/sightings/views.py index e97638f..cb821c8 100644 --- a/app/sightings/views.py +++ b/app/sightings/views.py @@ -4,11 +4,13 @@ from utils.views import PaginatedListView from .models import AP, Sighting from dal import autocomplete + class SightingListView(PaginatedListView): template_name = 'archives/sightings.html' def get_queryset(self): - return Sighting.objects.all() + qs_ids = Sighting.objects.order_by('ap__id', '-pub_date').distinct('ap').values_list('id', flat=True) + return Sighting.objects.filter(id__in=qs_ids).order_by('-pub_date') class SightingListUserView(PaginatedListView): diff --git a/design/templates/archives/sightings.html b/design/templates/archives/sightings.html index 413ec44..713ab09 100644 --- a/design/templates/archives/sightings.html +++ b/design/templates/archives/sightings.html @@ -11,7 +11,7 @@ <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> → </li> {% if region %}{%if region.name == 'United States'%} <li><a href="{% url 'sightings:list' %}" title="See all" itemprop="url"><span itemprop="title">Plants and Animals</span></a> →</li> <li itemprop="title">the United States</li>{%else%}<li><a href="/jrnl/" title="See all Journal Entries" itemprop="url"><span>Plants and Animals</span></a> →</li> - <li>{{region.name|title|smartypants|safe}}</li>{%endif%}{%else%}<li>Plants and Animals</li>{%endif%} + <li>{{region.name|title|smartypants|safe}}</li>{%endif%}{%else%}<li>dialogues</li>{%endif%} </ul> <main role="main" class="archive">{% autopaginate object_list 24%} <h1 class="hide">Plants and Animals seen {% if region %}in {%if region.name == 'United States'%}the United States{%else%}{{region.name|title|smartypants|safe}}{%endif%}{%else%} by {{user}}{%endif%}</h1> {% for object in object_list %} @@ -26,7 +26,7 @@ </figure>{%endif%} </div> <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> + <time class="post--date" datetime="{{object.pub_date|date:'c'}}">Last Seen: {{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time> <p> <span class="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%} diff --git a/design/templates/details/sighting.html b/design/templates/details/sighting.html index 718583f..5a46e14 100644 --- a/design/templates/details/sighting.html +++ b/design/templates/details/sighting.html @@ -9,7 +9,7 @@ {% 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> → </li> - <li><a href="{% url 'sightings:list' %}" title="See all" itemprop="url"><span itemprop="title">Plants and Animals</span></a></li> + <li><a href="{% url 'sightings:list' %}" title="See all" itemprop="url"><span itemprop="title">Dialogues</span></a></li> </ul> <main> |