diff --git a/content/about/about.html b/content/about/about.html index 9b7b4d6..87791b0 100644 --- a/content/about/about.html +++ b/content/about/about.html @@ -1,4 +1,4 @@ -{% extends "_about.html" %} +{% extends "_flatpage.html" %} {%hyde title: "About" diff --git a/content/resume/resume.html b/content/resume/resume.html index 1129ec0..e2eea8f 100644 --- a/content/resume/resume.html +++ b/content/resume/resume.html @@ -1,7 +1,8 @@ -{% extends "_about.html" %} +{% extends "_flatpage.html" %} {%hyde title: "Résumé" + exclude: True %} {% block article %} diff --git a/layout/_about.html b/layout/_flatpage.html similarity index 100% rename from layout/_about.html rename to layout/_flatpage.html diff --git a/settings.py b/settings.py index 103c00d..105f04f 100644 --- a/settings.py +++ b/settings.py @@ -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 - -# 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 +# Processor Configuration -# 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