move isso.css to journal subdir, use glob.glob instead of listdir

4 files changed, 6 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index e893cab..c9ef1c1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 HTML := index.html journal.html about.html
-CSS  := style.css isso.css
+CSS  := style.css journal/isso.css
 RESOURCES := glider.png
 
 FILES := $(HTML) $(CSS) sitemap.xml pgp-key.txt \
diff --git a/scripts/bupa b/scripts/bupa
index 0ed31e6..d0630f5 100755
--- a/scripts/bupa
+++ b/scripts/bupa
@@ -5,7 +5,7 @@ Options:
   -h --help     Show this screen.
 """
 from jinja2 import Environment, FileSystemLoader
-import os, yaml, docopt
+import glob, yaml, docopt
 
 from docutils import core
 from docutils.writers.html4css1 import Writer
@@ -48,14 +48,14 @@ def parse(filename):
 def build_journal(env):
 	template   = env.get_template('journal.html')
 	entry_tmpl = env.get_template('entry.html')
-	files = os.listdir('src/journal')
+	files = glob.glob('src/journal/*.rst')
 	files.sort(key=filename_to_id, reverse=True)
 
 	entries = []
 	for file in files:
-		entry = parse('src/journal/' + file)
+		entry = parse(file)
 		entry.id = filename_to_id(file)
-		entry.page = 'journal/' + file.split('.', 1)[0] + '.html'
+		entry.page = file.split('/', 1)[1].split('.', 1)[0] + '.html'
 		entry.body = reST_to_html(entry.body)
 		entries += [entry]
 		with open('build/'+entry.page, 'w') as file:
diff --git a/src/isso.css b/src/journal/isso.css
index bd880dd..bd880dd 100644
--- a/src/isso.css
+++ b/src/journal/isso.css
diff --git a/src/templates/entry.html b/src/templates/entry.html
index 1988537..1f23123 100644
--- a/src/templates/entry.html
+++ b/src/templates/entry.html
@@ -1,7 +1,7 @@
 {% extends 'layout.html' %}
 
 {% block head %}
-	<link href="/~kyrias/isso.css" rel="stylesheet">
+	<link href="isso.css" rel="stylesheet">
 {% endblock head %}
 
 {% block content %}