summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/essays/admin.py2
-rw-r--r--app/essays/migrations/0001_initial.py2
-rw-r--r--app/jrnl/migrations/0001_squashed_0019_remove_entry_thumbnail.py6
-rw-r--r--app/jrnl/migrations/0017_entry_field_notes.py6
-rw-r--r--design/sass/_details.scss4
-rw-r--r--design/sass/_global.scss9
-rw-r--r--design/templates/essays/essay_detail.html14
-rw-r--r--design/templates/fieldnotes/fieldnote_detail.html6
-rw-r--r--design/templates/fluent_comments/templatetags/flat_list.html17
-rw-r--r--design/templates/jrnl/entry_detail.html10
10 files changed, 26 insertions, 50 deletions
diff --git a/app/essays/admin.py b/app/essays/admin.py
index 8b16c19..ed39ca3 100644
--- a/app/essays/admin.py
+++ b/app/essays/admin.py
@@ -4,6 +4,7 @@ from utils.widgets import LGEntryForm
from .models import Essay
+
@admin.register(Essay)
class EssayAdmin(admin.ModelAdmin):
form = LGEntryForm
@@ -31,6 +32,7 @@ class EssayAdmin(admin.ModelAdmin):
'originally_published_by',
'originally_published_by_url',
'afterword',
+ 'preamble',
('field_notes', 'books'),
),
'classes': (
diff --git a/app/essays/migrations/0001_initial.py b/app/essays/migrations/0001_initial.py
index e315809..7b7ea62 100644
--- a/app/essays/migrations/0001_initial.py
+++ b/app/essays/migrations/0001_initial.py
@@ -11,7 +11,6 @@ class Migration(migrations.Migration):
dependencies = [
('photos', '0018_auto_20161130_1218'),
- ('sketches', '0002_auto_20180208_0743'),
('books', '0007_auto_20190131_2351'),
('taxonomy', '0001_initial'),
]
@@ -39,7 +38,6 @@ class Migration(migrations.Migration):
('afterword', models.TextField(blank=True)),
('books', models.ManyToManyField(blank=True, to='books.Book')),
('featured_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='photos.LuxImage')),
- ('field_notes', models.ManyToManyField(blank=True, to='sketches.Sketch')),
('tags', taggit.managers.TaggableManager(blank=True, help_text='Topics Covered', through='taxonomy.TaggedItems', to='taxonomy.LuxTag', verbose_name='Tags')),
],
options={
diff --git a/app/jrnl/migrations/0001_squashed_0019_remove_entry_thumbnail.py b/app/jrnl/migrations/0001_squashed_0019_remove_entry_thumbnail.py
index a74b598..4b1dea3 100644
--- a/app/jrnl/migrations/0001_squashed_0019_remove_entry_thumbnail.py
+++ b/app/jrnl/migrations/0001_squashed_0019_remove_entry_thumbnail.py
@@ -14,7 +14,6 @@ class Migration(migrations.Migration):
dependencies = [
('photos', '0016_auto_20161022_1411'),
- ('sketches', '0002_auto_20180208_0743'),
('books', '0005_auto_20171214_2239'),
('photos', '0010_auto_20160517_0906'),
('photos', '0003_luxgallery_caption_style'),
@@ -71,11 +70,6 @@ class Migration(migrations.Migration):
),
migrations.AddField(
model_name='entry',
- name='field_notes',
- field=models.ManyToManyField(blank=True, to='sketches.Sketch'),
- ),
- migrations.AddField(
- model_name='entry',
name='books',
field=models.ManyToManyField(blank=True, to='books.Book'),
),
diff --git a/app/jrnl/migrations/0017_entry_field_notes.py b/app/jrnl/migrations/0017_entry_field_notes.py
index e013d5d..f131183 100644
--- a/app/jrnl/migrations/0017_entry_field_notes.py
+++ b/app/jrnl/migrations/0017_entry_field_notes.py
@@ -6,14 +6,8 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
- ('sketches', '0002_auto_20180208_0743'),
('jrnl', '0016_auto_20161219_1058'),
]
operations = [
- migrations.AddField(
- model_name='entry',
- name='field_notes',
- field=models.ManyToManyField(to='sketches.Sketch'),
- ),
]
diff --git a/design/sass/_details.scss b/design/sass/_details.scss
index 8996712..fe1d618 100644
--- a/design/sass/_details.scss
+++ b/design/sass/_details.scss
@@ -35,11 +35,13 @@
color: #999;
}
- .post-location {
+ .post-linewrapper {
margin-top: 1rem;
padding-top: 1rem;
display: inline-block;
border-top: 1px solid #efefef;
+ }
+ .post-location {
color: #b6b6b6;
text-align: center;
a {
diff --git a/design/sass/_global.scss b/design/sass/_global.scss
index 7915751..7ca7b9a 100644
--- a/design/sass/_global.scss
+++ b/design/sass/_global.scss
@@ -35,13 +35,13 @@ a {
p {
text-align: left;
font-family: $fancy_serif;
- @include fontsize(18);
+ @include fontsize(20);
@include breakpoint(alpha){
- @include fontsize(20);
+ @include fontsize(22);
line-height: 1.5;
}
@include breakpoint(beta){
- @include fontsize(22);
+ @include fontsize(24);
line-height: 1.6;
}
}
@@ -124,7 +124,7 @@ figcaption {
}
figcaption, figcaption a {
@include fancy_sans;
- @include fontsize(14);
+ @include fontsize(16);
text-align: left;
line-height: 1.9;
padding: .3rem .5rem .3rem 0;
@@ -153,7 +153,6 @@ h2 {
h3 {
@include fancy_sans;
@include fontsize(24);
- font-weight: normal;
text-align: left;
@include breakpoint(gamma){
@include fontsize(28);
diff --git a/design/templates/essays/essay_detail.html b/design/templates/essays/essay_detail.html
index 43cf8af..99c105e 100644
--- a/design/templates/essays/essay_detail.html
+++ b/design/templates/essays/essay_detail.html
@@ -2,7 +2,7 @@
{% load typogrify_tags %}
{% load comments %}
-{% block pagetitle %}{{object.title|title|smartypants|safe}} - Luxagraf, Essays{% endblock %}
+{% block pagetitle %}{{object.title|title|smartypants|safe}} - by Scott Gilbertson{% endblock %}
{% block metadescription %}{% autoescape on %}{{object.meta_description|striptags|safe}}{% endautoescape %}{% endblock %}
{%block extrahead%}
@@ -10,7 +10,6 @@
<link rel="stylesheet" href="/media/src/solarized.css" type="text/css" media="screen"/>
{%endif %}
<link rel="canonical" href="https://luxagraf.net{{object.get_absolute_url}}" />
-
<meta property="og:type" content="article" />
<meta property="og:title" content="{{object.title|safe}}" />
<meta property="og:url" content="https://luxagraf.net{{object.get_absolute_url}}" />
@@ -39,14 +38,15 @@ class="detail {%if t == 1 or t == 3 or t == 5 %}double{%else%}single{%endif%}{%i
<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|smartypants|safe}}{%else%}{{object.title|smartypants|safe}}{%endif%}</h1>
<h2 class="post-subtitle">{{object.sub_title|smartypants|safe}}</h2>
- <div class="post-dateline">
+ <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.location %}<div class="p-location h-adr adr post-location" itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
+ <h3 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%}</h3>
+ &ndash;&nbsp;<a href="" onclick="showMap({{object.latitude}}, {{object.longitude}}, { type:'point', lat:'{{object.latitude}}', lon:'{{object.longitude}}'}); return false;" title="see a map">Map</a>
+ </div>{%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>
- <aside class="p-location h-adr adr post-location" itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
- {% if object.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.state.name|safe}}</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.country.slug}}/" title="travel writing from {{object.country.name}}">{{object.country.name|safe}}</a>{%endif%}
- {% with object.get_template_name_display as t %}{%if t == "single" or t == "single-dark" %} &ndash;&nbsp;<a href="" onclick="showMap({{object.latitude}}, {{object.longitude}}, { type:'point', lat:'{{object.latitude}}', lon:'{{object.longitude}}'}); return false;" title="see a map">Map</a>{%endif%}{%endwith%}
- </aside>
</header>
<div id="article" class="e-content entry-content post--body post--body--{% with object.template_name as t %}{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%endif%}{%endwith%}" itemprop="articleBody">
{{object.body_html|safe|smartypants}}
diff --git a/design/templates/fieldnotes/fieldnote_detail.html b/design/templates/fieldnotes/fieldnote_detail.html
index e858277..dc90e16 100644
--- a/design/templates/fieldnotes/fieldnote_detail.html
+++ b/design/templates/fieldnotes/fieldnote_detail.html
@@ -26,12 +26,14 @@
<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|smartypants|safe}}{%else%}{{object.title|smartypants|safe}}{%endif%}</h1>
{% if object.subtitle %}<h2 class="post-subtitle">{{object.subtitle|smartypants|safe}}</h2>{%endif%}
- <aside class="p-location h-adr adr post-location" itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
+ <div class="post-linewrapper">
+ {% if object.location %}<div class="p-location h-adr adr post-location" itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
<h3 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%}</h3>
&ndash;&nbsp;<a href="" onclick="showMap({{object.latitude}}, {{object.longitude}}, { type:'point', lat:'{{object.latitude}}', lon:'{{object.longitude}}'}); return false;" title="see a map">Map</a>
- </aside>
+ </div>{%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>
<div class="e-content">
{{object.body_html|safe|smartypants}}
diff --git a/design/templates/fluent_comments/templatetags/flat_list.html b/design/templates/fluent_comments/templatetags/flat_list.html
deleted file mode 100644
index 28c74ab..0000000
--- a/design/templates/fluent_comments/templatetags/flat_list.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% comment %}
-
- The normal list, spiced up.
- This is included via comments/list.html
-
- The id="comments" is required for JavaScript,
- the 'comments/comment.html template is also used by the Ajax view.
-
-{% endcomment %}
-{% if comment_list %}
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}fluent_comments/css/ajaxcomments.css" />
-<script src="/media/js/jquery-1.8.3.min.js" type="text/javascript"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}fluent_comments/js/ajaxcomments.js"></script>
-<div id="comments" class="comment--container">
- <h4>Comments</h4>
- {% for comment in comment_list %}{% include "comments/comment.html" %}{% endfor %}
-</div>{% endif %}
diff --git a/design/templates/jrnl/entry_detail.html b/design/templates/jrnl/entry_detail.html
index f2f2fdc..b517e91 100644
--- a/design/templates/jrnl/entry_detail.html
+++ b/design/templates/jrnl/entry_detail.html
@@ -67,12 +67,14 @@ class="detail {%if t == 1 or t == 3 or t == 5 %}double{%else%}single{%endif%}{%i
<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|smartypants|safe}}{%else%}{{object.title|smartypants|safe}}{%endif%}</h1>
{% if object.subtitle %}<h2 class="post-subtitle">{{object.subtitle|smartypants|safe}}</h2>{%endif%}
- <aside class="p-location h-adr adr post-location" itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
- <h3 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.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%}</h3>
- {% with object.get_template_name_display as t %}{%if t == "single" or t == "single-dark" %} &ndash;&nbsp;<a href="" onclick="showMap({{object.latitude}}, {{object.longitude}}, { type:'point', lat:'{{object.latitude}}', lon:'{{object.longitude}}'}); return false;" title="see a map">Map</a>{%endif%}{%endwith%}
- </aside>
+ <div class="post-linewrapper">
+ {% if object.location %}<div class="p-location h-adr adr post-location" itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
+ <h3 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%}</h3>
+ &ndash;&nbsp;<a href="" onclick="showMap({{object.latitude}}, {{object.longitude}}, { type:'point', lat:'{{object.latitude}}', lon:'{{object.longitude}}'}); return false;" title="see a map">Map</a>
+ </div>{%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>
<div id="article" class="e-content entry-content post--body post--body--{% with object.template_name as t %}{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%endif%}{%endwith%}" itemprop="articleBody">
{{object.body_html|safe|smartypants}}
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-16 12:42:58 +0000