Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PY=/usr/bin/env python3
PY=/usr/bin/env python
PELICAN=$(CURDIR)/bin/pelican
PELICANOPTS=

Expand All @@ -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 '
Expand All @@ -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 ' '
Expand Down
5 changes: 4 additions & 1 deletion pelicanconf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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 = (
Expand Down
Binary file removed theme/static/img/credit-digitalocean.png
Binary file not shown.
Binary file removed theme/static/img/psd/credit-skogmo.psd
Binary file not shown.
Binary file removed theme/static/img/psd/event-raspberry.psd
Binary file not shown.
Binary file removed theme/static/img/psd/footer-logo.psd
Binary file not shown.
Binary file removed theme/static/img/psd/header-small.psd
Binary file not shown.
Binary file removed theme/static/img/psd/header.psd
Binary file not shown.
Binary file removed theme/static/img/psd/hero.psd
Binary file not shown.
Binary file removed theme/static/img/psd/profile.psd
Binary file not shown.
Binary file removed theme/static/img/psd/profile2.psd
Binary file not shown.
17 changes: 16 additions & 1 deletion theme/templates/archives.html
Original file line number Diff line number Diff line change
@@ -1 +1,16 @@
{% extends "index.html" %}
{% extends "base.html" %}
{% block content_title %}{% endblock %}
{% block content %}

{% block featured %}{% endblock %}

<section class="post-list">
{% for article in (articles_page.object_list if articles_page else articles) %}
{% include 'article_summary.html' %}
{% endfor%}
</section>

{% include 'pagination.html' %}
{#{> footer this}#}

{% endblock content %}
8 changes: 4 additions & 4 deletions theme/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,12 @@
<!-- Collection of nav links and other content for toggling -->
<div id="navbarCollapse" class="collapse navbar-collapse">
<ul id="menu-pane" class="nav navbar-nav">
<li class="active"><a href="#">Home</a></li>
<li class="active"><a href="/">Home</a></li>
<li><a href="#">Groups</a></li>
<li><a href="#">Events</a></li>
<li><a href="#">People</a></li>
<li><a href="#">Get Involved</a></li>
<li><a href="/authors">People</a></li>
<li><a href="/archives">Blog</a></li>
<li><a href="/engage">Get Involved</a></li>
</ul>
</div>
</nav>
Expand Down Expand Up @@ -105,7 +106,6 @@ <h1>Follow Us</h1>
<div class="container footer-credits">
<div class="row">
<div class="col-sm-4"><img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/img/footer-logo.png"/></div>
<div class="col-sm-4"><h1>Hosting by</h1><img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/img/credit-digitalocean.png" height="30px"/></div>
<div class="col-sm-4"><h1>Design by<h1/><img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/img/credit-skogmo.png" height="30px"></div>
</div>
<div class="row">
Expand Down