From 1b51da329b70dfbc91e1a8c115047c387288fc92 Mon Sep 17 00:00:00 2001 From: luxagraf Date: Thu, 29 Oct 2015 20:09:57 -0400 Subject: tidied up the src section --- app/src/TODO | 6 +----- app/src/admin.py | 2 +- design/sass/_src.scss | 3 +++ design/sass/screenv8.scss | 1 + design/templates/archives/src_home.html | 19 +++++++++++++++++++ design/templates/details/src_entry.html | 9 +++++++++ design/templates/src_base.html | 4 ++-- 7 files changed, 36 insertions(+), 8 deletions(-) diff --git a/app/src/TODO b/app/src/TODO index 9e9bca0..36f3907 100644 --- a/app/src/TODO +++ b/app/src/TODO @@ -1,6 +1,2 @@ -Add syntax highlighting in templates (shit, need option to toggle that in admin) - finish home/archive page add book detail page. - -Get rid of src in menu item. - +port data from lhp diff --git a/app/src/admin.py b/app/src/admin.py index 2a9a285..a83dd66 100644 --- a/app/src/admin.py +++ b/app/src/admin.py @@ -21,7 +21,7 @@ class EntryAdmin(admin.ModelAdmin): ('pub_date', 'status'), 'topics', 'meta_description', - ('slug', 'enable_comments', 'template_name'), + ('slug', 'enable_comments', 'has_code', 'template_name'), ), 'classes': ( 'show', diff --git a/design/sass/_src.scss b/design/sass/_src.scss index b054ffe..4b5d131 100644 --- a/design/sass/_src.scss +++ b/design/sass/_src.scss @@ -2,3 +2,6 @@ @include smcaps; @include fontsize(11); } +.post--body pre { + margin: 1em auto !important; +} diff --git a/design/sass/screenv8.scss b/design/sass/screenv8.scss index 369bce7..3f5c9b4 100644 --- a/design/sass/screenv8.scss +++ b/design/sass/screenv8.scss @@ -19,6 +19,7 @@ @import "_birds.scss"; @import "_books.scss"; @import "_src.scss"; +@import "_figments.scss"; @import "_inbox.scss"; //@import _large.sass diff --git a/design/templates/archives/src_home.html b/design/templates/archives/src_home.html index e69de29..2eee4eb 100644 --- a/design/templates/archives/src_home.html +++ b/design/templates/archives/src_home.html @@ -0,0 +1,19 @@ +{% extends 'src_base.html' %} +{% load typogrify_tags %} +{% load comments %} + +{% block pagetitle %}luxagraf:src - archive{% 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 primary %} +
+

Luxagraf:src

{% for object in object_list %}{% if object.slug != 'about' %} +
+

{{object.title|safe}}

+
{%endif%} + {%endfor%} +
+{%endblock%} diff --git a/design/templates/details/src_entry.html b/design/templates/details/src_entry.html index 3fa4c93..ff4ddfe 100644 --- a/design/templates/details/src_entry.html +++ b/design/templates/details/src_entry.html @@ -2,6 +2,12 @@ {% load typogrify_tags %} {% load comments %} +{% block pagetitle %}{{object.title|title|smartypants|safe}} luxagraf:src{% endblock %} + +{% block metadescription %}{% autoescape on %}{{object.meta_description|striptags|safe}}{% endautoescape %}{% endblock %} +{%block extrahead%} + +{%endblock%} {% block primary %}
@@ -66,4 +72,7 @@ window.onload = function() { {%endif%}{%endwith%} } +{% if object.has_code %} + +{%endif %} {% endblock %} diff --git a/design/templates/src_base.html b/design/templates/src_base.html index 29991a9..6c59463 100644 --- a/design/templates/src_base.html +++ b/design/templates/src_base.html @@ -30,11 +30,11 @@

-

SRC: Code Slowly

+

SRC: Code Slowly