From 548ed0739f559656aba6eda379ee65159640fba2 Mon Sep 17 00:00:00 2001
From: luxagraf <sng@luxagraf.net>
Date: Sun, 15 Nov 2020 16:28:13 -0500
Subject: fixed templates for multiple sites in pages

---
 app/pages/templates/pages/discursive/homepage.html | 20 +++++
 .../templates/pages/discursive/page_detail.html    | 30 +++++++
 .../templates/pages/discursive/page_detail.txt     |  7 ++
 app/pages/templates/pages/homepage.html            | 98 ----------------------
 app/pages/templates/pages/luxagraf/homepage.html   | 98 ++++++++++++++++++++++
 .../templates/pages/luxagraf/page_detail.html      | 37 ++++++++
 app/pages/templates/pages/luxagraf/page_detail.txt |  8 ++
 app/pages/templates/pages/page_detail.html         | 37 --------
 app/pages/templates/pages/page_detail.txt          |  8 --
 app/pages/views.py                                 |  8 +-
 10 files changed, 206 insertions(+), 145 deletions(-)
 create mode 100644 app/pages/templates/pages/discursive/homepage.html
 create mode 100644 app/pages/templates/pages/discursive/page_detail.html
 create mode 100644 app/pages/templates/pages/discursive/page_detail.txt
 delete mode 100644 app/pages/templates/pages/homepage.html
 create mode 100644 app/pages/templates/pages/luxagraf/homepage.html
 create mode 100644 app/pages/templates/pages/luxagraf/page_detail.html
 create mode 100644 app/pages/templates/pages/luxagraf/page_detail.txt
 delete mode 100644 app/pages/templates/pages/page_detail.html
 delete mode 100644 app/pages/templates/pages/page_detail.txt

(limited to 'app/pages')

