# HG changeset patch # User Steve Losh # Date 1261008864 18000 # Node ID a5470aefd4f051aec29648b32346b1eae2025e41 # Parent 5c26a85d5e3335a8548b74c4c52c0d1b093ca885 Shuffling. diff -r 5c26a85d5e33 -r a5470aefd4f0 content/about/about.html --- a/content/about/about.html Wed Dec 16 19:02:57 2009 -0500 +++ b/content/about/about.html Wed Dec 16 19:14:24 2009 -0500 @@ -1,4 +1,4 @@ -{% extends "_about.html" %} +{% extends "_flatpage.html" %} {%hyde title: "About" diff -r 5c26a85d5e33 -r a5470aefd4f0 content/resume/resume.html --- a/content/resume/resume.html Wed Dec 16 19:02:57 2009 -0500 +++ b/content/resume/resume.html Wed Dec 16 19:14:24 2009 -0500 @@ -1,7 +1,8 @@ -{% extends "_about.html" %} +{% extends "_flatpage.html" %} {%hyde title: "Résumé" + exclude: True %} {% block article %} diff -r 5c26a85d5e33 -r a5470aefd4f0 layout/_about.html --- a/layout/_about.html Wed Dec 16 19:02:57 2009 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -{% extends "skeleton/_body.html" %} -{% block content_body %} -
-{% filter typogrify %} -{% markdown %} - -{% block article %} - -{% endblock %} - -{% endmarkdown %} -{% endfilter %} -
-{% endblock %} \ No newline at end of file diff -r 5c26a85d5e33 -r a5470aefd4f0 layout/_flatpage.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/layout/_flatpage.html Wed Dec 16 19:14:24 2009 -0500 @@ -0,0 +1,14 @@ +{% extends "skeleton/_body.html" %} +{% block content_body %} +
+{% filter typogrify %} +{% markdown %} + +{% block article %} + +{% endblock %} + +{% endmarkdown %} +{% endfilter %} +
+{% endblock %} \ No newline at end of file diff -r 5c26a85d5e33 -r a5470aefd4f0 settings.py --- a/settings.py Wed Dec 16 19:02:57 2009 -0500 +++ b/settings.py Wed Dec 16 19:14:24 2009 -0500 @@ -2,6 +2,9 @@ ROOT_PATH = os.path.abspath(os.path.dirname(__file__)) +import hydeengine +HYDE_FOLDER = os.path.dirname(os.path.dirname(hydeengine.__file__)) + LAYOUT_DIR = os.path.join(ROOT_PATH, 'layout') CONTENT_DIR = os.path.join(ROOT_PATH, 'content') MEDIA_DIR = os.path.join(ROOT_PATH, 'media') @@ -18,13 +21,7 @@ GENERATE_ABSOLUTE_FS_URLS = False GENERATE_CLEAN_URLS = True - -# A list of filenames (without extensions) that will be considered listing -# pages for their enclosing folders. LISTING_PAGE_NAMES = ['index'] - -# Determines whether or not to append a trailing slash to generated urls when -# clean urls are enabled. APPEND_SLASH = True # {folder : extension : (processors)} @@ -39,19 +36,11 @@ # Extensions do not support wildcards. MEDIA_PROCESSORS = { - '*':{ - '.css':('hydeengine.media_processors.TemplateProcessor', - 'hydeengine.media_processors.YUICompressor',), - '.ccss':('hydeengine.media_processors.TemplateProcessor', - 'hydeengine.media_processors.CleverCSS', - 'hydeengine.media_processors.YUICompressor',), - '.hss':( - 'hydeengine.media_processors.TemplateProcessor', - 'hydeengine.media_processors.HSS', - 'hydeengine.media_processors.YUICompressor',), - '.js':( - 'hydeengine.media_processors.TemplateProcessor', - 'hydeengine.media_processors.YUICompressor',) + '*': { + '.css':( 'hydeengine.media_processors.TemplateProcessor', + 'hydeengine.media_processors.YUICompressor', ), + '.js':( 'hydeengine.media_processors.TemplateProcessor', + 'hydeengine.media_processors.YUICompressor', ) } } @@ -76,17 +65,9 @@ } -#Processor Configuration +# Processor Configuration -# path for YUICompressor, or None if you don't -# want to compress JS/CSS. Project homepage: -# http://developer.yahoo.com/yui/compressor/ -YUI_COMPRESSOR = "./lib/yuicompressor-2.4.1.jar" -#YUI_COMPRESSOR = None - -# path for HSS, which is a preprocessor for CSS-like files (*.hss) -# project page at http://ncannasse.fr/projects/hss -#HSS_PATH = "./lib/hss-1.0-osx" +YUI_COMPRESSOR = os.path.join(HYDE_FOLDER, 'lib', 'yuicompressor-2.4.1.jar') HSS_PATH = None # if you don't want to use HSS # Django settings