diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/pages/views.py | 2 | ||||
| -rw-r--r-- | app/posts/models.py | 12 | ||||
| -rw-r--r-- | app/posts/templates/posts/jrnl_detail.html | 7 |
3 files changed, 16 insertions, 5 deletions
diff --git a/app/pages/views.py b/app/pages/views.py index d4c4880..4becff8 100644 --- a/app/pages/views.py +++ b/app/pages/views.py @@ -35,7 +35,7 @@ class HomePageList(DetailView): def get_context_data(self, **kwargs): # Call the base implementation first to get a context context = super(HomePageList, self).get_context_data(**kwargs) - context['object_list'] = Post.objects.filter(post_type=PostType.JRNL).filter(status__exact=1).order_by('-pub_date').exclude().select_related('location').select_related('featured_image')[1:9] + context['object_list'] = Post.objects.filter(post_type__in=[PostType.JRNL,PostType.ESSAY, PostType.PHOTO_ESSAY]).filter(status__exact=1).order_by('-pub_date').exclude().select_related('location').select_related('featured_image')[1:9] context['location'] = LuxCheckIn.objects.latest() return context diff --git a/app/posts/models.py b/app/posts/models.py index 94adf6c..997e5de 100644 --- a/app/posts/models.py +++ b/app/posts/models.py @@ -158,7 +158,10 @@ class Post(models.Model): @property def get_previous_published(self): - return self.get_previous_by_pub_date(status__exact=1,post_type=self.post_type) + if self.post_type in (2, 4, 6): + return self.get_previous_by_pub_date(status__exact=1,post_type__in=[2,4,6]) + else: + return self.get_previous_by_pub_date(status__exact=1,post_type=self.post_type) @property def get_previous_admin_url(self): @@ -167,8 +170,11 @@ class Post(models.Model): @property def get_next_published(self): - return self.get_next_by_pub_date(status__exact=1,post_type=self.post_type) - + if self.post_type in (2, 4, 6): + return self.get_next_by_pub_date(status__exact=1,post_type__in=[2,4,6]) + else: + return self.get_next_by_pub_date(status__exact=1,post_type=self.post_type) + @property def get_next_admin_url(self): model = apps.get_model(app_label=self._meta.app_label, model_name=self._meta.model_name) diff --git a/app/posts/templates/posts/jrnl_detail.html b/app/posts/templates/posts/jrnl_detail.html index e34a825..ee5590b 100644 --- a/app/posts/templates/posts/jrnl_detail.html +++ b/app/posts/templates/posts/jrnl_detail.html @@ -27,7 +27,7 @@ </div> </header> <div class="e-content entry-content post-body" itemprop="articleBody"> - {{object.body_html|safe|smartypants}} + {{object.body_html|safe|smartypants|widont}} </div> {%if wildlife or object.field_notes.all or object.books.all %}<div class="entry-footer">{%if wildlife %} <aside id="wildlife"> @@ -117,5 +117,10 @@ {% block js %} <script src="/media/js/leaflet-master/leaflet-mod.js"></script> <script src="/media/js/detail.min.js"></script> +<script src="/media/js/fslightbox.js"></script> +<script> + fsLightbox.props.type = "image"; + fsLightbox.props.showThumbsOnMount = true; +</script> {{ block.super }} {%endblock%} |