Skip to content

Commit

Permalink
Shuffling.
Browse files Browse the repository at this point in the history
--HG--
rename : layout/_about.html => layout/_flatpage.html
  • Loading branch information
sjl committed Dec 17, 2009
1 parent 72c9e17 commit 39a1549
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 31 deletions.
2 changes: 1 addition & 1 deletion content/about/about.html
@@ -1,4 +1,4 @@
{% extends "_about.html" %}
{% extends "_flatpage.html" %}

{%hyde
title: "About"
Expand Down
3 changes: 2 additions & 1 deletion content/resume/resume.html
@@ -1,7 +1,8 @@
{% extends "_about.html" %}
{% extends "_flatpage.html" %}

{%hyde
title: "Résumé"
exclude: True
%}

{% block article %}
Expand Down
File renamed without changes.
39 changes: 10 additions & 29 deletions settings.py
Expand Up @@ -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')
Expand All @@ -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)}
Expand All @@ -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', )
}
}

Expand All @@ -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
Expand Down

0 comments on commit 39a1549

Please sign in to comment.