From 69a5872d3a6084a6fd6042fc24be90b0009eb3c9 Mon Sep 17 00:00:00 2001 From: Filip Ter Date: Sat, 26 Mar 2016 15:04:12 +0000 Subject: [PATCH 1/2] Some fixes - Added link to blog - Enabled link to authors - Fixed Pelican summary - Default first para summary - Default make job --- Makefile | 6 +++++- pelicanconf.py | 5 ++++- theme/static/img/credit-digitalocean.png | Bin 6974 -> 0 bytes theme/templates/archives.html | 17 ++++++++++++++++- theme/templates/base.html | 8 ++++---- 5 files changed, 29 insertions(+), 7 deletions(-) delete mode 100644 theme/static/img/credit-digitalocean.png diff --git a/Makefile b/Makefile index 6fb56e8..c6b86b8 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PY=/usr/bin/env python3 +PY=/usr/bin/env python PELICAN=$(CURDIR)/bin/pelican PELICANOPTS= @@ -13,10 +13,13 @@ ifeq ($(DEBUG), 1) PELICANOPTS += -D endif +all: bootstrap devserver + help: @echo 'Makefile for a pelican Web site ' @echo ' ' @echo 'Usage: ' + @echo ' make install deps and start devserver ' @echo ' make html (re)generate the web site ' @echo ' make clean remove the generated files ' @echo ' make regenerate regenerate files upon modification ' @@ -26,6 +29,7 @@ help: @echo ' make stopserver stop local server ' @echo ' make ssh_upload upload the web site via SSH ' @echo ' make github upload the web site via gh-pages ' + @echo ' make bootstrap install and build dependencies ' @echo ' ' @echo 'Set the DEBUG variable to 1 to enable debugging, e.g. make DEBUG=1 html' @echo ' ' diff --git a/pelicanconf.py b/pelicanconf.py index f1add9e..d7b43be 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -28,7 +28,7 @@ sys.path.append('src/pelican_extended_authors') -PLUGIN_PATHS = ['src/pelican-plugins'] +PLUGIN_PATH = 'src/pelican-plugins' PLUGINS = ( 'pelican_edit_url', 'pelican_extended_authors', @@ -38,6 +38,9 @@ SUMMARY_BEGIN_MARKER = '-- PELICAN_BEGIN_SUMMARY --' SUMMARY_END_MARKER = '-- PELICAN_END_SUMMARY --' +# Default to first paragraph if no marker in article +SUMMARY_USE_FIRST_PARAGRAPH = True + # Menu DISPLAY_CATEGORIES_ON_MENU = False MENUITEMS = ( diff --git a/theme/static/img/credit-digitalocean.png b/theme/static/img/credit-digitalocean.png deleted file mode 100644 index 4f82598a1cbcdbf35176f948de27deb56c25b536..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6974 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 Q&;S4c07*qoM6N<$f>PyLn*aa+ diff --git a/theme/templates/archives.html b/theme/templates/archives.html index 09763b9..e517699 100644 --- a/theme/templates/archives.html +++ b/theme/templates/archives.html @@ -1 +1,16 @@ -{% extends "index.html" %} +{% extends "base.html" %} +{% block content_title %}{% endblock %} +{% block content %} + + {% block featured %}{% endblock %} + +
+ {% for article in (articles_page.object_list if articles_page else articles) %} + {% include 'article_summary.html' %} + {% endfor%} +
+ + {% include 'pagination.html' %} + {#{> footer this}#} + +{% endblock content %} diff --git a/theme/templates/base.html b/theme/templates/base.html index 8c803fa..d8883ca 100644 --- a/theme/templates/base.html +++ b/theme/templates/base.html @@ -57,11 +57,12 @@ @@ -105,7 +106,6 @@

Follow Us