summaryrefslogtreecommitdiff
path: root/design/templates
diff options
context:
space:
mode:
Diffstat (limited to 'design/templates')
-rw-r--r--design/templates/base.html9
-rw-r--r--design/templates/essays/essay_detail.html4
-rw-r--r--design/templates/src/post_detail.html (renamed from design/templates/details/src_entry.html)20
-rw-r--r--design/templates/src/post_list.html36
-rw-r--r--design/templates/src/topic_list.html (renamed from design/templates/archives/src_home.html)14
5 files changed, 60 insertions, 23 deletions
diff --git a/design/templates/base.html b/design/templates/base.html
index 3777d6c..355a100 100644
--- a/design/templates/base.html
+++ b/design/templates/base.html
@@ -33,17 +33,18 @@
<div class="header-wrapper">
<header role="banner">
<h1><a id="logo" href="/" title="home">Luxagraf</a></h1>
- <h2>Walk Slowly</h2>
+ <h2>{%block sitesubtitle %}Walk Slowly{% endblock%}</h2>
</header>
<nav role="navigation" class="bl">
<ul>
- <li id="laverdad"><a href="/jrnl/" title="What we've been up to lately">Jrnl</a></li>
- <li id="laverdad"><a href="/essays/" title="Writings">Essays</a></li>
+ <li id="laverdad"><a href="/jrnl/" title="What I've been up to lately">Jrnl</a></li>
+ <li id="laverdad"><a href="/essays/" title="">Essays</a></li>
<li id="lttr"><a href="/newsletter/" title="The 'friends of a long year' newsletter">Lttr</a></li>
<!--<li id="nota"><a href="/field-notes/" title="Quick notes and images from the road">Notes</a></li>
<li id="fotos"><a href="/photos/" title="Photos from travels around the world">Photos</a></li>i-->
<!--<li id="maps"><a href="/map" title="Maps">Map</a></li>-->
- <li id="about"><a href="/about" title="About Luxagraf">About</a></li>
+ <li id="src"><a href="/src/" title="The indie web is awesome, learn how to built for it">Src</a></li>
+ <li id="about"><a href="/about" title="About Scott">About</a></li>
<li id="etc" class="last"><a href="/projects/" title="the less visible portions of the iceberg">More</a></li>
</ul>
</nav>
diff --git a/design/templates/essays/essay_detail.html b/design/templates/essays/essay_detail.html
index bdf502c..436004a 100644
--- a/design/templates/essays/essay_detail.html
+++ b/design/templates/essays/essay_detail.html
@@ -1,7 +1,7 @@
{% extends 'base.html' %}
{% load typogrify_tags %}
{% load comments %}
-
+{%block htmlclass%}class="detail single"{%endblock%}
{% block pagetitle %}{{object.title|title|smartypants|safe}} - by Scott Gilbertson{% endblock %}
{% block metadescription %}{% autoescape on %}{{object.meta_description|striptags|safe}}{% endautoescape %}{% endblock %}
@@ -27,8 +27,6 @@
<meta name="twitter:image:src" content="{{object.featured_image.get_image_url}}"/>{%endif%}
<meta name="twitter:creator" content="@luxagraf"/>
{%endblock%}
-{%block htmlclass%}{% with object.template_name as t %}
-class="detail {%if t == 1 or t == 3 or t == 5 %}double{%else%}single{%endif%}{%if t == 2 or t == 3 %} dark{%endif%}{%if t == 4 or t == 5 %} black{%endif%}"{%endwith%}{%endblock%}
{%block bodyid %}{% if object.get_post_type_display == 'tools' %}class="src"{% endif %}{%endblock%}
diff --git a/design/templates/details/src_entry.html b/design/templates/src/post_detail.html
index 91532dc..0b80635 100644
--- a/design/templates/details/src_entry.html
+++ b/design/templates/src/post_detail.html
@@ -1,10 +1,7 @@
-{% extends 'src_base.html' %}
+{% extends 'base.html' %}
{% load typogrify_tags %}
{% load comments %}
-
-{% block pagetitle %}{{object.title|striptags}} | luxagraf:src{% endblock %}
-
-{% block bodyid %}class="src detail single"{% endblock %}
+{% block pagetitle %}{{object.title|striptags}} - by Scott Gilbertson{% endblock %}
{% block metadescription %}{% autoescape on %}{{object.meta_description|striptags|safe}}{% endautoescape %}{% endblock %}
{%block extrahead%}
<meta property="og:type" content="article" />
@@ -23,6 +20,10 @@
<link rel="stylesheet" href="/media/src/solarized.css" type="text/css" media="screen"/>
{%endblock%}
+
+{% block bodyid %}class="src detail single"{% endblock %}
+{%block sitesubtitle %}Code Slowly{% endblock%}
+
{% 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> &rarr; </li>
<li><a href="/src/"><code>src</code></a></li>
@@ -32,10 +33,11 @@
<header id="header" class="post-header {% with object.get_template_name_display as t %}{%if t == "double" or t == "double-dark" %}post--header--double{%endif%}{%endwith%}">
<h1 class="p-name entry-title post--title" itemprop="headline">{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|safe|smartypants}}{%else%}{{object.title|safe|smartypants|widont}}{%endif%}</h1>
<h2 class="post-subtitle">{{object.meta_description|smartypants|safe}}</h2>
- <div class="post-dateline">
- {% if object.topics.all %}<h4 class="post-source">Topics: {% for topic in object.topics.all%} <a href="/src/topic/{{topic.slug}}">{{topic.name}}</a>{%if forloop.last%}{%else%}, {%endif%}{%endfor%}</h4>{%endif%}
- {% if object.slug != 'about' %}<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>{%endif%}
- <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>
+ <div class="post-linewrapper">
+ {% if object.originally_published_by %}<h4 class="post-source">Originally Published By: <a href="{{object.originally_published_by_url}}" title="View {{object.title}} on {{object.originally_published_by}}">{{object.originally_published_by}}</a></h4>{%endif%}
+ {% if object.topics.all %}<h4 class="post-source">Topics: {% for topic in object.topics.all%} <a href="/src/topic/{{topic.slug}}">{{topic.name}}</a>{%if forloop.last%}{%else%}, {%endif%}{%endfor%}</h4>{%endif%}
+ <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>
</div>
</header>
diff --git a/design/templates/src/post_list.html b/design/templates/src/post_list.html
new file mode 100644
index 0000000..af65ea7
--- /dev/null
+++ b/design/templates/src/post_list.html
@@ -0,0 +1,36 @@
+{% extends 'base.html' %}
+{% load typogrify_tags %}
+{% load comments %}
+
+{% block pagetitle %}Tutorials and tools for building great things{% endblock %}
+{% block metadescription %}Tutorials and tools for building great things on the web - by Scott Gilbertson.{% endblock %}
+
+{%block sitesubtitle %}Code Slowly{% endblock%}
+{% 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> &rarr; </li>{% if topic %}
+ <li><a href="/src/" title="luxagraf:src homepage" itemprop="url"><span itemprop="title"><code>src</code></span></a> &rarr; </li>
+ <li>{{topic}}</li>{%else%}
+ <li><code>src</code></li>{%endif%}
+ </ul>
+ <main role="main" id="essay-archive" class="essay-archive archive-list">
+ <div class="essay-intro">
+ <h2>Tutorials and tools for building great things on the web.</h2>
+ <p>The indie web is an amazing democratic publishing platform unlike anything in history. The catch is, to avoid serving at the pleasure of the corporate king, you need to know <em>how</em> to publish. That's what these articles are here for, to help you learn how to use independent, community supported open source tools. The web won't last forever, let's build something cool while we can.</p>
+ <p>Topics include HTML, CSS, Django, Linux, Nginx, Python, Postgresql, free software, and, once, the evil that is Google AMP.</p>
+ <p>A few of the articles below were previously published in: <em><a href="https://arstechnica.com/">Ars Technica</a></em>, <em><a href="https://www.wired.com/author/scott-gilbertson/">Wired</a></em>, and <em><a href="https://www.theregister.co.uk/Author/Scott-Gilbertson/">The Register</a></em></p>
+ </div>
+ <h1 class="topic-hed">Articles</h1>
+ <ul class="fancy-archive-list">{% for object in object_list %}{% if object.slug != 'about' %}
+ <li class="h-entry hentry" itemscope itemType="http://schema.org/Article">
+ <span class="date dt-published">{{object.pub_date|date:"F Y"}}</span>
+ <a href="{{object.get_absolute_url}}">
+ <h2>{{object.title|safe|smartypants|widont}}</h2>
+ <p class="p-summary">{{object.meta_description|safe|smartypants|widont}}</p>
+ </a>
+ </li>
+ {%endif%}{%endfor%}</ul>
+
+
+
+ </main>
+{%endblock%}
diff --git a/design/templates/archives/src_home.html b/design/templates/src/topic_list.html
index 173596d..7149823 100644
--- a/design/templates/archives/src_home.html
+++ b/design/templates/src/topic_list.html
@@ -1,10 +1,11 @@
-{% extends 'src_base.html' %}
+{% extends 'base.html' %}
{% load typogrify_tags %}
{% load comments %}
-{% block pagetitle %}luxagraf:src - archive{% endblock %}
+{% block pagetitle %}Tutorials and tools for building great things{% endblock %}
-{% block metadescription %}luxagraf:src - thoughts on code, the web, servers, tools and things that might be useful to a couple of people somewhere in the future.{% endblock %}
+{% block metadescription %}Tutorials about {{topic}} - by Scott Gilbertson.{% endblock %}
+{%block sitesubtitle %}Code Slowly{% endblock%}
{% 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> &rarr; </li>{% if topic %}
<li><a href="/src/" title="luxagraf:src homepage" itemprop="url"><span itemprop="title"><code>src</code></span></a> &rarr; </li>
@@ -13,12 +14,11 @@
</ul>
<main role="main" id="essay-archive" class="essay-archive archive-list">
<div class="essay-intro">
- <h2>Tutorials and how-tos for web developers.</h2>
- <p>Topics include Linux, Nginx, Python, Postgresql, free software, HTML, and once, Google AMP.</p>
- <p>These tutorials are most often things I needed to do, and then I needed to do them again, but didnt remembered how. If you want to commit something to memory, write it down. Write it on the web and not only does your memory improve, but you have a URL you can consult later as well. </p>
+ <h2>Tutorials and tools for building great things on the web.</h2>
+ <p>The indie web is an amazing democratic publishing platform unlike anything in history. The catch is, to avoid serving at the pleasure of the corporate king, you need to know <em>how</em> to publish. That's what these articles are here for, to help you learn how to use independent, community supported open source tools. The web won't last forever, let's build something cool while we can.</p>
<p>A few of the articles below were previously published in: <em><a href="https://arstechnica.com/">Ars Technica</a></em>, <em><a href="https://www.wired.com/author/scott-gilbertson/">Wired</a></em>, and <em><a href="https://www.theregister.co.uk/Author/Scott-Gilbertson/">The Register</a></em></p>
</div>
- <h1 class="topic-hed">Articles</h1>
+ <h1 class="topic-hed">Tutorials about {{topic}}</h1>
<ul class="fancy-archive-list">{% for object in object_list %}{% if object.slug != 'about' %}
<li class="h-entry hentry" itemscope itemType="http://schema.org/Article">
<span class="date dt-published">{{object.pub_date|date:"F Y"}}</span>