summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluxagraf <sng@luxagraf.net>2015-10-29 20:09:57 -0400
committerluxagraf <sng@luxagraf.net>2015-10-29 20:09:57 -0400
commit1b51da329b70dfbc91e1a8c115047c387288fc92 (patch)
tree4545dc83868803cdaa9e9223ab3b4af1a48b186d
parentf5afbcb35c0d15591e2e51b97b21a5d8a4e30dd1 (diff)
tidied up the src section
-rw-r--r--app/src/TODO6
-rw-r--r--app/src/admin.py2
-rw-r--r--design/sass/_src.scss3
-rw-r--r--design/sass/screenv8.scss1
-rw-r--r--design/templates/archives/src_home.html19
-rw-r--r--design/templates/details/src_entry.html9
-rw-r--r--design/templates/src_base.html4
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 %}<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><code>src</code></li>
+ </ul>
+ <main role="main" id="src-archive" class="src-archive">
+ <h1 class="hide">Luxagraf:src</h1>{% for object in object_list %}{% if object.slug != 'about' %}
+ <article class="h-entry hentry {% cycle 'odd' 'even' %} {% cycle 'first' 'second' 'third' %}" itemscope itemType="http://schema.org/Article">
+ <h2>{{object.title|safe}}</h2>
+ </article>{%endif%}
+ {%endfor%}
+ </main>
+{%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%}
+<link rel="stylesheet" href="/media/src/prism.css" type="text/css" media="screen"/>
+{%endblock%}
{% block primary %}
<main role="main">
<article class="h-entry hentry post--article{% with object.get_template_name_display as t %}{%if t == "double" or t == "double-dark" %} post--article--double{%endif%}{%endwith%}" itemscope itemType="http://schema.org/Article">
@@ -66,4 +72,7 @@ window.onload = function() {
{%endif%}{%endwith%}
}
</script>
+{% if object.has_code %}
+<script src="/media/src/prism.js"></script>
+{%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 @@
<div class="header-wrapper">
<header role="banner">
<h1><a id="logo" href="/" title="home">Luxagraf</a></h1>
- <h2>SRC: Code Slowly</h2>
+ <h2><code>SRC: Code Slowly</code></h2>
</header>
<nav role="navigation" class="bl">
<ul>
- <li><a href="/src/" title="SRC Home">SRC Archive</a></li>
+ <li><a href="/src/" title="Archive/Home">Archive</a></li>
<li><a href="/src/books" title="Ebooks">Books</a></li>
<li class="last"><a href="/src/about" title="">About</a></li>
</ul>