move to new hyde

novel · Apr 30, 2016 · 5b1234a · 5b1234a
1 parent 1ba9c93
commit 5b1234a
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 175 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-HYDE?=	hyde.py
+HYDE?=	hyde
 TIDY?=	tidy -qe
 FIND?=	find
 ADDRESS?=	127.0.0.1
@@ -7,7 +7,7 @@ clean:
 	rm -fr deploy
 
 generate: clean
-	${HYDE} -g -s .
+	${HYDE} -s . gen
 
 validate: generate
 	@for html in `${FIND} deploy -name "*.html"|xargs`; do \
@@ -16,7 +16,7 @@ validate: generate
 	done
 
 serve: generate
-	${HYDE} -a ${ADDRESS} -w -k -s .
+	${HYDE} -s . serve -a ${ADDRESS}
 
 upload: generate
 	./upload.sh
diff --git a/content/.htaccess b/content/.htaccess
diff --git a/content/about/about.html b/content/about/about.html
@@ -1,7 +1,8 @@
-{% extends "_page.html" %}
-{%hyde
-    title: "About"
-%}
+---
+extends: _page.html
+title: About
+---
+
 {% block article %}
 
 # About

diff --git a/content/index.html b/content/index.html
@@ -1,9 +1,7 @@
-{% extends "skeleton/_body.html" %}
-{%hyde
-    title: "Home"
-    created: 2009-02-01 18:09:05
-    listing: True
-%}
+---
+extends: skeleton/_body.html
+title: Home
+---
 
 {% block extra_js %}
   <script type="text/javascript"

diff --git a/media/css/base.css → content/media/css/base.css b/media/css/base.css → content/media/css/base.css
diff --git a/media/js/novel.js → content/media/js/novel.js b/media/js/novel.js → content/media/js/novel.js
diff --git a/content/projects/projects.html b/content/projects/projects.html
@@ -1,7 +1,8 @@
-{% extends "_page.html" %}
-{%hyde
-    title: "Projects"
-%}
+---
+extends: _page.html
+title: Projects
+---
+
 {% block article %}
 
 [TOC]

diff --git a/content/writings/writings.html b/content/writings/writings.html
@@ -1,7 +1,8 @@
-{% extends "_page.html" %}
-{%hyde
-    title: "Writings"
-%}
+---
+extends: _page.html
+title: Writings
+---
+
 {% block article %}
 
 Time to time I write about UNIX-like systems and software. I'm interested

diff --git a/layout/skeleton/_body.html b/layout/skeleton/_body.html
@@ -1,5 +1,5 @@
 {% extends "skeleton/_base.html" %}
-{% block title %}{{site.name}} :: {{page.title}} {% endblock %}
+{% block title %}{{site.name}} :: {{resource.meta.title}} {% endblock %}
 {% block content %}
 {% block context_nav %}{% endblock %}
 {% block sitenav %}

diff --git a/settings.py b/settings.py
diff --git a/site.yaml b/site.yaml
@@ -0,0 +1,16 @@
+mode: development
+media_root: media
+media_url: /media
+base_url: /
+plugins:
+    - hyde.ext.plugins.meta.MetaPlugin
+    - hyde.ext.plugins.meta.AutoExtendPlugin
+    - hyde.ext.plugins.meta.SorterPlugin
+    - hyde.ext.plugins.meta.TaggerPlugin
+    - hyde.ext.plugins.text.SyntextPlugin
+    - hyde.ext.plugins.text.TextlinksPlugin
+
+context:
+    data:
+        site:
+            name: Roman Bogorodskiy