diff --git a/.gitignore b/.gitignore index d5252338a96d1578b8d51785058057af74d2934a..777b92f73bda75a804a32c1eeeff7f45b5d3282a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,10 @@ -# Hyde Build Artifacts -deploy/ -.hyde_deps +# Pelican +output -# Compiled py -*.pyc +# Bower +bower_components +content/lib -# Vim swap -*.swp +# Python +*.py[cod] +venv/ diff --git a/Makefile b/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..d1ddf80cf76b775a4868844835be0a100a0ecb43 --- /dev/null +++ b/Makefile @@ -0,0 +1,124 @@ +PY?=python3 +PELICAN?=pelican +PELICANOPTS= + +BASEDIR=$(CURDIR) +INPUTDIR=$(BASEDIR)/content +OUTPUTDIR=$(BASEDIR)/output +CONFFILE=$(BASEDIR)/pelicanconf.py +PUBLISHCONF=$(BASEDIR)/publishconf.py + +FTP_HOST=localhost +FTP_USER=anonymous +FTP_TARGET_DIR=/ + +SSH_HOST=localhost +SSH_PORT=22 +SSH_USER=root +SSH_TARGET_DIR=/var/www + +S3_BUCKET=my_s3_bucket + +CLOUDFILES_USERNAME=my_rackspace_username +CLOUDFILES_API_KEY=my_rackspace_api_key +CLOUDFILES_CONTAINER=my_cloudfiles_container + +DROPBOX_DIR=~/Dropbox/Public/ + +GITHUB_PAGES_BRANCH=gh-pages + +DEBUG ?= 0 +ifeq ($(DEBUG), 1) + PELICANOPTS += -D +endif + +RELATIVE ?= 0 +ifeq ($(RELATIVE), 1) + PELICANOPTS += --relative-urls +endif + +help: + @echo 'Makefile for a pelican Web site ' + @echo ' ' + @echo 'Usage: ' + @echo ' make html (re)generate the web site ' + @echo ' make clean remove the generated files ' + @echo ' make regenerate regenerate files upon modification ' + @echo ' make publish generate using production settings ' + @echo ' make serve [PORT=8000] serve site at http://localhost:8000' + @echo ' make serve-global [SERVER=0.0.0.0] serve (as root) to $(SERVER):80 ' + @echo ' make devserver [PORT=8000] start/restart develop_server.sh ' + @echo ' make stopserver stop local server ' + @echo ' make ssh_upload upload the web site via SSH ' + @echo ' make rsync_upload upload the web site via rsync+ssh ' + @echo ' make dropbox_upload upload the web site via Dropbox ' + @echo ' make ftp_upload upload the web site via FTP ' + @echo ' make s3_upload upload the web site via S3 ' + @echo ' make cf_upload upload the web site via Cloud Files' + @echo ' make github upload the web site via gh-pages ' + @echo ' ' + @echo 'Set the DEBUG variable to 1 to enable debugging, e.g. make DEBUG=1 html ' + @echo 'Set the RELATIVE variable to 1 to enable relative urls ' + @echo ' ' + +html: + $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) + +clean: + [ ! -d $(OUTPUTDIR) ] || rm -rf $(OUTPUTDIR) + +regenerate: + $(PELICAN) -r $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) + +serve: +ifdef PORT + cd $(OUTPUTDIR) && $(PY) -m pelican.server $(PORT) +else + cd $(OUTPUTDIR) && $(PY) -m pelican.server +endif + +serve-global: +ifdef SERVER + cd $(OUTPUTDIR) && $(PY) -m pelican.server 80 $(SERVER) +else + cd $(OUTPUTDIR) && $(PY) -m pelican.server 80 0.0.0.0 +endif + + +devserver: +ifdef PORT + $(BASEDIR)/develop_server.sh restart $(PORT) +else + $(BASEDIR)/develop_server.sh restart +endif + +stopserver: + $(BASEDIR)/develop_server.sh stop + @echo 'Stopped Pelican and SimpleHTTPServer processes running in background.' + +publish: + $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS) + +ssh_upload: publish + scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) + +rsync_upload: publish + rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude + +dropbox_upload: publish + cp -r $(OUTPUTDIR)/* $(DROPBOX_DIR) + +ftp_upload: publish + lftp ftp://$(FTP_USER)@$(FTP_HOST) -e "mirror -R $(OUTPUTDIR) $(FTP_TARGET_DIR) ; quit" + +s3_upload: publish + s3cmd sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl-public --delete-removed --guess-mime-type + +cf_upload: publish + cd $(OUTPUTDIR) && swift -v -A https://auth.api.rackspacecloud.com/v1.0 -U $(CLOUDFILES_USERNAME) -K $(CLOUDFILES_API_KEY) upload -c $(CLOUDFILES_CONTAINER) . + +github: publish + ghp-import -m "Generate Pelican site" -b $(GITHUB_PAGES_BRANCH) $(OUTPUTDIR) + git push origin $(GITHUB_PAGES_BRANCH) + +.PHONY: html help clean regenerate serve serve-global devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github diff --git a/README.md b/README.md index 564089be30b80667efca8825895318990c803e7d..7ea081199c828c435eb9ecbee417949b66a72562 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,10 @@ # ant.sr -My personal website. Build with [Hyde](http://hyde.github.io/), a static site generator written in Python. +My personal website. Built with +[Pelican](http://docs.getpelican.com/en/3.6.3/index.html), +a static site generator written in Python. ## Setup -`pip install -r requirements.txt` - -## Development Server - -* `hyde gen` to build the site -* `hyde serve -a0` to listen on 0.0.0.0:8080 \ No newline at end of file +* `pip install -r requirements.txt` to install Python dependencies +* `bower-installer` to install front-end dependencies diff --git a/bower.json b/bower.json new file mode 100644 index 0000000000000000000000000000000000000000..9adf35b5571c51439f5b935867f417af70e51200 --- /dev/null +++ b/bower.json @@ -0,0 +1,21 @@ +{ + "name": "ant.sr", + "authors": [ + "Anton Sarukhanov <code@ant.sr>" + ], + "description": "Anton Sarukhanov's personal website", + "private": true, + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "test", + "tests" + ], + "dependencies": { + "normalize-css": "normalize.css#^4.1.1" + }, + "install": { + "path": "content/lib" + } +} diff --git a/content/404.html b/content/404.html deleted file mode 100644 index d89db4028864c5614e912b74d1991fafcbd3649b..0000000000000000000000000000000000000000 --- a/content/404.html +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: Not Found -extends: base.j2 ---- - -## Not Found - -Sorry, there's nothing here. - -Perhaps you'd like to check out my [blog posts](blog), or [get in touch](contact)? diff --git a/content/blog/index.html b/content/blog/index.html deleted file mode 100644 index 96629b96eba7c1660143a21ab2b0c324fca208f3..0000000000000000000000000000000000000000 --- a/content/blog/index.html +++ /dev/null @@ -1,9 +0,0 @@ ---- -title: Blog -extends: base.j2 ---- - -## This is my blog - -coming soon - diff --git a/content/contact.html b/content/contact.html deleted file mode 100644 index 21bbf09a242aec66d0f64e7e38475c8e5d7bc7ac..0000000000000000000000000000000000000000 --- a/content/contact.html +++ /dev/null @@ -1,14 +0,0 @@ ---- -title: Contact -extends: base.j2 ---- - -## Yo Dawg - -Lets talk. - -``` -echo $THOUGHTS >/dev/null -``` - -But actually, [mail@ant.sr](mailto:mail@ant.sr). diff --git a/content/index.html b/content/index.html deleted file mode 100644 index 348a3ed8af98b3041d6ec69324c15437334d77bf..0000000000000000000000000000000000000000 --- a/content/index.html +++ /dev/null @@ -1,29 +0,0 @@ ---- -extends: base.j2 ---- - -## Hi! My name is Anton. - -I have a passion for solving problems with technology. -I’m an experienced front- and back-end developer, currently -maintaining custom PHP and Python solutions for [Rutgers OIT][oit]. -When I’m not working I enjoy tinkering with electronics, -[building stuff](blog), nature, and bike rides. - -Do you have a tough technical challenge? Need a website, -custom software, or a hardware integration? [I’d love to hear from you.](contact) - -## Recent Posts - -coming soon - - -## Recent Code Commits - -coming soon - -## Projects - -coming soon - -[oit]: https://oit.rutgers.edu "Rutgers OIT" diff --git a/content/media/css/style.css b/content/media/css/style.css deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/content/meta.yaml b/content/meta.yaml deleted file mode 100644 index e4c1de0dc0128c66659daa654a7cbe56a02439d2..0000000000000000000000000000000000000000 --- a/content/meta.yaml +++ /dev/null @@ -1,2 +0,0 @@ -level: basic - diff --git a/content/pages/home.md b/content/pages/home.md new file mode 100644 index 0000000000000000000000000000000000000000..2cc219c5d7c5429925cb556f8cd42e40048b8c73 --- /dev/null +++ b/content/pages/home.md @@ -0,0 +1,7 @@ +Title: Anton Sarukhanov +Menu_Title: Home +URL: +Template: home +Save_As: index.html + +Hello world. diff --git a/develop_server.sh b/develop_server.sh new file mode 100755 index 0000000000000000000000000000000000000000..ae8f29e87b7a1b5b76250a8691da11fd65d12deb --- /dev/null +++ b/develop_server.sh @@ -0,0 +1,103 @@ +#!/usr/bin/env bash +## +# This section should match your Makefile +## +PY=${PY:-python3} +PELICAN=${PELICAN:-pelican} +PELICANOPTS= + +BASEDIR=$(pwd) +INPUTDIR=$BASEDIR/content +OUTPUTDIR=$BASEDIR/output +CONFFILE=$BASEDIR/pelicanconf.py + +### +# Don't change stuff below here unless you are sure +### + +SRV_PID=$BASEDIR/srv.pid +PELICAN_PID=$BASEDIR/pelican.pid + +function usage(){ + echo "usage: $0 (stop) (start) (restart) [port]" + echo "This starts Pelican in debug and reload mode and then launches" + echo "an HTTP server to help site development. It doesn't read" + echo "your Pelican settings, so if you edit any paths in your Makefile" + echo "you will need to edit your settings as well." + exit 3 +} + +function alive() { + kill -0 $1 >/dev/null 2>&1 +} + +function shut_down(){ + PID=$(cat $SRV_PID) + if [[ $? -eq 0 ]]; then + if alive $PID; then + echo "Stopping HTTP server" + kill $PID + else + echo "Stale PID, deleting" + fi + rm $SRV_PID + else + echo "HTTP server PIDFile not found" + fi + + PID=$(cat $PELICAN_PID) + if [[ $? -eq 0 ]]; then + if alive $PID; then + echo "Killing Pelican" + kill $PID + else + echo "Stale PID, deleting" + fi + rm $PELICAN_PID + else + echo "Pelican PIDFile not found" + fi +} + +function start_up(){ + local port=$1 + echo "Starting up Pelican and HTTP server" + shift + $PELICAN --debug --autoreload -r $INPUTDIR -o $OUTPUTDIR -s $CONFFILE $PELICANOPTS & + pelican_pid=$! + echo $pelican_pid > $PELICAN_PID + cd $OUTPUTDIR + $PY -m pelican.server $port & + srv_pid=$! + echo $srv_pid > $SRV_PID + cd $BASEDIR + sleep 1 + if ! alive $pelican_pid ; then + echo "Pelican didn't start. Is the Pelican package installed?" + return 1 + elif ! alive $srv_pid ; then + echo "The HTTP server didn't start. Is there another service using port" $port "?" + return 1 + fi + echo 'Pelican and HTTP server processes now running in background.' +} + +### +# MAIN +### +[[ ($# -eq 0) || ($# -gt 2) ]] && usage +port='' +[[ $# -eq 2 ]] && port=$2 + +if [[ $1 == "stop" ]]; then + shut_down +elif [[ $1 == "restart" ]]; then + shut_down + start_up $port +elif [[ $1 == "start" ]]; then + if ! start_up $port; then + shut_down + fi +else + usage +fi diff --git a/fabfile.py b/fabfile.py new file mode 100644 index 0000000000000000000000000000000000000000..95796b57483ba73accfe3d59023c7d62b5463d32 --- /dev/null +++ b/fabfile.py @@ -0,0 +1,94 @@ +from fabric.api import * +import fabric.contrib.project as project +import os +import shutil +import sys +import SocketServer + +from pelican.server import ComplexHTTPRequestHandler + +# Local path configuration (can be absolute or relative to fabfile) +env.deploy_path = 'output' +DEPLOY_PATH = env.deploy_path + +# Remote server configuration +production = 'root@localhost:22' +dest_path = '/var/www' + +# Rackspace Cloud Files configuration settings +env.cloudfiles_username = 'my_rackspace_username' +env.cloudfiles_api_key = 'my_rackspace_api_key' +env.cloudfiles_container = 'my_cloudfiles_container' + +# Github Pages configuration +env.github_pages_branch = "gh-pages" + +# Port for `serve` +PORT = 8000 + +def clean(): + """Remove generated files""" + if os.path.isdir(DEPLOY_PATH): + shutil.rmtree(DEPLOY_PATH) + os.makedirs(DEPLOY_PATH) + +def build(): + """Build local version of site""" + local('pelican -s pelicanconf.py') + +def rebuild(): + """`clean` then `build`""" + clean() + build() + +def regenerate(): + """Automatically regenerate site upon file modification""" + local('pelican -r -s pelicanconf.py') + +def serve(): + """Serve site at http://localhost:8000/""" + os.chdir(env.deploy_path) + + class AddressReuseTCPServer(SocketServer.TCPServer): + allow_reuse_address = True + + server = AddressReuseTCPServer(('', PORT), ComplexHTTPRequestHandler) + + sys.stderr.write('Serving on port {0} ...\n'.format(PORT)) + server.serve_forever() + +def reserve(): + """`build`, then `serve`""" + build() + serve() + +def preview(): + """Build production version of site""" + local('pelican -s publishconf.py') + +def cf_upload(): + """Publish to Rackspace Cloud Files""" + rebuild() + with lcd(DEPLOY_PATH): + local('swift -v -A https://auth.api.rackspacecloud.com/v1.0 ' + '-U {cloudfiles_username} ' + '-K {cloudfiles_api_key} ' + 'upload -c {cloudfiles_container} .'.format(**env)) + +@hosts(production) +def publish(): + """Publish to production via rsync""" + local('pelican -s publishconf.py') + project.rsync_project( + remote_dir=dest_path, + exclude=".DS_Store", + local_dir=DEPLOY_PATH.rstrip('/') + '/', + delete=True, + extra_opts='-c', + ) + +def gh_pages(): + """Publish to GitHub Pages""" + rebuild() + local("ghp-import -b {github_pages_branch} {deploy_path}".format(**env)) + local("git push origin {github_pages_branch}".format(**env)) diff --git a/layout/base.j2 b/layout/base.j2 deleted file mode 100644 index 2819baefa1788038caafed0adc96c1e269326b36..0000000000000000000000000000000000000000 --- a/layout/base.j2 +++ /dev/null @@ -1,26 +0,0 @@ -<!doctype html> -<html lang="en"> - <head> - <title>Anton Sarukhanov {% if resource.meta.title-%} - | {{ resource.meta.title}}{%-endif %}</title> - <meta charset="utf-8" /> - <link rel="stylesheet" href="{{ media_url('css/style.css') }}"> - </head> - <body> - <header> - {% set not_home = (content_url(resource.url) != content_url('index.html')) -%} - <h1>{% if not_home -%}<a href="{{ content_url('index.html') }}">{% endif -%} - Anton Sarukhanov{% if not_home %}</a>{% endif %}</h1> - </header> - <nav> - {% import "macros.j2" as macros with context -%} - {{ macros.render_main_menu()|indent(12) }} - </nav> - <article id="content"> - {% filter markdown|indent(12) -%} - {% block content %}{% endblock %} - {%- endfilter %} - - </article> - </body> -</html> diff --git a/layout/macros.j2 b/layout/macros.j2 deleted file mode 100644 index 4aba2404facdfc443ab94e6340271eb70192a0ae..0000000000000000000000000000000000000000 --- a/layout/macros.j2 +++ /dev/null @@ -1,8 +0,0 @@ -{# Generate menu from context (site.yaml) #} -{% macro render_main_menu() -%}<ul> -{% for menu_item in menu %} - <li><a {% if (menu_item.url == resource.relative_path) %}class="selected" {% endif -%} - href="{{ content_url(menu_item.url) }}">{{ menu_item.title }}</a></li> -{% endfor %} -</ul> -{%- endmacro %} diff --git a/pelicanconf.py b/pelicanconf.py new file mode 100644 index 0000000000000000000000000000000000000000..09b4f2d3137d63fda9a3c0b3a5dce01afb529c5e --- /dev/null +++ b/pelicanconf.py @@ -0,0 +1,33 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- # +from __future__ import unicode_literals + +AUTHOR = 'Anton Sarukhanov' +SITENAME = 'ant.sr' +SITESUBTITLE = 'full-stack developer' +SITEURL = '' + +PATH = 'content' +THEME = 'theme' + +TIMEZONE = 'America/New_York' +DEFAULT_DATE = 'fs' +DEFAULT_PAGINATION = 10 + +# no feeds in dev +FEED_ALL_ATOM = None +CATEGORY_FEED_ATOM = None +TRANSLATION_FEED_ATOM = None +AUTHOR_FEED_ATOM = None +AUTHOR_FEED_RSS = None + +FOO = "B4R" + +# Blogroll +LINKS = (('Code', 'https://git.xhost.io/anton'), + ('Resume', 'static/resume.pdf'),) + +# Social widget +SOCIAL = (('Code', 'https://git.xhost.io/anton'), + ('Facebook', 'https://facebook.com/ASarukhanov'),) + diff --git a/publishconf.py b/publishconf.py new file mode 100644 index 0000000000000000000000000000000000000000..6f2d2205629ef6a80dcd6bda22e331a00d055e14 --- /dev/null +++ b/publishconf.py @@ -0,0 +1,23 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- # +from __future__ import unicode_literals + +# This file is only used if you use `make publish` or +# explicitly specify it as your config file. + +import os +import sys +sys.path.append(os.curdir) +from pelicanconf import * + +SITEURL = '' +RELATIVE_URLS = False + +FEED_ALL_ATOM = 'feeds/all.atom.xml' +CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml' + +DELETE_OUTPUT_DIRECTORY = True + +PIWIK_URL = "analytics.ant.sr" +PIWIK_SITE_ID = 4 + diff --git a/requirements.txt b/requirements.txt index c8dfbf7c269f5513ca5b465c72d919a6367e2fc4..3820962d098fe7eabc7d94e0b7eb92f6873bbed8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ -hyde==0.8.9 +pelican==3.6.3 +Markdown==2.6.6 diff --git a/site.yaml b/site.yaml deleted file mode 100644 index e48707159582b369987a3302f8de12dce5d1cc5a..0000000000000000000000000000000000000000 --- a/site.yaml +++ /dev/null @@ -1,47 +0,0 @@ -mode: dev -media_root: media -media_url: /media -base_url: / -template: hyde.ext.templates.jinja.Jinja2Template - -plugins: - - hyde.ext.plugins.meta.MetaPlugin - - hyde.ext.plugins.meta.AutoExtendPlugin - - hyde.ext.plugins.meta.SorterPlugin - - hyde.ext.plugins.meta.GrouperPlugin - - hyde.ext.plugins.urls.UrlCleanerPlugin - -context: - data: - menu: - - title: Home - url: index.html - - title: Blog - url: blog/index.html - - title: Contact - url: contact.html -meta: - nodemeta: meta.yaml - default_block: content - -sorter: - latest: - attr: meta.created - reverse: True - -grouper: - category: - sorter: latest - description: Category - groups: - - name: basic - description: Basic - - name: advanced - description: Advanced - -urlcleaner: - index_file_names: - - index.html - strip_extensions: - - html - append_slash: true diff --git a/theme/templates/archives.html b/theme/templates/archives.html new file mode 100644 index 0000000000000000000000000000000000000000..050f268648ed42d56f111f7dfb12dfbd9dfa3afa --- /dev/null +++ b/theme/templates/archives.html @@ -0,0 +1,11 @@ +{% extends "base.html" %} +{% block content %} +<h1>Archives for {{ SITENAME }}</h1> + +<dl> +{% for article in dates %} + <dt>{{ article.locale_date }}</dt> + <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd> +{% endfor %} +</dl> +{% endblock %} diff --git a/theme/templates/base.html b/theme/templates/base.html new file mode 100644 index 0000000000000000000000000000000000000000..fd222a5a6fadc9e8585923144e5c7faf9f98d174 --- /dev/null +++ b/theme/templates/base.html @@ -0,0 +1,59 @@ +<!DOCTYPE html> +<html lang="{{ DEFAULT_LANG }}"> +<head> + {% block head %} + <title>{% block title %}{{ SITENAME }}{% endblock title %}</title> + <meta charset="utf-8" /> + {% if FEED_ALL_ATOM %} + <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Full Atom Feed" /> + {% endif %} + {% if FEED_ALL_RSS %} + <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Full RSS Feed" /> + {% endif %} + {% if FEED_ATOM %} + <link href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" /> + {% endif %} + {% if FEED_RSS %} + <link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" /> + {% endif %} + {% if CATEGORY_FEED_ATOM and category %} + <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM|format(category.slug) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories Atom Feed" /> + {% endif %} + {% if CATEGORY_FEED_RSS and category %} + <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS|format(category.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" /> + {% endif %} + {% if TAG_FEED_ATOM and tag %} + <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(tag.slug) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" /> + {% endif %} + {% if TAG_FEED_RSS and tag %} + <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" /> + {% endif %} + {% endblock head %} +</head> +<body> +{% block body %} + <header class="body"> + <h1><a href="{{ SITEURL }}/">{{ SITENAME }}</a></h1> + <h2><a href="{{ SITEURL }}/">{{ SITESUBTITLE }}</a></h2> + </header> + <nav><ul> + {% for title, link in MENUITEMS %} + <li><a href="{{ link }}">{{ title }}</a></li> + {% endfor %} + {% if DISPLAY_PAGES_ON_MENU %} + {% for p in PAGES %} + <li{% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.menu_title or p.title }}</a></li> + {% endfor %} + {% else %} + {% if DISPLAY_CATEGORIES_ON_MENU %} + {% for cat, null in categories %} + <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li> + {% endfor %} + {% endif %} + {% endif %} + </ul></nav> + {% block content %}{% endblock %} + {% block footer %}{% endblock %} +{% endblock %} +</body> +</html> diff --git a/theme/templates/home.html b/theme/templates/home.html new file mode 100644 index 0000000000000000000000000000000000000000..8e671391d7785a0dc7f43ca9f4d3a16bbed80eeb --- /dev/null +++ b/theme/templates/home.html @@ -0,0 +1,25 @@ +{% extends "base.html" %} +{% block content %} +{{ page.content }} +<section> +<h2>Recent Posts</h2> +<ol> +{% for article in articles.object_list %} + <li> + <article> + <header><h2> + <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"> + {{ article.title }}</a> + </h2></header> + <div>{{ article.summary }}</div> + <footer> + Published + <abbr title="{{ article.date.isoformat() }}"> + {{ article.locale_date }}</abbr> + </footer> + </article> + </li> +{% endfor %} +</ol> +</section> +{% endblock content %}