pages: got rid of site var in view template func

author: luxagraf <sng@luxagraf.net> 2022-12-17 16:38:13 -0600
committer: luxagraf <sng@luxagraf.net> 2022-12-17 16:38:13 -0600
commit: 074ec1e21a7bfa867bbb2c35057c19b5cfc375c4 (patch)
tree: 69cb480af067e78248757fcce6829df76dda47bc
parent: 250c9dabae53407b7e1f76cb619729f2672ed82d (diff)
4 files changed, 1 insertions, 96 deletions
diff --git a/app/pages/templates/pages/luxagraf/homepage.html b/app/pages/templates/pages/luxagraf/homepage.html
deleted file mode 100644
index 7b67a7a..0000000
--- a/app/pages/templates/pages/luxagraf/homepage.html
+++ /dev/null
@@ -1,95 +0,0 @@
-{% extends 'base.html' %}
-{% load typogrify_tags %}
-{% block sitename %}
-<head itemscope itemtype="http://schema.org/WebSite">
-    <title itemprop='name'>Libregraf Publishing. Fine books for fine people</title>
-    <link rel="canonical" href="https://luxagraf.net/">{%endblock%}
-
-    {%block extrahead%}
-<style>
-@media screen and (min-width: 1440px) {
-    .banner .post-image img {
-        margin-top: {{object.image_offset_vertical}};
-    }
-}
-</style>
-{%endblock%}
-{%block bodyid%}id="home" class="archive"{%endblock%}
-
-{% block primary %}<div class="banner">{% with object=homepage.featured %}
-        <article class="h-entry hentry" itemscope itemType="http://schema.org/Article">
-            <figure class="post-image">
-                <a href="{{object.get_absolute_url}}" title="{{object.title}}">{%with image=homepage.featured_image%}
-                    <img class="u-photo"  itemprop="image" sizes="(max-width: 960px) 100vw"
-                    srcset="{{image.get_srcset}}"
-                    src="{{image.get_src}}"
-                    alt="{{image.alt}} photographed by {% if image.photo_credit_source %}{{image.photo_credit_source}}{%else%}luxagraf{%endif%}">
-                 </a>{%endwith%}
-                <figcaption> 
-                    <div class="hero-text-wrapper">
-                        <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>
-                        <h2 class="post-subtitle">{% if object.subtitle %}{{object.subtitle|smartypants|safe}}{%else%}{{homepage.tag_line|safe|smartypants}}{%endif%}</h2>
-                        <aside class="p-location h-adr adr post-location" itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
-                            <div 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%}</div>
-                        </aside>
-                <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>
-                    <a href="{{object.get_absolute_url}}" class="u-url btn" title="{%if object.title_keywords%}{{object.title_keywords}}{%else%}{{object.title}}{%endif%}">Read</a>
-                    </div>
-                </figcaption>
-            </figure>
-    </article>{% endwith %} 
-   </div>
-    <section class="bio-short">
-        <h2 class="homepage-section-header">The Wandren Code</h2>
-    </section>
-    <section class="recent-popular">
-        <div class="recent">
-        <h2 class="homepage-section-header">Recent</h2>
-        <div  class="archive-grid">{% for object in object_list %}
-        <article class="h-entry hentry archive-card {% 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}}">{% if object.featured_image %}
-                    {% include "lib/img_archive.html" with image=object.featured_image %}
-                    {%else%}
-                    <img src="{{object.get_image_url}}" alt="{{ object.title }}" class="u-photo post-image" itemprop="image" />{%endif%}</a>
-            </div>
-            <h3 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></h3>
-            <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 class="post-summary">
-                <span class="p-location h-adr adr post-location" itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
-                    {% if object.location.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.location.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.location.country_slug}}/" title="travel writing from {{object.location.country_name}}">{{object.location.country_name}}</a>{%endif%}
-                </span> 
-            </p>
-        </article> {% endfor %}
-        </div>
-        </div>
-        <div class="popular">
-        <h2 class="homepage-section-header">Popular</h2>
-        <div class="archive-grid">{% for object in homepage.popular.all %}
-        <article class="h-entry hentry archive-card {% 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}}">{% if object.featured_image %}
-                    {% include "lib/img_archive.html" with image=object.featured_image %}
-                    {%else%}
-                    <img src="{{object.get_image_url}}" alt="{{ object.title }}" class="u-photo post-image" itemprop="image" />{%endif%}</a>
-            </div>
-            <h3 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></h3>
-            <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 class="post-summary">
-                <span class="p-location h-adr adr post-location" itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
-                    {% if object.location.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.location.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.location.country.slug}}/" title="travel writing from {{object.location.country_name}}">{{object.location.country_name}}</a>{%endif%}
-                </span>
-            </p>
-        </article> {% endfor %}
-        </div>
-        </div>
-    </section>
-    <section>
-        <h5 class="homepage-next"><a href="/jrnl/">Browse the Archives</a></h5>
-    </section>
-{% endblock %}
-
-{% block js %}{% comment %} <script async src="/media/js/hyphenate.min.js" type="text/javascript"></script>{% endcomment%}{% endblock%}
diff --git a/app/pages/templates/pages/luxagraf/page_detail.html b/app/pages/templates/pages/page_detail.html
index 4644386..4644386 100644
--- a/app/pages/templates/pages/luxagraf/page_detail.html
+++ b/app/pages/templates/pages/page_detail.html
diff --git a/app/pages/templates/pages/luxagraf/page_detail.txt b/app/pages/templates/pages/page_detail.txt
index 547ce79..547ce79 100644
--- a/app/pages/templates/pages/luxagraf/page_detail.txt
+++ b/app/pages/templates/pages/page_detail.txt
diff --git a/app/pages/views.py b/app/pages/views.py
index a4be450..5262806 100644
--- a/app/pages/views.py
+++ b/app/pages/views.py
@@ -10,7 +10,7 @@ class PageDetailView(LuxDetailView):
 
     def get_template_names(self):
         obj = self.get_object()
-        return ["pages/%s/%s.html" % (obj.site.name, obj.slug), 'pages/%s/page_detail.html'% obj.site.name]
+        return ["pages/%s.html" % (obj.slug), 'pages/page_detail.html']
 
 
 class PageDetailTXTView(LuxDetailView):
author	luxagraf <sng@luxagraf.net>	2022-12-17 16:38:13 -0600
committer	luxagraf <sng@luxagraf.net>	2022-12-17 16:38:13 -0600
commit	074ec1e21a7bfa867bbb2c35057c19b5cfc375c4 (patch)
tree	69cb480af067e78248757fcce6829df76dda47bc
parent	250c9dabae53407b7e1f76cb619729f2672ed82d (diff)