diff --git a/app/pages/templates/pages/discursive/homepage.html b/app/pages/templates/pages/discursive/homepage.html
new file mode 100644
index 0000000..68490ba
--- /dev/null
+++ b/app/pages/templates/pages/discursive/homepage.html
@@ -0,0 +1,20 @@
+{% extends 'discursive_base.html' %}
+{% load typogrify_tags %}
+{% load comments %}
+{% block pagetitle %}Learn Discursive Meditation{% endblock %}
+{% block metadescription %}{{object.meta_description}}{% endblock %}
+{%block bodyclass%}detail{%endblock%}
+{%block bodyid%}{%endblock%}								
+{% block breadcrumbs %}{% include "lib/breadcrumbs.html" with breadcrumbs=breadcrumbs %}{% endblock %}
+{% block content %}<main>
+    <article>
+        <header class="post-header">
+        <h1 class="post-title">{{object.title}}</h1>
+        {%if object.sub_title %}<h2 class="post-subtitle">{{object.sub_title}}</h2>{%endif%}
+        </header>
+        <div class="post-article">
+        {{object.body_html|safe|smartypants|widont}}
+        </div>  
+    </article>
+    </main>
+{% endblock %}
diff --git a/app/pages/templates/pages/discursive/page_detail.html b/app/pages/templates/pages/discursive/page_detail.html
new file mode 100644
index 0000000..8941cd2
--- /dev/null
+++ b/app/pages/templates/pages/discursive/page_detail.html
@@ -0,0 +1,30 @@
+{% extends 'discursive_base.html' %}
+{% load typogrify_tags %}
+{% load comments %}
+{% block pagetitle %}{{object.title}}{% endblock %}
+{% block metadescription %}{{object.meta_description}}{% endblock %}
+{%block htmlclass%}class="detail"{%endblock%}
+{%block bodyid%}{{object.title|slugify}}{%endblock%}								
+{% block breadcrumbs %}{% include "lib/breadcrumbs.html" with breadcrumbs=breadcrumbs %}{% endblock %}
+{% block content %}<main>
+    <article>
+        <header class="post-header">
+        <h1 class="post-title">{{object.title}}</h1>
+        {%if object.sub_title %}<h2 class="post-subtitle">{{object.sub_title}}</h2>{%endif%}
+        </header>
+        <div class="post-article">
+        {{object.body_html|safe|smartypants|widont}}
+        </div>  
+    </article>
+    {% if object.enable_comments %}
+{% get_comment_count for object as comment_count %}
+{%if comment_count > 0 %}
+<p class="comments--header">{{comment_count}} Comment{{ comment_count|pluralize }}</p>
+{% render_comment_list for object %}
+{%endif%}
+<div class="comment--form--wrapper {%if comment_count > 0%}comment-form-border{%endif%}">
+{% render_comment_form for object %}
+</div>
+{%endif%}
+    </main>
+{% endblock %}
diff --git a/app/pages/templates/pages/discursive/page_detail.txt b/app/pages/templates/pages/discursive/page_detail.txt
new file mode 100644
index 0000000..bbeb715
--- /dev/null
+++ b/app/pages/templates/pages/discursive/page_detail.txt
@@ -0,0 +1,7 @@
+{{object.title|safe}}
+{% for letter in object.title %}={%endfor%}
+
+    <https://{{object.site.domain}}{{object.get_absolute_url}}>
+    {{object.pub_date|date:"l, d F Y"}}
+
+{{object.body_markdown|safe}}
diff --git a/app/pages/templates/pages/homepage.html b/app/pages/templates/pages/homepage.html
deleted file mode 100644
index c8075ea..0000000
--- a/app/pages/templates/pages/homepage.html
+++ /dev/null
@@ -1,98 +0,0 @@
-{% extends 'base.html' %}
-{% load typogrify_tags %}
-{% block sitename %}
-<head itemscope itemtype="http://schema.org/WebSite">
-    <title itemprop='name'>Luxagraf: thoughts on ecology, culture, travel, photography, walking and other ephemera</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">About Luxagraf</h2>
-        <img src="/media/img/usa-resize.svg" alt="map of travels" class="homepage-map-img" />
-        <p>We’re a family of five living full time in a vintage 1969 Dodge Travco motorhome. We’ve been at it for three years now. People always ask: <a href="https://luxagraf.net/1969-dodge-travco-motorhome">What's it like for five people to live in a 26ft RV</a>? <a href="https://luxagraf.net/essay/why-a-vintage-rv">Why do we live this way</a>?</p>
-        <p>The short answer is simple: because we like it and we can. If you want more than a soundbite, <a href="/jrnl/">read through the journal</a>. If you like it, sign up for the newsletter, <a href="/newsletter/friends/"><em>Friends of a Long Year</em></a>. I'd also <a href="/feed.xml">subscribe to the RSS feed</a>, but that's just <a href="/about">me</a>. <!-- If you’re interested there’s a guide section with some <a href="/guides/">advice, tips and tricks for those who’d aspire to live full time in a van or RV</a> --></p>
-    </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/homepage.html b/app/pages/templates/pages/luxagraf/homepage.html
new file mode 100644
index 0000000..c8075ea
--- /dev/null
+++ b/app/pages/templates/pages/luxagraf/homepage.html
@@ -0,0 +1,98 @@
+{% extends 'base.html' %}
+{% load typogrify_tags %}
+{% block sitename %}
+<head itemscope itemtype="http://schema.org/WebSite">
+    <title itemprop='name'>Luxagraf: thoughts on ecology, culture, travel, photography, walking and other ephemera</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">About Luxagraf</h2>
+        <img src="/media/img/usa-resize.svg" alt="map of travels" class="homepage-map-img" />
+        <p>We’re a family of five living full time in a vintage 1969 Dodge Travco motorhome. We’ve been at it for three years now. People always ask: <a href="https://luxagraf.net/1969-dodge-travco-motorhome">What's it like for five people to live in a 26ft RV</a>? <a href="https://luxagraf.net/essay/why-a-vintage-rv">Why do we live this way</a>?</p>
+        <p>The short answer is simple: because we like it and we can. If you want more than a soundbite, <a href="/jrnl/">read through the journal</a>. If you like it, sign up for the newsletter, <a href="/newsletter/friends/"><em>Friends of a Long Year</em></a>. I'd also <a href="/feed.xml">subscribe to the RSS feed</a>, but that's just <a href="/about">me</a>. <!-- If you’re interested there’s a guide section with some <a href="/guides/">advice, tips and tricks for those who’d aspire to live full time in a van or RV</a> --></p>
+    </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/luxagraf/page_detail.html
new file mode 100644
index 0000000..4644386
--- /dev/null
+++ b/app/pages/templates/pages/luxagraf/page_detail.html
@@ -0,0 +1,37 @@
+{% extends 'base.html' %}
+{% load typogrify_tags %}
+{% load comments %}
+{% block pagetitle %}Luxagraf | {{object.title}}{% endblock %}
+{% block metadescription %}{{object.meta_description}}{% endblock %}
+{%block htmlclass%}class="detail"{%endblock%}
+{%block bodyid%}id="{{object.title|slugify}}"{%endblock%}								
+{% block breadcrumbs %}{% include "lib/breadcrumbs.html" with breadcrumbs=breadcrumbs %}{% endblock %}
+{% block primary %}<main>
+    <article>
+        <header class="post-header">
+        <h1 class="post-title">{{object.title}}</h1>
+        {%if object.sub_title %}<h2 class="post-subtitle">{{object.sub_title}}</h2>{%endif%}
+        </header>
+        <div class="post-article">
+        {{object.body_html|safe|smartypants|widont}}
+        </div>  
+    </article>
+    {% if object.enable_comments %}
+{% get_comment_count for object as comment_count %}
+{%if comment_count > 0 %}
+<p class="comments--header">{{comment_count}} Comment{{ comment_count|pluralize }}</p>
+{% render_comment_list for object %}
+{%endif%}
+<div class="comment--form--wrapper {%if comment_count > 0%}comment-form-border{%endif%}">
+{% render_comment_form for object %}
+</div>
+{%endif%}
+    </main>
+{% endblock %}
+{% block js %}
+<script src="/media/js/lightbox.js" type="text/javascript"></script>
+<script>var opts={captions:true,onload:function(){var im=document.getElementById("jslghtbx-contentwrapper");var link=im.appendChild(document.createElement('a'))
+link.href=im.firstChild.src;link.innerHTML="open ";link.target="_blank";link.setAttribute('class','p-link');im.appendChild(link);}};var lightbox=new Lightbox();lightbox.load(opts);</script> 
+{% endblock %}
+
+
diff --git a/app/pages/templates/pages/luxagraf/page_detail.txt b/app/pages/templates/pages/luxagraf/page_detail.txt
new file mode 100644
index 0000000..547ce79
--- /dev/null
+++ b/app/pages/templates/pages/luxagraf/page_detail.txt
@@ -0,0 +1,8 @@
+{{object.title|safe}}
+{% for letter in object.title %}={%endfor%}
+
+    by Scott Gilbertson
+    <{{SITE_URL}}{{object.get_absolute_url}}>
+    {{object.pub_date|date:"l, d F Y"}}
+
+{{object.body_markdown|safe}}
diff --git a/app/pages/templates/pages/page_detail.html b/app/pages/templates/pages/page_detail.html
deleted file mode 100644
index 4644386..0000000
--- a/app/pages/templates/pages/page_detail.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{% extends 'base.html' %}
-{% load typogrify_tags %}
-{% load comments %}
-{% block pagetitle %}Luxagraf | {{object.title}}{% endblock %}
-{% block metadescription %}{{object.meta_description}}{% endblock %}
-{%block htmlclass%}class="detail"{%endblock%}
-{%block bodyid%}id="{{object.title|slugify}}"{%endblock%}								
-{% block breadcrumbs %}{% include "lib/breadcrumbs.html" with breadcrumbs=breadcrumbs %}{% endblock %}
-{% block primary %}<main>
-    <article>
-        <header class="post-header">
-        <h1 class="post-title">{{object.title}}</h1>
-        {%if object.sub_title %}<h2 class="post-subtitle">{{object.sub_title}}</h2>{%endif%}
-        </header>
-        <div class="post-article">
-        {{object.body_html|safe|smartypants|widont}}
-        </div>  
-    </article>
-    {% if object.enable_comments %}
-{% get_comment_count for object as comment_count %}
-{%if comment_count > 0 %}
-<p class="comments--header">{{comment_count}} Comment{{ comment_count|pluralize }}</p>
-{% render_comment_list for object %}
-{%endif%}
-<div class="comment--form--wrapper {%if comment_count > 0%}comment-form-border{%endif%}">
-{% render_comment_form for object %}
-</div>
-{%endif%}
-    </main>
-{% endblock %}
-{% block js %}
-<script src="/media/js/lightbox.js" type="text/javascript"></script>
-<script>var opts={captions:true,onload:function(){var im=document.getElementById("jslghtbx-contentwrapper");var link=im.appendChild(document.createElement('a'))
-link.href=im.firstChild.src;link.innerHTML="open ";link.target="_blank";link.setAttribute('class','p-link');im.appendChild(link);}};var lightbox=new Lightbox();lightbox.load(opts);</script> 
-{% endblock %}
-
-
diff --git a/app/pages/templates/pages/page_detail.txt b/app/pages/templates/pages/page_detail.txt
deleted file mode 100644
index 547ce79..0000000
--- a/app/pages/templates/pages/page_detail.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-{{object.title|safe}}
-{% for letter in object.title %}={%endfor%}
-
-    by Scott Gilbertson
-    <{{SITE_URL}}{{object.get_absolute_url}}>
-    {{object.pub_date|date:"l, d F Y"}}
-
-{{object.body_markdown|safe}}
diff --git a/app/pages/views.py b/app/pages/views.py
index ed8d380..1356729 100644
--- a/app/pages/views.py
+++ b/app/pages/views.py
@@ -11,13 +11,17 @@ class PageDetailView(LuxDetailView):
 
     def get_template_names(self):
         obj = self.get_object()
-        return ["pages/%s.html" % obj.slug, 'pages/page_detail.html']
+        return ["pages/%s/%s.html" % (obj.site.display_name, obj.slug), \
+                'pages/%spage_detail.html'% obj.site.display_name]
 
 
 class PageDetailTXTView(LuxDetailView):
     model = Page
     slug_field = "slug"
-    template_name = "pages/page_detail.txt"
+    
+    def get_template_names(self):
+        obj = self.get_object()
+        return 'pages/%spage_detail.txt'% obj.site.display_name
 
 
 class HomePageList(DetailView):
-- 
cgit v1.2.3-70-g09d2