From b81caf7b699085ff2d65aa052b4f177822892b6a Mon Sep 17 00:00:00 2001
From: Will Larson <lethain@gmail.com>
Date: Sun, 1 Jun 2008 10:03:22 +0900
Subject: [PATCH] Initial commit of LifeFlow files from SVN to Git.

---
 CHANGES                                       |   33 +
 HELP                                          |   66 +
 LICENSE                                       |   21 +
 TODO                                          |   54 +
 __init__.py                                   |   29 +
 comments/.DS_Store                            |  Bin 0 -> 6148 bytes
 comments/__init__.py                          |    0
 comments/akismet.py                           |  102 +
 comments/captcha/.DS_Store                    |  Bin 0 -> 6148 bytes
 comments/captcha/__init__.py                  |    0
 comments/captcha/captcha.py                   |  146 +
 comments/captcha/tests.py                     |   67 +
 context.py                                    |   50 +
 editor/__init__.py                            |    0
 editor/models.py                              |    3 +
 editor/urls.py                                |   38 +
 editor/views.py                               |  473 +++
 feeds.py                                      |  207 ++
 fixtures/.DS_Store                            |  Bin 0 -> 6148 bytes
 forms.py                                      |   67 +
 markdown/CHANGE_LOG.txt                       |  125 +
 markdown/README.html                          |   91 +
 markdown/README.txt                           |   98 +
 markdown/__init__.py                          |    1 +
 markdown/markdown.py                          | 1888 +++++++++++
 markdown/mdx_code.py                          |   51 +
 markdown/mdx_footnotes.py                     |  261 ++
 markdown/mdx_lifeflow.py                      |  203 ++
 markdown/mdx_rss.py                           |  120 +
 markdown/odt2txt.py                           |  465 +++
 markdown/setup.py                             |   13 +
 media/.DS_Store                               |  Bin 0 -> 6148 bytes
 media/blueprint/compressed/print.css          |   76 +
 media/blueprint/compressed/screen.css         |  696 ++++
 media/blueprint/lib/forms.css                 |   45 +
 media/blueprint/lib/grid.css                  |  193 ++
 media/blueprint/lib/ie.css                    |   30 +
 media/blueprint/lib/reset.css                 |   39 +
 media/blueprint/lib/typography.css            |  116 +
 media/blueprint/plugins/buttons/Readme        |   31 +
 media/blueprint/plugins/buttons/buttons.css   |   97 +
 media/blueprint/plugins/css-classes/Readme    |   14 +
 .../plugins/css-classes/css-classes.css       |   24 +
 media/blueprint/plugins/fancy-type/Readme     |   22 +
 .../fancy-type/fancy-type-compressed.css      |    5 +
 .../plugins/fancy-type/fancy-type.css         |   74 +
 media/blueprint/print.css                     |   68 +
 media/blueprint/screen.css                    |   22 +
 media/lifeflow/.DS_Store                      |  Bin 0 -> 6148 bytes
 media/lifeflow/author/.DS_Store               |  Bin 0 -> 6148 bytes
 media/lifeflow/code.css                       |   65 +
 media/lifeflow/editor/editor.css              |  412 +++
 media/lifeflow/editor/jquery.js               | 2992 +++++++++++++++++
 media/lifeflow/editor/lfe.js                  |   67 +
 media/lifeflow/lifeflow.css                   |  147 +
 media/lifeflow/resource/.DS_Store             |  Bin 0 -> 6148 bytes
 media/lifeflow/skins/LICENSE                  |   58 +
 media/lifeflow/skins/lethain.css              |   57 +
 media/lifeflow/skins/substanceis.css          |   53 +
 models.py                                     |  705 ++++
 mods/__init__.py                              |    0
 mods/static_files/__init__.py                 |   76 +
 mods/static_files/generator.py                |  169 +
 sitemaps.py                                   |    9 +
 templates/404.html                            |   11 +
 templates/500.html                            |   11 +
 templates/base.html                           |   83 +
 templates/feeds/all_description.html          |    1 +
 templates/feeds/all_title.html                |    1 +
 templates/feeds/author_description.html       |    1 +
 templates/feeds/author_title.html             |    1 +
 templates/feeds/comment_description.html      |    1 +
 templates/feeds/comment_title.html            |    1 +
 .../feeds/entry_comment_description.html      |    1 +
 templates/feeds/entry_comment_title.html      |    1 +
 templates/feeds/flow_description.html         |    1 +
 templates/feeds/flow_title.html               |    1 +
 templates/feeds/language_description.html     |    1 +
 templates/feeds/language_title.html           |    1 +
 templates/feeds/projects_description.html     |    1 +
 templates/feeds/projects_title.html           |    1 +
 templates/feeds/tag_description.html          |    1 +
 templates/feeds/tag_title.html                |    1 +
 templates/feeds/translations_description.html |    1 +
 templates/feeds/translations_title.html       |    1 +
 templates/lifeflow/articles.html              |   16 +
 templates/lifeflow/author_detail.html         |   32 +
 templates/lifeflow/author_list.html           |   16 +
 templates/lifeflow/comment.html               |   93 +
 templates/lifeflow/comment_list.html          |   40 +
 templates/lifeflow/editor/base.html           |   30 +
 templates/lifeflow/editor/blogroll.html       |   48 +
 templates/lifeflow/editor/comments.html       |   27 +
 templates/lifeflow/editor/edit.html           |   25 +
 templates/lifeflow/editor/edit_five.html      |   51 +
 templates/lifeflow/editor/edit_four.html      |   54 +
 templates/lifeflow/editor/edit_one.html       |   38 +
 templates/lifeflow/editor/edit_seven.html     |  100 +
 templates/lifeflow/editor/edit_six.html       |   53 +
 templates/lifeflow/editor/edit_three.html     |   54 +
 templates/lifeflow/editor/edit_two.html       |  126 +
 templates/lifeflow/editor/entries.html        |    7 +
 templates/lifeflow/editor/files.html          |   71 +
 templates/lifeflow/editor/login.html          |   18 +
 templates/lifeflow/editor/overview.html       |   85 +
 templates/lifeflow/editor/project_body.html   |  119 +
 .../lifeflow/editor/project_details.html      |   60 +
 templates/lifeflow/editor/projects.html       |   54 +
 templates/lifeflow/editor/resource.html       |   21 +
 templates/lifeflow/editor/translations.html   |    7 +
 templates/lifeflow/entry_archive.html         |   14 +
 templates/lifeflow/entry_archive_month.html   |   51 +
 templates/lifeflow/entry_archive_year.html    |   11 +
 templates/lifeflow/entry_detail.html          |   93 +
 templates/lifeflow/flow_detail.html           |   22 +
 templates/lifeflow/front.html                 |   22 +
 templates/lifeflow/language_detail.html       |   21 +
 templates/lifeflow/language_list.html         |   15 +
 templates/lifeflow/lifeflow_base.html         |   38 +
 templates/lifeflow/meta_rss.html              |   22 +
 templates/lifeflow/project_detail.html        |   12 +
 templates/lifeflow/project_list.html          |   20 +
 templates/lifeflow/show_articles_list.html    |   37 +
 templates/lifeflow/social_submit.html         |   14 +
 templates/lifeflow/tag_detail.html            |   20 +
 templates/lifeflow/tag_list.html              |   13 +
 templates/sitemap.xml                         |   13 +
 templates/sitemap_index.xml                   |    4 +
 templatetags/__init__.py                      |    0
 templatetags/lifeflow.py                      |   20 +
 tests.py                                      |  127 +
 urls.py                                       |   96 +
 views.py                                      |  170 +
 133 files changed, 13257 insertions(+)
 create mode 100644 CHANGES
 create mode 100644 HELP
 create mode 100644 LICENSE
 create mode 100644 TODO
 create mode 100644 __init__.py
 create mode 100644 comments/.DS_Store
 create mode 100644 comments/__init__.py
 create mode 100644 comments/akismet.py
 create mode 100644 comments/captcha/.DS_Store
 create mode 100644 comments/captcha/__init__.py
 create mode 100644 comments/captcha/captcha.py
 create mode 100644 comments/captcha/tests.py
 create mode 100644 context.py
 create mode 100644 editor/__init__.py
 create mode 100644 editor/models.py
 create mode 100644 editor/urls.py
 create mode 100644 editor/views.py
 create mode 100644 feeds.py
 create mode 100644 fixtures/.DS_Store
 create mode 100644 forms.py
 create mode 100644 markdown/CHANGE_LOG.txt
 create mode 100644 markdown/README.html
 create mode 100644 markdown/README.txt
 create mode 100644 markdown/__init__.py
 create mode 100644 markdown/markdown.py
 create mode 100644 markdown/mdx_code.py
 create mode 100644 markdown/mdx_footnotes.py
 create mode 100644 markdown/mdx_lifeflow.py
 create mode 100644 markdown/mdx_rss.py
 create mode 100644 markdown/odt2txt.py
 create mode 100644 markdown/setup.py
 create mode 100644 media/.DS_Store
 create mode 100644 media/blueprint/compressed/print.css
 create mode 100644 media/blueprint/compressed/screen.css
 create mode 100644 media/blueprint/lib/forms.css
 create mode 100755 media/blueprint/lib/grid.css
 create mode 100644 media/blueprint/lib/ie.css
 create mode 100755 media/blueprint/lib/reset.css
 create mode 100644 media/blueprint/lib/typography.css
 create mode 100644 media/blueprint/plugins/buttons/Readme
 create mode 100644 media/blueprint/plugins/buttons/buttons.css
 create mode 100644 media/blueprint/plugins/css-classes/Readme
 create mode 100644 media/blueprint/plugins/css-classes/css-classes.css
 create mode 100644 media/blueprint/plugins/fancy-type/Readme
 create mode 100644 media/blueprint/plugins/fancy-type/fancy-type-compressed.css
 create mode 100644 media/blueprint/plugins/fancy-type/fancy-type.css
 create mode 100755 media/blueprint/print.css
 create mode 100755 media/blueprint/screen.css
 create mode 100644 media/lifeflow/.DS_Store
 create mode 100644 media/lifeflow/author/.DS_Store
 create mode 100644 media/lifeflow/code.css
 create mode 100644 media/lifeflow/editor/editor.css
 create mode 100644 media/lifeflow/editor/jquery.js
 create mode 100644 media/lifeflow/editor/lfe.js
 create mode 100644 media/lifeflow/lifeflow.css
 create mode 100644 media/lifeflow/resource/.DS_Store
 create mode 100644 media/lifeflow/skins/LICENSE
 create mode 100644 media/lifeflow/skins/lethain.css
 create mode 100644 media/lifeflow/skins/substanceis.css
 create mode 100644 models.py
 create mode 100644 mods/__init__.py
 create mode 100644 mods/static_files/__init__.py
 create mode 100644 mods/static_files/generator.py
 create mode 100644 sitemaps.py
 create mode 100644 templates/404.html
 create mode 100644 templates/500.html
 create mode 100644 templates/base.html
 create mode 100644 templates/feeds/all_description.html
 create mode 100644 templates/feeds/all_title.html
 create mode 100644 templates/feeds/author_description.html
 create mode 100644 templates/feeds/author_title.html
 create mode 100644 templates/feeds/comment_description.html
 create mode 100644 templates/feeds/comment_title.html
 create mode 100644 templates/feeds/entry_comment_description.html
 create mode 100644 templates/feeds/entry_comment_title.html
 create mode 100644 templates/feeds/flow_description.html
 create mode 100644 templates/feeds/flow_title.html
 create mode 100644 templates/feeds/language_description.html
 create mode 100644 templates/feeds/language_title.html
 create mode 100644 templates/feeds/projects_description.html
 create mode 100644 templates/feeds/projects_title.html
 create mode 100644 templates/feeds/tag_description.html
 create mode 100644 templates/feeds/tag_title.html
 create mode 100644 templates/feeds/translations_description.html
 create mode 100644 templates/feeds/translations_title.html
 create mode 100644 templates/lifeflow/articles.html
 create mode 100644 templates/lifeflow/author_detail.html
 create mode 100644 templates/lifeflow/author_list.html
 create mode 100644 templates/lifeflow/comment.html
 create mode 100644 templates/lifeflow/comment_list.html
 create mode 100644 templates/lifeflow/editor/base.html
 create mode 100644 templates/lifeflow/editor/blogroll.html
 create mode 100644 templates/lifeflow/editor/comments.html
 create mode 100644 templates/lifeflow/editor/edit.html
 create mode 100644 templates/lifeflow/editor/edit_five.html
 create mode 100644 templates/lifeflow/editor/edit_four.html
 create mode 100644 templates/lifeflow/editor/edit_one.html
 create mode 100644 templates/lifeflow/editor/edit_seven.html
 create mode 100644 templates/lifeflow/editor/edit_six.html
 create mode 100644 templates/lifeflow/editor/edit_three.html
 create mode 100644 templates/lifeflow/editor/edit_two.html
 create mode 100644 templates/lifeflow/editor/entries.html
 create mode 100644 templates/lifeflow/editor/files.html
 create mode 100644 templates/lifeflow/editor/login.html
 create mode 100644 templates/lifeflow/editor/overview.html
 create mode 100644 templates/lifeflow/editor/project_body.html
 create mode 100644 templates/lifeflow/editor/project_details.html
 create mode 100644 templates/lifeflow/editor/projects.html
 create mode 100644 templates/lifeflow/editor/resource.html
 create mode 100644 templates/lifeflow/editor/translations.html
 create mode 100644 templates/lifeflow/entry_archive.html
 create mode 100644 templates/lifeflow/entry_archive_month.html
 create mode 100644 templates/lifeflow/entry_archive_year.html
 create mode 100644 templates/lifeflow/entry_detail.html
 create mode 100644 templates/lifeflow/flow_detail.html
 create mode 100644 templates/lifeflow/front.html
 create mode 100644 templates/lifeflow/language_detail.html
 create mode 100644 templates/lifeflow/language_list.html
 create mode 100644 templates/lifeflow/lifeflow_base.html
 create mode 100644 templates/lifeflow/meta_rss.html
 create mode 100644 templates/lifeflow/project_detail.html
 create mode 100644 templates/lifeflow/project_list.html
 create mode 100644 templates/lifeflow/show_articles_list.html
 create mode 100644 templates/lifeflow/social_submit.html
 create mode 100644 templates/lifeflow/tag_detail.html
 create mode 100644 templates/lifeflow/tag_list.html
 create mode 100644 templates/sitemap.xml
 create mode 100644 templates/sitemap_index.xml
 create mode 100644 templatetags/__init__.py
 create mode 100644 templatetags/lifeflow.py
 create mode 100644 tests.py
 create mode 100644 urls.py
 create mode 100644 views.py

diff --git a/CHANGES b/CHANGES
new file mode 100644
index 0000000..3351a91
--- /dev/null
+++ b/CHANGES
@@ -0,0 +1,33 @@
+
+
+* Added new dynamic context in markup.lifeflowmarkup:
+  1. [previous] -> link to previous entry, if one exists
+  2. [next] -> link to next entry, if one exists
+  3. [series nth] -> link to @nth entry of current series (starts with 1)
+  4. [series slug nth] -> link to @nth entry in series with @slug
+     (starts with 1, not 0)
+  5. [file markdown_name_of_resource] -> link to file stored in a Resource
+  6. [f markdown_name_of_resource] -> shortcut for file
+
+* Substantial reworking and refactoring of markup/lifeflowmarkup.py
+
+## R66
+* Major refactoring of markup handings by LifeFlow.
+  1. Created the *markup* folder, where all markup files now live.
+  2. Restored a pristine Python-Markdown 0.9 file
+  3. Moved all code syntax highlighting parts into markup/code.py
+  4. Moved the Dynamic Blog Context bits into markup/lifeflowmarkup.py
+  5. Added lifeflowmarkup.render() function for rendering any combination of MarkDown and rendering code, Dynamic Blog Context, and footnotes.
+  6. Added relevant tests to tests.py.
+
+* Added new dynamic context in markup/lifeflowmarkup:
+  1.[author] -> /author/ if 0 or >2 authors, otherwise to the authors bio page
+  2. [tag slug] -> /tag/slug/
+  3. [comment pk] -> page returned by get_absolute_url by comment with @pk
+  4. [project slug] => /project/slug/
+
+## R64
+* Added new static context in Lifeflowmarkup: comments, projects, series, tags
+* Renamed Markdownpp to Lifeflowmarkup due to terms of license.
+
+R60
diff --git a/HELP b/HELP
new file mode 100644
index 0000000..f9dea9a
--- /dev/null
+++ b/HELP
@@ -0,0 +1,66 @@
+
+
+## Using LifeFlowMarkUp
+
+[markdown]: http://daringfireball.net/projects/markdown/syntax
+[pygments]: http://www.pygments.com/
+
+LifeFlowMarkUp is a superset of MarkDown. It has two types of additions not found in [MarkDown][markdown]: syntax additions, and blog-specific context.
+
+### Additions to Syntax
+
+At this time there is only one addition to the syntax. Its purpose is to provide code syntax highlighting support.
+
+It looks like this:
+
+  @@ python
+  def __unicode__(self):
+      return u"My name is %s" % self.name
+  @@
+
+On the opening line you place two apersands (@), followed by the alias for a lexer in the Pygments package.
+
+
+## Dynamic Blog Context
+
+A great deal of LifeFlow's design is the result of three observations:
+
+1. MarkDown makes writing a lot more fun (and quicker).
+2. Linking things together adds a lot of value to posts.
+3. Writing the same reference links over in different posts is frustrating (Don't Repeat Yourself should apply to writing blog entries as well as programming!).
+
+Out of these observations, Dynamic Blog Context, or DBC was concieved.
+
+DBC is essentially a battery of automatically generated references that you can use when writing your blog entries. You may find yourself writing a lot of throw away references to link to a certain tag of yours, or to a certain project. You may get annoyed having to figure out the link to the previous blog entry, or remembering the link to the first entry in some blog series.
+
+Dynamic Blog Context does its best to make this all better.
+
+Lets take a look at an example:
+
+    Please take a look [at my articles about Japan][tag japan].
+ 
+The magic here (such as it is) is that this *just works*, instead of having to write it out like this
+
+    [tag japan]: /tags/japan/
+    Please take a look [at my articles about Japan][tag japan].
+
+Its a pleasant convenience, and helps abstract your entries from the specific URLs and implementation details of your blog. Using DBC you could rearrange your blog, but you just have to resave your entries (DBC is computed at save), and they would update.
+
+A number of more tags are in the work (they are quite simple, and I am working on a way to allow users to contribute their own without breaking their SVN checkout, at the moment you can just add more by looking in lifeflow/markup/lifeflowmarkup.py, but its likely that code will be getting cleaned up somehow in the near future)--[please check the project page for the update to date details][project lifeflow]--but take a look at the currently available DBC.
+
+1. [tag slug] - creates a link to the tag with @slug
+2. [comment pk] - creates a link to the comment with @pk (works with comments posted on any entry)
+3. [project slug] - creates a link to the project with @slug
+4. [author] - creates a link to the authors's biography page if there is one author, if there are more or less authors then it creates a link to the /author/ page.
+5. [comments] - creates a link to the comment division for the current entry
+6. [projects] - creates a link to the /projects/ page
+7. [series] - creates a link to the /articles/ page
+8. [tags] - creates a link to the site's tag cloud
+
+The others on the way (probably tonight):
+
+1. [previous]
+2. [series number_of_entry]
+3. [series slug number_of_entry]
+
+There are undoubtedly other places where Dynamic Blog Context would be appropriate, and I am open to suggestions about where those places may be. Let me know if you have any good ideas!
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..eada452
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+The MIT License
+ 
+ Copyright (c) 2008 Will Larson
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..0c640f6
--- /dev/null
+++ b/TODO
@@ -0,0 +1,54 @@
+
+### Teach Dynamic Blog Context the distinction between projects and entries
+
+Relevant code in lifeflow/markup/lifeflowmarkup.py
+
+
+### Considering enabling footnotes by default for entries (need to figure out how they work first)
+
+Relevant code in lifeflow/models.py (and lifeflow/markup/lifeflowmarkup.py)
+
+
+### Add Link model for storing frequently used references for MarkDown
+
+Relevant code in lifeflow/models.py
+
+
+### No specified author then about specifies to /author/
+
+Relevant code in lifeflow/context.py
+
+
+### Dynamic Blog Context work for image links
+
+At the moment DBC only works for reference links, not reference image links. Changing this should be a minor regex fix. Something like r"!?" somewhere in markup/lifeflowmarkup
+
+Relevant code in lifeflow/markup/lifeflowmarkup.py:
+
+LifeflowPreprocessor.run()
+
+
+### Improve tag cloud implementation
+
+The current tag cloud implementation crashes the database over and over. Its pretty atrocious. Just need to throw in some easy caching and its performance should increase dramatically.
+
+Relevant code in lifeflow/models.py:
+
+Tag
+
+
+### Improve Entry & Project resaving technique
+
+(I think the recent focus and implementation of Dynamic Blog Context may allow for this issue to partially or wholly disappear, depending)
+
+At the moment both Entry and Project instances need to know their ManyToMany instances before they can properly render themselves (specifically, they need to know the resources that have been assigned to them, so they can create markdown references to refer to them).
+
+The current way of handling this is simply having a signal that resaves each model a few seconds after its first save (with some checking to prevent infinite loops). This is sloppy, to say the least.
+
+A relatively easy *possible improvement* would be to implement a queue that objects that require resaving are place upon. Save them one at a time. Still a bit ackward, but would guarantee a successful save (eventually), which isn't necessary guaranteed at the moment. This is mostly a hypothetical issue, *but it can rear its ugly head when you attempt to do mass editing via the shell*.
+
+Relevant code in lifeflow/models.py:
+
+Entry.save
+Project.save
+resave_object
diff --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000..a9d1398
--- /dev/null
+++ b/__init__.py
@@ -0,0 +1,29 @@
+"""
+Import any enabled modules as specified in the settings.py
+file for the project.
+
+"""
+
+import imp
+import sys
+from django.conf import settings
+
+
+def import_module(name, globals=None, locals=None, fromlist=None):
+    # Fast path: see if the module has already been imported.
+    try:
+        return sys.modules[name]
+    except KeyError:
+        pass
+
+    # If any of the following calls raises an exception,
+    # there's a problem we can't handle -- let the caller handle it.
+
+    _, pathname, description = imp.find_module("lifeflow")
+    path = u"%s/mods/%s" % (pathname, name)
+    return imp.load_module(name, None, path, description)
+
+
+for mod in getattr(settings, u"LIFEFLOW_MODS", ()):
+    import_module(mod)
+
diff --git a/comments/.DS_Store b/comments/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..bb763a127797cc8df58f731262b6824ff7341005
GIT binary patch
literal 6148
zcmeHKO-lnY5PhQsiv{V?WBdbx{~(ll@a)ZtwyWr3bqngj+x|BHn7*0G7Pl^f7ZI5$
z$(u}OlF3_|4*)WIxjq4=0LCneqRN1%d9Z7zIFE>8W7K%YC4a|Q4-E7dO`7|}a<1`+
z&-uTet(t1NYL@g+dM;Rw-c6_h`&i(f5l?u)4cDz}-incft(ZMjj9SyX!W|a<8RYGI
z@4C8eN<Q7^(CkBkfnXpQ2nK?IpE1BQTV*_Pj5-(y27-YN1G+yX7R6k!b+oO6l|2E7
zn~NxQy)0`?Dwqqlj_jd`hY~$h$`eC8oc2`wa>3To!yz^^$0;*+j~B7oX;0=3$&OJ6
z1HnL_fn9G-_545OU#5Fi_PwGN3<LxJnE@Hi&*w9)u$--5)~aW1V!2{bQNLCd3iaM4
jfDPS84z1Jslj`)#1zSfQMeP<&jEjH~5>+tp3k-Y!<LWyU

literal 0
HcmV?d00001

diff --git a/comments/__init__.py b/comments/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/comments/akismet.py b/comments/akismet.py
new file mode 100644
index 0000000..1508392
--- /dev/null
+++ b/comments/akismet.py
@@ -0,0 +1,102 @@
+#!/usr/bin/python
+
+__version__ = "0.3"
+__date__ = "2005-12-01"
+__author__ = "David Lynch (kemayo AT Google's mail service DOT com)"
+__copyright__ = "Copyright 2005, David Lynch"
+__license__ = "Python"
+__history__ = """
+0.3 - 20051205 - Cleaned up __post.
+0.2 - 20051201 - Added documentation, and tweaked the circumstances where an error
+    will be thrown.
+0.1 - 20051201 - Initial release.  Everything pretty much works.  Probably.
+"""
+
+import httplib
+from urllib import urlencode
+
+USERAGENT = ""
+AKISMET_URL = "rest.akismet.com"
+AKISMET_PORT = 80
+
+class AkismetError(Exception):
+    def __init__(self, response, statuscode):
+        self.response = response
+        self.statuscode = statuscode
+    def __str__(self):
+         return repr(self.value)
+
+def __post(request, host, path, port = 80):
+    connection = httplib.HTTPConnection(host, port)
+    connection.request("POST", path, request,
+        {"User-Agent":"%s | %s/%s" % (USERAGENT,"Akistmet.py", __version__),
+        "Content-type":"application/x-www-form-urlencoded"})
+    response = connection.getresponse()
+    
+    return response.read(), response.status
+
+def verify_key(key, blog):
+    """Find out whether a given WordPress.com API key is valid.
+    Required parameters:
+        key: A WordPress.com API key.
+        blog: URL of the front page of the site comments will be submitted to.
+    Returns True if a valid key, False if invalid.
+    """
+    response, status = __post("key=%s&blog=%s" % (key,blog), AKISMET_URL, "/1.1/verify-key", AKISMET_PORT)
+    
+    if response == "valid":
+        return True
+    elif response == "invalid":
+        return False
+    else:
+        raise AkismetError(response, status)
+
+def comment_check(key, blog, user_ip, user_agent, **other):
+    """Submit a comment to find out whether Akismet thinks that it's spam.
+    Required parameters:
+        key: A valid WordPress.com API key, as tested with verify_key().
+        blog: URL of the front page of the site the comment will appear on.
+        user_ip: IP address of the being which submitted the comment.
+        user_agent: User agent reported by said being.
+    Suggested "other" keys: "permalink", "referrer", "comment_type", "comment_author",
+    "comment_author_email", "comment_author_url", "comment_content", and any other HTTP
+    headers sent from the client.
+    More detail on what should be submitted is available at:
+    http://akismet.com/development/api/
+    
+    Returns True if spam, False if ham.  Throws an AkismetError if the server says
+    anything unexpected.
+    """
+    
+    request = {'blog': blog, 'user_ip': user_ip, 'user_agent': user_agent}
+    request.update(other)
+    response, status = __post(urlencode(request), "%s.%s" % (key,AKISMET_URL), "/1.1/comment-check", AKISMET_PORT)
+    
+    if response == "true":
+        return True
+    elif response == "false":
+        return False
+    else:
+        raise AkismetError(response, status)
+
+def submit_spam(key, blog, user_ip, user_agent, **other):
+    """Report a false negative to Akismet.
+    Same arguments as comment_check.
+    Doesn't return anything.  Throws an AkismetError if the server says anything.
+    """
+    request = {'blog': blog, 'user_ip': user_ip, 'user_agent': user_agent}
+    request.update(other)
+    response, status = __post(urlencode(request), "%s.%s" % (key,AKISMET_URL), "/1.1/submit-spam", AKISMET_PORT)
+    if status != 200 or response != "":
+        raise AkismetError(response, status)
+
+def submit_ham(key, blog, user_ip, user_agent, **other):
+    """Report a false positive to Akismet.
+    Same arguments as comment_check.
+    Doesn't return anything.  Throws an AkismetError if the server says anything.
+    """
+    request = {'blog': blog, 'user_ip': user_ip, 'user_agent': user_agent}
+    request.update(other)
+    response, status = __post(urlencode(request), "%s.%s" % (key,AKISMET_URL), "/1.1/submit-ham", AKISMET_PORT)
+    if status != 200 or response != "":
+        raise AkismetError(response, status)
diff --git a/comments/captcha/.DS_Store b/comments/captcha/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..4193cc92f414687a9ca75706e5e74b69f67e8af9
GIT binary patch
literal 6148
zcmeHK%SuB*3{A9)iv{V@<@f`Fe=wA~aP7{G+A3Hmt<bt~cfZXa({qw2_Bu-uk)%vc
znn~ty;Lc1$M5oX9=OPmk>ClKuqak!RyAC4w5U4iBQg(8K-<do$2KtLGu6=B4Udmd&
zuK(q7wOPzpn>iv#&o$cVn+YtDBU#8D_PGN-!s4C>IeI+E=@9)OTj*^w{&f(~c~X*r
zWFQ$x29klFWdL_Jr5ih@P6m>JWZ;tlo(~0$SOa@UJ364O1OSfUHi6B@GIL5`4eTA!
z15r-}da6c=p`H$ZiMSfrJ9@gP&5Utk=8xh<ZFcyJg^O0l)X6|Hu+IQ%U&w^_{{=po
zW|40psgi+Y;J-4UquJGLirvNC`fZ=QYYW;f8ijE^4G8SLM*#lt967O0?=Q3wR|9)T
TjzYhs1M?wZgrrIaeu05^X9+b&

literal 0
HcmV?d00001

diff --git a/comments/captcha/__init__.py b/comments/captcha/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/comments/captcha/captcha.py b/comments/captcha/captcha.py
new file mode 100644
index 0000000..df9d2b4
--- /dev/null
+++ b/comments/captcha/captcha.py
@@ -0,0 +1,146 @@
+__license__ = """Copyright (c) 2007 Will R Larson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE."""
+
+
+__author__ = "Will R Larson"
+__email__ = "lethain at google's email service"
+__description__ = "A library for generating simple text-only captchas."
+__api__ = """
+
+The API for a captcha is two methods:
+
+check(answer) --> True or False
+question --> either a human or html formatted string
+             that represents the question being asked
+"""
+
+__todo__ = """
+MissingColorCaptcha
+
+Optionally encode questions using HTML character entitites
+
+"""
+
+
+
+import random
+
+
+class BaseMathCaptcha(object):
+    def __init__(self, qty=2, min=10, max=30, str_ops=False):
+        self._str_ops = str_ops
+        self._answer = None
+        self._question = None
+        self.numbers = []
+        for i in xrange(qty):
+            num = random.randint(min, max)
+            self.numbers.append(num)
+
+
+    def check(self, answer):
+        if self._answer is None:
+            self._calculate_answer()
+        if int(answer) == self._answer:
+            return True
+        else:
+            return False
+
+
+    def _calculate_answer(self):
+        op = self._operation()
+        self._answer = reduce(op, self.numbers)
+
+
+    def question(self):
+        if self._question is None:
+            str_numbers = []
+            for number in self.numbers:
+                str_numbers.append(str(number))
+            op_string = self._op_string()
+            self._question = op_string.join(str_numbers)
+        return self._question
+
+
+class AdditionCaptcha(BaseMathCaptcha):
+    'Captcha for addition problems.'
+
+    def _operation(self):
+        return lambda a, b: a + b
+
+    def _op_string(self):
+        if self._str_ops is True:
+            return " plus "
+        else:
+            return " + "
+
+
+class SubtractionCaptcha(BaseMathCaptcha):
+    'Captcha for subtraction problems.'
+
+    def _operation(self):
+        return lambda a, b: a - b
+
+    def _op_string(self):
+        if self._str_ops is True:
+            return " minus "
+        else:
+            return " - "
+
+
+class MultiplicationCaptcha(BaseMathCaptcha):
+    'Captcha for multiplication problems.'
+
+    def _operation(self):
+        return lambda a, b: a * b
+
+    def _op_string(self):
+        if self._str_ops is True:
+            return " times "
+        else:
+            return " * "
+
+
+
+class MissingNumberCaptcha(object):
+    def __init__(self, min=1, max=4):
+        if min == max:
+            self._question = ""
+            self.missing = min
+        else:
+            self.missing = random.randint(min, max)
+            numbers = range(min-1, max+2)
+            if len(numbers) > 0:
+                numbers.remove(self.missing)
+                numbers = map(lambda x : str(x), numbers)
+                self._question = " ".join(numbers)
+            else:
+                self._question = ""
+
+    def check(self, answer):
+        if int(answer) == self.missing:
+            return True
+        else:
+            return False
+
+    def question(self):
+        return self._question
+
+    def __str__(self):
+        return self.question()
diff --git a/comments/captcha/tests.py b/comments/captcha/tests.py
new file mode 100644
index 0000000..3d160c2
--- /dev/null
+++ b/comments/captcha/tests.py
@@ -0,0 +1,67 @@
+# tests for captcha.py
+
+import unittest, sys
+from captcha import *
+
+
+class TestCaptcha(unittest.TestCase):
+
+    def test_AdditionCaptcha(self):
+        c = AdditionCaptcha(qty=5, min=5, max=5)
+        self.assertEqual(c.check(25), True)
+        self.assertEqual(c.check(24), False)
+        self.assertEqual(c.check(26), False)
+        qst = "5 + 5 + 5 + 5 + 5"
+        self.assertEqual(c.question(), qst)
+
+        c = AdditionCaptcha(qty=20, min=10, max=1000)
+        answer = reduce(lambda a,b : a + b, c.numbers)
+        self.assertEqual(c.check(answer), True)
+
+        c = AdditionCaptcha(qty=2, min=10, max=10, str_ops=True)
+        self.assertEqual(c.check(20), True)
+        self.assertEqual(c.question(), "10 plus 10")
+
+
+    def test_SubtractionCaptcha(self):
+        c = SubtractionCaptcha(qty=2, min=5, max=5)
+        self.assertEqual(c.check(0), True)
+        self.assertEqual(c.question(), "5 - 5")
+
+        c = SubtractionCaptcha(qty=10, min=10, max=1000)
+        answer = reduce(lambda a,b: a - b, c.numbers)
+        self.assertEqual(c.check(answer), True)
+
+        c = SubtractionCaptcha(qty=2, min=10, max=10, str_ops=True)
+        self.assertEqual(c.check(0), True)
+        self.assertEqual(c.question(), "10 minus 10")
+
+
+    def test_MultiplicationCaptcha(self):
+        c = MultiplicationCaptcha(qty=3, min=10, max=10)
+        self.assertEqual(c.check(1000), True)
+        self.assertEqual(c.question(), "10 * 10 * 10")
+        
+        c = MultiplicationCaptcha(qty=10, min=10, max=1000)
+        answer = reduce(lambda a,b : a * b , c.numbers)
+        self.assertEqual(c.check(answer), True)
+
+        c = MultiplicationCaptcha(qty=2, min=10, max=10, str_ops=True)
+        self.assertEqual(c.check(100), True)
+        self.assertEqual(c.question(), "10 times 10")
+
+
+    def test_MissingNumberCaptcha(self):
+        c = MissingNumberCaptcha(min=5,max=5)
+        self.assertEqual(c.check(5), True)
+        
+
+
+
+def main(argv=None):
+    if argv is None: argv = sys.argv
+    unittest.main(argv=["tests.py"])
+
+
+if __name__ == '__main__':
+    main()
diff --git a/context.py b/context.py
new file mode 100644
index 0000000..a3c06bc
--- /dev/null
+++ b/context.py
@@ -0,0 +1,50 @@
+from lifeflow.models import Entry, Flow, RecommendedSite, Author, Flow, Language
+from django.contrib.sites.models import Site
+from django.conf import settings
+
+
+def blog(request):
+    def make_slug(str):
+        return str.lower().replace(" ","-")
+    recent = Entry.current.all()[:4]
+    random = Entry.current.all().order_by('?')[:3]
+    blog_roll = RecommendedSite.objects.all()
+    flows = Flow.objects.all()
+    site = Site.objects.get(pk=settings.SITE_ID)
+    analytics_id = getattr(settings, 'LIFEFLOW_GOOGLE_ANALYTICS_ID', None)
+    use_projects = getattr(settings, 'LIFEFLOW_USE_PROJECTS', True)
+    keywords = getattr(settings, 'LIFEFLOW_KEYWORDS', "blog")
+    description = getattr(settings, 'LIFEFLOW_DESCRIPTION', "blog")
+    author = getattr(settings, 'LIFEFLOW_AUTHOR_NAME', None)
+    template_author = getattr(settings, 'LIFEFLOW_TEMPLATE_AUTHOR', "Will Larson")
+    template_author_url = getattr(settings, 'LIFEFLOW_TEMPLATE_AUTHOR_URL', "http://www.lethain.com/")
+    if author is None:
+        try:
+            author = Author.objects.get(pk=1).name
+        except:
+            author = "Anonymous"
+
+    author_slug = make_slug(author)
+    blog_name = getattr(settings, 'LIFEFLOW_BLOG_NAME', "Unconfigured LifeFlow")
+    custom_css = getattr(settings, 'LIFEFLOW_CUSTOM_CSS', None)
+    custom_js_header = getattr(settings, 'LIFEFLOW_CUSTOM_JS_HEADER', None)
+    custom_js_footer = getattr(settings, 'LIFEFLOW_CUSTOM_JS_FOOTER', None)
+    return {
+        'blog_roll' : blog_roll,
+        'lifeflow_google_analytics_id':analytics_id,
+        'lifeflow_blog_name':blog_name,
+        'lifeflow_custom_css':custom_css,
+        'lifeflow_custom_js_header':custom_js_header,
+        'lifeflow_custom_js_footer':custom_js_footer,
+        'lifeflow_flows':flows,
+        'lifeflow_keywords':keywords,
+        'lifeflow_description':description,
+        'lifeflow_author':author,
+        'lifeflow_author_slug':author_slug,
+        'lifeflow_use_projects':use_projects,
+        'lifeflow_template_author':template_author,
+        'lifeflow_template_author_url':template_author_url,
+        'recent_entries' : recent, 
+        'random_entries' : random,
+        'site' : site,
+        }
diff --git a/editor/__init__.py b/editor/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/editor/models.py b/editor/models.py
new file mode 100644
index 0000000..71a8362
--- /dev/null
+++ b/editor/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/editor/urls.py b/editor/urls.py
new file mode 100644
index 0000000..96f562c
--- /dev/null
+++ b/editor/urls.py
@@ -0,0 +1,38 @@
+from django.conf.urls.defaults import *
+from lifeflow.models import *
+
+urlpatterns = patterns('lifeflow.editor.views',
+    (r'^$', 'overview'),
+    (r'^comments/$', 'comments'),
+    (r'^blogroll/$', 'blogroll'),
+    (r'^files/$', 'files'),
+
+    (r'^projects/$', 'projects'),
+    (r'^projects/create/$', 'create_project'),
+    (r'^projects/(?P<id>\d+)/details/$','project_details'),
+    (r'^projects/(?P<id>\d+)/body/$','project_body'),
+
+    (r'^login/$', 'login'),
+    (r'^logout/$', 'logout'),
+
+    (r'^create/$', 'create'),
+    (r'^update/$', 'update'),
+    (r'^display_resource/(?P<id>\d+)/$', 'display_resource'),
+    (r'^add_resource/', 'add_resource'),
+    (r'^create_model/', 'create_model'),
+    (r'^delete_model/', 'delete_model'),
+
+    (r'^edit/(?P<category>\w+)/(?P<id>\d+)/1/$', 'edit_one'),
+    (r'^edit/(?P<category>\w+)/(?P<id>\d+)/2/$', 'edit_two'),
+    (r'^edit/(?P<category>\w+)/(?P<id>\d+)/3/$', 'edit_three'),
+    (r'^edit/(?P<category>\w+)/(?P<id>\d+)/4/$', 'edit_four'),
+    (r'^edit/(?P<category>\w+)/(?P<id>\d+)/5/$', 'edit_five'),
+    (r'^edit/(?P<category>\w+)/(?P<id>\d+)/6/$', 'edit_six'),
+    (r'^edit/(?P<category>\w+)/(?P<id>\d+)/7/$', 'edit_seven'),
+    (r'^rough_to_edited/(?P<id>\d+)/$', 'rough_to_edited'),
+    (r'^edited_to_rough/(?P<id>\d+)/$', 'edited_to_rough'),
+    (r'^edited_to_published/(?P<id>\d+)/$', 'edited_to_published'),
+    (r'^published_to_edited/(?P<id>\d+)/$', 'published_to_edited'),
+    (r'^render/(?P<model>\w+)/(?P<id>\d+)/$', 'render'),
+    (r'^render/$', 'render'),
+)
diff --git a/editor/views.py b/editor/views.py
new file mode 100644
index 0000000..99c5d78
--- /dev/null
+++ b/editor/views.py
@@ -0,0 +1,473 @@
+"""
+
+
+TODO
+
+- write function to check a Draft for missing requirements before
+  transformation into an Entry, and report that data when the
+  transformation fails, instead of just "It failed" msg
+- File upload functionality
+- Setting datetime
+- display list of files in zipfile resources
+- display code for code resources
+
+
+"""
+
+
+import datetime
+from django.template import RequestContext
+from django.shortcuts import render_to_response
+from django.http import Http404, HttpResponseRedirect, HttpResponseServerError
+from lifeflow.models import *
+from django.http import HttpResponse
+from django.contrib.auth.decorators import login_required
+from django.conf import settings
+from django.contrib.auth import logout as auth_logout
+from django.contrib.auth import login as auth_login
+from django.contrib.auth import views, authenticate
+
+
+
+def slugify(str):
+    # This could be substantially more robust,
+    # but for the moment it suffices.
+    return str.lower().replace(' ','-').replace('.','-').replace(',','-')[:95]
+
+def login(request):
+    error_msg = u""
+    if request.method == "POST":
+        POST = request.POST.copy()
+        username = POST.get('username',"")
+        password = POST.get('password',"")
+
+        if username == "" or password == "":
+            error_msg = u"Your username AND password, si vous plait."
+        else:
+            user = authenticate(username=username, password=password)
+            if user is not None:
+                if user.is_active:
+                    auth_login(request, user)
+                    return HttpResponseRedirect("/editor/")
+            else:
+                error_msg = u"It works better when the username and password match."
+    return render_to_response("lifeflow/editor/login.html",
+                              
+                              {"login_screen":True,
+                               'error_message':error_msg})
+
+def logout(request):
+    auth_logout(request)
+    return HttpResponseRedirect("/")
+
+@login_required
+def overview(request):
+    rough = Draft.objects.filter(edited=False)
+    edited = Draft.objects.filter(edited=True)
+    published = Entry.objects.all()
+    return render_to_response('lifeflow/editor/overview.html',
+                              {'rough':rough,
+                               'edited':edited,
+                               'published':published},
+                              RequestContext(request, {}))
+
+@login_required
+def comments(request):
+    comments = Comment.objects.all()
+    return render_to_response('lifeflow/editor/comments.html',
+                              {'comments':comments},
+                              RequestContext(request,{}))
+
+@login_required
+def blogroll(request):
+    blogroll = RecommendedSite.objects.all()
+    return render_to_response('lifeflow/editor/blogroll.html',
+                              {'blogroll':blogroll},
+                              RequestContext(request,{}))
+
+@login_required
+def files(request):
+    resources = Resource.objects.all()
+    return render_to_response('lifeflow/editor/files.html',
+                              {'resources':resources},
+                              RequestContext(request,{}))
+
+@login_required
+def projects(request):
+    projects = Project.objects.all()
+    return render_to_response('lifeflow/editor/projects.html',
+                              {'projects':projects},
+                              RequestContext(request,{}))
+
+@login_required
+def project_details(request, id):
+    project = Project.objects.get(pk=id)
+    return render_to_response('lifeflow/editor/project_details.html',
+                              {'object':project},
+                              RequestContext(request,{}))
+
+@login_required
+def project_body(request, id):
+    project = Project.objects.get(pk=id)
+    resources = Resource.objects.all()
+    return render_to_response('lifeflow/editor/project_body.html',
+                              {'object':project,
+                               'resources':resources},
+                              RequestContext(request,{}))
+    
+    
+
+
+BOOLEAN_FIELDS = ["send_ping", "allow_comments", "use_markdown"]
+MANY_TO_MANY_FIELDS = ["flows", "tags", "series", "authors"]
+SPECIAL_FIELDS = ["translation"]
+
+@login_required
+def update(request):
+    dict = request.POST.copy()
+    id = dict.pop('pk')[0]
+    model = dict.pop('model')[0]
+    if model == u"draft":
+        object = Draft.objects.get(pk=id)
+    elif model == u"project":
+        object = Project.objects.get(pk=id)
+    else:
+        object = Entry.objects.get(pk=id)
+    obj_dict = object.__dict__
+    for key in dict.keys():
+        if obj_dict.has_key(key):
+            val = dict[key]
+            if key in BOOLEAN_FIELDS:
+                if val == u"true":
+                    val = True
+                elif val == u"false":
+                    val = False
+            obj_dict[key] = val
+        elif key in MANY_TO_MANY_FIELDS:
+            vals = dict.getlist(key)
+            manager = getattr(object, key)
+            manager.clear()
+            manager.add(*vals)
+    object.save()
+    return HttpResponse("success")
+
+
+def get_class(str):
+    return {"comment":Comment, "project":Project, "flow":Flow, "tag":Tag, "series":Series, "draft":Draft, "entry":Entry, "author":Author, "resource":Resource, "recommendedsite":RecommendedSite}[str]
+
+@login_required
+def delete_model(request):
+    cls = get_class(request.POST['model'])
+    pk = request.POST['pk']
+    try:
+        cls.objects.get(pk=pk).delete()
+        return HttpResponse("success")
+    except:
+        return HttpResponseServerError(u"fail")
+        
+
+@login_required
+def create_model(request):
+    def unique(slug, model):
+        if model.objects.filter(slug=slug).count() == 0:
+            return True
+        return False
+    toReturn = HttpResponseRedirect(request.META['HTTP_REFERER'])
+    model = request.POST['model']
+    if model in [u"flow", u"tag", u"series"]:
+        cls = get_class(model)
+        title = request.POST[u'title']
+        slug = slugify(title)
+        if unique(slug, cls):
+            f = cls(title=title, slug=slug)
+            f.save()
+    elif model == u"translation":
+        translated_pk = int(request.POST[u'pk'])
+        translated = Entry.objects.get(pk=translated_pk)
+        original_pk = int(request.POST[u'original'])
+        language_pk = int(request.POST[u'language'])
+        if original_pk == -1 or language_pk == -1:
+            [ x.delete() for x in Translation.objects.filter(original=translated)]
+            [ x.delete() for x in Translation.objects.filter(translated=translated)]
+        else:
+            original = Entry.objects.get(pk=original_pk)
+            language = Language.objects.get(pk=language_pk)
+            
+            t = Translation(language=language,original=original,translated=translated)
+            t.save()
+        # update toReturn to return rendered template of translations
+        translations = Translation.objects.filter(translated=translated)
+        toReturn = render_to_response('lifeflow/editor/translations.html',
+                                      {'translations':translations},
+                                      RequestContext(request, {}))
+
+    elif model == u"recommendedsite":
+        title = request.POST[u'title']
+        url = request.POST[u'url']
+        f = RecommendedSite(title=title, url=url)
+        f.save()
+
+    return toReturn
+
+@login_required
+def add_resource(request):
+    file = request.FILES['file']
+    title = request.POST['title']
+    markdown_id = request.POST['markdown_id']
+    filename = file['filename']
+    fd = open('%s/lifeflow/resource/%s' %(settings.MEDIA_ROOT, filename), 'wb')
+    fd.write(file['content'])
+    fd.close()
+    rec = Resource(title=title, markdown_id=markdown_id, content="lifeflow/resource/%s" % filename)
+    rec.save()
+    id = request.POST['pk']
+    model = request.POST['model']
+    return HttpResponseRedirect(request.META['HTTP_REFERER'])
+    #return HttpResponseRedirect("/editor/edit/%s/%s/2/" % (model, id))
+
+
+IMAGE_EXTS = ["jpg", "jpeg", "png", "gif"]
+ZIP_EXTS = ["zip"]
+CODE_EXTS = ["css", "html", "htm", "c", "o", "py", "lisp", "js", "xml",
+             "java", "rb"]
+
+@login_required
+def display_resource(request, id):
+    def guess_type(resource):
+        path = resource.content
+        print path
+        ext = path.split(".")[-1]
+        print ext
+        if ext in IMAGE_EXTS:
+            return "image"
+        elif ext in ZIP_EXTS:
+            return "zip"
+        elif ext in CODE_EXTS:
+            return "code"
+        else:
+            return "file"
+    res = Resource.objects.get(pk=id)
+    file = res.content.split("/")[-1]
+    type = guess_type(res)
+    return render_to_response('lifeflow/editor/resource.html',
+                              {'object':res,
+                               'file':file,
+                              'type':type},
+                              RequestContext(request, {}))
+
+
+@login_required
+def edit_one(request, category, id):
+    if category == "entry":
+        obj = Entry.objects.get(pk=id)
+    else:
+        obj = Draft.objects.get(pk=id)
+    return render_to_response('lifeflow/editor/edit_one.html',
+                              {'object':obj,
+                               'model':category},
+                              RequestContext(request, {}))
+
+@login_required
+def edit_two(request, category, id):
+    resources = Resource.objects.all()
+    if category == "entry":
+        obj = Entry.objects.get(pk=id)
+    else:
+        obj = Draft.objects.get(pk=id)
+    return render_to_response('lifeflow/editor/edit_two.html',
+                              {'object':obj,
+                               'resources':resources,
+                               'model':category},
+                              RequestContext(request, {}))
+
+@login_required
+def edit_three(request, category, id):
+    if category == "entry":
+        obj = Entry.objects.get(pk=id)
+    else:
+        obj = Draft.objects.get(pk=id)
+    obj_flows = obj.flows.all()
+    flows = [ (x, x in obj_flows) for x in Flow.objects.all()] 
+    return render_to_response('lifeflow/editor/edit_three.html',
+                              {'object':obj,
+                               'flows':flows,
+                               'model':category},
+                              RequestContext(request, {}))
+
+@login_required
+def edit_four(request, category, id):
+    if category == "entry":
+        obj = Entry.objects.get(pk=id)
+    else:
+        obj = Draft.objects.get(pk=id)
+    obj_tags = obj.tags.all()
+    tags = [ (x, x in obj_tags) for x in Tag.objects.all()]
+    return render_to_response('lifeflow/editor/edit_four.html',
+                              {'object':obj,
+                               'tags':tags,
+                               'model':category},
+                              RequestContext(request, {}))
+
+@login_required
+def edit_five(request, category, id):
+    if category == "entry":
+        obj = Entry.objects.get(pk=id)
+    else:
+        obj = Draft.objects.get(pk=id)
+    obj_series = obj.series.all()
+    series = [ (x, x in obj_series) for x in Series.objects.all()]
+    return render_to_response('lifeflow/editor/edit_five.html',
+                              {'object':obj,
+                               'series':series,
+                               'model':category},
+                              RequestContext(request, {}))
+
+
+@login_required
+def edit_six(request, category, id):
+    if category == "entry":
+        obj = Entry.objects.get(pk=id)
+    else:
+        obj = Draft.objects.get(pk=id)
+    return render_to_response('lifeflow/editor/edit_six.html',
+                              {'object':obj,
+                               'model':category},
+                              RequestContext(request, {}))
+
+
+@login_required
+def edit_seven(request, category, id):
+    if category == "entry":
+        obj = Entry.objects.get(pk=id)
+    else:
+        obj = Draft.objects.get(pk=id)
+    obj_authors = obj.authors.all()
+    authors = [ (x, x in obj_authors) for x in Author.objects.all()]
+    langs = Language.objects.all()
+    entries = Entry.objects.all()
+    translations = Translation.objects.filter(translated=obj)
+    return render_to_response('lifeflow/editor/edit_seven.html',
+                              {'object':obj,
+                               'authors':authors,
+                               'langs':langs,
+                               'entries':entries,
+                               'translations':translations,
+                               'model':category},
+                              RequestContext(request, {}))
+
+
+
+@login_required
+def rough_to_edited(request, id):
+    try:
+        obj = Draft.objects.get(pk=id)
+        obj.edited = True
+        obj.save()
+        return HttpResponse(u"%s" % obj.pk)
+    except:
+        return HttpResponseServerError(u"Failed.")
+
+@login_required
+def edited_to_rough(request, id):
+    try:
+        obj = Draft.objects.get(pk=id)
+        obj.edited = False
+        obj.save()
+        return HttpResponse(u"%s" % obj.pk)
+    except:
+        return HttpResponseServerError(u"Failed.")
+
+@login_required
+def edited_to_published(request, id):
+    def check(dict):
+        complaints = []
+        if dict[u"title"] in [None, u""]:
+            complaints.append("You need to give the entry a title first.")
+        if dict[u"body"] in [None, u""]:
+            complaints.append("You'll need to fill out the article a bit before publishing it.")          
+        if complaints == []:
+            return True
+        else:
+            return "\n<br>\n".join(complaints)
+
+    def transform(draft):
+        dict = draft.__dict__.copy()
+        del dict['id']
+        if dict['pub_date'] is None:
+            dict['pub_date'] = datetime.datetime.now()
+        del dict['edited']
+        if dict['slug'] is None and dict['title'] is not None:
+            dict['slug'] = slugify(dict['title'])
+        entry = Entry(**dict)
+        valid = check(entry.__dict__)
+        if valid != True:
+            return None, valid
+        else:
+            entry.save()
+            for field in MANY_TO_MANY_FIELDS:
+                getattr(entry, field).add(*getattr(draft, field).all())
+            return entry, True
+
+    try:
+        draft = Draft.objects.get(pk=id)
+        entry, result = transform(draft)
+        if result == True:
+            draft.delete()
+            return HttpResponse(u"%s" % entry.pk)
+        else:
+            return HttpResponseServerError(result)
+    except TypeError:
+        return HttpResponseServerError(u"The draft is missing required fields.")
+    except:
+        return HttpResponseServerError(u"The update made it to the server, but failed for unknown reasons.")
+
+@login_required
+def published_to_edited(request, id):
+    def transform(entry):
+        dict = entry.__dict__.copy()
+        dict['edited'] = True
+        del dict['body_html']
+        del dict['id']
+        draft = Draft(**dict)
+        draft.save()
+        for field in MANY_TO_MANY_FIELDS:
+                getattr(draft, field).add(*getattr(entry, field).all())
+        return draft
+    try:
+        entry = Entry.objects.get(pk=id)
+        draft = transform(entry)
+        entry.delete()
+        return HttpResponse(u"%s" % draft.pk)
+    except:
+        return HttpResponseServerError(u"Update failed.")
+
+
+@login_required
+def create(request):
+    obj = Draft()
+    obj.save()
+    return HttpResponseRedirect("../edit/draft/%s/1/" % obj.pk)
+
+@login_required
+def create_project(request):
+    obj = Project()
+    obj.save()
+    return HttpResponseRedirect("/editor/projects/%s/details/" % obj.pk)
+    
+
+@login_required
+def render(request, model=None, id=None):
+    if id is None:
+        txt = dbc_markup(request.POST['txt'])
+    else:
+        if model == u"draft":
+            obj = Draft.objects.get(pk=id)
+        elif model ==u"entry":
+            obj = Entry.objects.get(pk=id)
+        elif model == u"project":
+            obj = Project.objects.get(pk=id)
+        if obj.use_markdown:
+            txt = dbc_markup(obj.body, obj)
+        else:
+            txt = obj.body
+    return HttpResponse(txt)
diff --git a/feeds.py b/feeds.py
new file mode 100644
index 0000000..5c85be6
--- /dev/null
+++ b/feeds.py
@@ -0,0 +1,207 @@
+from django.contrib.syndication.feeds import Feed
+from django.conf import settings
+from lifeflow.models import *
+
+
+ 
+class AllFeed(Feed):
+    title = u"%s" % settings.LIFEFLOW_BLOG_NAME 
+    link = u"/"
+    description = u"The full feed of all entries! Piping hot and ready for consumption."
+    copyright = u'Creative Commons License'
+
+
+    def items(self):
+        return Entry.current.all().order_by('-pub_date')[:25]
+
+
+
+class FlowFeed(Feed):
+    def get_object(self, bits):
+        slug = bits[0]
+        return Flow.objects.get(slug=slug)
+
+
+    def title(self, obj):
+        return u"%s: %s" % (settings.LIFEFLOW_BLOG_NAME,
+                                              obj.title)
+
+
+    def link(self, obj):
+        return obj.get_absolute_url()
+
+
+    def description(self, obj):
+        return u"The piping hot feed for all entries in the %s flow." % obj.title
+
+
+    def items(self, obj):
+        return obj.latest(qty=25)
+
+
+
+class TagFeed(Feed):
+    def get_object(self, bits):
+        slug = bits[0]
+        return Tag.objects.get(slug=slug)
+
+    
+    def title(self, obj):
+        return u"%s: the %s tag" % (settings.LIFEFLOW_BLOG_NAME,
+                                              obj.title)
+
+
+    def link(self, obj):
+        return obj.get_absolute_url()
+
+
+    def description(self, obj):
+        return u"All entries tagged with %s." % obj.title
+
+    
+    def items(self, obj):
+        return obj.latest()
+
+
+
+class AuthorFeed(Feed):
+    def get_object(self, bits):
+        slug = bits[0]
+        return Author.objects.get(slug=slug)
+
+
+    def title(self, obj):
+        return u"%s: %s" % (settings.LIFEFLOW_BLOG_NAME,
+                                              obj.name)
+    
+    def title(self, obj):
+        return u"Feed for stuff by %s." % obj.name
+
+
+    def link(self, obj):
+        return obj.get_absolute_url()
+
+
+    def description(self, obj):
+        return u"Recent entries written by %s." % obj.name
+
+    
+    def items(self, obj):
+        return obj.latest()
+
+
+
+class LanguageFeed(Feed):
+    def get_object(self, bits):
+        slug = bits[0]
+        return Language.objects.get(slug=slug)
+
+
+    def title(self, obj):
+        return u"%s: %s" % (settings.LIFEFLOW_BLOG_NAME,
+                                              obj.title)
+    
+    def title(self, obj):
+        return u"Feed for stuff translated into %s." % obj.title
+
+
+    def link(self, obj):
+        return obj.get_absolute_url()
+
+
+    def description(self, obj):
+        return u"Recent entries translated into %s." % obj.title
+
+    
+    def items(self, obj):
+        return obj.latest()
+
+
+
+class SeriesFeed(Feed):
+    def get_object(self, bits):
+        slug = bits[0]
+        return Series.objects.get(slug=slug)
+
+    
+    def title(self, obj):
+        return u"%s: %s" % (settings.LIFEFLOW_BLOG_NAME,
+                                              obj.title)
+
+
+    def link(self, obj):
+        return obj.get_absolute_url()
+
+
+    def description(self, obj):
+        return u"Entries in the %s series." % obj.title
+
+    
+    def items(self, obj):
+        return obj.latest()
+
+
+
+class TranslationFeed(Feed):
+    title = u"%s: Translations" % settings.LIFEFLOW_BLOG_NAME
+    link = u"/"
+    description = u"Recent translationed entries."
+    copyright = u'Creative Commons License'
+
+
+    def items(self):
+        return Entry.objects.all().filter(**{'pub_date__lte': datetime.datetime.now()}).filter(**{'is_translation':True})
+
+
+
+class ProjectFeed(Feed):
+    title = u"%s: Projects" % settings.LIFEFLOW_BLOG_NAME
+    link = u"/"
+    description = u"Latest projects on %s." % settings.LIFEFLOW_BLOG_NAME
+    copyright = u'Creative Commons License'
+
+
+    def items(self):
+        return Project.objects.all().order_by('-id')
+
+
+
+class CommentFeed(Feed):
+    title = u"%s: Comments" % settings.LIFEFLOW_BLOG_NAME
+    link = "/"
+    description = u"Latest comments on %s." % settings.LIFEFLOW_BLOG_NAME
+    copyright = u'Creative Commons License'
+    
+
+    def items(self):
+        return Comment.objects.all().order_by('-date',)[:20]
+
+
+
+class EntryCommentFeed(Feed):
+    def get_object(self, bits):
+        year = bits[0]
+        month = bits[1]
+        day = bits[2]
+        slug = bits[3]
+        return Entry.objects.get(pub_date__year=year,
+                                 pub_date__month=month,
+                                 pub_date__day=day,
+                                 slug=slug)
+
+    
+    def title(self, obj):
+        return u"%s: Comments for %s" % (settings.LIFEFLOW_BLOG_NAME,
+                                              obj.title)
+
+
+    def link(self, obj):
+        return obj.get_absolute_url()
+
+
+    def description(self, obj):
+        return u"Comments for %s." % obj.title
+
+    
+    def items(self, obj):
+        return obj.comment_set.all().order_by('-date')
diff --git a/fixtures/.DS_Store b/fixtures/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/forms.py b/forms.py
new file mode 100644
index 0000000..b427631
--- /dev/null
+++ b/forms.py
@@ -0,0 +1,67 @@
+import cgi
+from django import newforms as forms
+from lifeflow.models import comment_markup
+
+
+class CommentForm(forms.Form):
+    name = forms.CharField(required=False)
+    email = forms.CharField(required=False)
+    webpage = forms.CharField(required=False)
+    body = forms.CharField(widget=forms.Textarea, required=False)
+
+
+    def clean_name(self):
+        name = self.cleaned_data['name']
+        if name == u"":
+            name = u"name"
+        else:
+            name = cgi.escape(name)
+        return name
+        
+
+    def clean_email(self):
+        email = self.cleaned_data['email']
+        if email == u"":
+            email = u"email"
+        else:
+            email = cgi.escape(email)
+        return email
+
+
+    def clean_webpage(self):
+        webpage = self.cleaned_data['webpage']
+        if webpage == u"":
+            webpage = u"webpage"
+        else:
+            webpage = cgi.escape(webpage)
+        if webpage.find('://') == -1: webpage = "http://%s" % webpage
+        return webpage
+        
+
+    def clean_body(self):
+        body = self.cleaned_data['body']
+        lines = body.split("\n")
+        new_lines = []
+        in_code = False
+
+        # at the moment you could disable all parsing simply by
+        # having initial @@'s but no closing @@'s. Instead this
+        # should only disable code escaping for code-syntax blocks
+        # if there is a closing @@ as well as an opening @@
+        # (admittedly, it may well crash the markdownpp if 
+        # it is improperly formed... if thats any consulation)
+        for line in lines:
+            if line.startswith("@@") and in_code is True:
+                in_code = False
+            elif line.startswith("@@") and in_code is False:
+                in_code = True
+            if in_code is False:
+                if line.startswith(">"):
+                    line = ">%s" % cgi.escape(line[1:])
+                else:
+                    line = cgi.escape(line)
+            new_lines.append(line)
+        escaped = u"\n".join(new_lines)
+        self.cleaned_data['rendered'] = unicode(comment_markup(escaped))
+        return body
+        
diff --git a/markdown/CHANGE_LOG.txt b/markdown/CHANGE_LOG.txt
new file mode 100644
index 0000000..07e6027
--- /dev/null
+++ b/markdown/CHANGE_LOG.txt
@@ -0,0 +1,125 @@
+PYTHON MARKDOWN CHANGELOG
+=========================
+
+Dec 12, 2007: Updated docs. Removed encoding arg from Markdown
+and markdown as per list discussion. Clean up in prep for 1.7.
+
+Nov 29, 2007: Added support for images inside links. Also fixed
+a few bugs in the footnote extension.
+
+Nov 19, 2007: `message` now uses python's logging module. Also removed 
+limit imposed by recursion in _process_section(). You can now parse as 
+long of a document as your memory can handle.
+
+Nov 5, 2007: Moved safe_mode code to a textPostprocessor and added 
+escaping option.
+
+Nov 3, 2007: Fixed convert method to accept empty strings.
+
+Oct 30, 2007: Fixed BOM removal (thanks Malcolm Tredinnick). Fixed 
+infinite loop in bracket regex for inline links.
+
+Oct 11, 2007: LineBreaks is now an inlinePattern. Fixed HR in 
+blockquotes. Refactored _processSection method (see tracker #1793419).
+
+Oct 9, 2007: Added textPreprocessor (from 1.6b).
+
+Oct 8, 2008: Fixed Lazy Blockquote. Fixed code block on first line. 
+Fixed empty inline image link.
+
+Oct 7, 2007: Limit recursion on inlinePatterns. Added a 'safe' tag 
+to htmlStash.
+
+March 18, 2007: Fixed or merged a bunch of minor bugs, including
+multi-line comments and markup inside links. (Tracker #s: 1683066,
+1671153, 1661751, 1627935, 1544371, 1458139.) -> v. 1.6b
+
+Oct 10, 2006: Fixed a bug that caused some text to be lost after
+comments.  Added "safe mode" (user's html tags are removed).
+
+Sept 6, 2006: Added exception for PHP tags when handling html blocks.
+
+August 7, 2006: Incorporated Sergej Chodarev's patch to fix a problem
+with ampersand normalization and html blocks.
+
+July 10, 2006: Switched to using optparse.  Added proper support for
+unicode.
+
+July 9, 2006: Fixed the <!--@address.com> problem (Tracker #1501354).  
+
+May 18, 2006: Stopped catching unquoted titles in reference links.
+Stopped creating blank headers.
+
+May 15, 2006: A bug with lists, recursion on block-level elements,
+run-in headers, spaces before headers, unicode input (thanks to Aaron
+Swartz). Sourceforge tracker #s: 1489313, 1489312, 1489311, 1488370,
+1485178, 1485176. (v. 1.5)
+
+Mar. 24, 2006: Switched to a not-so-recursive algorithm with
+_handleInline.  (Version 1.4)
+
+Mar. 15, 2006: Replaced some instance variables with class variables
+(a patch from Stelios Xanthakis).  Chris Clark's new regexps that do
+not trigger midword underlining.
+
+Feb. 28, 2006: Clean-up and command-line handling by Stewart
+Midwinter. (Version 1.3)
+
+Feb. 24, 2006: Fixed a bug with the last line of the list appearing
+again as a separate paragraph.  Incorporated Chris Clark's "mailto"
+patch.  Added support for <br /> at the end of lines ending in two or
+more spaces.  Fixed a crashing bug when using ImageReferencePattern.
+Added several utility methods to Nanodom.  (Version 1.2)
+
+Jan. 31, 2006: Added "hr" and "hr/" to BLOCK_LEVEL_ELEMENTS and
+changed <hr/> to <hr />.  (Thanks to Sergej Chodarev.)
+
+Nov. 26, 2005: Fixed a bug with certain tabbed lines inside lists
+getting wrapped in <pre><code>.  (v. 1.1)
+
+Nov. 19, 2005: Made "<!...", "<?...", etc. behave like block-level
+HTML tags.
+
+Nov. 14, 2005: Added entity code and email autolink fix by Tiago
+Cogumbreiro.  Fixed some small issues with backticks to get 100%
+compliance with John's test suite.  (v. 1.0)
+
+Nov. 7, 2005: Added an unlink method for documents to aid with memory
+collection (per Doug Sauder's suggestion).
+
+Oct. 29, 2005: Restricted a set of html tags that get treated as
+block-level elements.
+
+Sept. 18, 2005: Refactored the whole script to make it easier to
+customize it and made footnote functionality into an extension.
+(v. 0.9)
+
+Sept. 5, 2005: Fixed a bug with multi-paragraph footnotes.  Added
+attribute support.
+
+Sept. 1, 2005: Changed the way headers are handled to allow inline
+syntax in headers (e.g. links) and got the lists to use p-tags
+correctly (v. 0.8)
+
+Aug. 29, 2005: Added flexible tabs, fixed a few small issues, added
+basic support for footnotes.  Got rid of xml.dom.minidom and added
+pretty-printing. (v. 0.7)
+
+Aug. 13, 2005: Fixed a number of small bugs in order to conform to the
+test suite.  (v. 0.6)
+
+Aug. 11, 2005: Added support for inline html and entities, inline
+images, autolinks, underscore emphasis. Cleaned up and refactored the
+code, added some more comments.
+
+Feb. 19, 2005: Rewrote the handling of high-level elements to allow
+multi-line list items and all sorts of nesting.
+
+Feb. 3, 2005: Reference-style links, single-line lists, backticks,
+escape, emphasis in the beginning of the paragraph.
+
+Nov. 2004: Added links, blockquotes, html blocks to Manfred
+Stienstra's code
+
+Apr. 2004: Manfred's version at http://www.dwerg.net/projects/markdown/
+
diff --git a/markdown/README.html b/markdown/README.html
new file mode 100644
index 0000000..6d94e8e
--- /dev/null
+++ b/markdown/README.html
@@ -0,0 +1,91 @@
+<h1><a href="http://freewisdom.org/projects/python-markdown">Python-Markdown</a></h1>
+<p>This is a Python implementation of John Gruber's <a href="http://daringfireball.net/projects/markdown/">Markdown</a>. 
+   It is almost completely compliant with the reference implementation,
+   though there are a few known issues. See <a href="http://www.freewisdom.org/projects/python-markdown/Features">Features</a> for information 
+   on what exactly is supported and what is not. Additional features are 
+   supported by the <a href="http://www.freewisdom.org/projects/python-markdown/Available_Extensions">Available Extensions</a>.
+</p>
+
+<h2>Installation</h2>
+<p>To install Python Markdown <a href="http://sourceforge.net/project/showfiles.php?group_id=153041">download</a> the zip file and extract the 
+   files.  If you want to install markdown as a module into your python 
+   tree, run <code>sudo python setup.py install</code> from a directory where you 
+   unzip the files.
+</p>
+
+<h2>Command Line Usage</h2>
+<p>To use markdown.py from the command line, run it as 
+</p>
+<pre><code>python markdown.py &lt;input_file&gt;
+</code></pre><p>or 
+</p>
+<pre><code>python markdown.py &lt;input_file&gt; &gt; &lt;output_file&gt;
+</code></pre><p>For more details, use the <code>-h</code> or <code>--help</code> options from the command line 
+   or read the <a href="http://www.freewisdom.org/projects/python-markdown/Command_Line">Command Line Docs</a> available online.
+</p>
+
+<h2>Using as a Python Module</h2>
+<p>To use markdown as a module:
+</p>
+<pre><code>import markdown
+html = markdown.markdown(your_text_string)
+</code></pre><p>For more details see the <a href="http://www.freewisdom.org/projects/python-markdown/Using_as_a_Module">Module Docs</a>.
+</p>
+
+<h2>Support</h2>
+<p>You may ask for help and discuss various other issues on the <a href="http://lists.sourceforge.net/lists/listinfo/python-markdown-discuss">mailing list</a> and report bugs on the <a href="http://sourceforge.net/tracker/?func=add&amp;group_id=153041&amp;atid=790198">bug tracker</a>.
+</p>
+
+<h2>Credits</h2>
+<ul>
+ <li>
+     Most of the code currently in the module was written by <a href="http://www.freewisdom.org">Yuri Takhteyev</a>
+  while procrastinating from his Ph.D.
+ </li>
+
+ <li>
+     The original version of this script was written by <a href="http://www.dwerg.net/">Manfred Stienstra</a>,
+  who is responsible for about a quarter of the code.
+ </li>
+
+ <li>
+     Many recent bugs are being fixed by <a href="http://achinghead.com/">Waylan Limberg</a>.
+ </li>
+</ul>
+<p>Other contributions:
+</p>
+<ul>
+ <li>
+     Daniel Krech provided the setup.py script.
+ </li>
+
+ <li>
+     G. Clark Haynes submitted a patch for indented lists.
+ </li>
+
+ <li>
+     Tiago Cogumbreiro submitted an email autolink fix.
+ </li>
+
+ <li>
+     Sergej Chodarev submitted a patch for treatment of <code>&lt;hr/&gt;</code> tags.
+ </li>
+
+ <li>
+     Chris Clark submitted a patch to handle <code>&lt;mailto:...&gt;</code> syntax and a reg ex 
+  for &quot;smart&quot; emphasis (ignoring underscores within a word).
+ </li>
+
+ <li>
+     Steward Midwinter wrote command-line parser and cleaned up comments.
+ </li>
+
+ <li>
+     Many other people helped by reporting bugs.
+ </li>
+</ul>
+
+<h2>License</h2>
+<p>The code is dual-licensed under <a href="http://www.gnu.org/copyleft/gpl.html)">GPL</a> and <a href="http://www.opensource.org/licenses/bsd-license.php">BSD License</a>.  Other
+   licensing arrangements can be discussed.
+</p>
\ No newline at end of file
diff --git a/markdown/README.txt b/markdown/README.txt
new file mode 100644
index 0000000..b859924
--- /dev/null
+++ b/markdown/README.txt
@@ -0,0 +1,98 @@
+[Python-Markdown][]
+===================
+
+This is a Python implementation of John Gruber's [Markdown][]. 
+It is almost completely compliant with the reference implementation,
+though there are a few known issues. See [Features][] for information 
+on what exactly is supported and what is not. Additional features are 
+supported by the [Available Extensions][].
+
+[Python-Markdown]: http://freewisdom.org/projects/python-markdown
+[Markdown]: http://daringfireball.net/projects/markdown/
+[Features]: http://www.freewisdom.org/projects/python-markdown/Features
+[Available Extensions]: http://www.freewisdom.org/projects/python-markdown/Available_Extensions
+
+
+Installation
+------------
+
+To install Python Markdown [download][] the zip file and extract the 
+files.  If you want to install markdown as a module into your python 
+tree, run `sudo python setup.py install` from a directory where you 
+unzip the files.
+
+[download]: http://sourceforge.net/project/showfiles.php?group_id=153041
+
+
+Command Line Usage
+------------------
+
+To use markdown.py from the command line, run it as 
+
+    python markdown.py <input_file>
+
+or 
+
+    python markdown.py <input_file> > <output_file>
+
+For more details, use the `-h` or `--help` options from the command line 
+or read the [Command Line Docs][] available online.
+
+[Command Line Docs]: http://www.freewisdom.org/projects/python-markdown/Command_Line
+
+
+
+Using as a Python Module
+------------------------
+
+To use markdown as a module:
+
+    import markdown
+    html = markdown.markdown(your_text_string)
+
+For more details see the [Module Docs][].
+
+[Module Docs]: http://www.freewisdom.org/projects/python-markdown/Using_as_a_Module
+
+Support
+-------
+
+You may ask for help and discuss various other issues on the [mailing list][] and report bugs on the [bug tracker][].
+
+[mailing list]: http://lists.sourceforge.net/lists/listinfo/python-markdown-discuss
+[bug tracker]: http://sourceforge.net/tracker/?func=add&group_id=153041&atid=790198
+
+
+Credits
+-------
+
+* Most of the code currently in the module was written by [Yuri Takhteyev][]
+  while procrastinating from his Ph.D.
+* The original version of this script was written by [Manfred Stienstra][],
+  who is responsible for about a quarter of the code.
+* Many recent bugs are being fixed by [Waylan Limberg][].
+
+Other contributions:
+
+* Daniel Krech provided the setup.py script.
+* G. Clark Haynes submitted a patch for indented lists.
+* Tiago Cogumbreiro submitted an email autolink fix.
+* Sergej Chodarev submitted a patch for treatment of `<hr/>` tags.
+* Chris Clark submitted a patch to handle `<mailto:...>` syntax and a reg ex 
+  for "smart" emphasis (ignoring underscores within a word).
+* Steward Midwinter wrote command-line parser and cleaned up comments.
+* Many other people helped by reporting bugs.
+
+[Yuri Takhteyev]: http://www.freewisdom.org
+[Manfred Stienstra]: http://www.dwerg.net/
+[Waylan Limberg]: http://achinghead.com/
+
+
+License
+-------
+
+The code is dual-licensed under [GPL][] and [BSD License][].  Other
+licensing arrangements can be discussed.
+
+[GPL]: http://www.gnu.org/copyleft/gpl.html) 
+[BSD License]: http://www.opensource.org/licenses/bsd-license.php
diff --git a/markdown/__init__.py b/markdown/__init__.py
new file mode 100644
index 0000000..599c5e7
--- /dev/null
+++ b/markdown/__init__.py
@@ -0,0 +1 @@
+__all__ = ["markdown", "mdx_code", "mdx_footnotes", "mdx_lifeflow"]
diff --git a/markdown/markdown.py b/markdown/markdown.py
new file mode 100644
index 0000000..f8cc00b
--- /dev/null
+++ b/markdown/markdown.py
@@ -0,0 +1,1888 @@
+#!/usr/bin/env python
+
+version = "1.7"
+version_info = (1,7,0,"rc-1")
+__revision__ = "$Rev: 66 $"
+
+"""
+Python-Markdown
+===============
+
+Converts Markdown to HTML.  Basic usage as a module:
+
+    import markdown
+    md = Markdown()
+    html = md.convert(your_text_string)
+
+See http://www.freewisdom.org/projects/python-markdown/ for more
+information and instructions on how to extend the functionality of the
+script.  (You might want to read that before you try modifying this
+file.)
+
+Started by [Manfred Stienstra](http://www.dwerg.net/).  Continued and
+maintained  by [Yuri Takhteyev](http://www.freewisdom.org) and [Waylan
+Limberg](http://achinghead.com/).
+
+Contact: yuri [at] freewisdom.org
+         waylan [at] gmail.com
+
+License: GPL 2 (http://www.gnu.org/copyleft/gpl.html) or BSD
+
+"""
+
+
+import re, sys, os, random, codecs
+
+from logging import getLogger, StreamHandler, Formatter, \
+                    DEBUG, INFO, WARN, ERROR, CRITICAL
+
+
+MESSAGE_THRESHOLD = CRITICAL
+
+
+# Configure debug message logger (the hard way - to support python 2.3)
+logger = getLogger('MARKDOWN')
+logger.setLevel(DEBUG) # This is restricted by handlers later
+console_hndlr = StreamHandler()
+formatter = Formatter('%(name)s-%(levelname)s: "%(message)s"')
+console_hndlr.setFormatter(formatter)
+console_hndlr.setLevel(MESSAGE_THRESHOLD)
+logger.addHandler(console_hndlr)
+
+
+def message(level, text):
+    ''' A wrapper method for logging debug messages. '''
+    logger.log(level, text)
+
+
+# --------------- CONSTANTS YOU MIGHT WANT TO MODIFY -----------------
+
+TAB_LENGTH = 4            # expand tabs to this many spaces
+ENABLE_ATTRIBUTES = True  # @id = xyz -> <... id="xyz">
+SMART_EMPHASIS = 1        # this_or_that does not become this<i>or</i>that
+HTML_REMOVED_TEXT = "[HTML_REMOVED]" # text used instead of HTML in safe mode
+
+RTL_BIDI_RANGES = ( (u'\u0590', u'\u07FF'),
+                    # from Hebrew to Nko (includes Arabic, Syriac and Thaana)
+                    (u'\u2D30', u'\u2D7F'),
+                    # Tifinagh
+                    )
+
+# Unicode Reference Table:
+# 0590-05FF - Hebrew
+# 0600-06FF - Arabic
+# 0700-074F - Syriac
+# 0750-077F - Arabic Supplement
+# 0780-07BF - Thaana
+# 07C0-07FF - Nko
+
+BOMS = { 'utf-8': (codecs.BOM_UTF8, ),
+         'utf-16': (codecs.BOM_UTF16_LE, codecs.BOM_UTF16_BE),
+         #'utf-32': (codecs.BOM_UTF32_LE, codecs.BOM_UTF32_BE)
+         }
+
+def removeBOM(text, encoding):
+    convert = isinstance(text, unicode)
+    for bom in BOMS[encoding]:
+        bom = convert and bom.decode(encoding) or bom
+        if text.startswith(bom):
+            return text.lstrip(bom)
+    return text
+
+# The following constant specifies the name used in the usage
+# statement displayed for python versions lower than 2.3.  (With
+# python2.3 and higher the usage statement is generated by optparse
+# and uses the actual name of the executable called.)
+
+EXECUTABLE_NAME_FOR_USAGE = "python markdown.py"
+                    
+
+# --------------- CONSTANTS YOU _SHOULD NOT_ HAVE TO CHANGE ----------
+
+# a template for html placeholders
+HTML_PLACEHOLDER_PREFIX = "qaodmasdkwaspemas"
+HTML_PLACEHOLDER = HTML_PLACEHOLDER_PREFIX + "%dajkqlsmdqpakldnzsdfls"
+
+BLOCK_LEVEL_ELEMENTS = ['p', 'div', 'blockquote', 'pre', 'table',
+                        'dl', 'ol', 'ul', 'script', 'noscript',
+                        'form', 'fieldset', 'iframe', 'math', 'ins',
+                        'del', 'hr', 'hr/', 'style']
+
+def is_block_level (tag):
+    return ( (tag in BLOCK_LEVEL_ELEMENTS) or
+             (tag[0] == 'h' and tag[1] in "0123456789") )
+
+"""
+======================================================================
+========================== NANODOM ===================================
+======================================================================
+
+The three classes below implement some of the most basic DOM
+methods.  I use this instead of minidom because I need a simpler
+functionality and do not want to require additional libraries.
+
+Importantly, NanoDom does not do normalization, which is what we
+want. It also adds extra white space when converting DOM to string
+"""
+
+ENTITY_NORMALIZATION_EXPRESSIONS = [ (re.compile("&"), "&amp;"),
+                                     (re.compile("<"), "&lt;"),
+                                     (re.compile(">"), "&gt;"),
+                                     (re.compile("\""), "&quot;")]
+
+ENTITY_NORMALIZATION_EXPRESSIONS_SOFT = [ (re.compile("&(?!\#)"), "&amp;"),
+                                     (re.compile("<"), "&lt;"),
+                                     (re.compile(">"), "&gt;"),
+                                     (re.compile("\""), "&quot;")]
+
+
+def getBidiType(text):
+
+    if not text: return None
+
+    ch = text[0]
+
+    if not isinstance(ch, unicode) or not ch.isalpha():
+        return None
+
+    else:
+
+        for min, max in RTL_BIDI_RANGES:
+            if ( ch >= min and ch <= max ):
+                return "rtl"
+        else:
+            return "ltr"
+
+
+class Document:
+
+    def __init__ (self):
+        self.bidi = "ltr"
+
+    def appendChild(self, child):
+        self.documentElement = child
+        child.isDocumentElement = True
+        child.parent = self
+        self.entities = {}
+
+    def setBidi(self, bidi):
+        if bidi:
+            self.bidi = bidi
+
+    def createElement(self, tag, textNode=None):
+        el = Element(tag)
+        el.doc = self
+        if textNode:
+            el.appendChild(self.createTextNode(textNode))
+        return el
+
+    def createTextNode(self, text):
+        node = TextNode(text)
+        node.doc = self
+        return node
+
+    def createEntityReference(self, entity):
+        if entity not in self.entities:
+            self.entities[entity] = EntityReference(entity)
+        return self.entities[entity]
+
+    def createCDATA(self, text):
+        node = CDATA(text)
+        node.doc = self
+        return node
+
+    def toxml (self):
+        return self.documentElement.toxml()
+
+    def normalizeEntities(self, text, avoidDoubleNormalizing=False):
+
+        if avoidDoubleNormalizing:
+            regexps = ENTITY_NORMALIZATION_EXPRESSIONS_SOFT
+        else:
+            regexps = ENTITY_NORMALIZATION_EXPRESSIONS
+
+        for regexp, substitution in regexps:
+            text = regexp.sub(substitution, text)
+        return text
+
+    def find(self, test):
+        return self.documentElement.find(test)
+
+    def unlink(self):
+        self.documentElement.unlink()
+        self.documentElement = None
+
+
+class CDATA:
+
+    type = "cdata"
+
+    def __init__ (self, text):
+        self.text = text
+
+    def handleAttributes(self):
+        pass
+
+    def toxml (self):
+        return "<![CDATA[" + self.text + "]]>"
+
+class Element:
+
+    type = "element"
+
+    def __init__ (self, tag):
+
+        self.nodeName = tag
+        self.attributes = []
+        self.attribute_values = {}
+        self.childNodes = []
+        self.bidi = None
+        self.isDocumentElement = False
+
+    def setBidi(self, bidi):
+
+        if bidi:
+
+            orig_bidi = self.bidi
+
+            if not self.bidi or self.isDocumentElement:
+                # Once the bidi is set don't change it (except for doc element)
+                self.bidi = bidi
+                self.parent.setBidi(bidi)
+
+
+    def unlink(self):
+        for child in self.childNodes:
+            if child.type == "element":
+                child.unlink()
+        self.childNodes = None
+
+    def setAttribute(self, attr, value):
+        if not attr in self.attributes:
+            self.attributes.append(attr)
+
+        self.attribute_values[attr] = value
+
+    def insertChild(self, position, child):
+        self.childNodes.insert(position, child)
+        child.parent = self
+
+    def removeChild(self, child):
+        self.childNodes.remove(child)
+
+    def replaceChild(self, oldChild, newChild):
+        position = self.childNodes.index(oldChild)
+        self.removeChild(oldChild)
+        self.insertChild(position, newChild)
+
+    def appendChild(self, child):
+        self.childNodes.append(child)
+        child.parent = self
+
+    def handleAttributes(self):
+        pass
+
+    def find(self, test, depth=0):
+        """ Returns a list of descendants that pass the test function """
+        matched_nodes = []
+        for child in self.childNodes:
+            if test(child):
+                matched_nodes.append(child)
+            if child.type == "element":
+                matched_nodes += child.find(test, depth+1)
+        return matched_nodes
+
+    def toxml(self):
+        if ENABLE_ATTRIBUTES:
+            for child in self.childNodes:
+                child.handleAttributes()
+
+        buffer = ""
+        if self.nodeName in ['h1', 'h2', 'h3', 'h4']:
+            buffer += "\n"
+        elif self.nodeName in ['li']:
+            buffer += "\n "
+
+        # Process children FIRST, then do the attributes
+
+        childBuffer = ""
+
+        if self.childNodes or self.nodeName in ['blockquote']:
+            childBuffer += ">"
+            for child in self.childNodes:
+                childBuffer += child.toxml()
+            if self.nodeName == 'p':
+                childBuffer += "\n"
+            elif self.nodeName == 'li':
+                childBuffer += "\n "
+            childBuffer += "</%s>" % self.nodeName
+        else:
+            childBuffer += "/>"
+
+
+            
+        buffer += "<" + self.nodeName
+
+        if self.nodeName in ['p', 'li', 'ul', 'ol',
+                             'h1', 'h2', 'h3', 'h4', 'h5', 'h6']:
+
+            if not self.attribute_values.has_key("dir"):
+                if self.bidi:
+                    bidi = self.bidi
+                else:
+                    bidi = self.doc.bidi
+                    
+                if bidi=="rtl":
+                    self.setAttribute("dir", "rtl")
+        
+        for attr in self.attributes:
+            value = self.attribute_values[attr]
+            value = self.doc.normalizeEntities(value,
+                                               avoidDoubleNormalizing=True)
+            buffer += ' %s="%s"' % (attr, value)
+
+
+        # Now let's actually append the children
+
+        buffer += childBuffer
+
+        if self.nodeName in ['p', 'br ', 'li', 'ul', 'ol',
+                             'h1', 'h2', 'h3', 'h4'] :
+            buffer += "\n"
+
+        return buffer
+
+
+class TextNode:
+
+    type = "text"
+    attrRegExp = re.compile(r'\{@([^\}]*)=([^\}]*)}') # {@id=123}
+
+    def __init__ (self, text):
+        self.value = text        
+
+    def attributeCallback(self, match):
+
+        self.parent.setAttribute(match.group(1), match.group(2))
+
+    def handleAttributes(self):
+        self.value = self.attrRegExp.sub(self.attributeCallback, self.value)
+
+    def toxml(self):
+
+        text = self.value
+
+        self.parent.setBidi(getBidiType(text))
+        
+        if not text.startswith(HTML_PLACEHOLDER_PREFIX):
+            if self.parent.nodeName == "p":
+                text = text.replace("\n", "\n   ")
+            elif (self.parent.nodeName == "li"
+                  and self.parent.childNodes[0]==self):
+                text = "\n     " + text.replace("\n", "\n     ")
+        text = self.doc.normalizeEntities(text)
+        return text
+
+
+class EntityReference:
+
+    type = "entity_ref"
+
+    def __init__(self, entity):
+        self.entity = entity
+
+    def handleAttributes(self):
+        pass
+
+    def toxml(self):
+        return "&" + self.entity + ";"
+
+
+"""
+======================================================================
+========================== PRE-PROCESSORS ============================
+======================================================================
+
+Preprocessors munge source text before we start doing anything too
+complicated.
+
+Each preprocessor implements a "run" method that takes a pointer to a
+list of lines of the document, modifies it as necessary and returns
+either the same pointer or a pointer to a new list.  Preprocessors
+must extend markdown.Preprocessor.
+
+"""
+
+
+class Preprocessor:
+    pass
+
+
+class HeaderPreprocessor (Preprocessor):
+
+    """
+       Replaces underlined headers with hashed headers to avoid
+       the nead for lookahead later.
+    """
+
+    def run (self, lines):
+
+        i = -1
+        while i+1 < len(lines):
+            i = i+1
+            if not lines[i].strip():
+                continue
+
+            if lines[i].startswith("#"):
+                lines.insert(i+1, "\n")
+
+            if (i+1 <= len(lines)
+                  and lines[i+1]
+                  and lines[i+1][0] in ['-', '=']):
+
+                underline = lines[i+1].strip()
+
+                if underline == "="*len(underline):
+                    lines[i] = "# " + lines[i].strip()
+                    lines[i+1] = ""
+                elif underline == "-"*len(underline):
+                    lines[i] = "## " + lines[i].strip()
+                    lines[i+1] = ""
+
+        return lines
+
+HEADER_PREPROCESSOR = HeaderPreprocessor()
+
+class LinePreprocessor (Preprocessor):
+    """Deals with HR lines (needs to be done before processing lists)"""
+
+    blockquote_re = re.compile(r'^(> )+')
+
+    def run (self, lines):
+        for i in range(len(lines)):
+            prefix = ''
+            m = self.blockquote_re.search(lines[i])
+            if m : prefix = m.group(0)
+            if self._isLine(lines[i][len(prefix):]):
+                lines[i] = prefix + self.stash.store("<hr />", safe=True)
+        return lines
+
+    def _isLine(self, block):
+        """Determines if a block should be replaced with an <:wHR>"""
+        if block.startswith("    "): return 0  # a code block
+        text = "".join([x for x in block if not x.isspace()])
+        if len(text) <= 2:
+            return 0
+        for pattern in ['isline1', 'isline2', 'isline3']:
+            m = RE.regExp[pattern].match(text)
+            if (m and m.group(1)):
+                return 1
+        else:
+            return 0
+
+LINE_PREPROCESSOR = LinePreprocessor()
+
+
+class HtmlBlockPreprocessor (Preprocessor):
+    """Removes html blocks from self.lines"""
+    
+    def _get_left_tag(self, block):
+        return block[1:].replace(">", " ", 1).split()[0].lower()
+
+
+    def _get_right_tag(self, left_tag, block):
+        return block.rstrip()[-len(left_tag)-2:-1].lower()
+
+    def _equal_tags(self, left_tag, right_tag):
+        
+        if left_tag in ['?', '?php', 'div']: # handle PHP, etc.
+            return True
+        if ("/" + left_tag) == right_tag:
+            return True
+        if (right_tag == "--" and left_tag == "--"):
+            return True
+        elif left_tag == right_tag[1:] \
+            and right_tag[0] != "<":
+            return True
+        else:
+            return False
+
+    def _is_oneliner(self, tag):
+        return (tag in ['hr', 'hr/'])
+
+    
+    def run (self, text):
+
+        new_blocks = []
+        text = text.split("\n\n")
+        
+        items = []
+        left_tag = ''
+        right_tag = ''
+        in_tag = False # flag
+        
+        for block in text:
+            if block.startswith("\n"):
+                block = block[1:]
+
+            if not in_tag:
+
+                if block.startswith("<"):
+                    
+                    left_tag = self._get_left_tag(block)
+                    right_tag = self._get_right_tag(left_tag, block)
+
+                    if not (is_block_level(left_tag) \
+                        or block[1] in ["!", "?", "@", "%"]):
+                        new_blocks.append(block)
+                        continue
+
+                    if self._is_oneliner(left_tag):
+                        new_blocks.append(block.strip())
+                        continue
+                        
+                    if block[1] == "!":
+                        # is a comment block
+                        left_tag = "--"
+                        right_tag = self._get_right_tag(left_tag, block)
+                        # keep checking conditions below and maybe just append
+                        
+                    if block.rstrip().endswith(">") \
+                        and self._equal_tags(left_tag, right_tag):
+                        new_blocks.append(
+                            self.stash.store(block.strip()))
+                        continue
+                    else: #if not block[1] == "!":
+                        # if is block level tag and is not complete
+                        items.append(block.strip())
+                        in_tag = True
+                        continue
+
+                new_blocks.append(block)
+
+            else:
+                items.append(block.strip())
+                
+                right_tag = self._get_right_tag(left_tag, block)
+                
+                if self._equal_tags(left_tag, right_tag):
+                    # if find closing tag
+                    in_tag = False
+                    new_blocks.append(
+                        self.stash.store('\n\n'.join(items)))
+                    items = []
+
+        if items:
+            new_blocks.append(self.stash.store('\n\n'.join(items)))
+            new_blocks.append('\n')
+            
+        return "\n\n".join(new_blocks)
+
+HTML_BLOCK_PREPROCESSOR = HtmlBlockPreprocessor()
+
+
+class ReferencePreprocessor (Preprocessor):
+
+    def run (self, lines):
+
+        new_text = [];
+        for line in lines:
+            m = RE.regExp['reference-def'].match(line)
+            if m:
+                id = m.group(2).strip().lower()
+                t = m.group(4).strip()  # potential title
+                if not t:
+                    self.references[id] = (m.group(3), t)
+                elif (len(t) >= 2
+                      and (t[0] == t[-1] == "\""
+                           or t[0] == t[-1] == "\'"
+                           or (t[0] == "(" and t[-1] == ")") ) ):
+                    self.references[id] = (m.group(3), t[1:-1])
+                else:
+                    new_text.append(line)
+            else:
+                new_text.append(line)
+
+        return new_text #+ "\n"
+
+REFERENCE_PREPROCESSOR = ReferencePreprocessor()
+
+"""
+======================================================================
+========================== INLINE PATTERNS ===========================
+======================================================================
+
+Inline patterns such as *emphasis* are handled by means of auxiliary
+objects, one per pattern.  Pattern objects must be instances of classes
+that extend markdown.Pattern.  Each pattern object uses a single regular
+expression and needs support the following methods:
+
+  pattern.getCompiledRegExp() - returns a regular expression
+
+  pattern.handleMatch(m, doc) - takes a match object and returns
+                                a NanoDom node (as a part of the provided
+                                doc) or None
+
+All of python markdown's built-in patterns subclass from Patter,
+but you can add additional patterns that don't.
+
+Also note that all the regular expressions used by inline must
+capture the whole block.  For this reason, they all start with
+'^(.*)' and end with '(.*)!'.  In case with built-in expression
+Pattern takes care of adding the "^(.*)" and "(.*)!".
+
+Finally, the order in which regular expressions are applied is very
+important - e.g. if we first replace http://.../ links with <a> tags
+and _then_ try to replace inline html, we would end up with a mess.
+So, we apply the expressions in the following order:
+
+       * escape and backticks have to go before everything else, so
+         that we can preempt any markdown patterns by escaping them.
+
+       * then we handle auto-links (must be done before inline html)
+
+       * then we handle inline HTML.  At this point we will simply
+         replace all inline HTML strings with a placeholder and add
+         the actual HTML to a hash.
+
+       * then inline images (must be done before links)
+
+       * then bracketed links, first regular then reference-style
+
+       * finally we apply strong and emphasis
+"""
+
+NOBRACKET = r'[^\]\[]*'
+BRK = ( r'\[('
+        + (NOBRACKET + r'(\[')*6
+        + (NOBRACKET+ r'\])*')*6
+        + NOBRACKET + r')\]' )
+NOIMG = r'(?<!\!)'
+
+BACKTICK_RE = r'\`([^\`]*)\`'                    # `e= m*c^2`
+DOUBLE_BACKTICK_RE =  r'\`\`(.*)\`\`'            # ``e=f("`")``
+ESCAPE_RE = r'\\(.)'                             # \<
+EMPHASIS_RE = r'\*([^\*]*)\*'                    # *emphasis*
+STRONG_RE = r'\*\*(.*)\*\*'                      # **strong**
+STRONG_EM_RE = r'\*\*\*([^_]*)\*\*\*'            # ***strong***
+
+if SMART_EMPHASIS:
+    EMPHASIS_2_RE = r'(?<!\S)_(\S[^_]*)_'        # _emphasis_
+else:
+    EMPHASIS_2_RE = r'_([^_]*)_'                 # _emphasis_
+
+STRONG_2_RE = r'__([^_]*)__'                     # __strong__
+STRONG_EM_2_RE = r'___([^_]*)___'                # ___strong___
+
+LINK_RE = NOIMG + BRK + r'\s*\(([^\)]*)\)'               # [text](url)
+LINK_ANGLED_RE = NOIMG + BRK + r'\s*\(<([^\)]*)>\)'      # [text](<url>)
+IMAGE_LINK_RE = r'\!' + BRK + r'\s*\(([^\)]*)\)' # ![alttxt](http://x.com/)
+REFERENCE_RE = NOIMG + BRK+ r'\s*\[([^\]]*)\]'           # [Google][3]
+IMAGE_REFERENCE_RE = r'\!' + BRK + '\s*\[([^\]]*)\]' # ![alt text][2]
+NOT_STRONG_RE = r'( \* )'                        # stand-alone * or _
+AUTOLINK_RE = r'<(http://[^>]*)>'                # <http://www.123.com>
+AUTOMAIL_RE = r'<([^> \!]*@[^> ]*)>'               # <me@example.com>
+#HTML_RE = r'(\<[^\>]*\>)'                        # <...>
+HTML_RE = r'(\<[a-zA-Z/][^\>]*\>)'               # <...>
+ENTITY_RE = r'(&[\#a-zA-Z0-9]*;)'                # &amp;
+LINE_BREAK_RE = r'  \n'                     # two spaces at end of line
+LINE_BREAK_2_RE = r'  $'                    # two spaces at end of text
+
+class Pattern:
+
+    def __init__ (self, pattern):
+        self.pattern = pattern
+        self.compiled_re = re.compile("^(.*)%s(.*)$" % pattern, re.DOTALL)
+
+    def getCompiledRegExp (self):
+        return self.compiled_re
+
+BasePattern = Pattern # for backward compatibility
+
+class SimpleTextPattern (Pattern):
+
+    def handleMatch(self, m, doc):
+        return doc.createTextNode(m.group(2))
+
+class SimpleTagPattern (Pattern):
+
+    def __init__ (self, pattern, tag):
+        Pattern.__init__(self, pattern)
+        self.tag = tag
+
+    def handleMatch(self, m, doc):
+        el = doc.createElement(self.tag)
+        el.appendChild(doc.createTextNode(m.group(2)))
+        return el
+
+class SubstituteTagPattern (SimpleTagPattern):
+
+    def handleMatch (self, m, doc):
+        return doc.createElement(self.tag)
+
+class BacktickPattern (Pattern):
+
+    def __init__ (self, pattern):
+        Pattern.__init__(self, pattern)
+        self.tag = "code"
+
+    def handleMatch(self, m, doc):
+        el = doc.createElement(self.tag)
+        text = m.group(2).strip()
+        #text = text.replace("&", "&amp;")
+        el.appendChild(doc.createTextNode(text))
+        return el
+
+
+class DoubleTagPattern (SimpleTagPattern): 
+
+    def handleMatch(self, m, doc):
+        tag1, tag2 = self.tag.split(",")
+        el1 = doc.createElement(tag1)
+        el2 = doc.createElement(tag2)
+        el1.appendChild(el2)
+        el2.appendChild(doc.createTextNode(m.group(2)))
+        return el1
+
+
+class HtmlPattern (Pattern):
+
+    def handleMatch (self, m, doc):
+        rawhtml = m.group(2)
+        inline = True
+        place_holder = self.stash.store(rawhtml)
+        return doc.createTextNode(place_holder)
+
+
+class LinkPattern (Pattern):
+
+    def handleMatch(self, m, doc):
+        el = doc.createElement('a')
+        el.appendChild(doc.createTextNode(m.group(2)))
+        parts = m.group(9).split('"')
+        # We should now have [], [href], or [href, title]
+        if parts:
+            el.setAttribute('href', parts[0].strip())
+        else:
+            el.setAttribute('href', "")
+        if len(parts) > 1:
+            # we also got a title
+            title = '"' + '"'.join(parts[1:]).strip()
+            title = dequote(title) #.replace('"', "&quot;")
+            el.setAttribute('title', title)
+        return el
+
+
+class ImagePattern (Pattern):
+
+    def handleMatch(self, m, doc):
+        el = doc.createElement('img')
+        src_parts = m.group(9).split()
+        if src_parts:
+            el.setAttribute('src', src_parts[0])
+        else:
+            el.setAttribute('src', "")
+        if len(src_parts) > 1:
+            el.setAttribute('title', dequote(" ".join(src_parts[1:])))
+        if ENABLE_ATTRIBUTES:
+            text = doc.createTextNode(m.group(2))
+            el.appendChild(text)
+            text.handleAttributes()
+            truealt = text.value
+            el.childNodes.remove(text)
+        else:
+            truealt = m.group(2)
+        el.setAttribute('alt', truealt)
+        return el
+
+class ReferencePattern (Pattern):
+
+    def handleMatch(self, m, doc):
+
+        if m.group(9):
+            id = m.group(9).lower()
+        else:
+            # if we got something like "[Google][]"
+            # we'll use "google" as the id
+            id = m.group(2).lower()
+
+        if not self.references.has_key(id): # ignore undefined refs
+            return None
+        href, title = self.references[id]
+        text = m.group(2)
+        return self.makeTag(href, title, text, doc)
+
+    def makeTag(self, href, title, text, doc):
+        el = doc.createElement('a')
+        el.setAttribute('href', href)
+        if title:
+            el.setAttribute('title', title)
+        el.appendChild(doc.createTextNode(text))
+        return el
+
+
+class ImageReferencePattern (ReferencePattern):
+
+    def makeTag(self, href, title, text, doc):
+        el = doc.createElement('img')
+        el.setAttribute('src', href)
+        if title:
+            el.setAttribute('title', title)
+        el.setAttribute('alt', text)
+        return el
+
+
+class AutolinkPattern (Pattern):
+
+    def handleMatch(self, m, doc):
+        el = doc.createElement('a')
+        el.setAttribute('href', m.group(2))
+        el.appendChild(doc.createTextNode(m.group(2)))
+        return el
+
+class AutomailPattern (Pattern):
+
+    def handleMatch(self, m, doc):
+        el = doc.createElement('a')
+        email = m.group(2)
+        if email.startswith("mailto:"):
+            email = email[len("mailto:"):]
+        for letter in email:
+            entity = doc.createEntityReference("#%d" % ord(letter))
+            el.appendChild(entity)
+        mailto = "mailto:" + email
+        mailto = "".join(['&#%d;' % ord(letter) for letter in mailto])
+        el.setAttribute('href', mailto)
+        return el
+
+ESCAPE_PATTERN          = SimpleTextPattern(ESCAPE_RE)
+NOT_STRONG_PATTERN      = SimpleTextPattern(NOT_STRONG_RE)
+
+BACKTICK_PATTERN        = BacktickPattern(BACKTICK_RE)
+DOUBLE_BACKTICK_PATTERN = BacktickPattern(DOUBLE_BACKTICK_RE)
+STRONG_PATTERN          = SimpleTagPattern(STRONG_RE, 'strong')
+STRONG_PATTERN_2        = SimpleTagPattern(STRONG_2_RE, 'strong')
+EMPHASIS_PATTERN        = SimpleTagPattern(EMPHASIS_RE, 'em')
+EMPHASIS_PATTERN_2      = SimpleTagPattern(EMPHASIS_2_RE, 'em')
+
+STRONG_EM_PATTERN       = DoubleTagPattern(STRONG_EM_RE, 'strong,em')
+STRONG_EM_PATTERN_2     = DoubleTagPattern(STRONG_EM_2_RE, 'strong,em')
+
+LINE_BREAK_PATTERN      = SubstituteTagPattern(LINE_BREAK_RE, 'br ')
+LINE_BREAK_PATTERN_2    = SubstituteTagPattern(LINE_BREAK_2_RE, 'br ')
+
+LINK_PATTERN            = LinkPattern(LINK_RE)
+LINK_ANGLED_PATTERN     = LinkPattern(LINK_ANGLED_RE)
+IMAGE_LINK_PATTERN      = ImagePattern(IMAGE_LINK_RE)
+IMAGE_REFERENCE_PATTERN = ImageReferencePattern(IMAGE_REFERENCE_RE)
+REFERENCE_PATTERN       = ReferencePattern(REFERENCE_RE)
+
+HTML_PATTERN            = HtmlPattern(HTML_RE)
+ENTITY_PATTERN          = HtmlPattern(ENTITY_RE)
+
+AUTOLINK_PATTERN        = AutolinkPattern(AUTOLINK_RE)
+AUTOMAIL_PATTERN        = AutomailPattern(AUTOMAIL_RE)
+
+
+"""
+======================================================================
+========================== POST-PROCESSORS ===========================
+======================================================================
+
+Markdown also allows post-processors, which are similar to
+preprocessors in that they need to implement a "run" method.  Unlike
+pre-processors, they take a NanoDom document as a parameter and work
+with that.
+
+Post-Processor should extend markdown.Postprocessor.
+
+There are currently no standard post-processors, but the footnote
+extension below uses one.
+"""
+
+class Postprocessor:
+    pass
+
+
+"""
+======================================================================
+======================== TEXT-POST-PROCESSORS ========================
+======================================================================
+
+Markdown also allows text-post-processors, which are similar to
+textpreprocessors in that they need to implement a "run" method.  
+Unlike post-processors, they take a text string as a parameter and 
+should return a string.
+
+Text-Post-Processors should extend markdown.Postprocessor.
+
+"""
+
+
+class RawHtmlTextPostprocessor(Postprocessor):
+
+    def __init__(self):
+        pass
+
+    def run(self, text):
+        for i in range(self.stash.html_counter):
+            html, safe  = self.stash.rawHtmlBlocks[i]
+            if self.safeMode and not safe:
+                if str(self.safeMode).lower() == 'escape':
+                    html = self.escape(html)
+                elif str(self.safeMode).lower() == 'remove':
+                    html = ''
+                else:
+                    html = HTML_REMOVED_TEXT
+                                   
+            text = text.replace("<p>%s\n</p>" % (HTML_PLACEHOLDER % i),
+                              html + "\n")
+            text =  text.replace(HTML_PLACEHOLDER % i, html)
+        return text
+
+    def escape(self, html):
+        ''' Basic html escaping '''
+        html = html.replace('&', '&amp;')
+        html = html.replace('<', '&lt;')
+        html = html.replace('>', '&gt;')
+        return html.replace('"', '&quot;')
+
+RAWHTMLTEXTPOSTPROCESSOR = RawHtmlTextPostprocessor()
+
+"""
+======================================================================
+========================== MISC AUXILIARY CLASSES ====================
+======================================================================
+"""
+
+class HtmlStash:
+    """This class is used for stashing HTML objects that we extract
+        in the beginning and replace with place-holders."""
+
+    def __init__ (self):
+        self.html_counter = 0 # for counting inline html segments
+        self.rawHtmlBlocks=[]
+
+    def store(self, html, safe=False):
+        """Saves an HTML segment for later reinsertion.  Returns a
+           placeholder string that needs to be inserted into the
+           document.
+
+           @param html: an html segment
+           @param safe: label an html segment as safe for safemode
+           @param inline: label a segmant as inline html
+           @returns : a placeholder string """
+        self.rawHtmlBlocks.append((html, safe))
+        placeholder = HTML_PLACEHOLDER % self.html_counter
+        self.html_counter += 1
+        return placeholder
+
+
+class BlockGuru:
+
+    def _findHead(self, lines, fn, allowBlank=0):
+
+        """Functional magic to help determine boundaries of indented
+           blocks.
+
+           @param lines: an array of strings
+           @param fn: a function that returns a substring of a string
+                      if the string matches the necessary criteria
+           @param allowBlank: specifies whether it's ok to have blank
+                      lines between matching functions
+           @returns: a list of post processes items and the unused
+                      remainder of the original list"""
+
+        items = []
+        item = -1
+
+        i = 0 # to keep track of where we are
+
+        for line in lines:
+
+            if not line.strip() and not allowBlank:
+                return items, lines[i:]
+
+            if not line.strip() and allowBlank:
+                # If we see a blank line, this _might_ be the end
+                i += 1
+
+                # Find the next non-blank line
+                for j in range(i, len(lines)):
+                    if lines[j].strip():
+                        next = lines[j]
+                        break
+                else:
+                    # There is no more text => this is the end
+                    break
+
+                # Check if the next non-blank line is still a part of the list
+
+                part = fn(next)
+
+                if part:
+                    items.append("")
+                    continue
+                else:
+                    break # found end of the list
+
+            part = fn(line)
+
+            if part:
+                items.append(part)
+                i += 1
+                continue
+            else:
+                return items, lines[i:]
+        else:
+            i += 1
+
+        return items, lines[i:]
+
+
+    def detabbed_fn(self, line):
+        """ An auxiliary method to be passed to _findHead """
+        m = RE.regExp['tabbed'].match(line)
+        if m:
+            return m.group(4)
+        else:
+            return None
+
+
+    def detectTabbed(self, lines):
+
+        return self._findHead(lines, self.detabbed_fn,
+                              allowBlank = 1)
+
+
+def print_error(string):
+    """Print an error string to stderr"""
+    sys.stderr.write(string +'\n')
+
+
+def dequote(string):
+    """ Removes quotes from around a string """
+    if ( ( string.startswith('"') and string.endswith('"'))
+         or (string.startswith("'") and string.endswith("'")) ):
+        return string[1:-1]
+    else:
+        return string
+
+"""
+======================================================================
+========================== CORE MARKDOWN =============================
+======================================================================
+
+This stuff is ugly, so if you are thinking of extending the syntax,
+see first if you can do it via pre-processors, post-processors,
+inline patterns or a combination of the three.
+"""
+
+class CorePatterns:
+    """This class is scheduled for removal as part of a refactoring
+        effort."""
+
+    patterns = {
+        'header':          r'(#*)([^#]*)(#*)', # # A title
+        'reference-def':   r'(\ ?\ ?\ ?)\[([^\]]*)\]:\s*([^ ]*)(.*)',
+                           # [Google]: http://www.google.com/
+        'containsline':    r'([-]*)$|^([=]*)', # -----, =====, etc.
+        'ol':              r'[ ]{0,3}[\d]*\.\s+(.*)', # 1. text
+        'ul':              r'[ ]{0,3}[*+-]\s+(.*)', # "* text"
+        'isline1':         r'(\**)', # ***
+        'isline2':         r'(\-*)', # ---
+        'isline3':         r'(\_*)', # ___
+        'tabbed':          r'((\t)|(    ))(.*)', # an indented line
+        'quoted':          r'> ?(.*)', # a quoted block ("> ...")
+    }
+
+    def __init__ (self):
+
+        self.regExp = {}
+        for key in self.patterns.keys():
+            self.regExp[key] = re.compile("^%s$" % self.patterns[key],
+                                          re.DOTALL)
+
+        self.regExp['containsline'] = re.compile(r'^([-]*)$|^([=]*)$', re.M)
+
+RE = CorePatterns()
+
+
+class Markdown:
+    """ Markdown formatter class for creating an html document from
+        Markdown text """
+
+
+    def __init__(self, source=None,  # depreciated
+                 extensions=[],
+                 extension_configs=None,
+                 safe_mode = False):
+        """Creates a new Markdown instance.
+
+           @param source: The text in Markdown format. Depreciated!
+           @param extensions: A list if extensions.
+           @param extension-configs: Configuration setting for extensions.
+           @param safe_mode: Disallow raw html. """
+
+        self.source = source
+        if source is not None:
+            message(WARN, "The `source` arg of Markdown.__init__() is depreciated and will be removed in the future. Use `instance.convert(source)` instead.")
+        self.safeMode = safe_mode
+        self.blockGuru = BlockGuru()
+        self.registeredExtensions = []
+        self.stripTopLevelTags = 1
+        self.docType = ""
+
+        self.textPreprocessors = [HTML_BLOCK_PREPROCESSOR]
+
+        self.preprocessors = [HEADER_PREPROCESSOR,
+                              LINE_PREPROCESSOR,
+                              # A footnote preprocessor will
+                              # get inserted here
+                              REFERENCE_PREPROCESSOR]
+
+
+        self.postprocessors = [] # a footnote postprocessor will get
+                                 # inserted later
+
+        self.textPostprocessors = [# a footnote postprocessor will get
+                                   # inserted here
+                                   RAWHTMLTEXTPOSTPROCESSOR]
+
+        self.prePatterns = []
+        
+
+        self.inlinePatterns = [DOUBLE_BACKTICK_PATTERN,
+                               BACKTICK_PATTERN,
+                               ESCAPE_PATTERN,
+                               REFERENCE_PATTERN,
+                               LINK_ANGLED_PATTERN,
+                               LINK_PATTERN,
+                               IMAGE_LINK_PATTERN,
+			                   IMAGE_REFERENCE_PATTERN,
+			                   AUTOLINK_PATTERN,
+                               AUTOMAIL_PATTERN,
+                               LINE_BREAK_PATTERN_2,
+                               LINE_BREAK_PATTERN,
+                               HTML_PATTERN,
+                               ENTITY_PATTERN,
+                               NOT_STRONG_PATTERN,
+                               STRONG_EM_PATTERN,
+                               STRONG_EM_PATTERN_2,
+                               STRONG_PATTERN,
+                               STRONG_PATTERN_2,
+                               EMPHASIS_PATTERN,
+                               EMPHASIS_PATTERN_2
+                               # The order of the handlers matters!!!
+                               ]
+
+        self.registerExtensions(extensions = extensions,
+                                configs = extension_configs)
+
+        self.reset()
+
+
+    def registerExtensions(self, extensions, configs):
+        if not configs:
+            configs = {}
+        for module in extensions:
+            ext = module.__name__.split("_")[1]
+            if configs.has_key(ext):
+                configs_for_ext = configs[ext]
+            else:
+                configs_for_ext = []
+            extension = module.makeExtension(configs_for_ext)    
+            extension.extendMarkdown(self, globals())
+
+
+
+
+    def registerExtension(self, extension):
+        """ This gets called by the extension """
+        self.registeredExtensions.append(extension)
+
+    def reset(self):
+        """Resets all state variables so that we can start
+            with a new text."""
+        self.references={}
+        self.htmlStash = HtmlStash()
+
+        HTML_BLOCK_PREPROCESSOR.stash = self.htmlStash
+        LINE_PREPROCESSOR.stash = self.htmlStash
+        REFERENCE_PREPROCESSOR.references = self.references
+        HTML_PATTERN.stash = self.htmlStash
+        ENTITY_PATTERN.stash = self.htmlStash
+        REFERENCE_PATTERN.references = self.references
+        IMAGE_REFERENCE_PATTERN.references = self.references
+        RAWHTMLTEXTPOSTPROCESSOR.stash = self.htmlStash
+        RAWHTMLTEXTPOSTPROCESSOR.safeMode = self.safeMode
+
+        for extension in self.registeredExtensions:
+            extension.reset()
+
+
+    def _transform(self):
+        """Transforms the Markdown text into a XHTML body document
+
+           @returns: A NanoDom Document """
+
+        # Setup the document
+
+        self.doc = Document()
+        self.top_element = self.doc.createElement("span")
+        self.top_element.appendChild(self.doc.createTextNode('\n'))
+        self.top_element.setAttribute('class', 'markdown')
+        self.doc.appendChild(self.top_element)
+
+        # Fixup the source text
+        text = self.source
+        text = text.replace("\r\n", "\n").replace("\r", "\n")
+        text += "\n\n"
+        text = text.expandtabs(TAB_LENGTH)
+
+        # Split into lines and run the preprocessors that will work with
+        # self.lines
+
+        self.lines = text.split("\n")
+
+        # Run the pre-processors on the lines
+        for prep in self.preprocessors :
+            self.lines = prep.run(self.lines)
+
+        # Create a NanoDom tree from the lines and attach it to Document
+
+
+        buffer = []
+        for line in self.lines:
+            if line.startswith("#"):
+                self._processSection(self.top_element, buffer)
+                buffer = [line]
+            else:
+                buffer.append(line)
+        self._processSection(self.top_element, buffer)
+        
+        #self._processSection(self.top_element, self.lines)
+
+        # Not sure why I put this in but let's leave it for now.
+        self.top_element.appendChild(self.doc.createTextNode('\n'))
+
+        # Run the post-processors
+        for postprocessor in self.postprocessors:
+            postprocessor.run(self.doc)
+
+        return self.doc
+
+
+    def _processSection(self, parent_elem, lines,
+                        inList = 0, looseList = 0):
+
+        """Process a section of a source document, looking for high
+           level structural elements like lists, block quotes, code
+           segments, html blocks, etc.  Some those then get stripped
+           of their high level markup (e.g. get unindented) and the
+           lower-level markup is processed recursively.
+
+           @param parent_elem: A NanoDom element to which the content
+                               will be added
+           @param lines: a list of lines
+           @param inList: a level
+           @returns: None"""
+
+        # Loop through lines until none left.
+        while lines:
+
+            # Check if this section starts with a list, a blockquote or
+            # a code block
+
+            processFn = { 'ul':     self._processUList,
+                          'ol':     self._processOList,
+                          'quoted': self._processQuote,
+                          'tabbed': self._processCodeBlock}
+
+            for regexp in ['ul', 'ol', 'quoted', 'tabbed']:
+                m = RE.regExp[regexp].match(lines[0])
+                if m:
+                    processFn[regexp](parent_elem, lines, inList)
+                    return
+
+            # We are NOT looking at one of the high-level structures like
+            # lists or blockquotes.  So, it's just a regular paragraph
+            # (though perhaps nested inside a list or something else).  If
+            # we are NOT inside a list, we just need to look for a blank
+            # line to find the end of the block.  If we ARE inside a
+            # list, however, we need to consider that a sublist does not
+            # need to be separated by a blank line.  Rather, the following
+            # markup is legal:
+            #
+            # * The top level list item
+            #
+            #     Another paragraph of the list.  This is where we are now.
+            #     * Underneath we might have a sublist.
+            #
+
+            if inList:
+
+                start, lines  = self._linesUntil(lines, (lambda line:
+                                 RE.regExp['ul'].match(line)
+                                 or RE.regExp['ol'].match(line)
+                                                  or not line.strip()))
+
+                self._processSection(parent_elem, start,
+                                     inList - 1, looseList = looseList)
+                inList = inList-1
+
+            else: # Ok, so it's just a simple block
+
+                paragraph, lines = self._linesUntil(lines, lambda line:
+                                                     not line.strip())
+
+                if len(paragraph) and paragraph[0].startswith('#'):
+                    self._processHeader(parent_elem, paragraph)
+
+                elif paragraph:
+                    self._processParagraph(parent_elem, paragraph,
+                                          inList, looseList)
+
+            if lines and not lines[0].strip():
+                lines = lines[1:]  # skip the first (blank) line
+
+
+    def _processHeader(self, parent_elem, paragraph):
+        m = RE.regExp['header'].match(paragraph[0])
+        if m:
+            level = len(m.group(1))
+            h = self.doc.createElement("h%d" % level)
+            parent_elem.appendChild(h)
+            for item in self._handleInlineWrapper(m.group(2).strip()):
+                h.appendChild(item)
+        else:
+            message(CRITICAL, "We've got a problem header!")
+
+
+    def _processParagraph(self, parent_elem, paragraph, inList, looseList):
+        list = self._handleInlineWrapper("\n".join(paragraph))
+
+        if ( parent_elem.nodeName == 'li'
+                and not (looseList or parent_elem.childNodes)):
+
+            # If this is the first paragraph inside "li", don't
+            # put <p> around it - append the paragraph bits directly
+            # onto parent_elem
+            el = parent_elem
+        else:
+            # Otherwise make a "p" element
+            el = self.doc.createElement("p")
+            parent_elem.appendChild(el)
+
+        for item in list:
+            el.appendChild(item)
+ 
+
+    def _processUList(self, parent_elem, lines, inList):
+        self._processList(parent_elem, lines, inList,
+                         listexpr='ul', tag = 'ul')
+
+    def _processOList(self, parent_elem, lines, inList):
+        self._processList(parent_elem, lines, inList,
+                         listexpr='ol', tag = 'ol')
+
+
+    def _processList(self, parent_elem, lines, inList, listexpr, tag):
+        """Given a list of document lines starting with a list item,
+           finds the end of the list, breaks it up, and recursively
+           processes each list item and the remainder of the text file.
+
+           @param parent_elem: A dom element to which the content will be added
+           @param lines: a list of lines
+           @param inList: a level
+           @returns: None"""
+
+        ul = self.doc.createElement(tag)  # ul might actually be '<ol>'
+        parent_elem.appendChild(ul)
+
+        looseList = 0
+
+        # Make a list of list items
+        items = []
+        item = -1
+
+        i = 0  # a counter to keep track of where we are
+
+        for line in lines: 
+
+            loose = 0
+            if not line.strip():
+                # If we see a blank line, this _might_ be the end of the list
+                i += 1
+                loose = 1
+
+                # Find the next non-blank line
+                for j in range(i, len(lines)):
+                    if lines[j].strip():
+                        next = lines[j]
+                        break
+                else:
+                    # There is no more text => end of the list
+                    break
+
+                # Check if the next non-blank line is still a part of the list
+                if ( RE.regExp['ul'].match(next) or
+                     RE.regExp['ol'].match(next) or 
+                     RE.regExp['tabbed'].match(next) ):
+                    # get rid of any white space in the line
+                    items[item].append(line.strip())
+                    looseList = loose or looseList
+                    continue
+                else:
+                    break # found end of the list
+
+            # Now we need to detect list items (at the current level)
+            # while also detabing child elements if necessary
+
+            for expr in ['ul', 'ol', 'tabbed']:
+
+                m = RE.regExp[expr].match(line)
+                if m:
+                    if expr in ['ul', 'ol']:  # We are looking at a new item
+                        #if m.group(1) :
+                        # Removed the check to allow for a blank line
+                        # at the beginning of the list item
+                        items.append([m.group(1)])
+                        item += 1
+                    elif expr == 'tabbed':  # This line needs to be detabbed
+                        items[item].append(m.group(4)) #after the 'tab'
+
+                    i += 1
+                    break
+            else:
+                items[item].append(line)  # Just regular continuation
+                i += 1 # added on 2006.02.25
+        else:
+            i += 1
+
+        # Add the dom elements
+        for item in items:
+            li = self.doc.createElement("li")
+            ul.appendChild(li)
+
+            self._processSection(li, item, inList + 1, looseList = looseList)
+
+        # Process the remaining part of the section
+
+        self._processSection(parent_elem, lines[i:], inList)
+
+
+    def _linesUntil(self, lines, condition):
+        """ A utility function to break a list of lines upon the
+            first line that satisfied a condition.  The condition
+            argument should be a predicate function.
+            """
+
+        i = -1
+        for line in lines:
+            i += 1
+            if condition(line): break
+        else:
+            i += 1
+        return lines[:i], lines[i:]
+
+    def _processQuote(self, parent_elem, lines, inList):
+        """Given a list of document lines starting with a quote finds
+           the end of the quote, unindents it and recursively
+           processes the body of the quote and the remainder of the
+           text file.
+
+           @param parent_elem: DOM element to which the content will be added
+           @param lines: a list of lines
+           @param inList: a level
+           @returns: None """
+
+        dequoted = []
+        i = 0
+        blank_line = False # allow one blank line between paragraphs
+        for line in lines:
+            m = RE.regExp['quoted'].match(line)
+            if m:
+                dequoted.append(m.group(1))
+                i += 1
+                blank_line = False
+            elif not blank_line and line.strip() != '':
+                dequoted.append(line)
+                i += 1
+            elif not blank_line and line.strip() == '':
+                dequoted.append(line)
+                i += 1
+                blank_line = True
+            else:
+                break
+
+        blockquote = self.doc.createElement('blockquote')
+        parent_elem.appendChild(blockquote)
+
+        self._processSection(blockquote, dequoted, inList)
+        self._processSection(parent_elem, lines[i:], inList)
+
+
+
+
+    def _processCodeBlock(self, parent_elem, lines, inList):
+        """Given a list of document lines starting with a code block
+           finds the end of the block, puts it into the dom verbatim
+           wrapped in ("<pre><code>") and recursively processes the
+           the remainder of the text file.
+
+           @param parent_elem: DOM element to which the content will be added
+           @param lines: a list of lines
+           @param inList: a level
+           @returns: None"""
+
+        detabbed, theRest = self.blockGuru.detectTabbed(lines)
+
+        pre = self.doc.createElement('pre')
+        code = self.doc.createElement('code')
+        parent_elem.appendChild(pre)
+        pre.appendChild(code)
+        text = "\n".join(detabbed).rstrip()+"\n"
+        #text = text.replace("&", "&amp;")
+        code.appendChild(self.doc.createTextNode(text))
+        self._processSection(parent_elem, theRest, inList)
+
+
+
+    def _handleInlineWrapper (self, line, patternIndex=0):
+
+        parts = [line]
+
+        while patternIndex < len(self.inlinePatterns):
+
+            i = 0
+
+            while i < len(parts):
+                
+                x = parts[i]
+
+                if isinstance(x, (str, unicode)):
+                    result = self._applyPattern(x, \
+                                self.inlinePatterns[patternIndex], \
+                                patternIndex)
+
+                    if result:
+                        i -= 1
+                        parts.remove(x)
+                        for y in result:
+                            parts.insert(i+1,y)
+
+                i += 1
+            patternIndex += 1
+
+        for i in range(len(parts)):
+            x = parts[i]
+            if isinstance(x, (str, unicode)):
+                parts[i] = self.doc.createTextNode(x)
+
+        return parts
+        
+
+    def _handleInline(self,  line):
+        """Transform a Markdown line with inline elements to an XHTML
+        fragment.
+
+        This function uses auxiliary objects called inline patterns.
+        See notes on inline patterns above.
+
+        @param item: A block of Markdown text
+        @return: A list of NanoDom nodes """
+
+        if not(line):
+            return [self.doc.createTextNode(' ')]
+
+        for pattern in self.inlinePatterns:
+            list = self._applyPattern( line, pattern)
+            if list: return list
+
+        return [self.doc.createTextNode(line)]
+
+    def _applyPattern(self, line, pattern, patternIndex):
+
+        """ Given a pattern name, this function checks if the line
+        fits the pattern, creates the necessary elements, and returns
+        back a list consisting of NanoDom elements and/or strings.
+        
+        @param line: the text to be processed
+        @param pattern: the pattern to be checked
+
+        @returns: the appropriate newly created NanoDom element if the
+                  pattern matches, None otherwise.
+        """
+
+        # match the line to pattern's pre-compiled reg exp.
+        # if no match, move on.
+
+
+
+        m = pattern.getCompiledRegExp().match(line)
+        if not m:
+            return None
+
+        # if we got a match let the pattern make us a NanoDom node
+        # if it doesn't, move on
+        node = pattern.handleMatch(m, self.doc)
+
+        # check if any of this nodes have children that need processing
+
+        if isinstance(node, Element):
+
+            if not node.nodeName in ["code", "pre"]:
+                for child in node.childNodes:
+                    if isinstance(child, TextNode):
+                        
+                        result = self._handleInlineWrapper(child.value, patternIndex+1)
+                        
+                        if result:
+
+                            if result == [child]:
+                                continue
+                                
+                            result.reverse()
+                            #to make insertion easier
+
+                            position = node.childNodes.index(child)
+                            
+                            node.removeChild(child)
+
+                            for item in result:
+
+                                if isinstance(item, (str, unicode)):
+                                    if len(item) > 0:
+                                        node.insertChild(position,
+                                             self.doc.createTextNode(item))
+                                else:
+                                    node.insertChild(position, item)
+                
+
+
+
+        if node:
+            # Those are in the reverse order!
+            return ( m.groups()[-1], # the string to the left
+                     node,           # the new node
+                     m.group(1))     # the string to the right of the match
+
+        else:
+            return None
+
+    def convert (self, source = None):
+        """Return the document in XHTML format.
+
+        @returns: A serialized XHTML body."""
+
+        if source is not None: #Allow blank string
+            self.source = source
+
+        if not self.source:
+            return u""
+
+        try:
+            self.source = unicode(self.source)
+        except UnicodeDecodeError:
+            message(CRITICAL, 'UnicodeDecodeError: Markdown only accepts unicode or ascii  input.')
+            return u""
+
+        for pp in self.textPreprocessors:
+            self.source = pp.run(self.source)
+
+        doc = self._transform()
+        xml = doc.toxml()
+
+
+        # Return everything but the top level tag
+
+        if self.stripTopLevelTags:
+            xml = xml.strip()[23:-7] + "\n"
+
+        for pp in self.textPostprocessors:
+            xml = pp.run(xml)
+
+        return (self.docType + xml).strip()
+
+
+    def __str__(self):
+        ''' Report info about instance. Markdown always returns unicode. '''
+        if self.source is None:
+            status = 'in which no source text has been assinged.'
+        else:
+            status = 'which contains %d chars and %d line(s) of source.'%\
+                     (len(self.source), self.source.count('\n')+1)
+        return 'An instance of "%s" %s'% (self.__class__, status)
+
+    __unicode__ = convert # markdown should always return a unicode string
+
+
+
+
+
+# ====================================================================
+
+def markdownFromFile(input = None,
+                     output = None,
+                     extensions = [],
+                     encoding = None,
+                     message_threshold = CRITICAL,
+                     safe = False):
+
+    global console_hndlr
+    console_hndlr.setLevel(message_threshold)
+
+    message(DEBUG, "input file: %s" % input)
+
+    if not encoding:
+        encoding = "utf-8"
+
+    input_file = codecs.open(input, mode="r", encoding=encoding)
+    text = input_file.read()
+    input_file.close()
+
+    text = removeBOM(text, encoding)
+
+    new_text = markdown(text, extensions, safe_mode = safe)
+
+    if output:
+        output_file = codecs.open(output, "w", encoding=encoding)
+        output_file.write(new_text)
+        output_file.close()
+
+    else:
+        sys.stdout.write(new_text.encode(encoding))
+
+def markdown(text,
+             extensions = [],
+             safe_mode = False):
+    
+    message(DEBUG, "in markdown.markdown(), received text:\n%s" % text)
+
+    extension_names = []
+    extension_configs = {}
+    
+    for ext in extensions:
+        pos = ext.find("(") 
+        if pos == -1:
+            extension_names.append(ext)
+        else:
+            name = ext[:pos]
+            extension_names.append(name)
+            pairs = [x.split("=") for x in ext[pos+1:-1].split(",")]
+            configs = [(x.strip(), y.strip()) for (x, y) in pairs]
+            extension_configs[name] = configs
+
+    md = Markdown(extensions=extension_names,
+                  extension_configs=extension_configs,
+                  safe_mode = safe_mode)
+
+    return md.convert(text)
+        
+
+class Extension:
+
+    def __init__(self, configs = {}):
+        self.config = configs
+
+    def getConfig(self, key):
+        if self.config.has_key(key):
+            return self.config[key][0]
+        else:
+            return ""
+
+    def getConfigInfo(self):
+        return [(key, self.config[key][1]) for key in self.config.keys()]
+
+    def setConfig(self, key, value):
+        self.config[key][0] = value
+
+
+OPTPARSE_WARNING = """
+Python 2.3 or higher required for advanced command line options.
+For lower versions of Python use:
+
+      %s INPUT_FILE > OUTPUT_FILE
+    
+""" % EXECUTABLE_NAME_FOR_USAGE
+
+def parse_options():
+
+    try:
+        optparse = __import__("optparse")
+    except:
+        if len(sys.argv) == 2:
+            return {'input': sys.argv[1],
+                    'output': None,
+                    'message_threshold': CRITICAL,
+                    'safe': False,
+                    'extensions': [],
+                    'encoding': None }
+
+        else:
+            print OPTPARSE_WARNING
+            return None
+
+    parser = optparse.OptionParser(usage="%prog INPUTFILE [options]")
+
+    parser.add_option("-f", "--file", dest="filename",
+                      help="write output to OUTPUT_FILE",
+                      metavar="OUTPUT_FILE")
+    parser.add_option("-e", "--encoding", dest="encoding",
+                      help="encoding for input and output files",)
+    parser.add_option("-q", "--quiet", default = CRITICAL,
+                      action="store_const", const=60, dest="verbose",
+                      help="suppress all messages")
+    parser.add_option("-v", "--verbose",
+                      action="store_const", const=INFO, dest="verbose",
+                      help="print info messages")
+    parser.add_option("-s", "--safe", dest="safe", default=False,
+                      metavar="SAFE_MODE",
+                      help="same mode ('replace', 'remove' or 'escape'  user's HTML tag)")
+    
+    parser.add_option("--noisy",
+                      action="store_const", const=DEBUG, dest="verbose",
+                      help="print debug messages")
+    parser.add_option("-x", "--extension", action="append", dest="extensions",
+                      help = "load extension EXTENSION", metavar="EXTENSION")
+
+    (options, args) = parser.parse_args()
+
+    if not len(args) == 1:
+        parser.print_help()
+        return None
+    else:
+        input_file = args[0]
+
+    if not options.extensions:
+        options.extensions = []
+
+    return {'input': input_file,
+            'output': options.filename,
+            'message_threshold': options.verbose,
+            'safe': options.safe,
+            'extensions': options.extensions,
+            'encoding': options.encoding }
+
+if __name__ == '__main__':
+    """ Run Markdown from the command line. """
+
+    options = parse_options()
+
+    #if os.access(inFile, os.R_OK):
+
+    if not options:
+        sys.exit(0)
+    
+    markdownFromFile(**options)
+
+
+
+
+
+
+
+
+
+
diff --git a/markdown/mdx_code.py b/markdown/mdx_code.py
new file mode 100644
index 0000000..c5b13e9
--- /dev/null
+++ b/markdown/mdx_code.py
@@ -0,0 +1,51 @@
+import re
+from lifeflow.markdown import markdown
+from pygments import highlight
+from pygments.formatters import HtmlFormatter
+from pygments.lexers import get_lexer_by_name
+
+class CodeExtension (markdown.Extension):
+
+    def __name__(self):
+        return u"code"
+
+    def extendMarkdown(self, md, md_global):
+        preprocessor = CodeBlockPreprocessor()
+        preprocessor.md = md
+        md.textPreprocessors.insert(0, preprocessor)
+
+
+class CodeBlockPreprocessor :
+
+    def run (self, text):
+        text.replace("\r\n","\n")
+        lines = text.split("\n")
+        new_lines = []
+        seen_start = False
+        lang = None
+        block = []
+        for line in lines:
+            if line.startswith("@@") is True and seen_start is False:
+                lang = line.strip("@@ ")
+                seen_start = True
+            elif line.startswith("@@") is True and seen_start is True:
+                content = u"\n".join(block)
+                try:
+                    lexer = get_lexer_by_name(lang)
+                    highlighted = highlight(content, lexer, HtmlFormatter())
+                    new_lines.append(u"%s" % (highlighted))
+                except:
+                    new_lines.append(u"<pre>%s</pre>" % content)
+                lang = None
+                block = []
+                seen_start = False
+            elif seen_start is True:
+                block.append(line)
+            else:
+                new_lines.append(line)
+        return u"\n".join(new_lines)
+
+
+def makeExtension(configs=None) :
+    return CodeExtension(configs=configs)
+
diff --git a/markdown/mdx_footnotes.py b/markdown/mdx_footnotes.py
new file mode 100644
index 0000000..e92dd1b
--- /dev/null
+++ b/markdown/mdx_footnotes.py
@@ -0,0 +1,261 @@
+"""
+========================= FOOTNOTES =================================
+
+This section adds footnote handling to markdown.  It can be used as
+an example for extending python-markdown with relatively complex
+functionality.  While in this case the extension is included inside
+the module itself, it could just as easily be added from outside the
+module.  Not that all markdown classes above are ignorant about
+footnotes.  All footnote functionality is provided separately and
+then added to the markdown instance at the run time.
+
+Footnote functionality is attached by calling extendMarkdown()
+method of FootnoteExtension.  The method also registers the
+extension to allow it's state to be reset by a call to reset()
+method.
+"""
+
+FN_BACKLINK_TEXT = "zz1337820767766393qq"
+
+from lifeflow.markdown import markdown
+import re, random
+
+class FootnoteExtension (markdown.Extension):
+
+    DEF_RE = re.compile(r'(\ ?\ ?\ ?)\[\^([^\]]*)\]:\s*(.*)')
+    SHORT_USE_RE = re.compile(r'\[\^([^\]]*)\]', re.M) # [^a]
+
+    def __init__ (self, configs) :
+
+        self.config = {'PLACE_MARKER' :
+                       ["///Footnotes Go Here///",
+                        "The text string that marks where the footnotes go"]}
+
+        for key, value in configs :
+            self.config[key][0] = value
+            
+        self.reset()
+
+
+    def __name__(self):
+        return u"footnotes"
+
+    def extendMarkdown(self, md, md_globals) :
+
+        self.md = md
+
+        # Stateless extensions do not need to be registered
+        md.registerExtension(self)
+
+        # Insert a preprocessor before ReferencePreprocessor
+        index = md.preprocessors.index(md_globals['REFERENCE_PREPROCESSOR'])
+        preprocessor = FootnotePreprocessor(self)
+        preprocessor.md = md
+        md.preprocessors.insert(index, preprocessor)
+
+        # Insert an inline pattern before ImageReferencePattern
+        FOOTNOTE_RE = r'\[\^([^\]]*)\]' # blah blah [^1] blah
+        index = md.inlinePatterns.index(md_globals['IMAGE_REFERENCE_PATTERN'])
+        md.inlinePatterns.insert(index, FootnotePattern(FOOTNOTE_RE, self))
+
+        # Insert a post-processor that would actually add the footnote div
+        postprocessor = FootnotePostprocessor(self)
+        postprocessor.extension = self
+
+        md.postprocessors.append(postprocessor)
+        
+        textPostprocessor = FootnoteTextPostprocessor(self)
+
+        md.textPostprocessors.append(textPostprocessor)
+
+
+    def reset(self) :
+        # May be called by Markdown is state reset is desired
+
+        self.footnote_suffix = "-" + str(int(random.random()*1000000000))
+        self.used_footnotes={}
+        self.footnotes = {}
+
+    def findFootnotesPlaceholder(self, doc) :
+        def findFootnotePlaceholderFn(node=None, indent=0):
+            if node.type == 'text':
+                if node.value.find(self.getConfig("PLACE_MARKER")) > -1 :
+                    return True
+
+        fn_div_list = doc.find(findFootnotePlaceholderFn)
+        if fn_div_list :
+            return fn_div_list[0]
+
+
+    def setFootnote(self, id, text) :
+        self.footnotes[id] = text
+
+    def makeFootnoteId(self, num) :
+        return 'fn%d%s' % (num, self.footnote_suffix)
+
+    def makeFootnoteRefId(self, num) :
+        return 'fnr%d%s' % (num, self.footnote_suffix)
+
+    def makeFootnotesDiv (self, doc) :
+        """Creates the div with class='footnote' and populates it with
+           the text of the footnotes.
+
+           @returns: the footnote div as a dom element """
+
+        if not self.footnotes.keys() :
+            return None
+
+        div = doc.createElement("div")
+        div.setAttribute('class', 'footnote')
+        hr = doc.createElement("hr")
+        div.appendChild(hr)
+        ol = doc.createElement("ol")
+        div.appendChild(ol)
+
+        footnotes = [(self.used_footnotes[id], id)
+                     for id in self.footnotes.keys()]
+        footnotes.sort()
+
+        for i, id in footnotes :
+            li = doc.createElement('li')
+            li.setAttribute('id', self.makeFootnoteId(i))
+
+            self.md._processSection(li, self.footnotes[id].split("\n"), looseList=1)
+
+            #li.appendChild(doc.createTextNode(self.footnotes[id]))
+
+            backlink = doc.createElement('a')
+            backlink.setAttribute('href', '#' + self.makeFootnoteRefId(i))
+            backlink.setAttribute('class', 'footnoteBackLink')
+            backlink.setAttribute('title',
+                                  'Jump back to footnote %d in the text' % 1)
+            backlink.appendChild(doc.createTextNode(FN_BACKLINK_TEXT))
+
+            if li.childNodes :
+                node = li.childNodes[-1]
+                if node.type == "text" :
+		    li.appendChild(backlink)
+		elif node.nodeName == "p":
+                    node.appendChild(backlink)
+		else:
+		    p = doc.createElement('p')
+		    p.appendChild(backlink)
+		    li.appendChild(p)
+
+            ol.appendChild(li)
+
+        return div
+
+
+class FootnotePreprocessor :
+
+    def __init__ (self, footnotes) :
+        self.footnotes = footnotes
+
+    def run(self, lines) :
+
+        self.blockGuru = markdown.BlockGuru()
+        lines = self._handleFootnoteDefinitions (lines)
+
+        # Make a hash of all footnote marks in the text so that we
+        # know in what order they are supposed to appear.  (This
+        # function call doesn't really substitute anything - it's just
+        # a way to get a callback for each occurence.
+
+        text = "\n".join(lines)
+        self.footnotes.SHORT_USE_RE.sub(self.recordFootnoteUse, text)
+
+        return text.split("\n")
+
+
+    def recordFootnoteUse(self, match) :
+
+        id = match.group(1)
+        id = id.strip()
+        nextNum = len(self.footnotes.used_footnotes.keys()) + 1
+        self.footnotes.used_footnotes[id] = nextNum
+
+
+    def _handleFootnoteDefinitions(self, lines) :
+        """Recursively finds all footnote definitions in the lines.
+
+            @param lines: a list of lines of text
+            @returns: a string representing the text with footnote
+                      definitions removed """
+
+        i, id, footnote = self._findFootnoteDefinition(lines)
+
+        if id :
+
+            plain = lines[:i]
+
+            detabbed, theRest = self.blockGuru.detectTabbed(lines[i+1:])
+
+            self.footnotes.setFootnote(id,
+                                       footnote + "\n"
+                                       + "\n".join(detabbed))
+
+            more_plain = self._handleFootnoteDefinitions(theRest)
+            return plain + [""] + more_plain
+
+        else :
+            return lines
+
+    def _findFootnoteDefinition(self, lines) :
+        """Finds the first line of a footnote definition.
+
+            @param lines: a list of lines of text
+            @returns: the index of the line containing a footnote definition """
+
+        counter = 0
+        for line in lines :
+            m = self.footnotes.DEF_RE.match(line)
+            if m :
+                return counter, m.group(2), m.group(3)
+            counter += 1
+        return counter, None, None
+
+
+class FootnotePattern (markdown.Pattern) :
+
+    def __init__ (self, pattern, footnotes) :
+
+        markdown.Pattern.__init__(self, pattern)
+        self.footnotes = footnotes
+
+    def handleMatch(self, m, doc) :
+        sup = doc.createElement('sup')
+        a = doc.createElement('a')
+        sup.appendChild(a)
+        id = m.group(2)
+        num = self.footnotes.used_footnotes[id]
+        sup.setAttribute('id', self.footnotes.makeFootnoteRefId(num))
+        a.setAttribute('href', '#' + self.footnotes.makeFootnoteId(num))
+        a.appendChild(doc.createTextNode(str(num)))
+        return sup
+
+class FootnotePostprocessor (markdown.Postprocessor):
+
+    def __init__ (self, footnotes) :
+        self.footnotes = footnotes
+
+    def run(self, doc) :
+        footnotesDiv = self.footnotes.makeFootnotesDiv(doc)
+        if footnotesDiv :
+            fnPlaceholder = self.extension.findFootnotesPlaceholder(doc)
+            if fnPlaceholder :
+                fnPlaceholder.parent.replaceChild(fnPlaceholder, footnotesDiv)
+            else :
+                doc.documentElement.appendChild(footnotesDiv)
+
+class FootnoteTextPostprocessor (markdown.Postprocessor):
+
+    def __init__ (self, footnotes) :
+        self.footnotes = footnotes
+
+    def run(self, text) :
+        return text.replace(FN_BACKLINK_TEXT, "&#8617;")
+
+def makeExtension(configs=None) :
+    return FootnoteExtension(configs=configs)
+
diff --git a/markdown/mdx_lifeflow.py b/markdown/mdx_lifeflow.py
new file mode 100644
index 0000000..7e62c3b
--- /dev/null
+++ b/markdown/mdx_lifeflow.py
@@ -0,0 +1,203 @@
+import re
+from lifeflow.markdown import markdown
+import lifeflow.models
+
+class LifeflowExtension (markdown.Extension):
+    
+    def __init__(self, entry):
+        self.entry = entry
+
+    def extendMarkdown(self, md, md_globals):
+        preprocessor = LifeflowPreprocessor(self.entry)
+        preprocessor.md = md
+        md.preprocessors.insert(0, preprocessor)
+
+    def reset(self):
+        pass
+
+
+def make_syntax():
+    # note that the key is a tuple of the number of arguments,
+    # and the name of the reference before the first space.
+    # for example [refer year name] would be (2, u"refer")
+    # and [absurd] would be (0, u"absurd")
+    # the value is a function that accepts
+    # entry, str, and then N additional parameters where
+    # N is equal to the number of args specified in the
+    # tuple
+
+    # [this is my author bio][author]
+    def author(entry, str):
+        authors = entry.authors.all()
+        if len(authors) == 1:
+            return str % authors[0].get_absolute_url()
+        else:
+            return str % u"/author/"
+
+    # [this is the lifeflow tag ][tag lifeflow]
+    def tag(entry, str, slug):
+        t = lifeflow.models.Tag.objects.get(slug=slug)
+        return str % t.get_absolute_url()
+
+    # [this is the comment with primary key 123][comment 123]
+    def comment(entry, str, pk):
+        c = lifeflow.models.Comment.objects.get(pk=int(pk))
+        return str % c.get_absolute_url()
+
+    # [this is the project with slug magic-wand][project magic-wand]
+    def project(entry, str, slug):
+        p = lifeflow.models.Project.objects.get(slug=slug)
+        return str % p.get_absolute_url()
+
+
+    # [remember my previous entry?][previous]
+    def previous(entry, str):
+        prev = entry.get_previous_article()
+        if prev is None:
+            return None
+        return str % prev.get_absolute_url()
+
+
+    # [Update: I clarified this in the next entry!][next]
+    def next(entry, str):
+        nxt = entry.get_next_article()
+        if nxt is None:
+            return None
+        return str % nxt.get_absolute_url()
+
+
+    # [Check out the first entry in this series][series 1]
+    # [or the second entry!][series 2]
+    def series_number(entry, str, nth):
+        try:
+            nth = int(nth)
+            if nth > 0:
+                nth = nth - 1
+        except ValueError:
+            return None
+        series = entry.series.all()[0]
+        if series:
+            try:
+                e = series.entry_set.all().order_by('pub_date')[nth]
+                return str % e.get_absolute_url() 
+            except IndexError:
+                return None
+
+
+    # [Remember the Two-Faced Django series?][series two_faced 1]
+    # [Well, I wrote that too! Go me.][series jet-survival 3]
+    def series_slug_number(entry, str, slug, nth):
+        try:
+            nth = int(nth)
+            if nth > 0:
+                nth = nth - 1
+        except ValueError:
+            return None
+        try:
+            series = lifeflow.models.Series.objects.get(slug=slug)
+        except lifeflow.models.Series.DoesNotExist:
+            return None
+        try:
+            e = series.entry_set.all()[nth]
+            return str % e.get_absolute_url() 
+        except IndexError:
+            return None
+
+
+    # [and check out this code!][file the_name]
+    # ![ a picture that I really like][file my_pic]
+    # ![ and you can abreviate it][f my_pic]
+    # [this way too][f my_code]
+    def file(entry, str, name):
+        try:
+            resource = lifeflow.models.Resource.objects.get(markdown_id=name)
+            return str % resource.get_relative_url()
+        except lifeflow.models.Resource.DoesNotExist:
+            return None
+
+
+    # [I like markdown][history md]
+    # [and talk about why the lucky stiff occasionally][history why]
+    # [but history is long... so...][h why]
+    # [and a link to my svn][h svn_lethain]
+    def history(entry, str, name):
+        pass
+
+    syntax = {}
+    syntax[(0, u"previous")] = previous
+    syntax[(0, u"next")] = next
+    syntax[(0, u"author")] = author
+    syntax[(1, u"file")] = file
+    syntax[(1, u"f")] = file
+    syntax[(1, u"tag")] = tag
+    syntax[(1, u"comment")] = comment
+    syntax[(1, u"project")] = project
+    syntax[(1, u"series")] = series_number
+    syntax[(2, u"series")] = series_slug_number
+
+    return syntax
+
+
+
+class LifeflowPreprocessor :
+    
+    def __init__(self, entry):
+        NOBRACKET = r'[^\]\[]*'
+        BRK = ( r'\[('
+                + (NOBRACKET + r'(\[')*6
+                + (NOBRACKET+ r'\])*')*6
+                + NOBRACKET + r')\]' )
+        LIFEFLOW_RE = BRK + r'\s*\[([^\]]*)\]'
+        
+
+        self.LIFEFLOW_RE = re.compile(LIFEFLOW_RE)
+        self.entry = entry
+        self.tags = {}
+        self.syntax = make_syntax()
+
+
+    def process_dynamic(self, ref):
+        # if tag has already been built, ignore
+        if self.tags.has_key(ref):
+            return None
+        parts = ref.split(u" ")
+        name = parts[0]
+        args = parts[1:]
+        length = len(args)
+        format = u"[%s]: %s" % (ref, u"%s")
+        try:
+            func = self.syntax[(length, name)]
+            result = func(self.entry, format, *args)
+            self.tags[ref] = True
+            return result
+        except KeyError:
+            self.tags[ref] = False
+            to_return = None
+
+
+    def build_static_references(self):
+        raw_refs = ((u'comments', u"#comments", u"Comments"),
+                    (u'projects', u"/projects/", "Projects"),
+                    (u'series', u"/articles/", "Series"),
+                    (u'tags', u"/tags/", "Tags"))
+        refs = [ u'[%s]: %s "%s"' % (x[0], x[1], x[2]) for x in raw_refs ]
+        return refs
+
+
+    def run (self, lines):
+        def clean(match):
+            return match[-1]
+        text = u"\n".join(lines)
+        refs = self.LIFEFLOW_RE.findall(text)
+        
+        cleaned = [ clean(x) for x in refs ]
+        processed = [ self.process_dynamic(x) for x in cleaned]
+        dynamic_refs = [ x for x in processed if x is not None ]
+        static_refs = self.build_static_references()
+        return static_refs + dynamic_refs + lines
+
+
+
+def makeExtension(configs=None) :
+    return LifeflowExtension(configs)
+    
diff --git a/markdown/mdx_rss.py b/markdown/mdx_rss.py
new file mode 100644
index 0000000..2117baf
--- /dev/null
+++ b/markdown/mdx_rss.py
@@ -0,0 +1,120 @@
+import markdown
+
+DEFAULT_URL = "http://www.freewisdom.org/projects/python-markdown/"
+DEFAULT_CREATOR = "Yuri Takhteyev"
+DEFAULT_TITLE = "Markdown in Python"
+GENERATOR = "http://www.freewisdom.org/projects/python-markdown/markdown2rss"
+
+month_map = { "Jan" : "01",
+              "Feb" : "02",
+              "March" : "03",
+              "April" : "04",
+              "May" : "05",
+              "June" : "06",
+              "July" : "07",
+              "August" : "08",
+              "September" : "09",
+              "October" : "10",
+              "November" : "11",
+              "December" : "12" }
+
+def get_time(heading) :
+
+    heading = heading.split("-")[0]
+    heading = heading.strip().replace(",", " ").replace(".", " ")
+
+    month, date, year = heading.split()
+    month = month_map[month]
+
+    return rdftime(" ".join((month, date, year, "12:00:00 AM")))
+
+def rdftime(time) :
+
+    time = time.replace(":", " ")
+    time = time.replace("/", " ")
+    time = time.split()
+    return "%s-%s-%sT%s:%s:%s-08:00" % (time[0], time[1], time[2],
+                                        time[3], time[4], time[5])
+
+
+def get_date(text) :
+    return "date"
+
+class RssExtension (markdown.Extension):
+
+    def extendMarkdown(self, md, md_globals) :
+
+        self.config = { 'URL' : [DEFAULT_URL, "Main URL"],
+                        'CREATOR' : [DEFAULT_CREATOR, "Feed creator's name"],
+                        'TITLE' : [DEFAULT_TITLE, "Feed title"] }
+
+        md.xml_mode = True
+        
+        # Insert a post-processor that would actually add the title tag
+        postprocessor = RssPostProcessor(self)
+        postprocessor.ext = self
+        md.postprocessors.append(postprocessor)
+        md.stripTopLevelTags = 0
+        md.docType = '<?xml version="1.0" encoding="utf-8"?>\n'
+
+class RssPostProcessor (markdown.Postprocessor):
+
+    def __init__(self, md) :
+        
+        pass
+
+    def run (self, doc) :
+
+        oldDocElement = doc.documentElement
+        rss = doc.createElement("rss")
+        rss.setAttribute('version', '2.0')
+
+        doc.appendChild(rss)
+
+        channel = doc.createElement("channel")
+        rss.appendChild(channel)
+        for tag, text in (("title", self.ext.getConfig("TITLE")),
+                          ("link", self.ext.getConfig("URL")),
+                          ("description", None)):
+            channel.appendChild(doc.createElement(tag, textNode = text))
+
+        for child in oldDocElement.childNodes :
+
+            if child.type == "element" :
+
+                if child.nodeName in ["h1", "h2", "h3", "h4", "h5"] :
+
+                    heading = child.childNodes[0].value.strip()
+                    
+                    item = doc.createElement("item")
+                    channel.appendChild(item)
+                    item.appendChild(doc.createElement("link",
+                                                       self.ext.getConfig("URL")))
+
+                    item.appendChild(doc.createElement("title", heading))
+
+                    guid = ''.join([x for x in heading if x.isalnum()])
+
+                    guidElem = doc.createElement("guid", guid)
+                    guidElem.setAttribute("isPermaLink", "false")
+                    item.appendChild(guidElem)
+
+                elif child.nodeName in ["p"] :
+
+                    description = doc.createElement("description")
+
+                    
+                    content = "\n".join([node.toxml()
+                                         for node in child.childNodes])
+
+                    cdata = doc.createCDATA(content)
+
+                    description.appendChild(cdata)
+
+                    if item :
+                        item.appendChild(description)
+
+
+def makeExtension(configs) :
+
+    return RssExtension(configs)
diff --git a/markdown/odt2txt.py b/markdown/odt2txt.py
new file mode 100644
index 0000000..bb8fab0
--- /dev/null
+++ b/markdown/odt2txt.py
@@ -0,0 +1,465 @@
+"""
+ODT2TXT
+=======
+
+ODT2TXT convers files in Open Document Text format (ODT) into
+Markdown-formatted plain text.
+
+Writteby by [Yuri Takhteyev](http://www.freewisdom.org).
+
+Project website: http://www.freewisdom.org/projects/python-markdown/odt2txt.php
+Contact: yuri [at] freewisdom.org
+
+License: GPL 2 (http://www.gnu.org/copyleft/gpl.html) or BSD
+
+Version: 0.1 (April 7, 2006)
+
+"""
+
+
+
+import sys, zipfile, xml.dom.minidom
+
+IGNORED_TAGS = ["office:annotation"]
+
+FOOTNOTE_STYLES = ["Footnote"]
+
+
+class TextProps :
+    """ Holds properties for a text style. """
+
+    def __init__ (self):
+        
+        self.italic = False
+        self.bold = False
+        self.fixed = False
+
+    def setItalic (self, value) :
+        if value == "italic" :
+            self.italic = True
+
+    def setBold (self, value) :
+        if value == "bold" :
+            self.bold = True
+
+    def setFixed (self, value) :
+        self.fixed = value
+
+    def __str__ (self) :
+
+        return "[i=%s, h=i%s, fixed=%s]" % (str(self.italic),
+                                          str(self.bold),
+                                          str(self.fixed))
+
+class ParagraphProps :
+    """ Holds properties of a paragraph style. """
+
+    def __init__ (self):
+
+        self.blockquote = False
+        self.headingLevel = 0
+        self.code = False
+        self.title = False
+        self.indented = 0
+
+    def setIndented (self, value) :
+        self.indented = value
+
+    def setHeading (self, level) :
+        self.headingLevel = level
+
+    def setTitle (self, value):
+        self.title = value
+
+    def setCode (self, value) :
+        self.code = value
+
+
+    def __str__ (self) :
+
+        return "[bq=%s, h=%d, code=%s]" % (str(self.blockquote),
+                                           self.headingLevel,
+                                           str(self.code))
+
+
+class ListProperties :
+    """ Holds properties for a list style. """
+
+    def __init__ (self):
+        self.ordered = False
+ 
+    def setOrdered (self, value) :
+        self.ordered = value
+
+
+    
+class OpenDocumentTextFile :
+
+
+    def __init__ (self, filepath) :
+        self.footnotes = []
+        self.footnoteCounter = 0
+        self.textStyles = {"Standard" : TextProps()}
+        self.paragraphStyles = {"Standard" : ParagraphProps()}
+        self.listStyles = {}
+        self.fixedFonts = []
+        self.hasTitle = 0
+
+        self.load(filepath)
+        
+
+    def processFontDeclarations (self, fontDecl) :
+        """ Extracts necessary font information from a font-declaration
+            element.
+            """
+        for fontFace in fontDecl.getElementsByTagName("style:font-face") :
+            if fontFace.getAttribute("style:font-pitch") == "fixed" :
+                self.fixedFonts.append(fontFace.getAttribute("style:name"))
+        
+
+
+    def extractTextProperties (self, style, parent=None) :
+        """ Extracts text properties from a style element. """
+        
+        textProps = TextProps()
+        
+        if parent :
+            parentProp = self.textStyles.get(parent, None)
+            if parentProp :
+                textProp = parentProp
+            
+        textPropEl = style.getElementsByTagName("style:text-properties")
+        if not textPropEl : return textProps
+        
+        textPropEl = textPropEl[0]
+
+        italic = textPropEl.getAttribute("fo:font-style")
+        bold = textPropEl.getAttribute("fo:font-weight")
+
+        textProps.setItalic(italic)
+        textProps.setBold(bold)
+
+        if textPropEl.getAttribute("style:font-name") in self.fixedFonts :
+            textProps.setFixed(True)
+
+        return textProps
+
+    def extractParagraphProperties (self, style, parent=None) :
+        """ Extracts paragraph properties from a style element. """
+
+        paraProps = ParagraphProps()
+
+        name = style.getAttribute("style:name")
+
+        if name.startswith("Heading_20_") :
+            level = name[11:]
+            try :
+                level = int(level)
+                paraProps.setHeading(level)
+            except :
+                level = 0
+
+        if name == "Title" :
+            paraProps.setTitle(True)
+        
+        paraPropEl = style.getElementsByTagName("style:paragraph-properties")
+        if paraPropEl :
+            paraPropEl = paraPropEl[0]
+            leftMargin = paraPropEl.getAttribute("fo:margin-left")
+            if leftMargin :
+                try :
+                    leftMargin = float(leftMargin[:-2])
+                    if leftMargin > 0.01 :
+                        paraProps.setIndented(True)
+                except :
+                    pass
+
+        textProps = self.extractTextProperties(style)
+        if textProps.fixed :
+            paraProps.setCode(True)
+
+        return paraProps
+    
+
+    def processStyles(self, styleElements) :
+        """ Runs through "style" elements extracting necessary information.
+            """
+
+        for style in styleElements :
+
+            name = style.getAttribute("style:name")
+
+            if name == "Standard" : continue
+
+            family = style.getAttribute("style:family")
+            parent = style.getAttribute("style:parent-style-name")
+
+            if family == "text" : 
+                self.textStyles[name] = self.extractTextProperties(style,
+                                                                   parent)
+
+            elif family == "paragraph":
+                self.paragraphStyles[name] = (
+                                 self.extractParagraphProperties(style,
+                                                                 parent))
+    def processListStyles (self, listStyleElements) :
+
+        for style in listStyleElements :
+            name = style.getAttribute("style:name")
+
+            prop = ListProperties()
+            if style.childNodes :
+                if ( style.childNodes[0].tagName
+                     == "text:list-level-style-number" ) :
+                    prop.setOrdered(True)
+
+            self.listStyles[name] = prop
+        
+
+    def load(self, filepath) :
+        """ Loads an ODT file. """
+        
+        zip = zipfile.ZipFile(filepath)
+
+        styles_doc = xml.dom.minidom.parseString(zip.read("styles.xml"))
+        self.processFontDeclarations(styles_doc.getElementsByTagName(
+            "office:font-face-decls")[0])
+        self.processStyles(styles_doc.getElementsByTagName("style:style"))
+        self.processListStyles(styles_doc.getElementsByTagName(
+            "text:list-style"))
+        
+        self.content = xml.dom.minidom.parseString(zip.read("content.xml"))
+        self.processFontDeclarations(self.content.getElementsByTagName(
+            "office:font-face-decls")[0])
+        self.processStyles(self.content.getElementsByTagName("style:style"))
+        self.processListStyles(self.content.getElementsByTagName(
+            "text:list-style"))
+
+    def compressCodeBlocks(self, text) :
+        """ Removes extra blank lines from code blocks. """
+
+        lines = text.split("\n")
+        buffer = ""
+        numLines = len(lines)
+        for i in range(numLines) :
+            
+            if (lines[i].strip() or i == numLines-1  or i == 0 or
+                not ( lines[i-1].startswith("    ")
+                      and lines[i+1].startswith("    ") ) ):
+                buffer += "\n" + lines[i]
+
+        return buffer
+
+
+
+    def listToString (self, listElement) :
+
+        buffer = ""
+
+        styleName = listElement.getAttribute("text:style-name")
+        props = self.listStyles.get(styleName, ListProperties())
+
+        
+            
+        i = 0
+        for item in listElement.childNodes :
+            i += 1
+            if props.ordered :
+                number = str(i)
+                number = number + "." + " "*(2-len(number))
+                buffer += number + self.paragraphToString(item.childNodes[0],
+                                                        indent=3)
+            else :
+                buffer += "* " + self.paragraphToString(item.childNodes[0],
+                                                        indent=2)
+            buffer += "\n\n"
+            
+        return buffer
+
+    def toString (self) :
+        """ Converts the document to a string. """
+        body = self.content.getElementsByTagName("office:body")[0]
+        text = self.content.getElementsByTagName("office:text")[0]
+
+        buffer = u""
+
+
+        paragraphs = [el for el in text.childNodes
+                      if el.tagName in ["text:p", "text:h",
+                                        "text:list"]]
+
+        for paragraph in paragraphs :
+            if paragraph.tagName == "text:list" :
+                text = self.listToString(paragraph)
+            else :
+                text = self.paragraphToString(paragraph)
+            if text :
+                buffer += text + "\n\n"
+
+        if self.footnotes :
+
+            buffer += "--------\n\n"
+            for cite, body in self.footnotes :
+                buffer += "[^%s]: %s\n\n" % (cite, body)
+
+
+        return self.compressCodeBlocks(buffer)
+
+
+    def textToString(self, element) :
+
+        buffer = u""
+
+        for node in element.childNodes :
+
+            if node.nodeType == xml.dom.Node.TEXT_NODE :
+                buffer += node.nodeValue
+
+            elif node.nodeType == xml.dom.Node.ELEMENT_NODE :
+                tag = node.tagName
+
+                if tag == "text:span" :
+
+                    text = self.textToString(node) 
+
+                    if not text.strip() :
+                        return ""  # don't apply styles to white space
+
+                    styleName = node.getAttribute("text:style-name")
+                    style = self.textStyles.get(styleName, None)
+
+                    #print styleName, str(style)
+
+                    if style.fixed :
+                        buffer += "`" + text + "`"
+                        continue
+                    
+                    if style :
+                        if style.italic and style.bold :
+                            mark = "***"
+                        elif style.italic :
+                            mark = "_"
+                        elif style.bold :
+                            mark = "**"
+                        else :
+                            mark = ""
+                    else :
+                        mark = "<" + styleName + ">"
+
+                    buffer += "%s%s%s" % (mark, text, mark)
+                    
+                elif tag == "text:note" :
+                    cite = (node.getElementsByTagName("text:note-citation")[0]
+                                .childNodes[0].nodeValue)
+                               
+                    body = (node.getElementsByTagName("text:note-body")[0]
+                                .childNodes[0])
+
+                    self.footnotes.append((cite, self.textToString(body)))
+
+                    buffer += "[^%s]" % cite
+
+                elif tag in IGNORED_TAGS :
+                    pass
+
+                elif tag == "text:s" :
+                    try :
+                        num = int(node.getAttribute("text:c"))
+                        buffer += " "*num
+                    except :
+                        buffer += " "
+
+                elif tag == "text:tab" :
+                    buffer += "    "
+
+
+                elif tag == "text:a" :
+
+                    text = self.textToString(node)
+                    link = node.getAttribute("xlink:href")
+                    buffer += "[%s](%s)" % (text, link)
+                    
+                else :
+                    buffer += " {" + tag + "} "
+
+        return buffer
+
+    def paragraphToString(self, paragraph, indent = 0) :
+
+
+        style_name = paragraph.getAttribute("text:style-name")
+        paraProps = self.paragraphStyles.get(style_name) #, None)
+        text = self.textToString(paragraph)
+
+        #print style_name
+
+        if paraProps and not paraProps.code :
+            text = text.strip()
+
+        if paraProps.title :
+            self.hasTitle = 1
+            return text + "\n" + ("=" * len(text))
+
+        if paraProps.headingLevel :
+
+            level = paraProps.headingLevel
+            if self.hasTitle : level += 1
+
+            if level == 1 :
+                return text + "\n" + ("=" * len(text))
+            elif level == 2 :
+                return text + "\n" + ("-" * len(text))
+            else :
+                return "#" * level + " " + text
+
+        elif paraProps.code :
+            lines = ["    %s" % line for line in text.split("\n")]
+            return "\n".join(lines)
+
+        if paraProps.indented :
+            return self.wrapParagraph(text, indent = indent, blockquote = True)
+
+        else :
+            return self.wrapParagraph(text, indent = indent)
+        
+
+    def wrapParagraph(self, text, indent = 0, blockquote=False) :
+
+        counter = 0
+        buffer = ""
+        LIMIT = 50
+
+        if blockquote :
+            buffer += "> "
+        
+        for token in text.split() :
+
+            if counter > LIMIT - indent :
+                buffer += "\n" + " "*indent
+                if blockquote :
+                    buffer += "> "
+                counter = 0
+
+            buffer += token + " "
+            counter += len(token)
+
+        return buffer
+        
+
+
+if __name__ == "__main__" :
+
+
+    odt = OpenDocumentTextFile(sys.argv[1])
+
+    #print odt.fixedFonts
+
+    #sys.exit(0)
+    #out = open("out.txt", "wb")
+
+    unicode = odt.toString()
+    out_utf8 = unicode.encode("utf-8")
+
+    sys.stdout.write(out_utf8)
+
+    #out.write(
diff --git a/markdown/setup.py b/markdown/setup.py
new file mode 100644
index 0000000..dad6811
--- /dev/null
+++ b/markdown/setup.py
@@ -0,0 +1,13 @@
+from distutils.core import setup
+
+setup(
+    name = 'markdown',
+    version = '1.7',
+    description = "Python implementation of Markdown.",
+    author = "Manfred Stienstra and Yuri takhteyev",
+    maintainer = "Yuri Takhteyev",
+    maintainer_email = "yuri [at] freewisdom.org",
+    url = "http://www.freewisdom.org/projects/python-markdown",
+    py_modules = ["markdown","mdx_footnotes", "mdx_rss"],
+
+    ) 
diff --git a/media/.DS_Store b/media/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..440b93ce9b2afb9f5b1ef4f0d91d3f453697b898
GIT binary patch
literal 6148
zcmeHKK~BR!478z#NL+gCai0J`SXJ!{_&`-4C{olM5agN@e482DAgVN14q!|6WY?Z-
zGKcl9i0Jn9@lIqdA`P4<9}IJ2o<6gym?5gYqm^C;8QZbDomF3+Ah!XllUAPK-~3}g
z9FemRBei=ty>S)Th5DDVA5PE6y<0_wR3H^d1yX@jAQf0rz`Ln5H%kRMp9-V`|5gF+
z4+T!Ffs><c9SA(WGruCz@N7qRV2N=JoE(vXsZ)VY)wp74ocPu0$k(W!9Gxy|E8{(}
zvc?TX<HDfD%0;VV##A5`I9K4>himr#J$&K*e@@C#Dv%2NDFt-3yWef`OVL|rKgV8M
t;0O4Zq1MU~tQ7;T6=T3wy!laA_>6oFoE(jgd7}gKAV6KxQi0!4;1ia79g+Y5

literal 0
HcmV?d00001

diff --git a/media/blueprint/compressed/print.css b/media/blueprint/compressed/print.css
new file mode 100644
index 0000000..87eca64
--- /dev/null
+++ b/media/blueprint/compressed/print.css
@@ -0,0 +1,76 @@
+body {
+line-height:1.5;
+font-family:"Helvetica Neue", "Lucida Grande", Arial, Verdana, sans-serif;
+color:#000;
+background:none;
+font-size:10pt;
+}
+
+.container {
+background:none;
+}
+
+h1,h2,h3,h4,h5,h6 {
+font-family:"Helvetica Neue", Arial, "Lucida Grande", sans-serif;
+}
+
+code {
+font:.9em "Courier New", Monaco, Courier, monospace;
+}
+
+img {
+float:left;
+margin:1.5em 1.5em 1.5em 0;
+}
+
+a img {
+border:none;
+}
+
+p img.top {
+margin-top:0;
+}
+
+hr {
+background:#ccc;
+color:#ccc;
+width:100%;
+height:2px;
+border:none;
+margin:2em 0;
+padding:0;
+}
+
+blockquote {
+font-style:italic;
+font-size:.9em;
+margin:1.5em;
+padding:1em;
+}
+
+.small {
+font-size:.9em;
+}
+
+.large {
+font-size:1.1em;
+}
+
+.quiet {
+color:#999;
+}
+
+.hide {
+display:none;
+}
+
+a:link,a:visited {
+background:transparent;
+font-weight:700;
+text-decoration:underline;
+}
+
+a:link:after,a:visited:after {
+content:" (" attr(href) ") ";
+font-size:90%;
+}
\ No newline at end of file
diff --git a/media/blueprint/compressed/screen.css b/media/blueprint/compressed/screen.css
new file mode 100644
index 0000000..b15dbd3
--- /dev/null
+++ b/media/blueprint/compressed/screen.css
@@ -0,0 +1,696 @@
+html,body,div,span,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,code,del,dfn,em,img,q,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td {
+border:0;
+font-weight:inherit;
+font-style:inherit;
+font-size:100%;
+font-family:inherit;
+vertical-align:baseline;
+margin:0;
+padding:0;
+}
+
+body {
+line-height:1.5;
+background:#fff;
+font-size:75%;
+color:#222;
+font-family:"Helvetica Neue", "Lucida Grande", Helvetica, Arial, Verdana, sans-serif;
+margin:1.5em 0;
+}
+
+table {
+border-collapse:separate;
+border-spacing:0;
+margin-bottom:1.4em;
+}
+
+caption,th,td {
+text-align:left;
+font-weight:400;
+}
+
+blockquote:before,blockquote:after,q:before,q:after {
+content:"";
+}
+
+blockquote,q {
+quotes:;
+}
+
+a img {
+border:none;
+}
+
+h1,h2,h3,h4,h5,h6 {
+color:#111;
+font-family:"Helvetica Neue", Helvetica, Arial, sans-serif;
+font-weight:400;
+}
+
+h1 {
+font-size:3em;
+line-height:1;
+margin-bottom:.5em;
+}
+
+h2 {
+font-size:2em;
+margin-bottom:.75em;
+}
+
+h3 {
+font-size:1.5em;
+line-height:1;
+margin-bottom:1em;
+}
+
+h4 {
+font-size:1.2em;
+line-height:1.25;
+margin-bottom:1.25em;
+}
+
+h5 {
+font-size:1em;
+font-weight:700;
+margin-bottom:1.5em;
+}
+
+h6 {
+font-size:1em;
+font-weight:700;
+}
+
+p.last {
+margin-bottom:0;
+}
+
+p img {
+float:left;
+margin:1.5em 1.5em 1.5em 0;
+padding:0;
+}
+
+p img.top {
+margin-top:0;
+}
+
+ul,ol {
+margin:0 1.5em 1.5em;
+}
+
+ul {
+list-style-type:circle;
+}
+
+ol {
+list-style-type:decimal;
+}
+
+dd {
+margin-left:1.5em;
+}
+
+abbr,acronym {
+border-bottom:1px dotted #666;
+}
+
+address {
+margin-top:1.5em;
+font-style:italic;
+}
+
+a:focus,a:hover {
+color:#000;
+}
+
+a {
+color:#009;
+text-decoration:underline;
+}
+
+blockquote {
+color:#666;
+font-style:italic;
+margin:1.5em;
+}
+
+em,dfn {
+font-style:italic;
+background:#ffc;
+}
+
+pre,code {
+white-space:pre;
+margin:1.5em 0;
+}
+
+pre,code,tt {
+font:1em 'andale mono', monotype.com, 'lucida console', monospace;
+line-height:1.5;
+}
+
+tt {
+display:block;
+line-height:1.5;
+margin:1.5em 0;
+}
+
+th {
+border-bottom:2px solid #ccc;
+font-weight:700;
+}
+
+td {
+border-bottom:1px solid #ddd;
+}
+
+th,td {
+padding:4px 10px 4px 0;
+}
+
+tfoot {
+font-style:italic;
+}
+
+caption {
+background:#ffc;
+}
+
+table .last {
+padding-right:0;
+}
+
+.small {
+font-size:.8em;
+margin-bottom:1.875em;
+line-height:1.875em;
+}
+
+.large {
+font-size:1.2em;
+line-height:2.5em;
+margin-bottom:1.25em;
+}
+
+.hide {
+display:none;
+}
+
+.highlight {
+background:#ff0;
+}
+
+.added {
+color:#060;
+}
+
+.removed {
+color:#900;
+}
+
+.top {
+margin-top:0;
+padding-top:0;
+}
+
+.bottom {
+margin-bottom:0;
+padding-bottom:0;
+}
+
+.container {
+width:950px;
+margin:0 auto;
+}
+
+.column {
+float:left;
+margin-right:10px;
+}
+
+.last {
+margin-right:0;
+}
+
+.span-1 {
+width:30px;
+}
+
+.span-2 {
+width:70px;
+}
+
+.span-3 {
+width:110px;
+}
+
+.span-4 {
+width:150px;
+}
+
+.span-5 {
+width:190px;
+}
+
+.span-6 {
+width:230px;
+}
+
+.span-7 {
+width:270px;
+}
+
+.span-8 {
+width:310px;
+}
+
+.span-9 {
+width:350px;
+}
+
+.span-10 {
+width:390px;
+}
+
+.span-11 {
+width:430px;
+}
+
+.span-12 {
+width:470px;
+}
+
+.span-13 {
+width:510px;
+}
+
+.span-14 {
+width:550px;
+}
+
+.span-15 {
+width:590px;
+}
+
+.span-16 {
+width:630px;
+}
+
+.span-17 {
+width:670px;
+}
+
+.span-18 {
+width:710px;
+}
+
+.span-19 {
+width:750px;
+}
+
+.span-20 {
+width:790px;
+}
+
+.span-21 {
+width:830px;
+}
+
+.span-22 {
+width:870px;
+}
+
+.span-23 {
+width:910px;
+}
+
+.span-24 {
+width:950px;
+margin:0;
+}
+
+.append-1 {
+padding-right:40px;
+}
+
+.append-2 {
+padding-right:80px;
+}
+
+.append-3 {
+padding-right:120px;
+}
+
+.append-4 {
+padding-right:160px;
+}
+
+.append-5 {
+padding-right:200px;
+}
+
+.append-6 {
+padding-right:240px;
+}
+
+.append-7 {
+padding-right:280px;
+}
+
+.append-8 {
+padding-right:320px;
+}
+
+.append-9 {
+padding-right:360px;
+}
+
+.append-10 {
+padding-right:400px;
+}
+
+.append-11 {
+padding-right:440px;
+}
+
+.append-12 {
+padding-right:480px;
+}
+
+.append-13 {
+padding-right:520px;
+}
+
+.append-14 {
+padding-right:560px;
+}
+
+.append-15 {
+padding-right:600px;
+}
+
+.append-16 {
+padding-right:640px;
+}
+
+.append-17 {
+padding-right:680px;
+}
+
+.append-18 {
+padding-right:720px;
+}
+
+.append-19 {
+padding-right:760px;
+}
+
+.append-20 {
+padding-right:800px;
+}
+
+.append-21 {
+padding-right:840px;
+}
+
+.append-22 {
+padding-right:880px;
+}
+
+.append-23 {
+padding-right:920px;
+}
+
+.prepend-1 {
+padding-left:40px;
+}
+
+.prepend-2 {
+padding-left:80px;
+}
+
+.prepend-3 {
+padding-left:120px;
+}
+
+.prepend-4 {
+padding-left:160px;
+}
+
+.prepend-5 {
+padding-left:200px;
+}
+
+.prepend-6 {
+padding-left:240px;
+}
+
+.prepend-7 {
+padding-left:280px;
+}
+
+.prepend-8 {
+padding-left:320px;
+}
+
+.prepend-9 {
+padding-left:360px;
+}
+
+.prepend-10 {
+padding-left:400px;
+}
+
+.prepend-11 {
+padding-left:440px;
+}
+
+.prepend-12 {
+padding-left:480px;
+}
+
+.prepend-13 {
+padding-left:520px;
+}
+
+.prepend-14 {
+padding-left:560px;
+}
+
+.prepend-15 {
+padding-left:600px;
+}
+
+.prepend-16 {
+padding-left:640px;
+}
+
+.prepend-17 {
+padding-left:680px;
+}
+
+.prepend-18 {
+padding-left:720px;
+}
+
+.prepend-19 {
+padding-left:760px;
+}
+
+.prepend-20 {
+padding-left:800px;
+}
+
+.prepend-21 {
+padding-left:840px;
+}
+
+.prepend-22 {
+padding-left:880px;
+}
+
+.prepend-23 {
+padding-left:920px;
+}
+
+.border {
+padding-right:4px;
+margin-right:5px;
+border-right:1px solid #eee;
+}
+
+.colborder {
+padding-right:24px;
+margin-right:25px;
+border-right:1px solid #eee;
+}
+
+.pull-1 {
+margin-left:-40px;
+}
+
+.pull-2 {
+margin-left:-80px;
+}
+
+.pull-3 {
+margin-left:-120px;
+}
+
+.pull-4 {
+margin-left:-160px;
+}
+
+.push-0 {
+margin:0 0 0 18px;
+}
+
+.push-1 {
+margin:0 -40px 0 18px;
+}
+
+.push-2 {
+margin:0 -80px 0 18px;
+}
+
+.push-3 {
+margin:0 -120px 0 18px;
+}
+
+.push-4 {
+margin:0 -160px 0 18px;
+}
+
+.push-0,.push-1,.push-2,.push-3,.push-4 {
+float:right;
+}
+
+.box {
+margin-bottom:1.5em;
+background:#eee;
+padding:1.5em;
+}
+
+hr {
+background:#ddd;
+color:#ddd;
+clear:both;
+float:none;
+width:100%;
+height:.1em;
+border:none;
+margin:0 0 1.4em;
+}
+
+hr.space {
+background:#fff;
+color:#fff;
+}
+
+.clear {
+display:block;
+}
+
+.clear:after,.container:after {
+content:".";
+display:block;
+height:0;
+clear:both;
+visibility:hidden;
+}
+
+* html .clear {
+height:1%;
+}
+
+fieldset {
+border:1px solid #ccc;
+margin:0 0 1.5em;
+padding:1.4em;
+}
+
+legend {
+font-weight:700;
+font-size:1.2em;
+}
+
+input.text,input.title {
+width:300px;
+border:1px solid #bbb;
+background:#f6f6f6;
+margin:.5em .5em .5em 0;
+padding:5px;
+}
+
+input.title {
+font-size:1.5em;
+}
+
+textarea {
+width:400px;
+height:250px;
+border:1px solid #bbb;
+background:#eee;
+margin:.5em .5em .5em 0;
+padding:5px;
+}
+
+select {
+border:1px solid #ccc;
+background:#f6f6f6;
+width:200px;
+}
+
+.error,.notice,.success {
+margin-bottom:1em;
+border:2px solid #ddd;
+padding:.8em;
+}
+
+.error {
+background:#FBE3E4;
+color:#D12F19;
+border-color:#FBC2C4;
+}
+
+.notice {
+background:#FFF6BF;
+color:#817134;
+border-color:#FFD324;
+}
+
+.success {
+background:#E6EFC2;
+color:#529214;
+border-color:#C6D880;
+}
+
+.error a {
+color:#D12F19;
+}
+
+.notice a {
+color:#817134;
+}
+
+.success a {
+color:#529214;
+}
+
+p,img,dl {
+margin:0 0 1.5em;
+}
+
+dl dt,strong,dfn,label {
+font-weight:700;
+}
+
+del,.quiet {
+color:#666;
+}
+
+input.text:focus,input.title:focus,textarea:focus,select:focus {
+background:#fff;
+border:1px solid #999;
+}
\ No newline at end of file
diff --git a/media/blueprint/lib/forms.css b/media/blueprint/lib/forms.css
new file mode 100644
index 0000000..cf0bbca
--- /dev/null
+++ b/media/blueprint/lib/forms.css
@@ -0,0 +1,45 @@
+/* -------------------------------------------------------------- 
+   
+   forms.css
+   * Sets up some default styling for forms
+   * Gives you classes to enhance your forms
+   
+   Usage:
+   * For text fields, use class .title or .text
+   
+-------------------------------------------------------------- */
+
+label { font-weight: bold; }
+
+
+/* Fieldsets */
+fieldset    { padding:1.4em; margin: 0 0 1.5em 0; border: 1px solid #ccc; }
+legend      { font-weight: bold; font-size:1.2em; }
+
+/* Text fields */
+input.text, input.title   { width: 300px; margin:0.5em 0.5em 0.5em 0; }
+input.text, input.title   { border:1px solid #bbb; background:#f6f6f6; padding:5px; }
+input.text:focus,
+input.title:focus         { border:1px solid #999; background:#fff; }
+input.title               { font-size:1.5em; }
+
+/* Textareas */
+textarea            { width: 400px; height: 250px; margin:0.5em 0.5em 0.5em 0; }
+textarea            { border:1px solid #bbb; background:#eee; padding:5px; }
+textarea:focus      { border:1px solid #999; background:#fff; }
+
+/* Select fields */
+select              { border:1px solid #ccc; background:#f6f6f6; width:200px; }
+select:focus        { border:1px solid #999; background:#fff; }
+
+
+/* Success, error & notice boxes for messages and errors. */
+.error,
+.notice, 
+.success    { padding: .8em; margin-bottom: 1em; border: 2px solid #ddd; }
+.error      { background: #FBE3E4; color: #D12F19; border-color: #FBC2C4; }
+.notice     { background: #FFF6BF; color: #817134; border-color: #FFD324; }
+.success    { background: #E6EFC2; color: #529214; border-color: #C6D880; }
+.error a    { color: #D12F19; }
+.notice a   { color: #817134; }
+.success a  { color: #529214; }
diff --git a/media/blueprint/lib/grid.css b/media/blueprint/lib/grid.css
new file mode 100755
index 0000000..36cbe3a
--- /dev/null
+++ b/media/blueprint/lib/grid.css
@@ -0,0 +1,193 @@
+/* -------------------------------------------------------------- 
+   
+   grid.css
+   * Sets up an easy-to-use grid of 24 columns.
+   
+   Based on work by:
+   * Nathan Borror     [playgroundblues.com]
+   * Jeff Croft        [jeffcroft.com]
+   * Christian Metts   [mintchaos.com]
+   * Khoi Vinh         [subtraction.com]
+   
+   By default, the grid is 950px wide, with 24 columns 
+   spanning 30px, and a 10px margin between columns.
+   
+   If you need fewer or more columns, use this 
+   formula to find the new total width: 
+   Total width = (columns * 40) - 10
+   
+   Read more about using a grid here:
+   * subtraction.com/archives/2007/0318_oh_yeeaahh.php
+   
+-------------------------------------------------------------- */
+
+/* A container should group all your columns. */
+.container {
+  width: 950px;
+  margin: 0 auto;
+}
+
+
+/* Columns
+-------------------------------------------------------------- */
+
+/* Use this class together with the .span-x classes
+   to create any composition of columns in a layout. */
+   
+.column {
+  float: left;
+  margin-right: 10px;
+}
+
+
+/* The last column in a row needs this class. */
+.last { margin-right: 0; }
+
+/* Use these classes to set the width of a column. */
+.span-1   { width: 30px; }
+.span-2   { width: 70px; }
+.span-3   { width: 110px; }
+.span-4   { width: 150px; }
+.span-5   { width: 190px; }
+.span-6   { width: 230px; }
+.span-7   { width: 270px; }
+.span-8   { width: 310px; }
+.span-9   { width: 350px; }
+.span-10  { width: 390px; }
+.span-11  { width: 430px; }
+.span-12  { width: 470px; }
+.span-13  { width: 510px; }
+.span-14  { width: 550px; }
+.span-15  { width: 590px; }
+.span-16  { width: 630px; }
+.span-17  { width: 670px; }
+.span-18  { width: 710px; }
+.span-19  { width: 750px; }
+.span-20  { width: 790px; }
+.span-21  { width: 830px; }
+.span-22  { width: 870px; }
+.span-23  { width: 910px; }
+.span-24  { width: 950px; margin: 0; }
+
+/* Add these to a column to append empty cols. */
+.append-1   { padding-right: 40px; }  
+.append-2   { padding-right: 80px; } 
+.append-3   { padding-right: 120px; } 
+.append-4   { padding-right: 160px; } 
+.append-5   { padding-right: 200px; } 
+.append-6   { padding-right: 240px; } 
+.append-7   { padding-right: 280px; } 
+.append-8   { padding-right: 320px; } 
+.append-9   { padding-right: 360px; } 
+.append-10  { padding-right: 400px; } 
+.append-11  { padding-right: 440px; } 
+.append-12  { padding-right: 480px; } 
+.append-13  { padding-right: 520px; } 
+.append-14  { padding-right: 560px; } 
+.append-15  { padding-right: 600px; } 
+.append-16  { padding-right: 640px; } 
+.append-17  { padding-right: 680px; } 
+.append-18  { padding-right: 720px; } 
+.append-19  { padding-right: 760px; } 
+.append-20  { padding-right: 800px; } 
+.append-21  { padding-right: 840px; } 
+.append-22  { padding-right: 880px; } 
+.append-23  { padding-right: 920px; } 
+
+/* Add these to a column to prepend empty cols. */
+.prepend-1   { padding-left: 40px; }  
+.prepend-2   { padding-left: 80px; } 
+.prepend-3   { padding-left: 120px; } 
+.prepend-4   { padding-left: 160px; } 
+.prepend-5   { padding-left: 200px; } 
+.prepend-6   { padding-left: 240px; } 
+.prepend-7   { padding-left: 280px; } 
+.prepend-8   { padding-left: 320px; } 
+.prepend-9   { padding-left: 360px; } 
+.prepend-10  { padding-left: 400px; } 
+.prepend-11  { padding-left: 440px; } 
+.prepend-12  { padding-left: 480px; } 
+.prepend-13  { padding-left: 520px; } 
+.prepend-14  { padding-left: 560px; } 
+.prepend-15  { padding-left: 600px; } 
+.prepend-16  { padding-left: 640px; } 
+.prepend-17  { padding-left: 680px; } 
+.prepend-18  { padding-left: 720px; } 
+.prepend-19  { padding-left: 760px; } 
+.prepend-20  { padding-left: 800px; } 
+.prepend-21  { padding-left: 840px; } 
+.prepend-22  { padding-left: 880px; } 
+.prepend-23  { padding-left: 920px; } 
+
+
+/* Border on right hand side of a column. */
+.border {
+  padding-right: 4px;
+  margin-right: 5px;
+  border-right: 1px solid #eee;
+}
+
+/* Border with more whitespace, spans one column. */
+.colborder {
+  padding-right: 24px;
+  margin-right: 25px;
+  border-right: 1px solid #eee;
+}
+
+
+/* Use these classes on an element to push it into the 
+   next column, or to pull it into the previous column. */
+
+.pull-1  { margin-left: -40px; }
+.pull-2  { margin-left: -80px; }
+.pull-3  { margin-left: -120px; }
+.pull-4  { margin-left: -160px; }
+
+.push-0  { margin: 0 0 0 18px; }
+.push-1  { margin: 0 -40px 0 18px; }
+.push-2  { margin: 0 -80px 0 18px; }
+.push-3  { margin: 0 -120px 0 18px; }
+.push-4  { margin: 0 -160px 0 18px; }
+.push-0, .push-1, .push-2, .push-3, .push-4 { float: right; }
+
+
+/* Misc classes and elements
+-------------------------------------------------------------- */
+
+/* Use a .box to create a padded box inside a column.  */ 
+.box { 
+  padding: 1.5em; 
+  margin-bottom: 1.5em; 
+  background: #eee; 
+}
+
+/* Use this to create a horizontal ruler across a column. */
+hr {
+  background: #ddd; 
+  color: #ddd;
+  clear: both; 
+  float: none; 
+  width: 100%; 
+  height: .1em;
+  margin: 0 0 1.4em;
+  border: none; 
+}
+hr.space {
+  background: #fff;
+  color: #fff;
+}
+
+/* Clearing floats without extra markup
+   Based on How To Clear Floats Without Structural Markup by PiE
+   [http://www.positioniseverything.net/easyclearing.html] */
+
+.clear { display: inline-block; }   
+.clear:after, .container:after {
+  content: "."; 
+  display: block; 
+  height: 0; 
+  clear: both; 
+  visibility: hidden;
+}
+* html .clear { height: 1%; }
+.clear { display: block; }
diff --git a/media/blueprint/lib/ie.css b/media/blueprint/lib/ie.css
new file mode 100644
index 0000000..aca3787
--- /dev/null
+++ b/media/blueprint/lib/ie.css
@@ -0,0 +1,30 @@
+/* -------------------------------------------------------------- 
+   
+   ie.css
+   
+   Contains every hack for Internet Explorer versions prior 
+   to IE7, so that our core files stay sweet and nimble.
+   
+-------------------------------------------------------------- */
+
+/* Make sure the layout is centered in IE5 */
+body        { text-align: center; }
+.container  { text-align: left; }
+
+
+/* This fixes the problem where IE6 adds an extra 3px margin to
+   two columns that are floated up against each other. */
+
+* html .column { overflow-x: hidden; } /* IE6 fix */
+
+.pull-1, .pull-2, .pull-3, .pull-4,
+.push-1, .push-2, .push-3, .push-4, 
+ul, ol {
+  position: relative; /* Keeps IE6 from cutting pulled/pushed images */
+}
+
+/* Fixes incorrect styling of legend in IE6 fieldsets. */
+legend { margin-bottom:1.4em; }
+
+/* Fixes incorrect placement of numbers in ol's in IE6/7 */
+ol { margin-left:2em; }
\ No newline at end of file
diff --git a/media/blueprint/lib/reset.css b/media/blueprint/lib/reset.css
new file mode 100755
index 0000000..49ba3be
--- /dev/null
+++ b/media/blueprint/lib/reset.css
@@ -0,0 +1,39 @@
+/* -------------------------------------------------------------- 
+  
+   reset.css
+   * Resets default browser CSS.
+   
+   Based on work by Eric Meyer:
+   * meyerweb.com/eric/thoughts/2007/05/01/reset-reloaded/
+   
+-------------------------------------------------------------- */
+
+html, body, div, span, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, code,
+del, dfn, em, img, q, dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	font-weight: inherit;
+	font-style: inherit;
+	font-size: 100%;
+	font-family: inherit;
+	vertical-align: baseline;
+}
+
+
+body { line-height: 1.5; background: #fff; margin:1.5em 0; }
+
+/* Tables still need 'cellspacing="0"' in the markup. */
+table { border-collapse: separate; border-spacing: 0; }
+caption, th, td { text-align: left; font-weight:400; }
+
+/* Remove possible quote marks (") from <q>, <blockquote>. */
+blockquote:before, blockquote:after, q:before, q:after { content: ""; }
+blockquote, q { quotes: "" ""; }
+
+a img { border: none; }
+
diff --git a/media/blueprint/lib/typography.css b/media/blueprint/lib/typography.css
new file mode 100644
index 0000000..d9c8013
--- /dev/null
+++ b/media/blueprint/lib/typography.css
@@ -0,0 +1,116 @@
+/* -------------------------------------------------------------- 
+   
+   typography.css
+   * Sets up some sensible default typography.
+  
+   Based on work by:
+   * Nathan Borror     [playgroundblues.com]
+   * Jeff Croft        [jeffcroft.com]
+   * Christian Metts   [mintchaos.com]
+   * Wilson Miner      [wilsonminer.com]
+   * Richard Rutter    [clagnut.com]
+   
+   Read more about using a baseline here:
+   * alistapart.com/articles/settingtypeontheweb
+  
+-------------------------------------------------------------- */
+
+/* This is where you set your desired font size. The line-heights 
+   and vertical margins are automatically calculated from this. 
+   The percentage is of 16px (0.75 * 16px = 12px). */
+   
+body { font-size: 75%; }
+
+
+/* Default fonts and colors. 
+   If you prefer serif fonts, remove the font-family 
+   on the headings, and apply this one to the body:
+   font: 1em Georgia, "lucida bright", "times new roman", serif; */
+   
+body { 
+  color: #222; 
+  font-family: "Helvetica Neue", "Lucida Grande", Helvetica, Arial, Verdana, sans-serif; 
+}
+h1,h2,h3,h4,h5,h6 { 
+  color: #111; 
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; 
+}
+
+
+/* Headings
+-------------------------------------------------------------- */
+
+h1,h2,h3,h4,h5,h6 { font-weight: normal; }
+
+h1 { font-size: 3em; line-height: 1; margin-bottom: 0.5em; }
+h2 { font-size: 2em; margin-bottom: 0.75em; }
+h3 { font-size: 1.5em; line-height: 1; margin-bottom: 1em; }
+h4 { font-size: 1.2em; line-height: 1.25; margin-bottom: 1.25em; }
+h5 { font-size: 1em; font-weight: bold; margin-bottom: 1.5em; }
+h6 { font-size: 1em; font-weight: bold; }
+
+
+/* Text elements
+-------------------------------------------------------------- */
+
+p           { margin: 0 0 1.5em; }
+p.last      { margin-bottom: 0; }
+p img       { float: left; margin: 1.5em 1.5em 1.5em 0; padding: 0; }
+p img.top   { margin-top: 0; } /* Use this if the image is at the top of the <p>. */
+img         { margin: 0 0 1.5em; }
+
+ul, ol      { margin:0 1.5em 1.5em 1.5em; }
+ul          { list-style-type: circle; }
+ol          { list-style-type: decimal; }
+dl          { margin: 0 0 1.5em 0; }
+dl dt       { font-weight: bold; }
+dd          { margin-left: 1.5em;}
+
+abbr, 
+acronym     { border-bottom: 1px dotted #666; }
+address     { margin-top: 1.5em; font-style: italic; }
+del         { color:#666; }
+
+a:focus, 
+a:hover     { color: #000; }
+a           { color: #009; text-decoration: underline; }
+
+blockquote  { margin: 1.5em; color: #666; font-style: italic; }
+strong      { font-weight: bold; }
+em,dfn      { font-style: italic; background: #ffc; }
+dfn         { font-weight: bold; }
+pre,code    { margin: 1.5em 0; white-space: pre; }
+pre,code,tt { font: 1em 'andale mono', 'monotype.com', 'lucida console', monospace; line-height: 1.5; } 
+tt          { display: block; margin: 1.5em 0; line-height: 1.5; }
+
+
+/* Tables
+-------------------------------------------------------------- */
+
+table   { margin-bottom: 1.4em; }
+th      { border-bottom: 2px solid #ccc; font-weight: bold; }
+td      { border-bottom: 1px solid #ddd; }
+th,td   { padding: 4px 10px 4px 0; }
+tfoot   { font-style: italic; }
+caption { background: #ffc; }
+
+/* Use this if you use span-x classes on th/td. */
+table .last { padding-right: 0; } 
+
+
+/* Some default classes
+-------------------------------------------------------------- */
+
+.small      { font-size: .8em; margin-bottom: 1.875em; line-height: 1.875em; }
+.large      { font-size: 1.2em; line-height: 2.5em; margin-bottom: 1.25em; }
+.quiet      { color: #666; }
+
+.hide       { display: none; }
+.highlight  { background:#ff0; }
+.added      { color:#060; }
+.removed    { color:#900; }
+
+.top        { margin-top:0; padding-top:0; }
+.bottom     { margin-bottom:0; padding-bottom:0; }
+
+
diff --git a/media/blueprint/plugins/buttons/Readme b/media/blueprint/plugins/buttons/Readme
new file mode 100644
index 0000000..dd1cfe4
--- /dev/null
+++ b/media/blueprint/plugins/buttons/Readme
@@ -0,0 +1,31 @@
+Buttons
+* Gives you great looking CSS buttons, for both <a> and <button>.
+* Demo: particletree.com/features/rediscovering-the-button-element
+
+
+Credits
+----------------------------------------------------------------
+
+* Created by Kevin Hale [particletree.com]
+* Adapted for Blueprint by Olav Bjorkoy [bjorkoy.com]
+
+
+Usage
+----------------------------------------------------------------
+
+1) Add this line to "blueprint/screen.css":
+	 @import 'plugins/buttons/buttons.css';
+
+2) Use the following HTML code to place the buttons on your site:
+
+	<button type="submit" class="button positive">
+	  <img src="css/blueprint/plugins/buttons/icons/tick.png" alt=""/> Save
+	</button>
+
+	<a class="button" href="/password/reset/">
+	  <img src="css/blueprint/plugins/buttons/icons/key.png" alt=""/> Change Password
+	</a>
+
+	<a href="#" class="button negative">
+	  <img src="css/blueprint/plugins/buttons/icons/cross.png" alt=""/> Cancel
+	</a>
diff --git a/media/blueprint/plugins/buttons/buttons.css b/media/blueprint/plugins/buttons/buttons.css
new file mode 100644
index 0000000..613b6d0
--- /dev/null
+++ b/media/blueprint/plugins/buttons/buttons.css
@@ -0,0 +1,97 @@
+/* -------------------------------------------------------------- 
+  
+   buttons.css
+   * Gives you some great CSS-only buttons.
+   
+   Created by Kevin Hale [particletree.com]
+   * particletree.com/features/rediscovering-the-button-element
+
+   See Readme.txt in this folder for instructions.
+
+-------------------------------------------------------------- */
+
+a.button, button {
+  display:block;
+  float:left;
+  margin:0 0.583em 0.667em 0;
+  padding:5px 10px 5px 7px;   /* Links */
+  
+  border:1px solid #dedede;
+  border-top:1px solid #eee;
+  border-left:1px solid #eee;
+
+  background-color:#f5f5f5;
+  font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
+  font-size:100%;
+  line-height:130%;
+  text-decoration:none;
+  font-weight:bold;
+  color:#565656;
+  cursor:pointer;
+}
+button {
+  width:auto;
+  overflow:visible;
+  padding:4px 10px 3px 7px;   /* IE6 */
+}
+button[type] {
+  padding:4px 10px 4px 7px;   /* Firefox */
+  line-height:17px;           /* Safari */
+}
+*:first-child+html button[type] {
+  padding:4px 10px 3px 7px;   /* IE7 */
+}
+button img, a.button img{
+  margin:0 3px -3px 0 !important;
+  padding:0;
+  border:none;
+  width:16px;
+  height:16px;
+  float:none;
+}
+
+
+/* Button colors
+-------------------------------------------------------------- */
+
+/* Standard */
+button:hover, a.button:hover{
+  background-color:#dff4ff;
+  border:1px solid #c2e1ef;
+  color:#336699;
+}
+a.button:active{
+  background-color:#6299c5;
+  border:1px solid #6299c5;
+  color:#fff;
+}
+
+/* Positive */
+body .positive {
+  color:#529214;
+}
+a.positive:hover, button.positive:hover {
+  background-color:#E6EFC2;
+  border:1px solid #C6D880;
+  color:#529214;
+}
+a.positive:active {
+  background-color:#529214;
+  border:1px solid #529214;
+  color:#fff;
+}
+
+/* Negative */
+body .negative {
+  color:#d12f19;
+}
+a.negative:hover, button.negative:hover {
+  background:#fbe3e4;
+  border:1px solid #fbc2c4;
+  color:#d12f19;
+}
+a.negative:active {
+  background-color:#d12f19;
+  border:1px solid #d12f19;
+  color:#fff;
+}
diff --git a/media/blueprint/plugins/css-classes/Readme b/media/blueprint/plugins/css-classes/Readme
new file mode 100644
index 0000000..9594e23
--- /dev/null
+++ b/media/blueprint/plugins/css-classes/Readme
@@ -0,0 +1,14 @@
+CSS Development Classes Plugin
+
+Sets up some classes to use in CSS development
+
+This is an experimental plugin, and the tools it provides
+are not exactly semantically correct, so use with care,
+and preferably only in development. :)
+
+
+Usage
+----------------------------------------------------------------
+
+1) Add this line to "blueprint/screen.css", and you're done:
+	 @import 'plugins/css-classes/css-classes.css';
diff --git a/media/blueprint/plugins/css-classes/css-classes.css b/media/blueprint/plugins/css-classes/css-classes.css
new file mode 100644
index 0000000..805a38b
--- /dev/null
+++ b/media/blueprint/plugins/css-classes/css-classes.css
@@ -0,0 +1,24 @@
+/* -------------------------------------------------------------- 
+
+   css-classes.css
+   * Classes for CSS development
+   
+   See the Readme file in this directory
+   for further instructions.
+   
+-------------------------------------------------------------- */
+
+.left   { float:left; }
+.right  { float:right; }
+
+.hide   { display:none; }
+
+.reset-margin   { margin:0; } 
+.reset-padding  { padding:0; } 
+.reset          { margin:0; padding:0; } 
+
+.align-justify  { text-align:justify; } 
+.align-left     { text-align:left; } 
+.align-center   { text-align:center; } 
+.align-right    { text-align:right; } 
+
diff --git a/media/blueprint/plugins/fancy-type/Readme b/media/blueprint/plugins/fancy-type/Readme
new file mode 100644
index 0000000..7d2474d
--- /dev/null
+++ b/media/blueprint/plugins/fancy-type/Readme
@@ -0,0 +1,22 @@
+Fancy Type
+* Gives you classes to use if you'd like some 
+  extra fancy typography. 
+
+Credits and instructions are specified above each class
+in the fancy-type.css file in this directory.
+
+
+Usage
+----------------------------------------------------------------
+
+1) Add this line to "blueprint/screen.css", and you're done:
+	 @import 'plugins/fancy-type/fancy-type-compressed.css';
+
+Note that this uses the compressed version of the CSS file, 
+as the original file contains a lot of instructing comments.
+
+Remember to re-compress (or change) the compressed file 
+if you make any changes to the original CSS file.
+
+Here's a pretty good CSS compressor: 
+http://teenage.cz/acidofil/tools/cssformat.php
diff --git a/media/blueprint/plugins/fancy-type/fancy-type-compressed.css b/media/blueprint/plugins/fancy-type/fancy-type-compressed.css
new file mode 100644
index 0000000..ac2b598
--- /dev/null
+++ b/media/blueprint/plugins/fancy-type/fancy-type-compressed.css
@@ -0,0 +1,5 @@
+p + p { text-indent:2em; margin-top:-1.5em; }
+.alt{color:#666;font-family:"Warnock Pro","Goudy Old Style","Palatino","Book Antiqua",Georgia,serif;font-size:1.2em;line-height:80%;font-style:italic;}
+.dquo{margin-left:-.5em;}
+p.incr,.incr p{font-size:10px;line-height:1.44em;margin-bottom:1.5em;}
+.caps{font-variant:small-caps;letter-spacing:1px;text-transform:lowercase;font-size:1.2em;line-height:1%;font-weight:bold;}
diff --git a/media/blueprint/plugins/fancy-type/fancy-type.css b/media/blueprint/plugins/fancy-type/fancy-type.css
new file mode 100644
index 0000000..0e8eebc
--- /dev/null
+++ b/media/blueprint/plugins/fancy-type/fancy-type.css
@@ -0,0 +1,74 @@
+/* -------------------------------------------------------------- 
+  
+   fancy-type.css
+   * Lots of pretty advanced classes for manipulating text.
+   
+   See the Readme file in this folder for additional instructions.
+
+-------------------------------------------------------------- */
+
+/* Indentation instead of line shifts for sibling paragraphs. */
+   p + p { text-indent:2em; margin-top:-1.5em; }
+
+/* Ornaments on first paragraph.
+   Commented out by default. Use with care.
+   p:before { content: "\2767"; padding-right: 0.4em; }
+   p + p:before { content: ""; padding:0; } */
+
+/* For great looking type, use this code instead of asdf: 
+   <span class="alt">asdf</span>  
+   Best used on prepositions and ampersands. */
+  
+.alt { 
+  color: #666; 
+  font-family: "Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua", Georgia, serif; 
+  font-style: italic;
+  font-weight: normal;
+}
+
+
+/* For great looking quote marks in titles, replace "asdf" with:
+   <span class="dquo">&#8220;</span>asdf&#8221;
+   (That is, when the title starts with a quote mark). 
+   (You may have to change this value depending on your font size). */  
+   
+.dquo { margin-left: -.5em; } 
+
+
+/* Reduced size type with incremental leading
+   (http://www.markboulton.co.uk/journal/comments/incremental_leading/)
+
+   This could be used for side notes. For smaller type, you don't necessarily want to 
+   follow the 1.5x vertical rhythm -- the line-height is too much. 
+   
+   Using this class, it reduces your font size and line-height so that for 
+   every four lines of normal sized type, there is five lines of the sidenote. eg:
+
+   New type size in em's:
+     10px (wanted side note size) / 12px (existing base size) = 0.8333 (new type size in ems)
+
+   New line-height value:
+     12px x 1.5 = 18px (old line-height)
+     18px x 4 = 72px 
+     72px / 5 = 14.4px (new line height)
+     14.4px / 10px = 1.44 (new line height in em's) */
+
+p.incr, .incr p {
+	font-size: 10px;
+	line-height: 1.44em;  
+	margin-bottom: 1.5em;
+}
+
+
+/* Surround uppercase words and abbreviations with this class.
+   Based on work by Jørgen Arnor Gårdsø Lom [http://twistedintellect.com/] */
+   
+.caps { 
+  font-variant: small-caps; 
+  letter-spacing: 1px; 
+  text-transform: lowercase; 
+  font-size:1.2em;
+  line-height:1%;
+  font-weight:bold;
+  padding:0 2px;
+}
diff --git a/media/blueprint/print.css b/media/blueprint/print.css
new file mode 100755
index 0000000..abd6bca
--- /dev/null
+++ b/media/blueprint/print.css
@@ -0,0 +1,68 @@
+/* -------------------------------------------------------------- 
+  
+   Blueprint CSS Framework Print Styles
+   * Gives you some sensible styles for printing pages.
+   See Readme file in this directory for further instructions.
+      
+   Some additions you'll want to make, customized to your markup:
+   #header, #footer, #navigation { display:none; }
+	 
+-------------------------------------------------------------- */
+
+body {
+  line-height: 1.5;
+  font-family: "Helvetica Neue", "Lucida Grande", Arial, Verdana, sans-serif;   
+  color:#000;
+  background: none;
+  font-size: 10pt;
+}
+.container {
+  background: none;
+}
+
+h1,h2,h3,h4,h5,h6 { font-family: "Helvetica Neue", Arial, "Lucida Grande", sans-serif; }
+code { font:.9em "Courier New", Monaco, Courier, monospace; } 
+
+img { float:left; margin:1.5em 1.5em 1.5em 0; }
+a img { border:none; }
+p img.top { margin-top: 0; }
+
+hr { 
+  background:#ccc; 
+  color:#ccc;
+  width:100%;
+  height:2px;
+  margin:2em 0;
+  padding:0;
+  border:none;
+}
+
+blockquote {
+  margin:1.5em;
+  padding:1em;
+  font-style:italic;
+  font-size:.9em;
+}
+
+.small  { font-size: .9em; }
+.large  { font-size: 1.1em; }
+.quiet  { color: #999; }
+.hide   { display:none; }
+
+a:link, a:visited {
+	background: transparent;
+	font-weight:700;
+	text-decoration: underline;
+}
+
+a:link:after, a:visited:after {
+  content: " (" attr(href) ") ";
+  font-size: 90%;
+}
+
+/* If you're having trouble printing relative links, uncomment and customize this:
+   (note: This is valid CSS3, but it still won't go through the W3C CSS Validator) */
+
+/* a[href^="/"]:after {
+  content: " (http://www.yourdomain.com" attr(href) ") ";
+} */
diff --git a/media/blueprint/screen.css b/media/blueprint/screen.css
new file mode 100755
index 0000000..6d9f3c3
--- /dev/null
+++ b/media/blueprint/screen.css
@@ -0,0 +1,22 @@
+/* -------------------------------------------------------------- 
+  
+   Blueprint CSS Framework Screen Styles
+   * Version:   0.6 (21.9.2007)
+   * Website:   http://code.google.com/p/blueprintcss/
+   See Readme file in this directory for further instructions.
+   
+-------------------------------------------------------------- */
+
+@import 'lib/reset.css';
+@import 'lib/typography.css';
+@import 'lib/grid.css';
+@import 'lib/forms.css';
+
+/* Plugins:
+   Additional functionality can be found in the plugins directory.
+   See the readme files for each plugin. Example:
+   @import 'plugins/buttons/buttons.css'; */
+   
+/* See the grid:
+   Uncomment the line below to see the grid and baseline.
+   .container { background: url(lib/grid.png); } */
diff --git a/media/lifeflow/.DS_Store b/media/lifeflow/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..a2c76b856d6bc0ce21287b5508caff9747aa5ffd
GIT binary patch
literal 6148
zcmeHKJ5B>J5PcH@3ZEh+<sN_nZm^0%1%d*JnoSl+#AX-835aehZp5j$1aEAEvTUG1
zLI}-B<7ba&Jo2;U4*(e~^CO@Sphs2gY_nJ++OOJ@PPFV0#g9>8e)Bjz92M25<!y$)
z$bhch7BVcczy!_p(@o)JIxZh{g(;tW-D6Rex3oV~dzj-Ij-xDD8{_));_`e{RfUGO
zI#)KzN20UBy(e1Z|9!H;x%;^B;%@D}uFK05RrEV${YcQio0fSmFSD5(h|H=y$4f^t
zH&(>`<jEoHh&sWE6xpaiE^w2FIZg!Q*=)f$rfScT<1gH#nzL_@x=C{GFhvQsZuToQ
zH#{5j);uQ0fH7bU{E&fgqNBI_!*ML!7%&F@9|L+mBvi#TVja*Q9W4A8fY_zk3+w(h
zM@-Z}Oe59-X`x66C5BLmUktv+Vt*1bjaUZ^;Sish<HXDo-+U6^l9G6LNE*;eW55__
zGO!VveZBvWzyAL>gREr?7z6)`0qG7eh67G1-mR_4>0O&puc#{OR|otEVZ~p?^wq0)
bpX!D7L@UHJVjYkciai884OSQfzskTH*6C?+

literal 0
HcmV?d00001

diff --git a/media/lifeflow/author/.DS_Store b/media/lifeflow/author/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/media/lifeflow/code.css b/media/lifeflow/code.css
new file mode 100644
index 0000000..fb71b37
--- /dev/null
+++ b/media/lifeflow/code.css
@@ -0,0 +1,65 @@
+.highlight  { 
+    background: #f8f8f8; 
+    margin-left: 10px;
+    margin-right: 10px;
+    overflow: auto;
+}
+.highlight .c { color: #408080; font-style: italic } /* Comment */
+.highlight .err { border: 1px solid #FF0000 } /* Error */
+.highlight .k { color: #008000; font-weight: bold } /* Keyword */
+.highlight .o { color: #666666 } /* Operator */
+.highlight .cm { color: #408080; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #BC7A00 } /* Comment.Preproc */
+.highlight .c1 { color: #408080; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #408080; font-style: italic } /* Comment.Special */
+.highlight .gd { color: #A00000 } /* Generic.Deleted */
+.highlight .ge { font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #FF0000 } /* Generic.Error */
+.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.highlight .gi { color: #00A000 } /* Generic.Inserted */
+.highlight .go { color: #808080 } /* Generic.Output */
+.highlight .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
+.highlight .gs { font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.highlight .gt { color: #0040D0 } /* Generic.Traceback */
+.highlight .kc { color: #008000; font-weight: bold } /* Keyword.Constant */
+.highlight .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
+.highlight .kp { color: #008000 } /* Keyword.Pseudo */
+.highlight .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #008000; font-weight: bold } /* Keyword.Type */
+.highlight .m { color: #666666 } /* Literal.Number */
+.highlight .s { color: #BA2121 } /* Literal.String */
+.highlight .na { color: #7D9029 } /* Name.Attribute */
+.highlight .nb { color: #008000 } /* Name.Builtin */
+.highlight .nc { color: #0000FF; font-weight: bold } /* Name.Class */
+.highlight .no { color: #880000 } /* Name.Constant */
+.highlight .nd { color: #AA22FF } /* Name.Decorator */
+.highlight .ni { color: #999999; font-weight: bold } /* Name.Entity */
+.highlight .ne { color: #D2413A; font-weight: bold } /* Name.Exception */
+.highlight .nf { color: #0000FF } /* Name.Function */
+.highlight .nl { color: #A0A000 } /* Name.Label */
+.highlight .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
+.highlight .nt { color: #008000; font-weight: bold } /* Name.Tag */
+.highlight .nv { color: #19177C } /* Name.Variable */
+.highlight .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
+.highlight .w { color: #bbbbbb } /* Text.Whitespace */
+.highlight .mf { color: #666666 } /* Literal.Number.Float */
+.highlight .mh { color: #666666 } /* Literal.Number.Hex */
+.highlight .mi { color: #666666 } /* Literal.Number.Integer */
+.highlight .mo { color: #666666 } /* Literal.Number.Oct */
+.highlight .sb { color: #BA2121 } /* Literal.String.Backtick */
+.highlight .sc { color: #BA2121 } /* Literal.String.Char */
+.highlight .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */
+.highlight .s2 { color: #BA2121 } /* Literal.String.Double */
+.highlight .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
+.highlight .sh { color: #BA2121 } /* Literal.String.Heredoc */
+.highlight .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
+.highlight .sx { color: #008000 } /* Literal.String.Other */
+.highlight .sr { color: #BB6688 } /* Literal.String.Regex */
+.highlight .s1 { color: #BA2121 } /* Literal.String.Single */
+.highlight .ss { color: #19177C } /* Literal.String.Symbol */
+.highlight .bp { color: #008000 } /* Name.Builtin.Pseudo */
+.highlight .vc { color: #19177C } /* Name.Variable.Class */
+.highlight .vg { color: #19177C } /* Name.Variable.Global */
+.highlight .vi { color: #19177C } /* Name.Variable.Instance */
+.highlight .il { color: #666666 } /* Literal.Number.Integer.Long */
\ No newline at end of file
diff --git a/media/lifeflow/editor/editor.css b/media/lifeflow/editor/editor.css
new file mode 100644
index 0000000..d7a94e8
--- /dev/null
+++ b/media/lifeflow/editor/editor.css
@@ -0,0 +1,412 @@
+
+
+
+body {
+    font-size: 12pt;
+}
+
+div.login {
+    width:40%;
+    color: grey;
+    margin-left:30%;
+    margin-right:30%;
+    margin-top:75px;
+    padding: 20px;
+    border: dashed 3px orange;
+    overflow: auto;
+}
+
+.login tr {
+    font-size: 15pt;
+}
+
+.login input {
+    height: 20px;
+    width: 100%;
+    font-size: 15pt;
+}
+
+.login td {
+    border: none;
+}
+
+.login button {
+    height: 30px;
+    width: 90%;
+    text-align: center;
+}
+
+div.control-bar {
+    background-color: orange;
+    width: 100%;
+    overflow: hidden;
+}
+
+.control-bar a {
+
+    float: right;
+    text-decoration: none;
+    color: white;
+}
+.control-bar a:hover {
+    color: black;
+}
+.control-bar a.right {
+    margin-right: 30px;
+    float: right;
+}
+
+.control-bar a.left {
+    float: left;
+    margin-left: 30px;
+}
+
+div.breadcrumbs {
+    background-color: black;
+    color: grey;
+    width: 90%;
+    padding-left: 5%;
+    padding-right: 5%;
+    text-align: center;
+}
+
+
+.breadcrumbs a {
+    text-decoration: none;
+    color: grey;
+}
+
+.breadcrumbs a:hover {
+    color: white;
+}
+
+.breadcrumbs span {
+    margin-left: 10px;
+    margin-right: 10px;
+}
+
+.breadcrumbs span:hover {
+    color: white;
+}
+
+.breadcrumbs span.selected {
+    color: white;
+}
+
+div.error-msg {
+    font-size: 16pt;
+    background-color: red;
+}
+
+div.editing {
+    margin-top: 10px;
+    margin-left: 10%;
+    margin-right: 10%;
+    width: 80%;
+}
+
+.editing li {
+    padding: 10px;
+    margin: 5px;
+    border: solid 1px cyan;
+    overflow: auto;
+}
+
+div.li-mimic {
+    padding: 10px;
+    margin: 5px;
+    border: solid 1px cyan;
+    overflow: auto;
+}
+
+.li-mimic p {
+    margin: 0px;
+    padding: 0px;
+}
+
+.editing input {
+    width: 400px;
+}
+
+.editing select.dropdown {
+    width: 200px;
+    margin-left: 20px;
+    float: right;
+}
+
+.editing p.dropdown {
+    float: left;
+}
+
+.editing textarea {
+    width: 400px;
+}
+
+.editing span {
+    margin-right: 10px;
+}
+
+textarea.writing {
+    width: 100%;
+    height: 300px;
+}
+
+
+
+li {
+    list-style: none;
+}
+
+.error-msg p {
+    width: 100%;
+    text-align: center;
+}
+
+div.panels {
+    margin-top: 20px;
+    margin-bottom: 20px;
+    width: 98%;
+}
+
+div.panel {
+    float: left;
+    width: 33%;
+}
+
+div.wide {
+    width:50%;
+}
+
+div.narrow {
+    width:25%
+}
+
+h3.centered {
+    text-align: center;
+}
+
+.panel h3 {
+    text-align: center;
+}
+
+.published h3 {
+    color: orange;
+}
+
+.edited h3 {
+    color: cyan;
+}
+
+.rough h3 {
+    color: blue;
+}
+
+div.top {
+    
+}
+
+ul {
+    text-decoration: none;
+}
+
+.panel select {
+    width: 100%;
+    height: 350px;
+}
+
+select.small {
+    height: 100px;
+}
+
+div.buttons {
+    width: 100%;
+    overflow: hidden;
+}
+
+
+div.resource-select {
+    width: 33%;
+    float: left;
+    height: 220px;
+}
+
+.resource-select select {
+    width: 100%;
+}
+
+div.resource-details {
+    padding: 5px;
+    height: 100%;
+    width: 30%;
+    margin-left: 5px;
+    border: solid 1px cyan;
+    float: left;
+}
+
+div.resource-extra {
+    padding: 5px;
+    height: 100%;
+    width: 32%;
+    margin-left: 5px;
+    border: solid 1px cyan;
+    float: left;
+}
+
+.resource-extra img {
+    margin: 0px;
+    height: 100%;
+    width: 100%;
+}
+
+div.add-resource {
+    padding: 5px;
+    height: 100%;
+    width: 64%;
+    margin-left: 5px;
+    border: solid 1px cyan;
+    float: left;
+}
+
+div.selectables {
+    margin: 10px;
+}
+
+a.selectable {
+    //border: solid 1px cyan;
+    padding: 5px;
+    margin: 20px;
+    text-decoration: none;
+}
+
+a.selected {
+    background: orange;
+    border: none;
+}
+
+
+.writing-buttons a {
+    float: right;
+    width: 150px;
+    text-align: center;
+}
+
+.top a {
+    width: 25%;
+    text-align: center;
+}
+
+.bottom a {
+    width: 90%;
+    text-align: center;
+}
+
+a.button {
+    margin: 0px;
+}
+
+a.positive:hover {
+    background-color: blue;
+}
+
+a.neutral:hover {
+    background-color: cyan;
+}
+
+a.negative:hover {
+    background-color: orange;
+}
+
+a.right {
+    float: right;
+}
+    
+
+div.entries {
+    overflow: auto;
+}
+
+div.render-div {
+    margin: 20px;   
+}
+
+div.projects {
+    width: 80%;
+    margin-left: 10%;
+    margin-right: 10%;
+}
+
+div.projects select {
+    width: 95%;
+}
+
+div.comments {
+    
+}
+
+div.comments div.data {
+}
+
+div.comments div.controls {
+
+}
+
+div.blogs div.data {
+    width: 80%;
+    float: left;
+}
+div.blogs div.controls {
+    float: right;
+    width: 20%;
+}
+
+
+
+div.files {
+    width: 100%;
+}
+
+div.files div.selections {
+    width: 210px;
+    float: left;
+    height: 100%;
+}
+
+
+div.files div.selections select {
+    width: 100%;
+}
+
+div.files div.details {
+    padding: 5px;
+    height: 100px;
+    width: 75%;
+    border: solid 1px cyan;
+    float: left;
+    margin-left: 5px;
+    margin-top: 5px;
+    margin-bottom: 5px;
+}
+
+div.files div.extra {
+    padding: 5px;
+    width: 75%;
+    margin-left: 5px;
+    border: solid 1px cyan;
+    float: left;
+}
+
+div.files div.resource-extra img {
+    margin: 0px;
+    height: 100%;
+    width: 100%;
+}
+
+div.files div.add {
+    padding: 5px;
+    height: 100%;
+    width: 75%;
+    margin-top: 5px;
+    margin-left: 5px;
+    border: solid 1px cyan;
+    float: left;
+}
\ No newline at end of file
diff --git a/media/lifeflow/editor/jquery.js b/media/lifeflow/editor/jquery.js
new file mode 100644
index 0000000..9fb3a8e
--- /dev/null
+++ b/media/lifeflow/editor/jquery.js
@@ -0,0 +1,2992 @@
+(function(){
+/*
+ * jQuery 1.2.1 - New Wave Javascript
+ *
+ * Copyright (c) 2007 John Resig (jquery.com)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * $Date: 2007-09-16 23:42:06 -0400 (Sun, 16 Sep 2007) $
+ * $Rev: 3353 $
+ */
+
+// Map over jQuery in case of overwrite
+if ( typeof jQuery != "undefined" )
+	var _jQuery = jQuery;
+
+var jQuery = window.jQuery = function(selector, context) {
+	// If the context is a namespace object, return a new object
+	return this instanceof jQuery ?
+		this.init(selector, context) :
+		new jQuery(selector, context);
+};
+
+// Map over the $ in case of overwrite
+if ( typeof $ != "undefined" )
+	var _$ = $;
+	
+// Map the jQuery namespace to the '$' one
+window.$ = jQuery;
+
+var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/;
+
+jQuery.fn = jQuery.prototype = {
+	init: function(selector, context) {
+		// Make sure that a selection was provided
+		selector = selector || document;
+
+		// Handle HTML strings
+		if ( typeof selector  == "string" ) {
+			var m = quickExpr.exec(selector);
+			if ( m && (m[1] || !context) ) {
+				// HANDLE: $(html) -> $(array)
+				if ( m[1] )
+					selector = jQuery.clean( [ m[1] ], context );
+
+				// HANDLE: $("#id")
+				else {
+					var tmp = document.getElementById( m[3] );
+					if ( tmp )
+						// Handle the case where IE and Opera return items
+						// by name instead of ID
+						if ( tmp.id != m[3] )
+							return jQuery().find( selector );
+						else {
+							this[0] = tmp;
+							this.length = 1;
+							return this;
+						}
+					else
+						selector = [];
+				}
+
+			// HANDLE: $(expr)
+			} else
+				return new jQuery( context ).find( selector );
+
+		// HANDLE: $(function)
+		// Shortcut for document ready
+		} else if ( jQuery.isFunction(selector) )
+			return new jQuery(document)[ jQuery.fn.ready ? "ready" : "load" ]( selector );
+
+		return this.setArray(
+			// HANDLE: $(array)
+			selector.constructor == Array && selector ||
+
+			// HANDLE: $(arraylike)
+			// Watch for when an array-like object is passed as the selector
+			(selector.jquery || selector.length && selector != window && !selector.nodeType && selector[0] != undefined && selector[0].nodeType) && jQuery.makeArray( selector ) ||
+
+			// HANDLE: $(*)
+			[ selector ] );
+	},
+	
+	jquery: "1.2.1",
+
+	size: function() {
+		return this.length;
+	},
+	
+	length: 0,
+
+	get: function( num ) {
+		return num == undefined ?
+
+			// Return a 'clean' array
+			jQuery.makeArray( this ) :
+
+			// Return just the object
+			this[num];
+	},
+	
+	pushStack: function( a ) {
+		var ret = jQuery(a);
+		ret.prevObject = this;
+		return ret;
+	},
+	
+	setArray: function( a ) {
+		this.length = 0;
+		Array.prototype.push.apply( this, a );
+		return this;
+	},
+
+	each: function( fn, args ) {
+		return jQuery.each( this, fn, args );
+	},
+
+	index: function( obj ) {
+		var pos = -1;
+		this.each(function(i){
+			if ( this == obj ) pos = i;
+		});
+		return pos;
+	},
+
+	attr: function( key, value, type ) {
+		var obj = key;
+		
+		// Look for the case where we're accessing a style value
+		if ( key.constructor == String )
+			if ( value == undefined )
+				return this.length && jQuery[ type || "attr" ]( this[0], key ) || undefined;
+			else {
+				obj = {};
+				obj[ key ] = value;
+			}
+		
+		// Check to see if we're setting style values
+		return this.each(function(index){
+			// Set all the styles
+			for ( var prop in obj )
+				jQuery.attr(
+					type ? this.style : this,
+					prop, jQuery.prop(this, obj[prop], type, index, prop)
+				);
+		});
+	},
+
+	css: function( key, value ) {
+		return this.attr( key, value, "curCSS" );
+	},
+
+	text: function(e) {
+		if ( typeof e != "object" && e != null )
+			return this.empty().append( document.createTextNode( e ) );
+
+		var t = "";
+		jQuery.each( e || this, function(){
+			jQuery.each( this.childNodes, function(){
+				if ( this.nodeType != 8 )
+					t += this.nodeType != 1 ?
+						this.nodeValue : jQuery.fn.text([ this ]);
+			});
+		});
+		return t;
+	},
+
+	wrapAll: function(html) {
+		if ( this[0] )
+			// The elements to wrap the target around
+			jQuery(html, this[0].ownerDocument)
+				.clone()
+				.insertBefore(this[0])
+				.map(function(){
+					var elem = this;
+					while ( elem.firstChild )
+						elem = elem.firstChild;
+					return elem;
+				})
+				.append(this);
+
+		return this;
+	},
+
+	wrapInner: function(html) {
+		return this.each(function(){
+			jQuery(this).contents().wrapAll(html);
+		});
+	},
+
+	wrap: function(html) {
+		return this.each(function(){
+			jQuery(this).wrapAll(html);
+		});
+	},
+
+	append: function() {
+		return this.domManip(arguments, true, 1, function(a){
+			this.appendChild( a );
+		});
+	},
+
+	prepend: function() {
+		return this.domManip(arguments, true, -1, function(a){
+			this.insertBefore( a, this.firstChild );
+		});
+	},
+	
+	before: function() {
+		return this.domManip(arguments, false, 1, function(a){
+			this.parentNode.insertBefore( a, this );
+		});
+	},
+
+	after: function() {
+		return this.domManip(arguments, false, -1, function(a){
+			this.parentNode.insertBefore( a, this.nextSibling );
+		});
+	},
+
+	end: function() {
+		return this.prevObject || jQuery([]);
+	},
+
+	find: function(t) {
+		var data = jQuery.map(this, function(a){ return jQuery.find(t,a); });
+		return this.pushStack( /[^+>] [^+>]/.test( t ) || t.indexOf("..") > -1 ?
+			jQuery.unique( data ) : data );
+	},
+
+	clone: function(events) {
+		// Do the clone
+		var ret = this.map(function(){
+			return this.outerHTML ? jQuery(this.outerHTML)[0] : this.cloneNode(true);
+		});
+
+		// Need to set the expando to null on the cloned set if it exists
+		// removeData doesn't work here, IE removes it from the original as well
+		// this is primarily for IE but the data expando shouldn't be copied over in any browser
+		var clone = ret.find("*").andSelf().each(function(){
+			if ( this[ expando ] != undefined )
+				this[ expando ] = null;
+		});
+		
+		// Copy the events from the original to the clone
+		if (events === true)
+			this.find("*").andSelf().each(function(i) {
+				var events = jQuery.data(this, "events");
+				for ( var type in events )
+					for ( var handler in events[type] )
+						jQuery.event.add(clone[i], type, events[type][handler], events[type][handler].data);
+			});
+
+		// Return the cloned set
+		return ret;
+	},
+
+	filter: function(t) {
+		return this.pushStack(
+			jQuery.isFunction( t ) &&
+			jQuery.grep(this, function(el, index){
+				return t.apply(el, [index]);
+			}) ||
+
+			jQuery.multiFilter(t,this) );
+	},
+
+	not: function(t) {
+		return this.pushStack(
+			t.constructor == String &&
+			jQuery.multiFilter(t, this, true) ||
+
+			jQuery.grep(this, function(a) {
+				return ( t.constructor == Array || t.jquery )
+					? jQuery.inArray( a, t ) < 0
+					: a != t;
+			})
+		);
+	},
+
+	add: function(t) {
+		return this.pushStack( jQuery.merge(
+			this.get(),
+			t.constructor == String ?
+				jQuery(t).get() :
+				t.length != undefined && (!t.nodeName || jQuery.nodeName(t, "form")) ?
+					t : [t] )
+		);
+	},
+
+	is: function(expr) {
+		return expr ? jQuery.multiFilter(expr,this).length > 0 : false;
+	},
+
+	hasClass: function(expr) {
+		return this.is("." + expr);
+	},
+	
+	val: function( val ) {
+		if ( val == undefined ) {
+			if ( this.length ) {
+				var elem = this[0];
+		    	
+				// We need to handle select boxes special
+				if ( jQuery.nodeName(elem, "select") ) {
+					var index = elem.selectedIndex,
+						a = [],
+						options = elem.options,
+						one = elem.type == "select-one";
+					
+					// Nothing was selected
+					if ( index < 0 )
+						return null;
+
+					// Loop through all the selected options
+					for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
+						var option = options[i];
+						if ( option.selected ) {
+							// Get the specifc value for the option
+							var val = jQuery.browser.msie && !option.attributes["value"].specified ? option.text : option.value;
+							
+							// We don't need an array for one selects
+							if ( one )
+								return val;
+							
+							// Multi-Selects return an array
+							a.push(val);
+						}
+					}
+					
+					return a;
+					
+				// Everything else, we just grab the value
+				} else
+					return this[0].value.replace(/\r/g, "");
+			}
+		} else
+			return this.each(function(){
+				if ( val.constructor == Array && /radio|checkbox/.test(this.type) )
+					this.checked = (jQuery.inArray(this.value, val) >= 0 ||
+						jQuery.inArray(this.name, val) >= 0);
+				else if ( jQuery.nodeName(this, "select") ) {
+					var tmp = val.constructor == Array ? val : [val];
+
+					jQuery("option", this).each(function(){
+						this.selected = (jQuery.inArray(this.value, tmp) >= 0 ||
+						jQuery.inArray(this.text, tmp) >= 0);
+					});
+
+					if ( !tmp.length )
+						this.selectedIndex = -1;
+				} else
+					this.value = val;
+			});
+	},
+	
+	html: function( val ) {
+		return val == undefined ?
+			( this.length ? this[0].innerHTML : null ) :
+			this.empty().append( val );
+	},
+
+	replaceWith: function( val ) {
+		return this.after( val ).remove();
+	},
+
+	eq: function(i){
+		return this.slice(i, i+1);
+	},
+
+	slice: function() {
+		return this.pushStack( Array.prototype.slice.apply( this, arguments ) );
+	},
+
+	map: function(fn) {
+		return this.pushStack(jQuery.map( this, function(elem,i){
+			return fn.call( elem, i, elem );
+		}));
+	},
+
+	andSelf: function() {
+		return this.add( this.prevObject );
+	},
+	
+	domManip: function(args, table, dir, fn) {
+		var clone = this.length > 1, a; 
+
+		return this.each(function(){
+			if ( !a ) {
+				a = jQuery.clean(args, this.ownerDocument);
+				if ( dir < 0 )
+					a.reverse();
+			}
+
+			var obj = this;
+
+			if ( table && jQuery.nodeName(this, "table") && jQuery.nodeName(a[0], "tr") )
+				obj = this.getElementsByTagName("tbody")[0] || this.appendChild(document.createElement("tbody"));
+
+			jQuery.each( a, function(){
+				var elem = clone ? this.cloneNode(true) : this;
+				if ( !evalScript(0, elem) )
+					fn.call( obj, elem );
+			});
+		});
+	}
+};
+
+function evalScript(i, elem){
+	var script = jQuery.nodeName(elem, "script");
+
+	if ( script ) {
+		if ( elem.src )
+			jQuery.ajax({ url: elem.src, async: false, dataType: "script" });
+		else
+			jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
+	
+		if ( elem.parentNode )
+			elem.parentNode.removeChild(elem);
+
+	} else if ( elem.nodeType == 1 )
+    jQuery("script", elem).each(evalScript);
+
+	return script;
+}
+
+jQuery.extend = jQuery.fn.extend = function() {
+	// copy reference to target object
+	var target = arguments[0] || {}, a = 1, al = arguments.length, deep = false;
+
+	// Handle a deep copy situation
+	if ( target.constructor == Boolean ) {
+		deep = target;
+		target = arguments[1] || {};
+	}
+
+	// extend jQuery itself if only one argument is passed
+	if ( al == 1 ) {
+		target = this;
+		a = 0;
+	}
+
+	var prop;
+
+	for ( ; a < al; a++ )
+		// Only deal with non-null/undefined values
+		if ( (prop = arguments[a]) != null )
+			// Extend the base object
+			for ( var i in prop ) {
+				// Prevent never-ending loop
+				if ( target == prop[i] )
+					continue;
+
+				// Recurse if we're merging object values
+				if ( deep && typeof prop[i] == 'object' && target[i] )
+					jQuery.extend( target[i], prop[i] );
+
+				// Don't bring in undefined values
+				else if ( prop[i] != undefined )
+					target[i] = prop[i];
+			}
+
+	// Return the modified object
+	return target;
+};
+
+var expando = "jQuery" + (new Date()).getTime(), uuid = 0, win = {};
+
+jQuery.extend({
+	noConflict: function(deep) {
+		window.$ = _$;
+		if ( deep )
+			window.jQuery = _jQuery;
+		return jQuery;
+	},
+
+	// This may seem like some crazy code, but trust me when I say that this
+	// is the only cross-browser way to do this. --John
+	isFunction: function( fn ) {
+		return !!fn && typeof fn != "string" && !fn.nodeName && 
+			fn.constructor != Array && /function/i.test( fn + "" );
+	},
+	
+	// check if an element is in a XML document
+	isXMLDoc: function(elem) {
+		return elem.documentElement && !elem.body ||
+			elem.tagName && elem.ownerDocument && !elem.ownerDocument.body;
+	},
+
+	// Evalulates a script in a global context
+	// Evaluates Async. in Safari 2 :-(
+	globalEval: function( data ) {
+		data = jQuery.trim( data );
+		if ( data ) {
+			if ( window.execScript )
+				window.execScript( data );
+			else if ( jQuery.browser.safari )
+				// safari doesn't provide a synchronous global eval
+				window.setTimeout( data, 0 );
+			else
+				eval.call( window, data );
+		}
+	},
+
+	nodeName: function( elem, name ) {
+		return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
+	},
+	
+	cache: {},
+	
+	data: function( elem, name, data ) {
+		elem = elem == window ? win : elem;
+
+		var id = elem[ expando ];
+
+		// Compute a unique ID for the element
+		if ( !id ) 
+			id = elem[ expando ] = ++uuid;
+
+		// Only generate the data cache if we're
+		// trying to access or manipulate it
+		if ( name && !jQuery.cache[ id ] )
+			jQuery.cache[ id ] = {};
+		
+		// Prevent overriding the named cache with undefined values
+		if ( data != undefined )
+			jQuery.cache[ id ][ name ] = data;
+		
+		// Return the named cache data, or the ID for the element	
+		return name ? jQuery.cache[ id ][ name ] : id;
+	},
+	
+	removeData: function( elem, name ) {
+		elem = elem == window ? win : elem;
+
+		var id = elem[ expando ];
+
+		// If we want to remove a specific section of the element's data
+		if ( name ) {
+			if ( jQuery.cache[ id ] ) {
+				// Remove the section of cache data
+				delete jQuery.cache[ id ][ name ];
+
+				// If we've removed all the data, remove the element's cache
+				name = "";
+				for ( name in jQuery.cache[ id ] ) break;
+				if ( !name )
+					jQuery.removeData( elem );
+			}
+
+		// Otherwise, we want to remove all of the element's data
+		} else {
+			// Clean up the element expando
+			try {
+				delete elem[ expando ];
+			} catch(e){
+				// IE has trouble directly removing the expando
+				// but it's ok with using removeAttribute
+				if ( elem.removeAttribute )
+					elem.removeAttribute( expando );
+			}
+
+			// Completely remove the data cache
+			delete jQuery.cache[ id ];
+		}
+	},
+
+	// args is for internal usage only
+	each: function( obj, fn, args ) {
+		if ( args ) {
+			if ( obj.length == undefined )
+				for ( var i in obj )
+					fn.apply( obj[i], args );
+			else
+				for ( var i = 0, ol = obj.length; i < ol; i++ )
+					if ( fn.apply( obj[i], args ) === false ) break;
+
+		// A special, fast, case for the most common use of each
+		} else {
+			if ( obj.length == undefined )
+				for ( var i in obj )
+					fn.call( obj[i], i, obj[i] );
+			else
+				for ( var i = 0, ol = obj.length, val = obj[0]; 
+					i < ol && fn.call(val,i,val) !== false; val = obj[++i] ){}
+		}
+
+		return obj;
+	},
+	
+	prop: function(elem, value, type, index, prop){
+			// Handle executable functions
+			if ( jQuery.isFunction( value ) )
+				value = value.call( elem, [index] );
+				
+			// exclude the following css properties to add px
+			var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i;
+
+			// Handle passing in a number to a CSS property
+			return value && value.constructor == Number && type == "curCSS" && !exclude.test(prop) ?
+				value + "px" :
+				value;
+	},
+
+	className: {
+		// internal only, use addClass("class")
+		add: function( elem, c ){
+			jQuery.each( (c || "").split(/\s+/), function(i, cur){
+				if ( !jQuery.className.has( elem.className, cur ) )
+					elem.className += ( elem.className ? " " : "" ) + cur;
+			});
+		},
+
+		// internal only, use removeClass("class")
+		remove: function( elem, c ){
+			elem.className = c != undefined ?
+				jQuery.grep( elem.className.split(/\s+/), function(cur){
+					return !jQuery.className.has( c, cur );	
+				}).join(" ") : "";
+		},
+
+		// internal only, use is(".class")
+		has: function( t, c ) {
+			return jQuery.inArray( c, (t.className || t).toString().split(/\s+/) ) > -1;
+		}
+	},
+
+	swap: function(e,o,f) {
+		for ( var i in o ) {
+			e.style["old"+i] = e.style[i];
+			e.style[i] = o[i];
+		}
+		f.apply( e, [] );
+		for ( var i in o )
+			e.style[i] = e.style["old"+i];
+	},
+
+	css: function(e,p) {
+		if ( p == "height" || p == "width" ) {
+			var old = {}, oHeight, oWidth, d = ["Top","Bottom","Right","Left"];
+
+			jQuery.each( d, function(){
+				old["padding" + this] = 0;
+				old["border" + this + "Width"] = 0;
+			});
+
+			jQuery.swap( e, old, function() {
+				if ( jQuery(e).is(':visible') ) {
+					oHeight = e.offsetHeight;
+					oWidth = e.offsetWidth;
+				} else {
+					e = jQuery(e.cloneNode(true))
+						.find(":radio").removeAttr("checked").end()
+						.css({
+							visibility: "hidden", position: "absolute", display: "block", right: "0", left: "0"
+						}).appendTo(e.parentNode)[0];
+
+					var parPos = jQuery.css(e.parentNode,"position") || "static";
+					if ( parPos == "static" )
+						e.parentNode.style.position = "relative";
+
+					oHeight = e.clientHeight;
+					oWidth = e.clientWidth;
+
+					if ( parPos == "static" )
+						e.parentNode.style.position = "static";
+
+					e.parentNode.removeChild(e);
+				}
+			});
+
+			return p == "height" ? oHeight : oWidth;
+		}
+
+		return jQuery.curCSS( e, p );
+	},
+
+	curCSS: function(elem, prop, force) {
+		var ret, stack = [], swap = [];
+
+		// A helper method for determining if an element's values are broken
+		function color(a){
+			if ( !jQuery.browser.safari )
+				return false;
+
+			var ret = document.defaultView.getComputedStyle(a,null);
+			return !ret || ret.getPropertyValue("color") == "";
+		}
+
+		if (prop == "opacity" && jQuery.browser.msie) {
+			ret = jQuery.attr(elem.style, "opacity");
+			return ret == "" ? "1" : ret;
+		}
+		
+		if (prop.match(/float/i))
+			prop = styleFloat;
+
+		if (!force && elem.style[prop])
+			ret = elem.style[prop];
+
+		else if (document.defaultView && document.defaultView.getComputedStyle) {
+
+			if (prop.match(/float/i))
+				prop = "float";
+
+			prop = prop.replace(/([A-Z])/g,"-$1").toLowerCase();
+			var cur = document.defaultView.getComputedStyle(elem, null);
+
+			if ( cur && !color(elem) )
+				ret = cur.getPropertyValue(prop);
+
+			// If the element isn't reporting its values properly in Safari
+			// then some display: none elements are involved
+			else {
+				// Locate all of the parent display: none elements
+				for ( var a = elem; a && color(a); a = a.parentNode )
+					stack.unshift(a);
+
+				// Go through and make them visible, but in reverse
+				// (It would be better if we knew the exact display type that they had)
+				for ( a = 0; a < stack.length; a++ )
+					if ( color(stack[a]) ) {
+						swap[a] = stack[a].style.display;
+						stack[a].style.display = "block";
+					}
+
+				// Since we flip the display style, we have to handle that
+				// one special, otherwise get the value
+				ret = prop == "display" && swap[stack.length-1] != null ?
+					"none" :
+					document.defaultView.getComputedStyle(elem,null).getPropertyValue(prop) || "";
+
+				// Finally, revert the display styles back
+				for ( a = 0; a < swap.length; a++ )
+					if ( swap[a] != null )
+						stack[a].style.display = swap[a];
+			}
+
+			if ( prop == "opacity" && ret == "" )
+				ret = "1";
+
+		} else if (elem.currentStyle) {
+			var newProp = prop.replace(/\-(\w)/g,function(m,c){return c.toUpperCase();});
+			ret = elem.currentStyle[prop] || elem.currentStyle[newProp];
+
+			// From the awesome hack by Dean Edwards
+			// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+			// If we're not dealing with a regular pixel number
+			// but a number that has a weird ending, we need to convert it to pixels
+			if ( !/^\d+(px)?$/i.test(ret) && /^\d/.test(ret) ) {
+				var style = elem.style.left;
+				var runtimeStyle = elem.runtimeStyle.left;
+				elem.runtimeStyle.left = elem.currentStyle.left;
+				elem.style.left = ret || 0;
+				ret = elem.style.pixelLeft + "px";
+				elem.style.left = style;
+				elem.runtimeStyle.left = runtimeStyle;
+			}
+		}
+
+		return ret;
+	},
+	
+	clean: function(a, doc) {
+		var r = [];
+		doc = doc || document;
+
+		jQuery.each( a, function(i,arg){
+			if ( !arg ) return;
+
+			if ( arg.constructor == Number )
+				arg = arg.toString();
+			
+			// Convert html string into DOM nodes
+			if ( typeof arg == "string" ) {
+				// Fix "XHTML"-style tags in all browsers
+				arg = arg.replace(/(<(\w+)[^>]*?)\/>/g, function(m, all, tag){
+					return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area)$/i)? m : all+"></"+tag+">";
+				});
+
+				// Trim whitespace, otherwise indexOf won't work as expected
+				var s = jQuery.trim(arg).toLowerCase(), div = doc.createElement("div"), tb = [];
+
+				var wrap =
+					// option or optgroup
+					!s.indexOf("<opt") &&
+					[1, "<select>", "</select>"] ||
+					
+					!s.indexOf("<leg") &&
+					[1, "<fieldset>", "</fieldset>"] ||
+					
+					s.match(/^<(thead|tbody|tfoot|colg|cap)/) &&
+					[1, "<table>", "</table>"] ||
+					
+					!s.indexOf("<tr") &&
+					[2, "<table><tbody>", "</tbody></table>"] ||
+					
+				 	// <thead> matched above
+					(!s.indexOf("<td") || !s.indexOf("<th")) &&
+					[3, "<table><tbody><tr>", "</tr></tbody></table>"] ||
+					
+					!s.indexOf("<col") &&
+					[2, "<table><tbody></tbody><colgroup>", "</colgroup></table>"] ||
+
+					// IE can't serialize <link> and <script> tags normally
+					jQuery.browser.msie &&
+					[1, "div<div>", "</div>"] ||
+					
+					[0,"",""];
+
+				// Go to html and back, then peel off extra wrappers
+				div.innerHTML = wrap[1] + arg + wrap[2];
+				
+				// Move to the right depth
+				while ( wrap[0]-- )
+					div = div.lastChild;
+				
+				// Remove IE's autoinserted <tbody> from table fragments
+				if ( jQuery.browser.msie ) {
+					
+					// String was a <table>, *may* have spurious <tbody>
+					if ( !s.indexOf("<table") && s.indexOf("<tbody") < 0 ) 
+						tb = div.firstChild && div.firstChild.childNodes;
+						
+					// String was a bare <thead> or <tfoot>
+					else if ( wrap[1] == "<table>" && s.indexOf("<tbody") < 0 )
+						tb = div.childNodes;
+
+					for ( var n = tb.length-1; n >= 0 ; --n )
+						if ( jQuery.nodeName(tb[n], "tbody") && !tb[n].childNodes.length )
+							tb[n].parentNode.removeChild(tb[n]);
+	
+					// IE completely kills leading whitespace when innerHTML is used	
+					if ( /^\s/.test(arg) )	
+						div.insertBefore( doc.createTextNode( arg.match(/^\s*/)[0] ), div.firstChild );
+
+				}
+				
+				arg = jQuery.makeArray( div.childNodes );
+			}
+
+			if ( 0 === arg.length && (!jQuery.nodeName(arg, "form") && !jQuery.nodeName(arg, "select")) )
+				return;
+
+			if ( arg[0] == undefined || jQuery.nodeName(arg, "form") || arg.options )
+				r.push( arg );
+			else
+				r = jQuery.merge( r, arg );
+
+		});
+
+		return r;
+	},
+	
+	attr: function(elem, name, value){
+		var fix = jQuery.isXMLDoc(elem) ? {} : jQuery.props;
+
+		// Safari mis-reports the default selected property of a hidden option
+		// Accessing the parent's selectedIndex property fixes it
+		if ( name == "selected" && jQuery.browser.safari )
+			elem.parentNode.selectedIndex;
+		
+		// Certain attributes only work when accessed via the old DOM 0 way
+		if ( fix[name] ) {
+			if ( value != undefined ) elem[fix[name]] = value;
+			return elem[fix[name]];
+		} else if ( jQuery.browser.msie && name == "style" )
+			return jQuery.attr( elem.style, "cssText", value );
+
+		else if ( value == undefined && jQuery.browser.msie && jQuery.nodeName(elem, "form") && (name == "action" || name == "method") )
+			return elem.getAttributeNode(name).nodeValue;
+
+		// IE elem.getAttribute passes even for style
+		else if ( elem.tagName ) {
+
+			if ( value != undefined ) {
+				if ( name == "type" && jQuery.nodeName(elem,"input") && elem.parentNode )
+					throw "type property can't be changed";
+				elem.setAttribute( name, value );
+			}
+
+			if ( jQuery.browser.msie && /href|src/.test(name) && !jQuery.isXMLDoc(elem) ) 
+				return elem.getAttribute( name, 2 );
+
+			return elem.getAttribute( name );
+
+		// elem is actually elem.style ... set the style
+		} else {
+			// IE actually uses filters for opacity
+			if ( name == "opacity" && jQuery.browser.msie ) {
+				if ( value != undefined ) {
+					// IE has trouble with opacity if it does not have layout
+					// Force it by setting the zoom level
+					elem.zoom = 1; 
+	
+					// Set the alpha filter to set the opacity
+					elem.filter = (elem.filter || "").replace(/alpha\([^)]*\)/,"") +
+						(parseFloat(value).toString() == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
+				}
+	
+				return elem.filter ? 
+					(parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() : "";
+			}
+			name = name.replace(/-([a-z])/ig,function(z,b){return b.toUpperCase();});
+			if ( value != undefined ) elem[name] = value;
+			return elem[name];
+		}
+	},
+	
+	trim: function(t){
+		return (t||"").replace(/^\s+|\s+$/g, "");
+	},
+
+	makeArray: function( a ) {
+		var r = [];
+
+		// Need to use typeof to fight Safari childNodes crashes
+		if ( typeof a != "array" )
+			for ( var i = 0, al = a.length; i < al; i++ )
+				r.push( a[i] );
+		else
+			r = a.slice( 0 );
+
+		return r;
+	},
+
+	inArray: function( b, a ) {
+		for ( var i = 0, al = a.length; i < al; i++ )
+			if ( a[i] == b )
+				return i;
+		return -1;
+	},
+
+	merge: function(first, second) {
+		// We have to loop this way because IE & Opera overwrite the length
+		// expando of getElementsByTagName
+
+		// Also, we need to make sure that the correct elements are being returned
+		// (IE returns comment nodes in a '*' query)
+		if ( jQuery.browser.msie ) {
+			for ( var i = 0; second[i]; i++ )
+				if ( second[i].nodeType != 8 )
+					first.push(second[i]);
+		} else
+			for ( var i = 0; second[i]; i++ )
+				first.push(second[i]);
+
+		return first;
+	},
+
+	unique: function(first) {
+		var r = [], done = {};
+
+		try {
+			for ( var i = 0, fl = first.length; i < fl; i++ ) {
+				var id = jQuery.data(first[i]);
+				if ( !done[id] ) {
+					done[id] = true;
+					r.push(first[i]);
+				}
+			}
+		} catch(e) {
+			r = first;
+		}
+
+		return r;
+	},
+
+	grep: function(elems, fn, inv) {
+		// If a string is passed in for the function, make a function
+		// for it (a handy shortcut)
+		if ( typeof fn == "string" )
+			fn = eval("false||function(a,i){return " + fn + "}");
+
+		var result = [];
+
+		// Go through the array, only saving the items
+		// that pass the validator function
+		for ( var i = 0, el = elems.length; i < el; i++ )
+			if ( !inv && fn(elems[i],i) || inv && !fn(elems[i],i) )
+				result.push( elems[i] );
+
+		return result;
+	},
+
+	map: function(elems, fn) {
+		// If a string is passed in for the function, make a function
+		// for it (a handy shortcut)
+		if ( typeof fn == "string" )
+			fn = eval("false||function(a){return " + fn + "}");
+
+		var result = [];
+
+		// Go through the array, translating each of the items to their
+		// new value (or values).
+		for ( var i = 0, el = elems.length; i < el; i++ ) {
+			var val = fn(elems[i],i);
+
+			if ( val !== null && val != undefined ) {
+				if ( val.constructor != Array ) val = [val];
+				result = result.concat( val );
+			}
+		}
+
+		return result;
+	}
+});
+
+var userAgent = navigator.userAgent.toLowerCase();
+
+// Figure out what browser is being used
+jQuery.browser = {
+	version: (userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/) || [])[1],
+	safari: /webkit/.test(userAgent),
+	opera: /opera/.test(userAgent),
+	msie: /msie/.test(userAgent) && !/opera/.test(userAgent),
+	mozilla: /mozilla/.test(userAgent) && !/(compatible|webkit)/.test(userAgent)
+};
+
+var styleFloat = jQuery.browser.msie ? "styleFloat" : "cssFloat";
+	
+jQuery.extend({
+	// Check to see if the W3C box model is being used
+	boxModel: !jQuery.browser.msie || document.compatMode == "CSS1Compat",
+	
+	styleFloat: jQuery.browser.msie ? "styleFloat" : "cssFloat",
+	
+	props: {
+		"for": "htmlFor",
+		"class": "className",
+		"float": styleFloat,
+		cssFloat: styleFloat,
+		styleFloat: styleFloat,
+		innerHTML: "innerHTML",
+		className: "className",
+		value: "value",
+		disabled: "disabled",
+		checked: "checked",
+		readonly: "readOnly",
+		selected: "selected",
+		maxlength: "maxLength"
+	}
+});
+
+jQuery.each({
+	parent: "a.parentNode",
+	parents: "jQuery.dir(a,'parentNode')",
+	next: "jQuery.nth(a,2,'nextSibling')",
+	prev: "jQuery.nth(a,2,'previousSibling')",
+	nextAll: "jQuery.dir(a,'nextSibling')",
+	prevAll: "jQuery.dir(a,'previousSibling')",
+	siblings: "jQuery.sibling(a.parentNode.firstChild,a)",
+	children: "jQuery.sibling(a.firstChild)",
+	contents: "jQuery.nodeName(a,'iframe')?a.contentDocument||a.contentWindow.document:jQuery.makeArray(a.childNodes)"
+}, function(i,n){
+	jQuery.fn[ i ] = function(a) {
+		var ret = jQuery.map(this,n);
+		if ( a && typeof a == "string" )
+			ret = jQuery.multiFilter(a,ret);
+		return this.pushStack( jQuery.unique(ret) );
+	};
+});
+
+jQuery.each({
+	appendTo: "append",
+	prependTo: "prepend",
+	insertBefore: "before",
+	insertAfter: "after",
+	replaceAll: "replaceWith"
+}, function(i,n){
+	jQuery.fn[ i ] = function(){
+		var a = arguments;
+		return this.each(function(){
+			for ( var j = 0, al = a.length; j < al; j++ )
+				jQuery(a[j])[n]( this );
+		});
+	};
+});
+
+jQuery.each( {
+	removeAttr: function( key ) {
+		jQuery.attr( this, key, "" );
+		this.removeAttribute( key );
+	},
+	addClass: function(c){
+		jQuery.className.add(this,c);
+	},
+	removeClass: function(c){
+		jQuery.className.remove(this,c);
+	},
+	toggleClass: function( c ){
+		jQuery.className[ jQuery.className.has(this,c) ? "remove" : "add" ](this, c);
+	},
+	remove: function(a){
+		if ( !a || jQuery.filter( a, [this] ).r.length ) {
+			jQuery.removeData( this );
+			this.parentNode.removeChild( this );
+		}
+	},
+	empty: function() {
+		// Clean up the cache
+		jQuery("*", this).each(function(){ jQuery.removeData(this); });
+
+		while ( this.firstChild )
+			this.removeChild( this.firstChild );
+	}
+}, function(i,n){
+	jQuery.fn[ i ] = function() {
+		return this.each( n, arguments );
+	};
+});
+
+jQuery.each( [ "Height", "Width" ], function(i,name){
+	var n = name.toLowerCase();
+	
+	jQuery.fn[ n ] = function(h) {
+		return this[0] == window ?
+			jQuery.browser.safari && self["inner" + name] ||
+			jQuery.boxModel && Math.max(document.documentElement["client" + name], document.body["client" + name]) ||
+			document.body["client" + name] :
+		
+			this[0] == document ?
+				Math.max( document.body["scroll" + name], document.body["offset" + name] ) :
+        
+				h == undefined ?
+					( this.length ? jQuery.css( this[0], n ) : null ) :
+					this.css( n, h.constructor == String ? h : h + "px" );
+	};
+});
+
+var chars = jQuery.browser.safari && parseInt(jQuery.browser.version) < 417 ?
+		"(?:[\\w*_-]|\\\\.)" :
+		"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",
+	quickChild = new RegExp("^>\\s*(" + chars + "+)"),
+	quickID = new RegExp("^(" + chars + "+)(#)(" + chars + "+)"),
+	quickClass = new RegExp("^([#.]?)(" + chars + "*)");
+
+jQuery.extend({
+	expr: {
+		"": "m[2]=='*'||jQuery.nodeName(a,m[2])",
+		"#": "a.getAttribute('id')==m[2]",
+		":": {
+			// Position Checks
+			lt: "i<m[3]-0",
+			gt: "i>m[3]-0",
+			nth: "m[3]-0==i",
+			eq: "m[3]-0==i",
+			first: "i==0",
+			last: "i==r.length-1",
+			even: "i%2==0",
+			odd: "i%2",
+
+			// Child Checks
+			"first-child": "a.parentNode.getElementsByTagName('*')[0]==a",
+			"last-child": "jQuery.nth(a.parentNode.lastChild,1,'previousSibling')==a",
+			"only-child": "!jQuery.nth(a.parentNode.lastChild,2,'previousSibling')",
+
+			// Parent Checks
+			parent: "a.firstChild",
+			empty: "!a.firstChild",
+
+			// Text Check
+			contains: "(a.textContent||a.innerText||jQuery(a).text()||'').indexOf(m[3])>=0",
+
+			// Visibility
+			visible: '"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden"',
+			hidden: '"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden"',
+
+			// Form attributes
+			enabled: "!a.disabled",
+			disabled: "a.disabled",
+			checked: "a.checked",
+			selected: "a.selected||jQuery.attr(a,'selected')",
+
+			// Form elements
+			text: "'text'==a.type",
+			radio: "'radio'==a.type",
+			checkbox: "'checkbox'==a.type",
+			file: "'file'==a.type",
+			password: "'password'==a.type",
+			submit: "'submit'==a.type",
+			image: "'image'==a.type",
+			reset: "'reset'==a.type",
+			button: '"button"==a.type||jQuery.nodeName(a,"button")',
+			input: "/input|select|textarea|button/i.test(a.nodeName)",
+
+			// :has()
+			has: "jQuery.find(m[3],a).length",
+
+			// :header
+			header: "/h\\d/i.test(a.nodeName)",
+
+			// :animated
+			animated: "jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length"
+		}
+	},
+	
+	// The regular expressions that power the parsing engine
+	parse: [
+		// Match: [@value='test'], [@foo]
+		/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,
+
+		// Match: :contains('foo')
+		/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,
+
+		// Match: :even, :last-chlid, #id, .class
+		new RegExp("^([:.#]*)(" + chars + "+)")
+	],
+
+	multiFilter: function( expr, elems, not ) {
+		var old, cur = [];
+
+		while ( expr && expr != old ) {
+			old = expr;
+			var f = jQuery.filter( expr, elems, not );
+			expr = f.t.replace(/^\s*,\s*/, "" );
+			cur = not ? elems = f.r : jQuery.merge( cur, f.r );
+		}
+
+		return cur;
+	},
+
+	find: function( t, context ) {
+		// Quickly handle non-string expressions
+		if ( typeof t != "string" )
+			return [ t ];
+
+		// Make sure that the context is a DOM Element
+		if ( context && !context.nodeType )
+			context = null;
+
+		// Set the correct context (if none is provided)
+		context = context || document;
+
+		// Initialize the search
+		var ret = [context], done = [], last;
+
+		// Continue while a selector expression exists, and while
+		// we're no longer looping upon ourselves
+		while ( t && last != t ) {
+			var r = [];
+			last = t;
+
+			t = jQuery.trim(t);
+
+			var foundToken = false;
+
+			// An attempt at speeding up child selectors that
+			// point to a specific element tag
+			var re = quickChild;
+			var m = re.exec(t);
+
+			if ( m ) {
+				var nodeName = m[1].toUpperCase();
+
+				// Perform our own iteration and filter
+				for ( var i = 0; ret[i]; i++ )
+					for ( var c = ret[i].firstChild; c; c = c.nextSibling )
+						if ( c.nodeType == 1 && (nodeName == "*" || c.nodeName.toUpperCase() == nodeName.toUpperCase()) )
+							r.push( c );
+
+				ret = r;
+				t = t.replace( re, "" );
+				if ( t.indexOf(" ") == 0 ) continue;
+				foundToken = true;
+			} else {
+				re = /^([>+~])\s*(\w*)/i;
+
+				if ( (m = re.exec(t)) != null ) {
+					r = [];
+
+					var nodeName = m[2], merge = {};
+					m = m[1];
+
+					for ( var j = 0, rl = ret.length; j < rl; j++ ) {
+						var n = m == "~" || m == "+" ? ret[j].nextSibling : ret[j].firstChild;
+						for ( ; n; n = n.nextSibling )
+							if ( n.nodeType == 1 ) {
+								var id = jQuery.data(n);
+
+								if ( m == "~" && merge[id] ) break;
+								
+								if (!nodeName || n.nodeName.toUpperCase() == nodeName.toUpperCase() ) {
+									if ( m == "~" ) merge[id] = true;
+									r.push( n );
+								}
+								
+								if ( m == "+" ) break;
+							}
+					}
+
+					ret = r;
+
+					// And remove the token
+					t = jQuery.trim( t.replace( re, "" ) );
+					foundToken = true;
+				}
+			}
+
+			// See if there's still an expression, and that we haven't already
+			// matched a token
+			if ( t && !foundToken ) {
+				// Handle multiple expressions
+				if ( !t.indexOf(",") ) {
+					// Clean the result set
+					if ( context == ret[0] ) ret.shift();
+
+					// Merge the result sets
+					done = jQuery.merge( done, ret );
+
+					// Reset the context
+					r = ret = [context];
+
+					// Touch up the selector string
+					t = " " + t.substr(1,t.length);
+
+				} else {
+					// Optimize for the case nodeName#idName
+					var re2 = quickID;
+					var m = re2.exec(t);
+					
+					// Re-organize the results, so that they're consistent
+					if ( m ) {
+					   m = [ 0, m[2], m[3], m[1] ];
+
+					} else {
+						// Otherwise, do a traditional filter check for
+						// ID, class, and element selectors
+						re2 = quickClass;
+						m = re2.exec(t);
+					}
+
+					m[2] = m[2].replace(/\\/g, "");
+
+					var elem = ret[ret.length-1];
+
+					// Try to do a global search by ID, where we can
+					if ( m[1] == "#" && elem && elem.getElementById && !jQuery.isXMLDoc(elem) ) {
+						// Optimization for HTML document case
+						var oid = elem.getElementById(m[2]);
+						
+						// Do a quick check for the existence of the actual ID attribute
+						// to avoid selecting by the name attribute in IE
+						// also check to insure id is a string to avoid selecting an element with the name of 'id' inside a form
+						if ( (jQuery.browser.msie||jQuery.browser.opera) && oid && typeof oid.id == "string" && oid.id != m[2] )
+							oid = jQuery('[@id="'+m[2]+'"]', elem)[0];
+
+						// Do a quick check for node name (where applicable) so
+						// that div#foo searches will be really fast
+						ret = r = oid && (!m[3] || jQuery.nodeName(oid, m[3])) ? [oid] : [];
+					} else {
+						// We need to find all descendant elements
+						for ( var i = 0; ret[i]; i++ ) {
+							// Grab the tag name being searched for
+							var tag = m[1] == "#" && m[3] ? m[3] : m[1] != "" || m[0] == "" ? "*" : m[2];
+
+							// Handle IE7 being really dumb about <object>s
+							if ( tag == "*" && ret[i].nodeName.toLowerCase() == "object" )
+								tag = "param";
+
+							r = jQuery.merge( r, ret[i].getElementsByTagName( tag ));
+						}
+
+						// It's faster to filter by class and be done with it
+						if ( m[1] == "." )
+							r = jQuery.classFilter( r, m[2] );
+
+						// Same with ID filtering
+						if ( m[1] == "#" ) {
+							var tmp = [];
+
+							// Try to find the element with the ID
+							for ( var i = 0; r[i]; i++ )
+								if ( r[i].getAttribute("id") == m[2] ) {
+									tmp = [ r[i] ];
+									break;
+								}
+
+							r = tmp;
+						}
+
+						ret = r;
+					}
+
+					t = t.replace( re2, "" );
+				}
+
+			}
+
+			// If a selector string still exists
+			if ( t ) {
+				// Attempt to filter it
+				var val = jQuery.filter(t,r);
+				ret = r = val.r;
+				t = jQuery.trim(val.t);
+			}
+		}
+
+		// An error occurred with the selector;
+		// just return an empty set instead
+		if ( t )
+			ret = [];
+
+		// Remove the root context
+		if ( ret && context == ret[0] )
+			ret.shift();
+
+		// And combine the results
+		done = jQuery.merge( done, ret );
+
+		return done;
+	},
+
+	classFilter: function(r,m,not){
+		m = " " + m + " ";
+		var tmp = [];
+		for ( var i = 0; r[i]; i++ ) {
+			var pass = (" " + r[i].className + " ").indexOf( m ) >= 0;
+			if ( !not && pass || not && !pass )
+				tmp.push( r[i] );
+		}
+		return tmp;
+	},
+
+	filter: function(t,r,not) {
+		var last;
+
+		// Look for common filter expressions
+		while ( t  && t != last ) {
+			last = t;
+
+			var p = jQuery.parse, m;
+
+			for ( var i = 0; p[i]; i++ ) {
+				m = p[i].exec( t );
+
+				if ( m ) {
+					// Remove what we just matched
+					t = t.substring( m[0].length );
+
+					m[2] = m[2].replace(/\\/g, "");
+					break;
+				}
+			}
+
+			if ( !m )
+				break;
+
+			// :not() is a special case that can be optimized by
+			// keeping it out of the expression list
+			if ( m[1] == ":" && m[2] == "not" )
+				r = jQuery.filter(m[3], r, true).r;
+
+			// We can get a big speed boost by filtering by class here
+			else if ( m[1] == "." )
+				r = jQuery.classFilter(r, m[2], not);
+
+			else if ( m[1] == "[" ) {
+				var tmp = [], type = m[3];
+				
+				for ( var i = 0, rl = r.length; i < rl; i++ ) {
+					var a = r[i], z = a[ jQuery.props[m[2]] || m[2] ];
+					
+					if ( z == null || /href|src|selected/.test(m[2]) )
+						z = jQuery.attr(a,m[2]) || '';
+
+					if ( (type == "" && !!z ||
+						 type == "=" && z == m[5] ||
+						 type == "!=" && z != m[5] ||
+						 type == "^=" && z && !z.indexOf(m[5]) ||
+						 type == "$=" && z.substr(z.length - m[5].length) == m[5] ||
+						 (type == "*=" || type == "~=") && z.indexOf(m[5]) >= 0) ^ not )
+							tmp.push( a );
+				}
+				
+				r = tmp;
+
+			// We can get a speed boost by handling nth-child here
+			} else if ( m[1] == ":" && m[2] == "nth-child" ) {
+				var merge = {}, tmp = [],
+					test = /(\d*)n\+?(\d*)/.exec(
+						m[3] == "even" && "2n" || m[3] == "odd" && "2n+1" ||
+						!/\D/.test(m[3]) && "n+" + m[3] || m[3]),
+					first = (test[1] || 1) - 0, last = test[2] - 0;
+
+				for ( var i = 0, rl = r.length; i < rl; i++ ) {
+					var node = r[i], parentNode = node.parentNode, id = jQuery.data(parentNode);
+
+					if ( !merge[id] ) {
+						var c = 1;
+
+						for ( var n = parentNode.firstChild; n; n = n.nextSibling )
+							if ( n.nodeType == 1 )
+								n.nodeIndex = c++;
+
+						merge[id] = true;
+					}
+
+					var add = false;
+
+					if ( first == 1 ) {
+						if ( last == 0 || node.nodeIndex == last )
+							add = true;
+					} else if ( (node.nodeIndex + last) % first == 0 )
+						add = true;
+
+					if ( add ^ not )
+						tmp.push( node );
+				}
+
+				r = tmp;
+
+			// Otherwise, find the expression to execute
+			} else {
+				var f = jQuery.expr[m[1]];
+				if ( typeof f != "string" )
+					f = jQuery.expr[m[1]][m[2]];
+
+				// Build a custom macro to enclose it
+				f = eval("false||function(a,i){return " + f + "}");
+
+				// Execute it against the current filter
+				r = jQuery.grep( r, f, not );
+			}
+		}
+
+		// Return an array of filtered elements (r)
+		// and the modified expression string (t)
+		return { r: r, t: t };
+	},
+
+	dir: function( elem, dir ){
+		var matched = [];
+		var cur = elem[dir];
+		while ( cur && cur != document ) {
+			if ( cur.nodeType == 1 )
+				matched.push( cur );
+			cur = cur[dir];
+		}
+		return matched;
+	},
+	
+	nth: function(cur,result,dir,elem){
+		result = result || 1;
+		var num = 0;
+
+		for ( ; cur; cur = cur[dir] )
+			if ( cur.nodeType == 1 && ++num == result )
+				break;
+
+		return cur;
+	},
+	
+	sibling: function( n, elem ) {
+		var r = [];
+
+		for ( ; n; n = n.nextSibling ) {
+			if ( n.nodeType == 1 && (!elem || n != elem) )
+				r.push( n );
+		}
+
+		return r;
+	}
+});
+/*
+ * A number of helper functions used for managing events.
+ * Many of the ideas behind this code orignated from 
+ * Dean Edwards' addEvent library.
+ */
+jQuery.event = {
+
+	// Bind an event to an element
+	// Original by Dean Edwards
+	add: function(element, type, handler, data) {
+		// For whatever reason, IE has trouble passing the window object
+		// around, causing it to be cloned in the process
+		if ( jQuery.browser.msie && element.setInterval != undefined )
+			element = window;
+
+		// Make sure that the function being executed has a unique ID
+		if ( !handler.guid )
+			handler.guid = this.guid++;
+			
+		// if data is passed, bind to handler 
+		if( data != undefined ) { 
+        		// Create temporary function pointer to original handler 
+			var fn = handler; 
+
+			// Create unique handler function, wrapped around original handler 
+			handler = function() { 
+				// Pass arguments and context to original handler 
+				return fn.apply(this, arguments); 
+			};
+
+			// Store data in unique handler 
+			handler.data = data;
+
+			// Set the guid of unique handler to the same of original handler, so it can be removed 
+			handler.guid = fn.guid;
+		}
+
+		// Namespaced event handlers
+		var parts = type.split(".");
+		type = parts[0];
+		handler.type = parts[1];
+
+		// Init the element's event structure
+		var events = jQuery.data(element, "events") || jQuery.data(element, "events", {});
+		
+		var handle = jQuery.data(element, "handle", function(){
+			// returned undefined or false
+			var val;
+
+			// Handle the second event of a trigger and when
+			// an event is called after a page has unloaded
+			if ( typeof jQuery == "undefined" || jQuery.event.triggered )
+				return val;
+			
+			val = jQuery.event.handle.apply(element, arguments);
+			
+			return val;
+		});
+
+		// Get the current list of functions bound to this event
+		var handlers = events[type];
+
+		// Init the event handler queue
+		if (!handlers) {
+			handlers = events[type] = {};	
+			
+			// And bind the global event handler to the element
+			if (element.addEventListener)
+				element.addEventListener(type, handle, false);
+			else
+				element.attachEvent("on" + type, handle);
+		}
+
+		// Add the function to the element's handler list
+		handlers[handler.guid] = handler;
+
+		// Keep track of which events have been used, for global triggering
+		this.global[type] = true;
+	},
+
+	guid: 1,
+	global: {},
+
+	// Detach an event or set of events from an element
+	remove: function(element, type, handler) {
+		var events = jQuery.data(element, "events"), ret, index;
+
+		// Namespaced event handlers
+		if ( typeof type == "string" ) {
+			var parts = type.split(".");
+			type = parts[0];
+		}
+
+		if ( events ) {
+			// type is actually an event object here
+			if ( type && type.type ) {
+				handler = type.handler;
+				type = type.type;
+			}
+			
+			if ( !type ) {
+				for ( type in events )
+					this.remove( element, type );
+
+			} else if ( events[type] ) {
+				// remove the given handler for the given type
+				if ( handler )
+					delete events[type][handler.guid];
+				
+				// remove all handlers for the given type
+				else
+					for ( handler in events[type] )
+						// Handle the removal of namespaced events
+						if ( !parts[1] || events[type][handler].type == parts[1] )
+							delete events[type][handler];
+
+				// remove generic event handler if no more handlers exist
+				for ( ret in events[type] ) break;
+				if ( !ret ) {
+					if (element.removeEventListener)
+						element.removeEventListener(type, jQuery.data(element, "handle"), false);
+					else
+						element.detachEvent("on" + type, jQuery.data(element, "handle"));
+					ret = null;
+					delete events[type];
+				}
+			}
+
+			// Remove the expando if it's no longer used
+			for ( ret in events ) break;
+			if ( !ret ) {
+				jQuery.removeData( element, "events" );
+				jQuery.removeData( element, "handle" );
+			}
+		}
+	},
+
+	trigger: function(type, data, element, donative, extra) {
+		// Clone the incoming data, if any
+		data = jQuery.makeArray(data || []);
+
+		// Handle a global trigger
+		if ( !element ) {
+			// Only trigger if we've ever bound an event for it
+			if ( this.global[type] )
+				jQuery("*").add([window, document]).trigger(type, data);
+
+		// Handle triggering a single element
+		} else {
+			var val, ret, fn = jQuery.isFunction( element[ type ] || null ),
+				// Check to see if we need to provide a fake event, or not
+				evt = !data[0] || !data[0].preventDefault;
+			
+			// Pass along a fake event
+			if ( evt )
+				data.unshift( this.fix({ type: type, target: element }) );
+
+			// Enforce the right trigger type
+			data[0].type = type;
+
+			// Trigger the event
+			if ( jQuery.isFunction( jQuery.data(element, "handle") ) )
+				val = jQuery.data(element, "handle").apply( element, data );
+
+			// Handle triggering native .onfoo handlers
+			if ( !fn && element["on"+type] && element["on"+type].apply( element, data ) === false )
+				val = false;
+
+			// Extra functions don't get the custom event object
+			if ( evt )
+				data.shift();
+
+			// Handle triggering of extra function
+			if ( extra && extra.apply( element, data ) === false )
+				val = false;
+
+			// Trigger the native events (except for clicks on links)
+			if ( fn && donative !== false && val !== false && !(jQuery.nodeName(element, 'a') && type == "click") ) {
+				this.triggered = true;
+				element[ type ]();
+			}
+
+			this.triggered = false;
+		}
+
+		return val;
+	},
+
+	handle: function(event) {
+		// returned undefined or false
+		var val;
+
+		// Empty object is for triggered events with no data
+		event = jQuery.event.fix( event || window.event || {} ); 
+
+		// Namespaced event handlers
+		var parts = event.type.split(".");
+		event.type = parts[0];
+
+		var c = jQuery.data(this, "events") && jQuery.data(this, "events")[event.type], args = Array.prototype.slice.call( arguments, 1 );
+		args.unshift( event );
+
+		for ( var j in c ) {
+			// Pass in a reference to the handler function itself
+			// So that we can later remove it
+			args[0].handler = c[j];
+			args[0].data = c[j].data;
+
+			// Filter the functions by class
+			if ( !parts[1] || c[j].type == parts[1] ) {
+				var tmp = c[j].apply( this, args );
+
+				if ( val !== false )
+					val = tmp;
+
+				if ( tmp === false ) {
+					event.preventDefault();
+					event.stopPropagation();
+				}
+			}
+		}
+
+		// Clean up added properties in IE to prevent memory leak
+		if (jQuery.browser.msie)
+			event.target = event.preventDefault = event.stopPropagation =
+				event.handler = event.data = null;
+
+		return val;
+	},
+
+	fix: function(event) {
+		// store a copy of the original event object 
+		// and clone to set read-only properties
+		var originalEvent = event;
+		event = jQuery.extend({}, originalEvent);
+		
+		// add preventDefault and stopPropagation since 
+		// they will not work on the clone
+		event.preventDefault = function() {
+			// if preventDefault exists run it on the original event
+			if (originalEvent.preventDefault)
+				originalEvent.preventDefault();
+			// otherwise set the returnValue property of the original event to false (IE)
+			originalEvent.returnValue = false;
+		};
+		event.stopPropagation = function() {
+			// if stopPropagation exists run it on the original event
+			if (originalEvent.stopPropagation)
+				originalEvent.stopPropagation();
+			// otherwise set the cancelBubble property of the original event to true (IE)
+			originalEvent.cancelBubble = true;
+		};
+		
+		// Fix target property, if necessary
+		if ( !event.target && event.srcElement )
+			event.target = event.srcElement;
+				
+		// check if target is a textnode (safari)
+		if (jQuery.browser.safari && event.target.nodeType == 3)
+			event.target = originalEvent.target.parentNode;
+
+		// Add relatedTarget, if necessary
+		if ( !event.relatedTarget && event.fromElement )
+			event.relatedTarget = event.fromElement == event.target ? event.toElement : event.fromElement;
+
+		// Calculate pageX/Y if missing and clientX/Y available
+		if ( event.pageX == null && event.clientX != null ) {
+			var e = document.documentElement, b = document.body;
+			event.pageX = event.clientX + (e && e.scrollLeft || b.scrollLeft || 0);
+			event.pageY = event.clientY + (e && e.scrollTop || b.scrollTop || 0);
+		}
+			
+		// Add which for key events
+		if ( !event.which && (event.charCode || event.keyCode) )
+			event.which = event.charCode || event.keyCode;
+		
+		// Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
+		if ( !event.metaKey && event.ctrlKey )
+			event.metaKey = event.ctrlKey;
+
+		// Add which for click: 1 == left; 2 == middle; 3 == right
+		// Note: button is not normalized, so don't use it
+		if ( !event.which && event.button )
+			event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
+			
+		return event;
+	}
+};
+
+jQuery.fn.extend({
+	bind: function( type, data, fn ) {
+		return type == "unload" ? this.one(type, data, fn) : this.each(function(){
+			jQuery.event.add( this, type, fn || data, fn && data );
+		});
+	},
+	
+	one: function( type, data, fn ) {
+		return this.each(function(){
+			jQuery.event.add( this, type, function(event) {
+				jQuery(this).unbind(event);
+				return (fn || data).apply( this, arguments);
+			}, fn && data);
+		});
+	},
+
+	unbind: function( type, fn ) {
+		return this.each(function(){
+			jQuery.event.remove( this, type, fn );
+		});
+	},
+
+	trigger: function( type, data, fn ) {
+		return this.each(function(){
+			jQuery.event.trigger( type, data, this, true, fn );
+		});
+	},
+
+	triggerHandler: function( type, data, fn ) {
+		if ( this[0] )
+			return jQuery.event.trigger( type, data, this[0], false, fn );
+	},
+
+	toggle: function() {
+		// Save reference to arguments for access in closure
+		var a = arguments;
+
+		return this.click(function(e) {
+			// Figure out which function to execute
+			this.lastToggle = 0 == this.lastToggle ? 1 : 0;
+			
+			// Make sure that clicks stop
+			e.preventDefault();
+			
+			// and execute the function
+			return a[this.lastToggle].apply( this, [e] ) || false;
+		});
+	},
+
+	hover: function(f,g) {
+		
+		// A private function for handling mouse 'hovering'
+		function handleHover(e) {
+			// Check if mouse(over|out) are still within the same parent element
+			var p = e.relatedTarget;
+	
+			// Traverse up the tree
+			while ( p && p != this ) try { p = p.parentNode; } catch(e) { p = this; };
+			
+			// If we actually just moused on to a sub-element, ignore it
+			if ( p == this ) return false;
+			
+			// Execute the right function
+			return (e.type == "mouseover" ? f : g).apply(this, [e]);
+		}
+		
+		// Bind the function to the two event listeners
+		return this.mouseover(handleHover).mouseout(handleHover);
+	},
+	
+	ready: function(f) {
+		// Attach the listeners
+		bindReady();
+
+		// If the DOM is already ready
+		if ( jQuery.isReady )
+			// Execute the function immediately
+			f.apply( document, [jQuery] );
+			
+		// Otherwise, remember the function for later
+		else
+			// Add the function to the wait list
+			jQuery.readyList.push( function() { return f.apply(this, [jQuery]); } );
+	
+		return this;
+	}
+});
+
+jQuery.extend({
+	/*
+	 * All the code that makes DOM Ready work nicely.
+	 */
+	isReady: false,
+	readyList: [],
+	
+	// Handle when the DOM is ready
+	ready: function() {
+		// Make sure that the DOM is not already loaded
+		if ( !jQuery.isReady ) {
+			// Remember that the DOM is ready
+			jQuery.isReady = true;
+			
+			// If there are functions bound, to execute
+			if ( jQuery.readyList ) {
+				// Execute all of them
+				jQuery.each( jQuery.readyList, function(){
+					this.apply( document );
+				});
+				
+				// Reset the list of functions
+				jQuery.readyList = null;
+			}
+			// Remove event listener to avoid memory leak
+			if ( jQuery.browser.mozilla || jQuery.browser.opera )
+				document.removeEventListener( "DOMContentLoaded", jQuery.ready, false );
+			
+			// Remove script element used by IE hack
+			if( !window.frames.length ) // don't remove if frames are present (#1187)
+				jQuery(window).load(function(){ jQuery("#__ie_init").remove(); });
+		}
+	}
+});
+
+jQuery.each( ("blur,focus,load,resize,scroll,unload,click,dblclick," +
+	"mousedown,mouseup,mousemove,mouseover,mouseout,change,select," + 
+	"submit,keydown,keypress,keyup,error").split(","), function(i,o){
+	
+	// Handle event binding
+	jQuery.fn[o] = function(f){
+		return f ? this.bind(o, f) : this.trigger(o);
+	};
+});
+
+var readyBound = false;
+
+function bindReady(){
+	if ( readyBound ) return;
+	readyBound = true;
+
+	// If Mozilla is used
+	if ( jQuery.browser.mozilla || jQuery.browser.opera )
+		// Use the handy event callback
+		document.addEventListener( "DOMContentLoaded", jQuery.ready, false );
+	
+	// If IE is used, use the excellent hack by Matthias Miller
+	// http://www.outofhanwell.com/blog/index.php?title=the_window_onload_problem_revisited
+	else if ( jQuery.browser.msie ) {
+	
+		// Only works if you document.write() it
+		document.write("<scr" + "ipt id=__ie_init defer=true " + 
+			"src=//:><\/script>");
+	
+		// Use the defer script hack
+		var script = document.getElementById("__ie_init");
+		
+		// script does not exist if jQuery is loaded dynamically
+		if ( script ) 
+			script.onreadystatechange = function() {
+				if ( this.readyState != "complete" ) return;
+				jQuery.ready();
+			};
+	
+		// Clear from memory
+		script = null;
+	
+	// If Safari  is used
+	} else if ( jQuery.browser.safari )
+		// Continually check to see if the document.readyState is valid
+		jQuery.safariTimer = setInterval(function(){
+			// loaded and complete are both valid states
+			if ( document.readyState == "loaded" || 
+				document.readyState == "complete" ) {
+	
+				// If either one are found, remove the timer
+				clearInterval( jQuery.safariTimer );
+				jQuery.safariTimer = null;
+	
+				// and execute any waiting functions
+				jQuery.ready();
+			}
+		}, 10); 
+
+	// A fallback to window.onload, that will always work
+	jQuery.event.add( window, "load", jQuery.ready );
+}
+jQuery.fn.extend({
+	load: function( url, params, callback ) {
+		if ( jQuery.isFunction( url ) )
+			return this.bind("load", url);
+
+		var off = url.indexOf(" ");
+		if ( off >= 0 ) {
+			var selector = url.slice(off, url.length);
+			url = url.slice(0, off);
+		}
+
+		callback = callback || function(){};
+
+		// Default to a GET request
+		var type = "GET";
+
+		// If the second parameter was provided
+		if ( params )
+			// If it's a function
+			if ( jQuery.isFunction( params ) ) {
+				// We assume that it's the callback
+				callback = params;
+				params = null;
+
+			// Otherwise, build a param string
+			} else {
+				params = jQuery.param( params );
+				type = "POST";
+			}
+
+		var self = this;
+
+		// Request the remote document
+		jQuery.ajax({
+			url: url,
+			type: type,
+			data: params,
+			complete: function(res, status){
+				// If successful, inject the HTML into all the matched elements
+				if ( status == "success" || status == "notmodified" )
+					// See if a selector was specified
+					self.html( selector ?
+						// Create a dummy div to hold the results
+						jQuery("<div/>")
+							// inject the contents of the document in, removing the scripts
+							// to avoid any 'Permission Denied' errors in IE
+							.append(res.responseText.replace(/<script(.|\s)*?\/script>/g, ""))
+
+							// Locate the specified elements
+							.find(selector) :
+
+						// If not, just inject the full result
+						res.responseText );
+
+				// Add delay to account for Safari's delay in globalEval
+				setTimeout(function(){
+					self.each( callback, [res.responseText, status, res] );
+				}, 13);
+			}
+		});
+		return this;
+	},
+
+	serialize: function() {
+		return jQuery.param(this.serializeArray());
+	},
+	serializeArray: function() {
+		return this.map(function(){
+			return jQuery.nodeName(this, "form") ?
+				jQuery.makeArray(this.elements) : this;
+		})
+		.filter(function(){
+			return this.name && !this.disabled && 
+				(this.checked || /select|textarea/i.test(this.nodeName) || 
+					/text|hidden|password/i.test(this.type));
+		})
+		.map(function(i, elem){
+			var val = jQuery(this).val();
+			return val == null ? null :
+				val.constructor == Array ?
+					jQuery.map( val, function(val, i){
+						return {name: elem.name, value: val};
+					}) :
+					{name: elem.name, value: val};
+		}).get();
+	}
+});
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","), function(i,o){
+	jQuery.fn[o] = function(f){
+		return this.bind(o, f);
+	};
+});
+
+var jsc = (new Date).getTime();
+
+jQuery.extend({
+	get: function( url, data, callback, type ) {
+		// shift arguments if data argument was ommited
+		if ( jQuery.isFunction( data ) ) {
+			callback = data;
+			data = null;
+		}
+		
+		return jQuery.ajax({
+			type: "GET",
+			url: url,
+			data: data,
+			success: callback,
+			dataType: type
+		});
+	},
+
+	getScript: function( url, callback ) {
+		return jQuery.get(url, null, callback, "script");
+	},
+
+	getJSON: function( url, data, callback ) {
+		return jQuery.get(url, data, callback, "json");
+	},
+
+	post: function( url, data, callback, type ) {
+		if ( jQuery.isFunction( data ) ) {
+			callback = data;
+			data = {};
+		}
+
+		return jQuery.ajax({
+			type: "POST",
+			url: url,
+			data: data,
+			success: callback,
+			dataType: type
+		});
+	},
+
+	ajaxSetup: function( settings ) {
+		jQuery.extend( jQuery.ajaxSettings, settings );
+	},
+
+	ajaxSettings: {
+		global: true,
+		type: "GET",
+		timeout: 0,
+		contentType: "application/x-www-form-urlencoded",
+		processData: true,
+		async: true,
+		data: null
+	},
+	
+	// Last-Modified header cache for next request
+	lastModified: {},
+
+	ajax: function( s ) {
+		var jsonp, jsre = /=(\?|%3F)/g, status, data;
+
+		// Extend the settings, but re-extend 's' so that it can be
+		// checked again later (in the test suite, specifically)
+		s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s));
+
+		// convert data if not already a string
+		if ( s.data && s.processData && typeof s.data != "string" )
+			s.data = jQuery.param(s.data);
+
+		// Handle JSONP Parameter Callbacks
+		if ( s.dataType == "jsonp" ) {
+			if ( s.type.toLowerCase() == "get" ) {
+				if ( !s.url.match(jsre) )
+					s.url += (s.url.match(/\?/) ? "&" : "?") + (s.jsonp || "callback") + "=?";
+			} else if ( !s.data || !s.data.match(jsre) )
+				s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
+			s.dataType = "json";
+		}
+
+		// Build temporary JSONP function
+		if ( s.dataType == "json" && (s.data && s.data.match(jsre) || s.url.match(jsre)) ) {
+			jsonp = "jsonp" + jsc++;
+
+			// Replace the =? sequence both in the query string and the data
+			if ( s.data )
+				s.data = s.data.replace(jsre, "=" + jsonp);
+			s.url = s.url.replace(jsre, "=" + jsonp);
+
+			// We need to make sure
+			// that a JSONP style response is executed properly
+			s.dataType = "script";
+
+			// Handle JSONP-style loading
+			window[ jsonp ] = function(tmp){
+				data = tmp;
+				success();
+				complete();
+				// Garbage collect
+				window[ jsonp ] = undefined;
+				try{ delete window[ jsonp ]; } catch(e){}
+			};
+		}
+
+		if ( s.dataType == "script" && s.cache == null )
+			s.cache = false;
+
+		if ( s.cache === false && s.type.toLowerCase() == "get" )
+			s.url += (s.url.match(/\?/) ? "&" : "?") + "_=" + (new Date()).getTime();
+
+		// If data is available, append data to url for get requests
+		if ( s.data && s.type.toLowerCase() == "get" ) {
+			s.url += (s.url.match(/\?/) ? "&" : "?") + s.data;
+
+			// IE likes to send both get and post data, prevent this
+			s.data = null;
+		}
+
+		// Watch for a new set of requests
+		if ( s.global && ! jQuery.active++ )
+			jQuery.event.trigger( "ajaxStart" );
+
+		// If we're requesting a remote document
+		// and trying to load JSON or Script
+		if ( !s.url.indexOf("http") && s.dataType == "script" ) {
+			var head = document.getElementsByTagName("head")[0];
+			var script = document.createElement("script");
+			script.src = s.url;
+
+			// Handle Script loading
+			if ( !jsonp && (s.success || s.complete) ) {
+				var done = false;
+
+				// Attach handlers for all browsers
+				script.onload = script.onreadystatechange = function(){
+					if ( !done && (!this.readyState || 
+							this.readyState == "loaded" || this.readyState == "complete") ) {
+						done = true;
+						success();
+						complete();
+						head.removeChild( script );
+					}
+				};
+			}
+
+			head.appendChild(script);
+
+			// We handle everything using the script element injection
+			return;
+		}
+
+		var requestDone = false;
+
+		// Create the request object; Microsoft failed to properly
+		// implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available
+		var xml = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
+
+		// Open the socket
+		xml.open(s.type, s.url, s.async);
+
+		// Set the correct header, if data is being sent
+		if ( s.data )
+			xml.setRequestHeader("Content-Type", s.contentType);
+
+		// Set the If-Modified-Since header, if ifModified mode.
+		if ( s.ifModified )
+			xml.setRequestHeader("If-Modified-Since",
+				jQuery.lastModified[s.url] || "Thu, 01 Jan 1970 00:00:00 GMT" );
+
+		// Set header so the called script knows that it's an XMLHttpRequest
+		xml.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+
+		// Allow custom headers/mimetypes
+		if ( s.beforeSend )
+			s.beforeSend(xml);
+			
+		if ( s.global )
+		    jQuery.event.trigger("ajaxSend", [xml, s]);
+
+		// Wait for a response to come back
+		var onreadystatechange = function(isTimeout){
+			// The transfer is complete and the data is available, or the request timed out
+			if ( !requestDone && xml && (xml.readyState == 4 || isTimeout == "timeout") ) {
+				requestDone = true;
+				
+				// clear poll interval
+				if (ival) {
+					clearInterval(ival);
+					ival = null;
+				}
+				
+				status = isTimeout == "timeout" && "timeout" ||
+					!jQuery.httpSuccess( xml ) && "error" ||
+					s.ifModified && jQuery.httpNotModified( xml, s.url ) && "notmodified" ||
+					"success";
+
+				if ( status == "success" ) {
+					// Watch for, and catch, XML document parse errors
+					try {
+						// process the data (runs the xml through httpData regardless of callback)
+						data = jQuery.httpData( xml, s.dataType );
+					} catch(e) {
+						status = "parsererror";
+					}
+				}
+
+				// Make sure that the request was successful or notmodified
+				if ( status == "success" ) {
+					// Cache Last-Modified header, if ifModified mode.
+					var modRes;
+					try {
+						modRes = xml.getResponseHeader("Last-Modified");
+					} catch(e) {} // swallow exception thrown by FF if header is not available
+	
+					if ( s.ifModified && modRes )
+						jQuery.lastModified[s.url] = modRes;
+
+					// JSONP handles its own success callback
+					if ( !jsonp )
+						success();	
+				} else
+					jQuery.handleError(s, xml, status);
+
+				// Fire the complete handlers
+				complete();
+
+				// Stop memory leaks
+				if ( s.async )
+					xml = null;
+			}
+		};
+		
+		if ( s.async ) {
+			// don't attach the handler to the request, just poll it instead
+			var ival = setInterval(onreadystatechange, 13); 
+
+			// Timeout checker
+			if ( s.timeout > 0 )
+				setTimeout(function(){
+					// Check to see if the request is still happening
+					if ( xml ) {
+						// Cancel the request
+						xml.abort();
+	
+						if( !requestDone )
+							onreadystatechange( "timeout" );
+					}
+				}, s.timeout);
+		}
+			
+		// Send the data
+		try {
+			xml.send(s.data);
+		} catch(e) {
+			jQuery.handleError(s, xml, null, e);
+		}
+		
+		// firefox 1.5 doesn't fire statechange for sync requests
+		if ( !s.async )
+			onreadystatechange();
+		
+		// return XMLHttpRequest to allow aborting the request etc.
+		return xml;
+
+		function success(){
+			// If a local callback was specified, fire it and pass it the data
+			if ( s.success )
+				s.success( data, status );
+
+			// Fire the global callback
+			if ( s.global )
+				jQuery.event.trigger( "ajaxSuccess", [xml, s] );
+		}
+
+		function complete(){
+			// Process result
+			if ( s.complete )
+				s.complete(xml, status);
+
+			// The request was completed
+			if ( s.global )
+				jQuery.event.trigger( "ajaxComplete", [xml, s] );
+
+			// Handle the global AJAX counter
+			if ( s.global && ! --jQuery.active )
+				jQuery.event.trigger( "ajaxStop" );
+		}
+	},
+
+	handleError: function( s, xml, status, e ) {
+		// If a local callback was specified, fire it
+		if ( s.error ) s.error( xml, status, e );
+
+		// Fire the global callback
+		if ( s.global )
+			jQuery.event.trigger( "ajaxError", [xml, s, e] );
+	},
+
+	// Counter for holding the number of active queries
+	active: 0,
+
+	// Determines if an XMLHttpRequest was successful or not
+	httpSuccess: function( r ) {
+		try {
+			return !r.status && location.protocol == "file:" ||
+				( r.status >= 200 && r.status < 300 ) || r.status == 304 ||
+				jQuery.browser.safari && r.status == undefined;
+		} catch(e){}
+		return false;
+	},
+
+	// Determines if an XMLHttpRequest returns NotModified
+	httpNotModified: function( xml, url ) {
+		try {
+			var xmlRes = xml.getResponseHeader("Last-Modified");
+
+			// Firefox always returns 200. check Last-Modified date
+			return xml.status == 304 || xmlRes == jQuery.lastModified[url] ||
+				jQuery.browser.safari && xml.status == undefined;
+		} catch(e){}
+		return false;
+	},
+
+	httpData: function( r, type ) {
+		var ct = r.getResponseHeader("content-type");
+		var xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0;
+		var data = xml ? r.responseXML : r.responseText;
+
+		if ( xml && data.documentElement.tagName == "parsererror" )
+			throw "parsererror";
+
+		// If the type is "script", eval it in global context
+		if ( type == "script" )
+			jQuery.globalEval( data );
+
+		// Get the JavaScript object, if JSON is used.
+		if ( type == "json" )
+			data = eval("(" + data + ")");
+
+		return data;
+	},
+
+	// Serialize an array of form elements or a set of
+	// key/values into a query string
+	param: function( a ) {
+		var s = [];
+
+		// If an array was passed in, assume that it is an array
+		// of form elements
+		if ( a.constructor == Array || a.jquery )
+			// Serialize the form elements
+			jQuery.each( a, function(){
+				s.push( encodeURIComponent(this.name) + "=" + encodeURIComponent( this.value ) );
+			});
+
+		// Otherwise, assume that it's an object of key/value pairs
+		else
+			// Serialize the key/values
+			for ( var j in a )
+				// If the value is an array then the key names need to be repeated
+				if ( a[j] && a[j].constructor == Array )
+					jQuery.each( a[j], function(){
+						s.push( encodeURIComponent(j) + "=" + encodeURIComponent( this ) );
+					});
+				else
+					s.push( encodeURIComponent(j) + "=" + encodeURIComponent( a[j] ) );
+
+		// Return the resulting serialization
+		return s.join("&").replace(/%20/g, "+");
+	}
+
+});
+jQuery.fn.extend({
+	show: function(speed,callback){
+		return speed ?
+			this.animate({
+				height: "show", width: "show", opacity: "show"
+			}, speed, callback) :
+			
+			this.filter(":hidden").each(function(){
+				this.style.display = this.oldblock ? this.oldblock : "";
+				if ( jQuery.css(this,"display") == "none" )
+					this.style.display = "block";
+			}).end();
+	},
+	
+	hide: function(speed,callback){
+		return speed ?
+			this.animate({
+				height: "hide", width: "hide", opacity: "hide"
+			}, speed, callback) :
+			
+			this.filter(":visible").each(function(){
+				this.oldblock = this.oldblock || jQuery.css(this,"display");
+				if ( this.oldblock == "none" )
+					this.oldblock = "block";
+				this.style.display = "none";
+			}).end();
+	},
+
+	// Save the old toggle function
+	_toggle: jQuery.fn.toggle,
+	
+	toggle: function( fn, fn2 ){
+		return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ?
+			this._toggle( fn, fn2 ) :
+			fn ?
+				this.animate({
+					height: "toggle", width: "toggle", opacity: "toggle"
+				}, fn, fn2) :
+				this.each(function(){
+					jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ]();
+				});
+	},
+	
+	slideDown: function(speed,callback){
+		return this.animate({height: "show"}, speed, callback);
+	},
+	
+	slideUp: function(speed,callback){
+		return this.animate({height: "hide"}, speed, callback);
+	},
+
+	slideToggle: function(speed, callback){
+		return this.animate({height: "toggle"}, speed, callback);
+	},
+	
+	fadeIn: function(speed, callback){
+		return this.animate({opacity: "show"}, speed, callback);
+	},
+	
+	fadeOut: function(speed, callback){
+		return this.animate({opacity: "hide"}, speed, callback);
+	},
+	
+	fadeTo: function(speed,to,callback){
+		return this.animate({opacity: to}, speed, callback);
+	},
+	
+	animate: function( prop, speed, easing, callback ) {
+		var opt = jQuery.speed(speed, easing, callback);
+
+		return this[ opt.queue === false ? "each" : "queue" ](function(){
+			opt = jQuery.extend({}, opt);
+			var hidden = jQuery(this).is(":hidden"), self = this;
+			
+			for ( var p in prop ) {
+				if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
+					return jQuery.isFunction(opt.complete) && opt.complete.apply(this);
+
+				if ( p == "height" || p == "width" ) {
+					// Store display property
+					opt.display = jQuery.css(this, "display");
+
+					// Make sure that nothing sneaks out
+					opt.overflow = this.style.overflow;
+				}
+			}
+
+			if ( opt.overflow != null )
+				this.style.overflow = "hidden";
+
+			opt.curAnim = jQuery.extend({}, prop);
+			
+			jQuery.each( prop, function(name, val){
+				var e = new jQuery.fx( self, opt, name );
+
+				if ( /toggle|show|hide/.test(val) )
+					e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
+				else {
+					var parts = val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),
+						start = e.cur(true) || 0;
+
+					if ( parts ) {
+						var end = parseFloat(parts[2]),
+							unit = parts[3] || "px";
+
+						// We need to compute starting value
+						if ( unit != "px" ) {
+							self.style[ name ] = (end || 1) + unit;
+							start = ((end || 1) / e.cur(true)) * start;
+							self.style[ name ] = start + unit;
+						}
+
+						// If a +=/-= token was provided, we're doing a relative animation
+						if ( parts[1] )
+							end = ((parts[1] == "-=" ? -1 : 1) * end) + start;
+
+						e.custom( start, end, unit );
+					} else
+						e.custom( start, val, "" );
+				}
+			});
+
+			// For JS strict compliance
+			return true;
+		});
+	},
+	
+	queue: function(type, fn){
+		if ( jQuery.isFunction(type) ) {
+			fn = type;
+			type = "fx";
+		}
+
+		if ( !type || (typeof type == "string" && !fn) )
+			return queue( this[0], type );
+
+		return this.each(function(){
+			if ( fn.constructor == Array )
+				queue(this, type, fn);
+			else {
+				queue(this, type).push( fn );
+			
+				if ( queue(this, type).length == 1 )
+					fn.apply(this);
+			}
+		});
+	},
+
+	stop: function(){
+		var timers = jQuery.timers;
+
+		return this.each(function(){
+			for ( var i = 0; i < timers.length; i++ )
+				if ( timers[i].elem == this )
+					timers.splice(i--, 1);
+		}).dequeue();
+	}
+
+});
+
+var queue = function( elem, type, array ) {
+	if ( !elem )
+		return;
+
+	var q = jQuery.data( elem, type + "queue" );
+
+	if ( !q || array )
+		q = jQuery.data( elem, type + "queue", 
+			array ? jQuery.makeArray(array) : [] );
+
+	return q;
+};
+
+jQuery.fn.dequeue = function(type){
+	type = type || "fx";
+
+	return this.each(function(){
+		var q = queue(this, type);
+
+		q.shift();
+
+		if ( q.length )
+			q[0].apply( this );
+	});
+};
+
+jQuery.extend({
+	
+	speed: function(speed, easing, fn) {
+		var opt = speed && speed.constructor == Object ? speed : {
+			complete: fn || !fn && easing || 
+				jQuery.isFunction( speed ) && speed,
+			duration: speed,
+			easing: fn && easing || easing && easing.constructor != Function && easing
+		};
+
+		opt.duration = (opt.duration && opt.duration.constructor == Number ? 
+			opt.duration : 
+			{ slow: 600, fast: 200 }[opt.duration]) || 400;
+	
+		// Queueing
+		opt.old = opt.complete;
+		opt.complete = function(){
+			jQuery(this).dequeue();
+			if ( jQuery.isFunction( opt.old ) )
+				opt.old.apply( this );
+		};
+	
+		return opt;
+	},
+	
+	easing: {
+		linear: function( p, n, firstNum, diff ) {
+			return firstNum + diff * p;
+		},
+		swing: function( p, n, firstNum, diff ) {
+			return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
+		}
+	},
+	
+	timers: [],
+
+	fx: function( elem, options, prop ){
+		this.options = options;
+		this.elem = elem;
+		this.prop = prop;
+
+		if ( !options.orig )
+			options.orig = {};
+	}
+
+});
+
+jQuery.fx.prototype = {
+
+	// Simple function for setting a style value
+	update: function(){
+		if ( this.options.step )
+			this.options.step.apply( this.elem, [ this.now, this ] );
+
+		(jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
+
+		// Set display property to block for height/width animations
+		if ( this.prop == "height" || this.prop == "width" )
+			this.elem.style.display = "block";
+	},
+
+	// Get the current size
+	cur: function(force){
+		if ( this.elem[this.prop] != null && this.elem.style[this.prop] == null )
+			return this.elem[ this.prop ];
+
+		var r = parseFloat(jQuery.curCSS(this.elem, this.prop, force));
+		return r && r > -10000 ? r : parseFloat(jQuery.css(this.elem, this.prop)) || 0;
+	},
+
+	// Start an animation from one number to another
+	custom: function(from, to, unit){
+		this.startTime = (new Date()).getTime();
+		this.start = from;
+		this.end = to;
+		this.unit = unit || this.unit || "px";
+		this.now = this.start;
+		this.pos = this.state = 0;
+		this.update();
+
+		var self = this;
+		function t(){
+			return self.step();
+		}
+
+		t.elem = this.elem;
+
+		jQuery.timers.push(t);
+
+		if ( jQuery.timers.length == 1 ) {
+			var timer = setInterval(function(){
+				var timers = jQuery.timers;
+				
+				for ( var i = 0; i < timers.length; i++ )
+					if ( !timers[i]() )
+						timers.splice(i--, 1);
+
+				if ( !timers.length )
+					clearInterval( timer );
+			}, 13);
+		}
+	},
+
+	// Simple 'show' function
+	show: function(){
+		// Remember where we started, so that we can go back to it later
+		this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
+		this.options.show = true;
+
+		// Begin the animation
+		this.custom(0, this.cur());
+
+		// Make sure that we start at a small width/height to avoid any
+		// flash of content
+		if ( this.prop == "width" || this.prop == "height" )
+			this.elem.style[this.prop] = "1px";
+		
+		// Start by showing the element
+		jQuery(this.elem).show();
+	},
+
+	// Simple 'hide' function
+	hide: function(){
+		// Remember where we started, so that we can go back to it later
+		this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
+		this.options.hide = true;
+
+		// Begin the animation
+		this.custom(this.cur(), 0);
+	},
+
+	// Each step of an animation
+	step: function(){
+		var t = (new Date()).getTime();
+
+		if ( t > this.options.duration + this.startTime ) {
+			this.now = this.end;
+			this.pos = this.state = 1;
+			this.update();
+
+			this.options.curAnim[ this.prop ] = true;
+
+			var done = true;
+			for ( var i in this.options.curAnim )
+				if ( this.options.curAnim[i] !== true )
+					done = false;
+
+			if ( done ) {
+				if ( this.options.display != null ) {
+					// Reset the overflow
+					this.elem.style.overflow = this.options.overflow;
+				
+					// Reset the display
+					this.elem.style.display = this.options.display;
+					if ( jQuery.css(this.elem, "display") == "none" )
+						this.elem.style.display = "block";
+				}
+
+				// Hide the element if the "hide" operation was done
+				if ( this.options.hide )
+					this.elem.style.display = "none";
+
+				// Reset the properties, if the item has been hidden or shown
+				if ( this.options.hide || this.options.show )
+					for ( var p in this.options.curAnim )
+						jQuery.attr(this.elem.style, p, this.options.orig[p]);
+			}
+
+			// If a callback was provided, execute it
+			if ( done && jQuery.isFunction( this.options.complete ) )
+				// Execute the complete function
+				this.options.complete.apply( this.elem );
+
+			return false;
+		} else {
+			var n = t - this.startTime;
+			this.state = n / this.options.duration;
+
+			// Perform the easing function, defaults to swing
+			this.pos = jQuery.easing[this.options.easing || (jQuery.easing.swing ? "swing" : "linear")](this.state, n, 0, 1, this.options.duration);
+			this.now = this.start + ((this.end - this.start) * this.pos);
+
+			// Perform the next step of the animation
+			this.update();
+		}
+
+		return true;
+	}
+
+};
+
+jQuery.fx.step = {
+	scrollLeft: function(fx){
+		fx.elem.scrollLeft = fx.now;
+	},
+
+	scrollTop: function(fx){
+		fx.elem.scrollTop = fx.now;
+	},
+
+	opacity: function(fx){
+		jQuery.attr(fx.elem.style, "opacity", fx.now);
+	},
+
+	_default: function(fx){
+		fx.elem.style[ fx.prop ] = fx.now + fx.unit;
+	}
+};
+// The Offset Method
+// Originally By Brandon Aaron, part of the Dimension Plugin
+// http://jquery.com/plugins/project/dimensions
+jQuery.fn.offset = function() {
+	var left = 0, top = 0, elem = this[0], results;
+	
+	if ( elem ) with ( jQuery.browser ) {
+		var	absolute     = jQuery.css(elem, "position") == "absolute", 
+		    parent       = elem.parentNode, 
+		    offsetParent = elem.offsetParent, 
+		    doc          = elem.ownerDocument,
+		    safari2      = safari && parseInt(version) < 522;
+	
+		// Use getBoundingClientRect if available
+		if ( elem.getBoundingClientRect ) {
+			box = elem.getBoundingClientRect();
+		
+			// Add the document scroll offsets
+			add(
+				box.left + Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft),
+				box.top  + Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop)
+			);
+		
+			// IE adds the HTML element's border, by default it is medium which is 2px
+			// IE 6 and IE 7 quirks mode the border width is overwritable by the following css html { border: 0; }
+			// IE 7 standards mode, the border is always 2px
+			if ( msie ) {
+				var border = jQuery("html").css("borderWidth");
+				border = (border == "medium" || jQuery.boxModel && parseInt(version) >= 7) && 2 || border;
+				add( -border, -border );
+			}
+	
+		// Otherwise loop through the offsetParents and parentNodes
+		} else {
+		
+			// Initial element offsets
+			add( elem.offsetLeft, elem.offsetTop );
+		
+			// Get parent offsets
+			while ( offsetParent ) {
+				// Add offsetParent offsets
+				add( offsetParent.offsetLeft, offsetParent.offsetTop );
+			
+				// Mozilla and Safari > 2 does not include the border on offset parents
+				// However Mozilla adds the border for table cells
+				if ( mozilla && /^t[d|h]$/i.test(parent.tagName) || !safari2 )
+					border( offsetParent );
+				
+				// Safari <= 2 doubles body offsets with an absolutely positioned element or parent
+				if ( safari2 && !absolute && jQuery.css(offsetParent, "position") == "absolute" )
+					absolute = true;
+			
+				// Get next offsetParent
+				offsetParent = offsetParent.offsetParent;
+			}
+		
+			// Get parent scroll offsets
+			while ( parent.tagName && !/^body|html$/i.test(parent.tagName) ) {
+				// Work around opera inline/table scrollLeft/Top bug
+				if ( !/^inline|table-row.*$/i.test(jQuery.css(parent, "display")) )
+					// Subtract parent scroll offsets
+					add( -parent.scrollLeft, -parent.scrollTop );
+			
+				// Mozilla does not add the border for a parent that has overflow != visible
+				if ( mozilla && jQuery.css(parent, "overflow") != "visible" )
+					border( parent );
+			
+				// Get next parent
+				parent = parent.parentNode;
+			}
+		
+			// Safari doubles body offsets with an absolutely positioned element or parent
+			if ( safari2 && absolute )
+				add( -doc.body.offsetLeft, -doc.body.offsetTop );
+		}
+
+		// Return an object with top and left properties
+		results = { top: top, left: left };
+	}
+
+	return results;
+
+	function border(elem) {
+		add( jQuery.css(elem, "borderLeftWidth"), jQuery.css(elem, "borderTopWidth") );
+	}
+
+	function add(l, t) {
+		left += parseInt(l) || 0;
+		top += parseInt(t) || 0;
+	}
+};
+})();
diff --git a/media/lifeflow/editor/lfe.js b/media/lifeflow/editor/lfe.js
new file mode 100644
index 0000000..a4afbf1
--- /dev/null
+++ b/media/lifeflow/editor/lfe.js
@@ -0,0 +1,67 @@
+var display_error = function(txt, elem) {
+  if (elem == undefined) { elem = "#errors"; };
+  var msg = $('<div class="error-msg"><p>'+txt+'</p></div>');
+  msg.insertAfter($(elem)).fadeIn('slow').animate({opacity: 1.0}, 5000).fadeOut('slow', function() { msg.remove(); });
+};
+
+
+/* Talking with the LifeFlow API */
+
+var delete_model = function(model, pk, onCompleteFunc) {
+  if ( ! onCompleteFunc) onCompleteFunc = function() {};
+  $.ajax({url:"/editor/delete_model/", type:"POST", data:{model:model, pk:pk},
+	complete:onCompleteFunc});
+};
+
+var create_model = function(model, args, onCompleteFunc) {
+  if (! onCompleteFunc) onCompleteFunc = function() {};
+  if (! args) args = {};
+  args["model"] = model;
+  $.ajax({type:"POST", url:'/editor/create_model/', data:args,
+	complete:onCompleteFunc});
+}
+
+var update_model = function(model, pk, args) {
+  if (!args) args = {};
+  args["model"] = model;
+  args["pk"] = pk;
+  $.ajax({type:"POST", url:'/editor/update/', data:args});
+};
+
+/* Used by projects.html */
+
+var edit_project = function(pk) {
+  if (pk)
+    window.location =  pk + "/details/";
+  else
+    display_error("Please select a project to edit!");
+}
+
+/* Used by overview.html */
+
+var edit = function(lst, type) {
+  var index = lst[0].selectedIndex
+  if (index != -1) {
+    var chosen = lst.children()[index]
+    window.location = "edit/" + type + "/" + chosen.value + "/1/";
+  }
+  else {
+    display_error("You haven't selected anything to edit!");
+  }
+};
+  
+var move = function (lst, dest, urlBase) {
+  var index = lst[0].selectedIndex
+  if (index == -1) { display_error("Nothing selected to move."); }
+  else {
+    var chosen = lst.children()[index];
+    var pk = chosen.value;
+    var url = urlBase +"/" + pk + "/";
+    $.ajax({url:url, complete:function(res,status) {
+      if (status == "success") {
+        chosen.value = res.responseText;
+        chosen.parentNode.removeChild(chosen);
+        dest.prepend(chosen);
+      }
+      else { display_error(res.responseText); }
+}})}};
diff --git a/media/lifeflow/lifeflow.css b/media/lifeflow/lifeflow.css
new file mode 100644
index 0000000..f0dad10
--- /dev/null
+++ b/media/lifeflow/lifeflow.css
@@ -0,0 +1,147 @@
+div.footer {
+    text-align: center;
+}
+
+span.tag {
+    margin-left: 10px;
+}
+
+span.translation {
+    margin-right: 10px;
+}
+
+
+span.header-link {
+    margin-left: 10px;
+}
+
+span.very-large {
+    font-size: 2em;
+    margin-bottom: 0.75em;
+}
+
+h3.reply {
+    margin-top: 18px;
+    text-align: center;
+}
+
+div.author-picture {
+    float: left;
+    padding-right: 10px;
+    padding-bottom: 10px;
+}
+
+div.author-subscribe {
+    text-align: center;
+}
+
+/* Stylings for Social Links */
+
+div.social {
+    text-align: center;
+    margin-top: 18px;
+    margin-bottom: 18px;
+}
+
+span.social {
+    margin-right: 18px;
+}
+
+/* Stylings for comments. */
+
+div.comment {
+    margin-top: 18px;
+    overflow: auto;
+}
+
+div.comment-body {
+    padding-left: 10px;
+    padding-right: 10px;
+}
+
+span.comment-author {
+    float: left;
+    margin-left: 5px;
+}
+
+div.comments-subscribe {
+    text-align: center;
+}
+
+span.comment-reply {
+    float: right;
+    margin-right: 10px;
+}
+
+span.comment-parent-link {
+    float: right;
+    margin-right: 10px;
+}
+
+div.comment_0 {
+    overflow: auto;
+    border: 1px dashed;
+    margin-left: 10px;
+    margin-right: 10px;
+}
+
+div.comment_1 {
+    overflow: auto;
+    border: 1px dashed;
+    margin-left: 20px;
+    margin-right: 10px;
+}
+
+div.comment_2 {
+    overflow: auto;
+    border: 1px dashed;
+    margin-left: 30px;
+    margin-right: 10px;
+}
+
+div.comment_3 {
+    overflow: auto;
+    border: 1px dashed;
+    margin-left: 40px;
+    margin-right: 10px;
+}
+
+div.comment_4 {
+    overflow: auto;
+    border: 1px dashed;
+    margin-left: 50px;
+    margin-right: 10px;
+}
+
+
+/* Styling for honeypot section of comments */
+
+div.honey {
+    display: none;
+}
+
+/* Stylings for the tag-cloud. */
+
+.tag-cloud LI {
+    display: inline;
+}
+
+.tag-cloud .size1 {
+    font-size: 1em
+}
+
+.tag-cloud .size2 {
+    font-size: 1.3em
+}
+
+.tag-cloud .size3 {
+    font-size: 1.6em
+}
+
+.tag-cloud .size4 {
+    font-size: 1.9em
+}
+
+.tag-cloud .size5 {
+    font-size: 2.2em
+}
\ No newline at end of file
diff --git a/media/lifeflow/resource/.DS_Store b/media/lifeflow/resource/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/media/lifeflow/skins/LICENSE b/media/lifeflow/skins/LICENSE
new file mode 100644
index 0000000..2c9bd5e
--- /dev/null
+++ b/media/lifeflow/skins/LICENSE
@@ -0,0 +1,58 @@
+Please note that the Creative Commons Attribution license applies to all files in the skins directory (the directory where this file is found).
+
+
+License
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+
+1. Definitions
+
+"Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
+"Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License.
+"Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
+"Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
+"Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
+"Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
+"You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
+"Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
+"Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
+2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
+
+to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
+to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
+to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
+to Distribute and Publicly Perform Adaptations.
+For the avoidance of doubt:
+
+Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
+Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
+Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
+The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
+
+4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
+
+You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(b), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(b), as requested.
+If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Section 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4 (b) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
+Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
+8. Miscellaneous
+
+Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
+Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
+If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
+This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
+The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
diff --git a/media/lifeflow/skins/lethain.css b/media/lifeflow/skins/lethain.css
new file mode 100644
index 0000000..7a615f5
--- /dev/null
+++ b/media/lifeflow/skins/lethain.css
@@ -0,0 +1,57 @@
+body {
+    background-color: #613536;
+    font-size: 11pt;
+}
+pre {
+    margin-left: 15px;
+}
+div.article-header {
+    margin-bottom: 10px;
+}
+
+div.highlight {
+    margin-bottom: 10px;
+}
+
+div.series-list {
+    font-size: 10pt;
+}
+ul {
+    list-style: none;
+}
+div.heading {
+    background-color: #363942;   
+}
+.heading a {
+    color: #ff7f24;
+}
+h3.author-list-heading {
+    display: none;
+}
+div.content-main {
+    background-color: #eeb4b4;
+    overflow: hidden;
+}
+div.content-main-internal {
+    padding-top: 18px;
+    padding-left: 9px;
+    padding-right: 9px;
+}
+div.content-sidebar {
+    padding-top: 18px;
+    margin-left: -10px;
+    padding-right: 10px;
+    background-color: #ff7f24;
+}
+
+.article-body img {
+    width: 100%;
+}
+
+a {
+    text-decoration: none;
+    color: #940505;
+}
+a:hover { 
+    text-decoration: underline;
+}
\ No newline at end of file
diff --git a/media/lifeflow/skins/substanceis.css b/media/lifeflow/skins/substanceis.css
new file mode 100644
index 0000000..2d23d7b
--- /dev/null
+++ b/media/lifeflow/skins/substanceis.css
@@ -0,0 +1,53 @@
+body {
+    background-color: #591300;
+    font-size: 11pt;
+}
+a {
+    text-decoration: none;
+    color: #940505;
+}
+a:hover { 
+    text-decoration: underline;
+}
+pre {
+    margin-left: 15px;
+}
+div.article-header {
+    margin-bottom: 10px;
+}
+
+div.series-list {
+    font-size: 10pt;
+}
+ul {
+    list-style: none;
+}
+div.heading {
+    background-color: #C91B00;   
+}
+.heading a {
+    color: #ff7f24;
+}
+h3.author-list-heading {
+    display: none;
+}
+div.content-main {
+    background-color: #eeb4b4;
+    overflow: hidden;
+}
+div.content-main-internal {
+    padding-top: 18px;
+    padding-left: 9px;
+    padding-right: 9px;
+}
+div.content-sidebar {
+    padding-top: 18px;
+    margin-left: -10px;
+    padding-right: 10px;
+    background-color: #C91B00;   
+}
+
+.article-body img {
+    width: 100%;
+}
+
diff --git a/models.py b/models.py
new file mode 100644
index 0000000..97f1579
--- /dev/null
+++ b/models.py
@@ -0,0 +1,705 @@
+import datetime, copy, xmlrpclib, thread, time, cgi
+from django.db import models
+from django.core.cache import cache
+from django.contrib.sitemaps import ping_google
+from django.contrib.sites.models import Site
+from django.dispatch import dispatcher
+from django.db.models import signals
+from django.core.mail import mail_admins
+from lifeflow.markdown.markdown import Markdown
+
+
+
+def dbc_markup(txt, obj=None):
+    "Apply Dynamic Blog Context markup"
+    from lifeflow.markdown import mdx_lifeflow
+    from lifeflow.markdown import mdx_code
+    from lifeflow.markdown import mdx_footnotes
+    md = Markdown(txt,
+                  extensions=[mdx_footnotes,
+                              mdx_code,
+                              mdx_lifeflow],
+                  extension_configs={'lifeflow':obj},
+                  )
+    return md.convert()
+    
+
+def comment_markup(txt, obj=None):
+    from lifeflow.markdown import mdx_code
+    md = Markdown(txt, extensions=[mdx_code])
+    return md.convert()
+
+
+
+class Author(models.Model):
+    name = models.CharField(max_length=100)
+    slug = models.SlugField(
+        prepopulate_from=('name',),
+        help_text="Automatically built from author's name.",
+        )
+    link = models.CharField(
+        max_length=200,
+        help_text="Link to author's website.")
+    bio = models.TextField(
+        blank=True, null=True,
+        help_text="Bio of author, written in markdown format."
+        )
+    picture = models.FileField(
+        upload_to="lifeflow/author", blank=True, null=True,
+        help_text="Picture of author. For best visual appearance should be relatively small (200px by 200px or so)."
+        )
+    use_markdown = models.BooleanField(
+        default=True,
+        help_text="If true body is filtered using MarkDown, otherwise html is expected.",
+        )
+
+
+    class Meta:
+        ordering = ('name',)
+
+
+    class Admin:
+        list_display = ('name', 'link')
+        search_fields = ['name']
+
+    
+    def __unicode__(self):
+        return self.name
+
+
+    def get_absolute_url(self):
+        return u"/author/%s/" % self.slug
+
+
+    def latest(self, qty=10):
+        return self.entry_set.all().filter(**{'pub_date__lte': datetime.datetime.now()})[:qty]
+
+    
+    def name_with_link(self):
+        return u'<a href="%s">%s</a>' % (self.get_absolute_url(), self.name)
+
+
+
+class Comment(models.Model):
+    entry = models.ForeignKey('Entry')
+    parent = models.ForeignKey('Comment', blank=True, null=True)
+    name = models.CharField(max_length=100, blank=True, null=True)
+    email = models.CharField(max_length=100, blank=True, null=True)
+    webpage = models.CharField(max_length=100, blank=True, null=True)
+    body = models.TextField()
+    date = models.DateTimeField(auto_now_add=True)
+    html = models.TextField(blank=True, null=True)
+
+
+    class Meta:
+        ordering = ('-date',)
+
+
+    class Admin:
+        list_display = ('entry', 'name', 'email', 'webpage', 'date')
+        search_fields = ['name', 'email','body']
+
+
+    def save(self):
+        if self.name == u"name" or self.name == u"":
+            self.name = u"anonymous"
+        if self.webpage == u"http://webpage" or self.webpage == u"http://":
+            # better to check for valid URL
+            self.webpage = None
+        if self.email == u"email":
+            # better to check for valid email address
+            self.email = None
+
+        title = self.entry.title
+        subject = u"[Comment] %s on %s" % (self.name, self.entry.title)
+        body = u"Comment by %s [%s][%s] on %s\n\n%s" % (self.name, self.email, self.webpage, title, self.html) 
+        mail_admins(subject, body, fail_silently=True)
+
+        super(Comment,self).save()
+
+
+    def get_absolute_url(self):
+        return u"%s#comment_%s" % (self.entry.get_absolute_url(), self.pk)
+
+
+    def __unicode__(self):
+        name = self.name or "Unnamed Poster"
+        title = self.entry.title or "Unnamed Entry"
+        return u": ".join((name, title))
+
+
+class Draft(models.Model):
+    title = models.CharField(max_length=200, blank=True, null=True)
+    slug = models.SlugField(unique_for_date='pub_date',
+                            prepopulate_from=('title',),
+                            blank=True, null=True)
+    summary = models.TextField(blank=True, null=True)
+    body = models.TextField(blank=True, null=True)
+    pub_date = models.DateTimeField(blank=True, null=True)
+    edited = models.BooleanField(default=False)
+    use_markdown = models.BooleanField(default=True)
+    is_translation = models.BooleanField(default=False)
+    send_ping = models.BooleanField(default=False)
+    allow_comments = models.BooleanField(default=True)
+    flows = models.ManyToManyField('Flow', blank=True, null=True)
+    tags = models.ManyToManyField('Tag', blank=True, null=True)
+    series = models.ManyToManyField('Series', blank=True, null=True)
+    authors = models.ManyToManyField('Author', blank=True, null=True)
+
+
+    def __unicode__(self):
+        if self.title:
+            return self.title
+        else:
+            return "Untitled Draft"
+
+
+class CurrentEntryManager(models.Manager):
+    def get_query_set(self):
+        return super(CurrentEntryManager, self).get_query_set().filter(**{'pub_date__lte': datetime.datetime.now()}).filter(**{'is_translation':False})
+
+
+
+class Entry(models.Model):
+    title = models.CharField(
+        max_length=200,
+        help_text='Name of this entry.'
+        )
+    slug = models.SlugField(
+        unique_for_date='pub_date',
+        prepopulate_from=('title',),
+        help_text='Automatically built from the title.'
+        )
+    summary = models.TextField(help_text="One paragraph. Don't add &lt;p&gt; tag.")
+    body = models.TextField(
+        help_text='Use <a href="http://daringfireball.net/projects/markdown/syntax">Markdown-syntax</a>'
+        )
+    body_html = models.TextField(blank=True, null=True)
+    pub_date = models.DateTimeField(
+        help_text='If the date and time combination is in the future, the entry will not be visible until after that moment has passed.'
+        )
+    use_markdown = models.BooleanField(
+        default=True,
+        help_text="If true body is filtered using MarkDown++, otherwise no filtering is applied.",
+        )
+    is_translation = models.BooleanField(
+        default=False,
+        help_text="Only used to add articles to the translation feed.",
+        )
+    send_ping = models.BooleanField(
+        default=False,
+        help_text="If true will ping Google and any sites you have specified on saves."
+        )
+    allow_comments = models.BooleanField(
+        default=True,
+        help_text="If true users may add comments on this entry.",
+        )
+    flows = models.ManyToManyField(
+        'Flow', filter_interface=models.HORIZONTAL, blank=True, null=True,
+        help_text="Determine which pages and feeds to show entry on.",
+        )
+    tags = models.ManyToManyField(
+        'Tag', filter_interface=models.HORIZONTAL, blank=True, null=True,
+        help_text="Select tags to associate with this entry.",
+        )
+    series = models.ManyToManyField(
+        'Series', filter_interface=models.HORIZONTAL, blank=True, null=True,
+        help_text='Used to associated groups of entries together under one theme.',
+        )
+    resources = models.ManyToManyField(
+        'Resource', filter_interface=models.HORIZONTAL, blank=True, null=True,
+        help_text='Files or images used in entries. MarkDown links are automatically generated.',
+        )
+    authors = models.ManyToManyField(
+        'Author', filter_interface=models.HORIZONTAL, blank=True, null=True,
+        help_text='The authors associated with this entry.',
+        )
+    # main manager, allows access to all entries, required primarily for admin functionality
+    objects = models.Manager()
+    # current manager, does not allow access entries published to future dates
+    current = CurrentEntryManager()
+
+
+    class Meta:
+        ordering = ('-pub_date',)
+        get_latest_by = 'pub_date'
+        verbose_name_plural = "entries"
+
+
+    class Admin:
+        list_display = ('title', 'pub_date')
+        search_fields = ['title', 'summary', 'body']
+        fields = (
+            (None, {'fields' : ('title', 'slug', 'pub_date',)}),
+            ('Content', {'fields': ('summary', 'body',)}),
+            ('Options', {'fields': ('use_markdown', 'is_translation', 'send_ping', 'allow_comments', ), 'classes': 'collapse'}),
+            ('Authors', {'fields' : ('authors',), 'classes': 'collapse'}),
+            ('Resources', {'fields' : ('resources',), 'classes': 'collapse'}),
+            ('Series', {'fields': ('series',), 'classes': 'collapse'}),
+            ('Organization', {'fields': ('flows', 'tags',),}),
+            )
+
+
+    def __unicode__(self):
+        return self.title
+
+
+    def get_absolute_url(self):
+        return u"/entry/%s/%s/" % (
+            self.pub_date.strftime("%Y/%b/%d").lower(),
+            self.slug,
+            )
+
+
+    def save(self):
+        if self.use_markdown:
+            self.body_html = dbc_markup(self.body, self)
+        else:
+            self.body_html = self.body
+        if self.send_ping is True: self.ping()
+        super(Entry,self).save()
+
+
+    def ping(self):
+        # ping all sites to ping (Ping-O-Matic, etc)
+        for site in SiteToNotify.objects.all():
+            site.ping()
+
+        # inform Google sitemap has changed
+        try:
+            ping_google()
+        except Exception:
+            pass
+
+    
+    def get_next_article(self):
+        next =  Entry.current.filter(**{'pub_date__gt': self.pub_date}).order_by('pub_date')
+        try:
+            return next[0]
+        except IndexError:
+            return None
+
+
+    def get_previous_article(self):
+        previous =  Entry.current.filter(**{'pub_date__lt': self.pub_date}).order_by('-pub_date')
+        try:
+            return previous[0]
+        except IndexError:
+            return None
+
+
+    def get_random_entries(self):
+        return Entry.current.order_by('?')[:3]
+
+
+    def organize_comments(self):
+        """
+        Used to create a list of threaded comments. 
+
+        This is a bit tricky since we only know the parent for
+        each comment, as opposed to knowing each parent's children.
+        """
+        def build_relations(dict, comment=None, depth=-1):
+            if comment is None: id = None
+            else: id = comment.id
+            try:
+                children = dict[id]
+                return [(comment, depth), [build_relations(dict, x, depth+1) for x in children]]
+            except:
+                return (comment, depth)
+
+        def flatten(l, ltypes=(list, tuple)):
+            i = 0
+            while i < len(l):
+                while isinstance(l[i], ltypes):
+                    if not l[i]:
+                        l.pop(i)
+                        if not len(l):
+                            break
+                    else:
+                        l[i:i+1] = list(l[i])
+                i += 1
+            return l
+
+        def group(seq, length):
+            """
+            Taken from http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/496784
+            """
+            return [seq[i:i+length] for i in range(0, len(seq), length)]
+
+        dict = {None:[]}
+        all = Comment.objects.select_related().filter(entry=self)
+        for comment in all:
+            if comment.parent: id = comment.parent.id
+            else: id = None
+            try:
+                dict[id].append(comment)
+            except KeyError:
+                dict[id] = [comment]
+        relations = build_relations(dict)
+        # If there are no comments, return None
+        if len(relations) == 1:
+            return None
+        # Otherwise, throw away the None node, flatten
+        # the returned list, and regroup the list into
+        # 2-lists that look like
+        #   [CommentInstance, 4]
+        # where CommentInstance is an instance of the
+        # Comment class, and 4 is the depth of the
+        # comment in the layering
+        else:
+            return group(flatten(relations[1]), 2)
+
+
+
+class Flow(models.Model):
+    """
+    A genre of entries. Like things about Cooking, or Japan.
+    Broader than a tag, and gets its own nav link and is available
+    at /slug/ instead of /tags/slug/
+    """
+    title = models.CharField(max_length=100)
+    slug = models.SlugField(prepopulate_from=("title",))
+
+
+    class Admin:
+        pass
+
+
+    def __unicode__(self):
+        return self.title
+
+
+    def latest(self, qty=None):
+        if qty is None:
+            return self.entry_set.all().filter(**{'pub_date__lte': datetime.datetime.now()}).filter(**{'is_translation':False})
+        else:
+            return self.entry_set.all().filter(**{'pub_date__lte': datetime.datetime.now()}).filter(**{'is_translation':False})[:qty]
+
+    def get_absolute_url(self):
+        return u"/%s/" % self.slug
+
+
+
+class Language(models.Model):
+    title = models.CharField(max_length=50, core=True)
+    slug = models.SlugField(prepopulate_from=("title",))
+
+
+    class Admin:
+        pass
+
+    def __unicode__(self):
+        return self.title
+
+    def get_absolute_url(self):
+        return u"/language/%s/" % self.slug
+
+    def latest(self, qty=None):
+        return self.translation_set.all().filter(**{'translated__pub_date__lte': datetime.datetime.now()})
+
+
+
+class Project(models.Model):
+    """
+    A project of any kind. Think of it as a piece in a portfolio.
+    """
+    title = models.CharField(max_length=50)
+    slug = models.SlugField(
+        prepopulate_from=('title',),
+        help_text='Automatically built from the title.'
+        )
+    summary = models.TextField(help_text="One paragraph. Don't add &lt;p&gt; tag.")
+    body = models.TextField(
+        help_text='Use <a href="http://daringfireball.net/projects/markdown/syntax">Markdown-syntax</a>')
+    body_html = models.TextField(blank=True, null=True)
+    use_markdown = models.BooleanField(default=True)
+    language = models.CharField(
+        max_length=50,
+        help_text="The programming language the project is written in.",
+        )
+    license = models.CharField(
+        max_length=50,
+        help_text="The license under which the project is released.",
+        )
+    resources = models.ManyToManyField('Resource', filter_interface=models.HORIZONTAL, blank=True, null=True)
+    SIZE_CHOICES = (
+        ('0', 'Script'),
+        ('1', 'Small'),
+        ('2', 'Medium'),
+        ('3', 'Large'),
+        )
+    size = models.CharField(
+        max_length=1, choices=SIZE_CHOICES,
+        help_text="Used for deciding order projects will be displayed in.",
+        )
+
+
+    class Meta:
+        ordering = ('-size',)
+
+
+    class Admin:
+        list_display = ('title', 'language', 'license', 'size',)
+        search_fields = ['title', 'summary', 'body']
+        fields = (
+            (None, {
+                    'fields' : ('title', 'slug', 'size', 'language', 'license', 'use_markdown',)}),
+            ('Content', {'fields': ('summary', 'body', 'resources')}),
+            )
+
+        
+    def __unicode__(self):
+        return self.title
+
+
+    def size_string(self):
+        if self.size == str(0): return "Script"
+        if self.size == str(1): return "Small"
+        elif self.size == str(2): return "Medium"
+        elif self.size == str(3): return "Large"
+
+
+    def get_absolute_url(self):
+        return u"/projects/%s/" % self.slug
+
+
+    def save(self):
+        if self.use_markdown:
+            self.body_html = dbc_markup(self.body, self)
+        else:
+            self.body_html = self.body
+        super(Project,self).save()
+
+
+
+class Resource(models.Model):
+    """
+    A wrapper for files (image or otherwise, the model is unaware of the
+    distinction) that are used in blog entries.
+    """
+    title = models.CharField(max_length=50)
+    markdown_id = models.CharField(max_length=50)
+    content = models.FileField(upload_to="lifeflow/resource")
+
+
+    class Admin:
+        pass
+
+
+    def get_relative_url(self):
+        # figure out why I named this relative instead of absolute
+        # because... it sure as hell isn't relative
+        return u"/media/%s" % self.content
+
+
+    def __unicode__(self):
+        return u"[%s] %s" % (self.markdown_id, self.title,)
+
+
+
+class RecommendedSite(models.Model):
+    """
+    A site that is displayed under the 'Blogs-To-See' entry
+    on each page of the website. Akin to entries in a blog roll
+    on a WordPress blog.
+    """
+    title = models.CharField(max_length=50)
+    url = models.URLField()
+
+
+    class Admin:
+        pass
+
+
+    def __unicode__(self):
+        return u"%s ==> %s" % (self.title, self.url)
+
+
+
+class Series(models.Model):
+    """
+    A series is a collection of Entry instances on the same theme.
+    """
+    title = models.CharField(max_length=200, core=True)
+    slug= models.SlugField(prepopulate_from=("title",))
+
+
+    class Meta:
+        verbose_name_plural = "Series"
+
+
+    class Admin:
+        pass
+
+
+    def __unicode__(self):
+        return self.title
+
+
+    def get_absolute_url(self):
+        return u"/articles/%s/" % ( unicode(self.slug), )
+
+
+    def latest(self, qty=10):
+        return self.entry_set.all().filter(**{'pub_date__lte': datetime.datetime.now()})[:qty]
+
+
+    def num_articles(self):
+        return self.entry_set.all().count()
+
+
+
+class SiteToNotify(models.Model):
+    """
+    SiteToNotify instances are pinged by Entries where
+    someEntry.ping_sites is True.
+
+    Sites such as 'Ping-O-Matic' are easiest to use here.
+    Manually creating the Ping-O-Matic instance looks
+    something like this:
+
+    stn = SiteToNotify(title="Ping-O-Matic",
+                       url_to_ping="http://rpc.pingomatic.com/",
+                       blog_title="My Blog's Title",
+                       blog_url="http://www.myblog.com")
+    stn.save()
+    """
+    title = models.CharField(max_length=100)
+    url_to_ping = models.CharField(max_length=200)
+    blog_title = models.CharField(max_length=100)
+    blog_url = models.CharField(max_length=200)
+
+
+    class Meta:
+        verbose_name_plural = "Sites to Notify"
+
+
+    class Admin:
+        pass
+
+
+    def __unicode__(self):
+        return self.title
+
+
+    def ping(self):
+        def do_ping():
+            remote_server = xmlrpclib.Server(self.url_to_ping)
+            remote_server.weblogUpdates.ping(self.blog_title, self.blog_url)
+        thread.start_new_thread(do_ping, ())
+
+
+
+class Tag(models.Model):
+    "Tags are associated with Entry instances to describe their contents."
+    title = models.CharField(max_length=50, core=True)
+    slug = models.SlugField(prepopulate_from=("title",))
+
+
+    class Admin:
+        pass
+
+    class Meta:
+        ordering = ('title',)
+
+
+    def __unicode__(self):
+        return self.title
+
+
+    def get_absolute_url(self):
+        return u"/tags/%s/" % self.slug
+
+
+    def latest(self, qty=None):
+        if qty is None:
+            return self.entry_set.all().filter(**{'pub_date__lte': datetime.datetime.now()})
+        else:
+            return self.entry_set.all().filter(**{'pub_date__lte': datetime.datetime.now()})[:qty]
+
+
+    def get_max_tags(self):
+        max = cache.get('lifeflow_tags_max')
+        if max == None:
+            tags = Tag.objects.all()
+            max = 0
+            for tag in tags._get_data():
+                count = tag.entry_set.count()
+                if count > max: max = count
+            cache.set('lifeflow_tags_max', max)
+        return max
+
+
+    def tag_size(self):
+        max = self.get_max_tags()
+        count = self.entry_set.count()
+        ratio = (count * 1.0) / max
+        tag_name = "size"
+        if ratio < .2: return tag_name + "1"
+        elif ratio < .4: return tag_name + "2"
+        elif ratio < .6: return tag_name + "3"
+        elif ratio < .8: return tag_name + "4"
+        else: return tag_name + "5"
+
+
+
+class Translation(models.Model):
+    """
+    Link together two entries, where @translated is a translation of
+    @original in the language @language.
+    """
+    language = models.ForeignKey('Language')
+    original = models.ForeignKey('Entry')
+    translated = models.ForeignKey('Entry', related_name="translated")
+
+
+    class Admin:
+        pass
+
+
+    def __unicode__(self):
+        return u"Translation of %s into %s" % (self.original, self.language,)
+
+
+    def get_link(self):
+        url = self.translated.get_absolute_url()
+        return u'<a href="%s">%s</a>' % (url, self.language,)
+
+    def get_absolute_url(self):
+        return self.translated.get_absolute_url()
+
+
+
+def resave_object(sender, instance, signal, *args, **kwargs):
+    """
+    This is called to save objects a second time after required
+    manyTomany relationships have been established.
+
+    There must be a better way of handling this.
+    """
+    def do_save():
+        time.sleep(3)
+        try:
+            instance.save()
+        except:
+            pass
+
+    id = u"%s%s" % (unicode(instance), unicode(instance.id))
+    try:
+        should_resave = resave_hist[id]
+    except KeyError:
+        resave_hist[id] = True
+        should_resave = True
+
+    if should_resave is True:
+        resave_hist[id] = False
+        thread.start_new_thread(do_save, ())
+    else:
+        resave_hist[id] = True
+
+
+
+resave_hist = {}
+dispatcher.connect(resave_object, signal=signals.post_save, sender=Project)
+dispatcher.connect(resave_object, signal=signals.post_save, sender=Entry)
diff --git a/mods/__init__.py b/mods/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/mods/static_files/__init__.py b/mods/static_files/__init__.py
new file mode 100644
index 0000000..d8c384c
--- /dev/null
+++ b/mods/static_files/__init__.py
@@ -0,0 +1,76 @@
+"""
+DATE: 2008/1/11
+AUTHOR: Will R. Larson
+
+This module integrates Jared Kuolt's *Static File Generator for Django* with the LifeFlow blogging solution.
+
+The Static File Generator allows pages to be rendered to static files, instead of being dynamically generated by Django (or hitting the Django caching mechanism).
+
+### Pros and Cons of this module
+
+There are some advantages to this approach:
+
+1. Serving static files puts a very minimal load on the server.
+2. Even if your server is going to hell in a handbasket (aka shared hosting), its going to be able to serve static files even if it can't spare the memory for FastCGI or WSGI to render the page anew.
+
+and some disadvantages:
+
+1. The page will only be re-rendered when you explicitly ask for it to be, and thus it will lose parts of its dynacism (for example the random links to other blog entries will only be randomly chosen each time you re-render the page).
+
+
+### Who should use this module?
+
+Those with the most to gain from this module are those running on a resource restricted system. Thus those running on small VPS or on shared servers can use this to reduce their dependence on unreliable resources at their disposal.
+
+Sometimes even if you are running on a system with more resources you may still benefit from this module as it will allow you to weather traffic peaks (nginx can serve thousands of static files per second on your 256 MBs of RAM VPS, but mod_python will be serving a whole lot less.
+
+### What is cached?
+
+Not everything is cached using this solution. A comprehensive list of everything that will be cached is:
+
+1. The main page.
+2. The page for each blog entry
+3. The tag cloud page.
+4. The series page.
+5. The projects page
+6. The page for each project.
+
+And a comprehensive list of the events that will save their static page cache to be updated:
+
+1. When an entry is saved, the main page, the tag cloud, the series page, the previous entry (if one exists), the next entry (if one exists), and the page for that specific entry are all refreshed.
+2. When a comment is saved, the main page and the specific entry's page are refreshed.
+3. When a project is saved, the projects page and the project's page are rerendered.
+
+
+### Usage
+
+To use this module you must:
+
+1. And the variable "WEB_ROOT" to your settings.py file for the project.
+2. Add "static_files" to the "LIFEFLOW_MODS" list.
+3. Configure your server to look for the static files being created in "WEB_ROOT" before it attempts to query Apache.
+
+
+The details of configuring this for your server will vary depending on your specific setup, and what server you are using. Try [looking here](http://www.lethain.com/projects/lifeflow/) for resources on doing so.
+
+"""
+from generator import quick_publish
+from lifeflow.models import Comment, Entry, Project
+from django.dispatch import dispatcher
+from django.db.models import signals
+
+
+def render_for_entry(sender, instance, signal, *args, **kwargs):
+    # note: not yet re-rendering previous and next entries
+    quick_publish((instance, '/', '/articles/', '/tags/'))
+    
+def render_for_comment(sender, instance, signal, *args, **kwargs):
+    quick_publish((instance.entry, '/'))
+
+def render_for_project(sender, instance, signal, *args, **kwargs):
+    quick_publish((instance, '/projects'))
+
+
+dispatcher.connect(render_for_entry, signal=signals.post_save, sender=Entry)
+dispatcher.connect(render_for_comment, signal=signals.post_save, sender=Comment)
+dispatcher.connect(render_for_project, signal=signals.post_save, sender=Project)
diff --git a/mods/static_files/generator.py b/mods/static_files/generator.py
new file mode 100644
index 0000000..94f16bf
--- /dev/null
+++ b/mods/static_files/generator.py
@@ -0,0 +1,169 @@
+"""Static file generator for Django."""
+
+__version__ = 'pre0.97, 2008-1-11'
+
+#
+# Some updating for working with current django SVN. pre0.97
+#
+#
+
+# The MIT License
+# 
+# Copyright(c) 2008 Will Larson 
+# (although full credit is due to Jared Kuolt, I'm not certain what the
+#  etiquete should be here, because he wrote most everything, but I have
+#  slightly updated it...)
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+import os
+from django.http import HttpRequest
+from django.core.handlers.base import BaseHandler
+from django.db.models.base import ModelBase
+from django.db.models.manager import Manager
+from django.db.models import Model
+from django.db.models.query import QuerySet
+from django.conf import settings
+from django.utils.functional import Promise
+
+class DummyHandler(BaseHandler):
+    """Required to process request and response middleware"""
+    
+    def __call__(self, request):
+        self.load_middleware()
+        response = self.get_response(request)
+        for middleware_method in self._response_middleware:
+            response = middleware_method(request, response)
+            
+        return response    
+
+class StaticGeneratorException(Exception):
+    pass
+
+class StaticGenerator(object):
+    """
+    The StaticGenerator class is created for Django applications, like a blog,
+    that are not updated per request.
+    
+    Usage is simple::
+    
+        from blog.models import Post
+        from django.contrib.flatpages.models import FlatPage
+        gen = StaticGenerator(['/', Post.objects.live(), FlatPage])
+        gen.publish()
+        
+    The class accepts a list of 'resources' which can be any of the 
+    following: URL path (string), Model (class or instance), Manager, or 
+    QuerySet.
+    
+    The most effective usage is to associate a StaticGenerator with a model's
+    pre_ or post_save signal.
+    
+    """
+    
+    def __init__(self, resources):
+        self.resources = self.extract_resources(resources)
+        try:
+            self.web_root = getattr(settings, 'WEB_ROOT')
+        except AttributeError:
+            raise StaticGeneratorException('You must specify WEB_ROOT in settings.py')
+        
+    def extract_resources(self, resources):
+        """Takes a list of resources, and gets paths by type"""
+        extracted = []
+        for resource in resources:
+            
+            # A URL string
+            if isinstance(resource, (str, unicode, Promise)):
+                extracted.append(str(resource))
+                continue
+            
+            # A model instance; requires get_absolute_url method
+            if isinstance(resource, Model):
+                extracted.append(resource.get_absolute_url())
+                continue
+            
+            # If it's a Model, we get the base Manager
+            if isinstance(resource, ModelBase):
+                resource = resource._default_manager
+            
+            # If it's a Manager, we get the QuerySet
+            if isinstance(resource, Manager):
+                resource = resource.all()
+            
+            # Append all paths from obj.get_absolute_url() to list
+            if isinstance(resource, QuerySet):
+                for obj in resource:
+                    extracted.append(obj.get_absolute_url())
+        
+        return extracted
+    
+    def get_content_from_path(self, path):
+        """
+        Imitates a basic http request using DummyHandler to retrieve
+        resulting output (HTML, XML, whatever)
+        
+        """
+        request = HttpRequest()
+        request.path = path
+        request.META[u"SERVER_NAME"] = "localhost"
+        request.META[u"SERVER_PORT"] = 80
+        
+        handler = DummyHandler()
+        response = handler(request)
+        
+        return response.content
+        
+    def get_filename_from_path(self, path):
+        """Creates index.html for path or just returns path as filename"""
+        if path.endswith('/'):
+            path = '%sindex.html' % path
+        
+        return os.path.join(self.web_root, path[1:])
+        
+    def publish_from_path(self, path):
+        """
+        Gets filename and content for a path, attempts to create directory if 
+        necessary, writes to file.
+        
+        """
+        fn = self.get_filename_from_path(path)
+        content = self.get_content_from_path(path)
+        directory = os.path.dirname(fn)
+        if not os.path.exists(directory):
+            try:
+                os.makedirs(directory)
+            except:
+                raise StaticGeneratorException('Could not create the directory: %s' % directory)
+        
+        try:
+            f = open(fn, 'w')
+            f.write(content)
+            f.close()
+        except:
+            raise StaticGeneratorException('Could not create the file: %s' % fn)
+    
+    def publish(self):
+        """Publishes all resources"""
+        for path in self.resources:
+            self.publish_from_path(path)
+
+def quick_publish(resources):
+    gen = StaticGenerator(resources)
+    gen.publish()
diff --git a/sitemaps.py b/sitemaps.py
new file mode 100644
index 0000000..cdfd281
--- /dev/null
+++ b/sitemaps.py
@@ -0,0 +1,9 @@
+from django.contrib.sitemaps import Sitemap
+from lifeflow.models import Project, Entry
+
+class ProjectSitemap(Sitemap):
+    changefreq = 'monthly'
+    priority = 0.9
+    
+    def items(self):
+        return Project.objects.all()
diff --git a/templates/404.html b/templates/404.html
new file mode 100644
index 0000000..73364a9
--- /dev/null
+++ b/templates/404.html
@@ -0,0 +1,11 @@
+{% extends "lifeflow/lifeflow_base.html" %}
+
+{% block title %} 404 {% endblock %}
+
+{% block body %}
+
+<h1> 404 </h1>
+
+<p> Unfortunately this content could not be found. </p>
+
+{% endblock %}
diff --git a/templates/500.html b/templates/500.html
new file mode 100644
index 0000000..12bd781
--- /dev/null
+++ b/templates/500.html
@@ -0,0 +1,11 @@
+{% extends "lifeflow/lifeflow_base.html" %}
+
+{% block title %} 500 {% endblock %}
+
+{% block body %}
+
+<h1> 500 </h1>
+
+<p> Unfortunately an error appears to have occured. </p>
+
+{% endblock %}
diff --git a/templates/base.html b/templates/base.html
new file mode 100644
index 0000000..7c16f03
--- /dev/null
+++ b/templates/base.html
@@ -0,0 +1,83 @@
+{% block doctype %}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">{% endblock %}
+
+<html lang=en>
+<head>
+{% block head %}
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<meta name="author" content="{{ lifeflow_author }}">
+<meta name="description" content="{{ lifeflow_description }}">
+<meta name="keywords" content="{{ lifeflow_keywords }}">
+<link rel="alternate" type="application/rss+xml" title="Content feed" href="/feeds/all/" />
+<link rel="stylesheet" href="/media/blueprint/compressed/screen.css" type="text/css" media="screen, projection">
+<link rel="stylesheet" href="/media/blueprint/compressed/print.css" type="text/css" media="print">	
+<!--[if IE]><link rel="stylesheet" href="/media/blueprint/lib/ie.css" type="text/css" media="screen, projection"><![endif]-->
+<link type="text/css" rel="stylesheet" href="/media/lifeflow/lifeflow.css">
+<link type="text/css" rel="stylesheet" href="/media/lifeflow/code.css">
+{% if lifeflow_custom_css %}
+<link type="text/css" rel="stylesheet" href="{{ lifeflow_custom_css }}">
+{% endif %}
+{% if lifeflow_custom_js_header %}
+<script type="text/javascript" src="{{ lifeflow_custom_js_header }}"></script>
+{% endif %}
+
+
+<title>{% block title %}Welcome to {{ lifeflow_blog_name }}{% endblock %}</title>
+{% endblock %}
+{% block extra_head %}{% endblock %}
+</head>
+
+<body>
+<div class="container body">
+  <div class="column span-24 heading">
+    <div class="column span-12 first header-links">
+      {% for flow in lifeflow_flows %}
+      <span class="header-link"><a href="{{ flow.get_absolute_url }}">{{ flow }}</a></span>
+      {% endfor %}
+      {% if lifeflow_use_projects %}
+      <span class="header-link"><a href="/projects/">Projects</a></span>
+      {% endif %}
+      <span class="header-link"><a href="/articles/">Articles</a></span>
+      <span class="header-link"><a href="/meta/rss/">RSS</a></span>
+    </div>
+    <div class="column span-12 last heading-name">
+      {% block heading %}
+      <h1><a href="/">{{ lifeflow_blog_name }}</a></h1>
+      {% endblock %}
+    </div>
+  </div>
+  <div class="column span-24 content">
+    <div class="column span-18 first content-main">
+      <div class="content-main-internal">
+	{% block body %}{% endblock %}
+      </div>
+    </div>
+    <div class="column span-6 last content-sidebar">
+      {% block sidebar %}{% endblock %}
+    </div>
+  </div>
+  <div class="column span-24 last footer">
+    {% block footer %}
+    <span class="attribution">
+      Powered by <a href="http://www.lethain.com/projects/lifeflow/">LifeFlow</a>, <a href="http://www.djangoproject.com">Django</a>, and <a href="http://code.google.com/p/blueprintcss/">BluePrint</a>. {% if lifeflow_template_author and lifeflow_template_author_url %}Template by <a href="{{ lifeflow_template_author_url }}">{{ lifeflow_template_author }}</a>.{% endif %}
+    </span>
+    {% endblock %}
+  </div>
+</div>
+
+{% block extra_js %}{% endblock %}
+{% if lifeflow_custom_js_footer %}
+<script type="text/javascript" src="{{ lifeflow_custom_js_footer }}"></script>
+{% endif %}
+{% if lifeflow_google_analytics_id %}
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+_uacct = "{{ lifeflow_google_analytics_id }}";
+urchinTracker();
+</script>
+{% endif %}
+
+
+</body>
+</html>
diff --git a/templates/feeds/all_description.html b/templates/feeds/all_description.html
new file mode 100644
index 0000000..290ccd0
--- /dev/null
+++ b/templates/feeds/all_description.html
@@ -0,0 +1 @@
+{{ obj.body_html|safe }}
\ No newline at end of file
diff --git a/templates/feeds/all_title.html b/templates/feeds/all_title.html
new file mode 100644
index 0000000..be322ee
--- /dev/null
+++ b/templates/feeds/all_title.html
@@ -0,0 +1 @@
+{{ obj.title|safe }}
\ No newline at end of file
diff --git a/templates/feeds/author_description.html b/templates/feeds/author_description.html
new file mode 100644
index 0000000..290ccd0
--- /dev/null
+++ b/templates/feeds/author_description.html
@@ -0,0 +1 @@
+{{ obj.body_html|safe }}
\ No newline at end of file
diff --git a/templates/feeds/author_title.html b/templates/feeds/author_title.html
new file mode 100644
index 0000000..be322ee
--- /dev/null
+++ b/templates/feeds/author_title.html
@@ -0,0 +1 @@
+{{ obj.title|safe }}
\ No newline at end of file
diff --git a/templates/feeds/comment_description.html b/templates/feeds/comment_description.html
new file mode 100644
index 0000000..fa78190
--- /dev/null
+++ b/templates/feeds/comment_description.html
@@ -0,0 +1 @@
+{{ obj.html|safe }}
\ No newline at end of file
diff --git a/templates/feeds/comment_title.html b/templates/feeds/comment_title.html
new file mode 100644
index 0000000..1cbb671
--- /dev/null
+++ b/templates/feeds/comment_title.html
@@ -0,0 +1 @@
+{{ obj.name|safe }} on {{ obj.entry.title|safe }} at {{ obj.date|date:"F j, Y" }}
diff --git a/templates/feeds/entry_comment_description.html b/templates/feeds/entry_comment_description.html
new file mode 100644
index 0000000..fa78190
--- /dev/null
+++ b/templates/feeds/entry_comment_description.html
@@ -0,0 +1 @@
+{{ obj.html|safe }}
\ No newline at end of file
diff --git a/templates/feeds/entry_comment_title.html b/templates/feeds/entry_comment_title.html
new file mode 100644
index 0000000..fedfae5
--- /dev/null
+++ b/templates/feeds/entry_comment_title.html
@@ -0,0 +1 @@
+{{ obj.name|safe }} on {{ obj.entry.title|safe }} on {{ obj.date|date:"F j, Y" }}
diff --git a/templates/feeds/flow_description.html b/templates/feeds/flow_description.html
new file mode 100644
index 0000000..290ccd0
--- /dev/null
+++ b/templates/feeds/flow_description.html
@@ -0,0 +1 @@
+{{ obj.body_html|safe }}
\ No newline at end of file
diff --git a/templates/feeds/flow_title.html b/templates/feeds/flow_title.html
new file mode 100644
index 0000000..be322ee
--- /dev/null
+++ b/templates/feeds/flow_title.html
@@ -0,0 +1 @@
+{{ obj.title|safe }}
\ No newline at end of file
diff --git a/templates/feeds/language_description.html b/templates/feeds/language_description.html
new file mode 100644
index 0000000..9c96217
--- /dev/null
+++ b/templates/feeds/language_description.html
@@ -0,0 +1 @@
+{{ obj.translated.body_html|safe }}
\ No newline at end of file
diff --git a/templates/feeds/language_title.html b/templates/feeds/language_title.html
new file mode 100644
index 0000000..0acf087
--- /dev/null
+++ b/templates/feeds/language_title.html
@@ -0,0 +1 @@
+{{ obj|safe }}
\ No newline at end of file
diff --git a/templates/feeds/projects_description.html b/templates/feeds/projects_description.html
new file mode 100644
index 0000000..290ccd0
--- /dev/null
+++ b/templates/feeds/projects_description.html
@@ -0,0 +1 @@
+{{ obj.body_html|safe }}
\ No newline at end of file
diff --git a/templates/feeds/projects_title.html b/templates/feeds/projects_title.html
new file mode 100644
index 0000000..0443e22
--- /dev/null
+++ b/templates/feeds/projects_title.html
@@ -0,0 +1 @@
+{{ obj.name|safe }}
\ No newline at end of file
diff --git a/templates/feeds/tag_description.html b/templates/feeds/tag_description.html
new file mode 100644
index 0000000..290ccd0
--- /dev/null
+++ b/templates/feeds/tag_description.html
@@ -0,0 +1 @@
+{{ obj.body_html|safe }}
\ No newline at end of file
diff --git a/templates/feeds/tag_title.html b/templates/feeds/tag_title.html
new file mode 100644
index 0000000..be322ee
--- /dev/null
+++ b/templates/feeds/tag_title.html
@@ -0,0 +1 @@
+{{ obj.title|safe }}
\ No newline at end of file
diff --git a/templates/feeds/translations_description.html b/templates/feeds/translations_description.html
new file mode 100644
index 0000000..290ccd0
--- /dev/null
+++ b/templates/feeds/translations_description.html
@@ -0,0 +1 @@
+{{ obj.body_html|safe }}
\ No newline at end of file
diff --git a/templates/feeds/translations_title.html b/templates/feeds/translations_title.html
new file mode 100644
index 0000000..be322ee
--- /dev/null
+++ b/templates/feeds/translations_title.html
@@ -0,0 +1 @@
+{{ obj.title|safe }}
\ No newline at end of file
diff --git a/templates/lifeflow/articles.html b/templates/lifeflow/articles.html
new file mode 100644
index 0000000..00b2765
--- /dev/null
+++ b/templates/lifeflow/articles.html
@@ -0,0 +1,16 @@
+{% extends "lifeflow/lifeflow_base.html" %}
+{% block body %}
+<h1> Article Series </h1>
+<div class="all-article-series">
+{% for object in object_list %}
+<div class="article-series">
+  <span><strong>{{ object }}</strong> <a href="/feeds/series/{{ object.slug }}/"> subscribe </a></span>
+  <ul class="article-series">
+    {% for entry in object.entry_set.all %}
+    <li class="article-series-entry"><a href="{{ entry.get_absolute_url }}">{{ entry }}</a></li>
+    {% endfor %}
+  </ul>
+</div>
+{% endfor %}
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/author_detail.html b/templates/lifeflow/author_detail.html
new file mode 100644
index 0000000..c3ae5e9
--- /dev/null
+++ b/templates/lifeflow/author_detail.html
@@ -0,0 +1,32 @@
+{% load markup %}
+{% extends "lifeflow/lifeflow_base.html" %}
+{% block title %}{{ object.name|escape }}{% endblock %}
+{% block body %}
+<h2 class="author"><a href="{{ object.link }}">{{ object.name }}</a></h2>
+<div class="author">
+  {% if object.picture %}
+  <div class="author-picture">
+    <img src="{{ object.get_picture_url }}" alt="An picture of {{ object.name }}" >
+  </div>
+  {% endif %}
+  <div class="author-description">
+    {% if object.use_markdown %}
+    {{ object.bio|markdown }}
+    {% else %}
+    {{ object.bio|safe }}
+    {% endif %}
+  </div>
+  <div class="author-subscribe">
+    <h3><a href="/feeds/author/{{ object.slug }}/">Subscribe to entries by {{ object.name }}</a></h3>
+  </div>
+  
+  <div class="author-entries">
+    <p><strong>Entries written by {{ object.name|escape }}</strong></p>
+    <ul class="author-entries-list">
+      {% for entry in object.entry_set.all %}
+      <li class="author-entry"><a href="{{ entry.get_absolute_url }}">{{ entry.title }}</a></li>
+      {% endfor %}
+    </ul>
+  </div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/author_list.html b/templates/lifeflow/author_list.html
new file mode 100644
index 0000000..18d4f71
--- /dev/null
+++ b/templates/lifeflow/author_list.html
@@ -0,0 +1,16 @@
+{% extends "lifeflow/lifeflow_base.html" %}
+{% block title %} Authors {% endblock %}
+{% block body %}
+
+<h3 class="author-list-heading"> Authors </h3>
+
+<div class="authors-list">
+{% for object in object_list %}
+  <div class="author-in-list">
+    <a href="{{ object.slug }}/" >
+      <img src="{{ object.get_picture_url }}" alt="An picture of {{ object.name }}" >
+    </a>
+  </div>
+{% endfor %}
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/comment.html b/templates/lifeflow/comment.html
new file mode 100644
index 0000000..b30b69a
--- /dev/null
+++ b/templates/lifeflow/comment.html
@@ -0,0 +1,93 @@
+{% extends "lifeflow/lifeflow_base.html" %}
+{% block extra_head %}
+<link type="text/css" rel="stylesheet" href="/media/blueprint/plugins/buttons/buttons.css">
+{% endblock %}
+{% block title %} Commenting on {{ object.title|escape }}{% endblock %}
+{% block body %}
+<h3> You are writing a comment about <a href="{{ object.get_absolute_url }}">{{ object.title|escape }}</a>, here is a quick summary:</h3>
+<p> {{ object.summary }} </p>
+{% if parent %}
+<hr>
+<h3> You are responding to <a href="{{ object.get_absolute_url }}#comment_{{ parent.id }}"> this comment</a> written by {{ parent.name }} on {{ parent.date|date:"F jS Y, H:i" }}.</h3>
+<p> {{ parent.html|safe }} </p>
+{% endif %}
+{% if form.cleaned_data.rendered %}
+<hr>
+<h3> Preview of your comment: </h3>
+{{ form.cleaned_data.rendered|safe }}
+{% endif %}
+<hr>
+<p> Please be aware that comment forms go stale after one hour.</p>
+<form method="post" action="/comments/create/">
+<div class="comment">
+  <div class="honey">
+    <input type="text" name="honey5" />
+    <input type="text" name="honey6" />
+    <textarea name="honey7" id="honey_area" rows="10" cols="40"></textarea>
+    <span><input type="submit" name="honey8" /></span>
+  </div>
+  <div class="commentDetails">
+    <span><input type="text" class="text" name="name" value="{{ form.cleaned_data.name }}" maxlength=100 /></span>
+    <br/>
+    <span><input type="text" class="text" name="email" value="{{ form.cleaned_data.email }}" maxlength=100/></span>
+    <br/>
+    <span><input type="text" class="text" name="webpage" value="{{ form.cleaned_data.webpage }}" maxlength=100 /></span>
+    <br/>
+    <div class="honey">
+      <span><input type="submit" name="honey1" /></span>
+      <span><button type="submit" name="honey2"></button></span>
+    </div>
+      <div class="commentBody">
+    <textarea name="body" id="id_body" rows="10", cols="40">{{ form.cleaned_data.body }}</textarea>
+  </div>
+    <div class="buttons">
+      <span><button type="submit" class="button positive" name="preview" value="preview">Preview</button></span>
+      <span><button type="submit" class="button" name="submit" value="submit">Submit</button></span>
+    </div> 
+  </div>
+  </div>
+  <br/>
+  <input type="hidden" name="parent_id" value="{{ parent.id }}" />
+  <input type="hidden" name="entry_id" value="{{ object.id }}" />
+  <input type="hidden" name="identifier" value="{{ identifier }}" />
+  <input type="hidden" name="time" value="{{ time }}" />
+  <div class="honey">
+    <span><input type="submit" name="honey3" /></span>
+    <span><button type="submit" name="honey4"></span>
+  </div>
+</form>
+  <div class="comment-help">
+    <p> Comments may make use of all MarkDown++ formating. Raw html will be escaped.</p>
+<hr>
+    <h4> Quick Introduction to MarkDown++ Syntax </h4>
+    <p>A highlighted code block:</p>
+    <pre>@@ ruby
+def a (b, c):
+  b * c
+end
+@@</pre>
+    <p> Other common languages work as well: scheme, python, java, html, etc.</p>
+    <p>Other markdown syntax:</p>
+    <pre> ### This is an h3 title
+
+#### This is an h4 title
+
+**this is bold**
+
+*this is italics*
+
+1. This is an
+2. ordered list
+
+* And an unordered
+* list too
+
+[this is a link](http://www.lethain.com/ "Lethain")</pre>    
+    
+  </div>
+
+  
+</div>
+
+{% endblock %}
+{% block sidebar %}{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/comment_list.html b/templates/lifeflow/comment_list.html
new file mode 100644
index 0000000..4dec589
--- /dev/null
+++ b/templates/lifeflow/comment_list.html
@@ -0,0 +1,40 @@
+{% load lifeflow %}
+
+<div class="comments" id="comments">
+  {% with object.pub_date as date %}
+  <div class="comments-subscribe">
+  <span><a href="/feeds/entry_comment/{{ date.year }}/{{ date.month }}/{{ date.day }}/{{ object.slug }}/">Subscribe to comments on {{ object.title }}</a></span>
+  </div>
+  {% endwith %}
+  
+  {% for comment_tuple in object.organize_comments %}
+    {% with comment_tuple.0 as comment %}
+    {% with comment_tuple.1 as depth %}
+    <div class="comment">
+      <div class="comment_{{ depth|boundary:"4" }}" id="comment_{{ comment.pk }}">
+
+      {% if comment.webpage %}
+        <span class="comment-author">
+          <a href="{{ comment.webpage }}">{{ comment.name }}</a>
+        </span>
+      {% else %}
+        <span class="comment-author">
+          {{ comment.name }}
+        </span>
+      {% endif %}
+	<span class="comment-reply"><a href="/comments/create/{{ object.pk }}/{{ comment.pk }}/"> reply </a></span>
+	{% if comment.parent %}
+	<span class="comment-parent-link">
+	  Responding to <a href="#comment_{{ comment.parent.pk }}">{{ comment.parent.name }}</a>
+	</span>
+	{% endif %}
+      <div class="comment-body">
+        <p> {{ comment.html|safe }} </p>
+      </div>
+      </div>
+    </div>
+    {% endwith %}
+    {% endwith %}
+  {% endfor %}
+    <h3 class="reply"><a href="/comments/create/{{ object.pk }}/"> Reply to this entry </a></h3>
+</div>
\ No newline at end of file
diff --git a/templates/lifeflow/editor/base.html b/templates/lifeflow/editor/base.html
new file mode 100644
index 0000000..b915813
--- /dev/null
+++ b/templates/lifeflow/editor/base.html
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html lang=en>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="/media/blueprint/compressed/screen.css" type="text/css" media="screen, projection">
+<link rel="stylesheet" href="/media/blueprint/compressed/print.css" type="text/css" media="print">
+<link type="text/css" rel="stylesheet" href="/media/blueprint/plugins/buttons/buttons.css">
+<!--[if IE]><link rel="stylesheet" href="/media/blueprint/lib/ie.css" type="text/css" media="screen, projection"><![endif]-->
+<link type="text/css" rel="stylesheet" href="/media/lifeflow/editor/editor.css">
+<script type="text/javascript" src="/media/lifeflow/editor/jquery.js"></script>
+<script type="text/javascript" src="/media/lifeflow/editor/lfe.js"></script>
+<title>LifeFlow Editor: {{ lifeflow_blog_name }}</title>
+</head>
+
+<body>
+<div class="control-bar">
+  {% if not login_screen %}
+  <a class="right" href="/editor/logout/">logout</a>
+  <a class="left" href="/editor/">articles</a>
+  <a class="left" href="/editor/comments/">comments</a>
+  <a class="left" href="/editor/projects/">projects</a>
+  <a class="left" href="/editor/files/">files</a>
+  <a class="left" href="/editor/blogroll/">blogroll</a>
+  {% endif %}
+</div>
+<div class="error-msg" id="errors"></div>
+{% block body %}{% endblock %}
+</body>
+</html>
diff --git a/templates/lifeflow/editor/blogroll.html b/templates/lifeflow/editor/blogroll.html
new file mode 100644
index 0000000..4fd3d0d
--- /dev/null
+++ b/templates/lifeflow/editor/blogroll.html
@@ -0,0 +1,48 @@
+{% extends "lifeflow/editor/base.html" %}
+
+{% block body %}
+<script>
+var delete_blog = function(pk) {
+  delete_model("recommendedsite",pk);
+  var id = "#blog_" + pk;
+  $(id).fadeOut('slow');
+}
+</script>
+
+<div class="editing blogs">
+<ul>
+  <li>
+  <form method="post" action="/editor/create_model/">
+  <table>
+    <tr><td></td><td> Add a blog to the blogroll. </td></tr>
+    <tr><td> Title </td><td><input name="title"></td></tr>
+    <tr><td> Url </td><td><input name="url" value="http://"></td></tr>
+    <input type="hidden" value="recommendedsite" name="model">
+    <tr><td></td><td><button type="submit" class="button positive">Create</button></td></tr>
+    </table>
+  </form>
+    
+  </li>
+  <li>
+  <ul>
+{% for blog in blogroll %}
+  <li id="blog_{{ blog.pk }}">
+  <div class="data left">
+  <p> {{ blog.title }} <em>@</em> <a href="{{blog.url}}">{{ blog.url }}</a></p>
+
+  </div>
+  <div class="controls right">
+    <a class="button negative" onclick="delete_blog({{ blog.pk }})">delete</a>
+  </div>
+  </li>
+{% endfor %}
+  </ul>
+  </li>
+
+</ul>
+
+</div>
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/editor/comments.html b/templates/lifeflow/editor/comments.html
new file mode 100644
index 0000000..31cba35
--- /dev/null
+++ b/templates/lifeflow/editor/comments.html
@@ -0,0 +1,27 @@
+{% extends "lifeflow/editor/base.html" %}
+
+{% block body %}
+<script>
+var delete_comment = function(pk) {
+  delete_model("comment",pk);
+  var id = "#comment_" + pk;
+  $(id).fadeOut('slow');
+}
+</script>
+
+<div class="editing comments">
+<ul>
+{% for comment in comments %}
+  <li id="comment_{{ comment.pk }}">
+  <div class="data">
+  <p> {{ comment.name }} ({{ comment.email }}) at {{ comment.date }} on {{ comment.entry }}. </p>
+  <p>{{ comment.html }}</p>
+  </div>
+  <div class="controls">
+    <a class="button negative" onclick="delete_comment({{ comment.pk }})">delete</a>
+  </div>
+  </li>
+{% endfor %}
+</ul>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/editor/edit.html b/templates/lifeflow/editor/edit.html
new file mode 100644
index 0000000..ff6f500
--- /dev/null
+++ b/templates/lifeflow/editor/edit.html
@@ -0,0 +1,25 @@
+{% extends "lifeflow/editor/base.html" %}
+
+{% block body %}
+<div class="column span-17 edit-main" id="edit-main">
+  <textarea id="edit"> {{ entry.body }} </textarea>
+</div>
+
+
+<div class="column span-23 buttons">
+  <hr>
+  <a class="button positive" id="save">Continue</a>
+  <script>
+  $(document).ready(function() {$("#render").click(function() {
+  $("#render-txt").load('/editor/render/', {'txt':$("#edit").text()});
+      })});
+  </script>
+  <a class="button" id="render">Preview</a>
+  <hr>
+</div>
+
+<div class="column span-22 render-div last" id="render-txt">
+  <p> its a start, but is still rendering the old stuff, I think its because the text() function isn't what we want, although I'm having issues getting innerHTML to work...</p>
+</div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/editor/edit_five.html b/templates/lifeflow/editor/edit_five.html
new file mode 100644
index 0000000..5163598
--- /dev/null
+++ b/templates/lifeflow/editor/edit_five.html
@@ -0,0 +1,51 @@
+{% extends "lifeflow/editor/base.html" %}
+
+{% block body %}
+<div class="breadcrumbs">
+  <span> <a href="../1/">Title & Summary</a> </span>
+  <span> <a href="../2">Body & Files</a> </span>
+  <span>  <a href="../3/">Flows</a> </span>
+  <span> <a href="../4/">Tags</a> </span>
+  <span class="selected"> Series </span>
+  <span> <a href="../6/">Date & Options</a> </span>
+  <span> <a href="../7/">Authors & Translations</a> </span>
+</div>
+
+<script>
+$(document).ready(function() {
+  $("a.selectable").click(function () {
+    $(this).toggleClass("selected");
+  });
+  $("#select-list").hover(
+    function() {},
+    function() {
+      var selected = $.map($("a.selected"),function(x) { return x.id; });
+      var data = {"series":selected};
+      update_model("{{model}}",{{object.pk}},data);
+  });
+});
+</script>
+
+<div class="editing">
+  <ul>
+    <li id="select-list">
+    <p> Click on the series that this article should appear in. </p>
+    <div id="selectables" class="selectables">
+      {% for serie, selected in series %}
+      <a class="selectable {% if selected %} selected{% endif %}" id="{{ serie.pk }}"> {{ serie.title }}</a>
+      {% endfor %}
+    </div>
+    </li>
+    <li>
+      <form method="post" action="/editor/create_model/">
+        <table>
+	  <tr><td><p> Create a new series. </p></td></tr>
+	  <tr><td>Title: </td><td><input name="title"></td></tr>
+	  <input type="hidden" value="series" name="model">
+    	  <tr><td></td><td><button type="submit" class="button positive"> Create </a></td></tr>
+        </table>
+      </form>
+    </li>
+  </ul>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/editor/edit_four.html b/templates/lifeflow/editor/edit_four.html
new file mode 100644
index 0000000..da5c523
--- /dev/null
+++ b/templates/lifeflow/editor/edit_four.html
@@ -0,0 +1,54 @@
+{% extends "lifeflow/editor/base.html" %}
+
+{% block body %}
+
+<div class="breadcrumbs">
+  <span> <a href="../1/">Title & Summary</a> </span>
+  <span> <a href="../2">Body & Files</a> </span>
+  <span>  <a href="../3/">Flows</a> </span>
+  <span class="selected">Tags </span>
+  <span> <a href="../5/">Series</a> </span>
+  <span> <a href="../6/">Date & Options</a> </span>
+  <span> <a href="../7/">Authors & Translations</a> </span>
+</div>
+
+<script>
+$(document).ready(function() {
+  $("a.selectable").click(function () {
+    $(this).toggleClass("selected");
+  });
+  $("#select-list").hover(
+    function() {},
+    function() {
+      var selected = $.map($("a.selected"),function(x) { return x.id; });
+      var data = { "tags":selected };
+      update_model("{{model}}",{{ object.pk }}, data);
+  });
+});
+</script>
+
+<div class="editing">
+  <ul>
+    <li id="select-list">
+    <p> Click on the tags to associate with this article. </p>
+
+    <div id="selectables" class="selectables">
+      {% for tag, selected in tags %}
+      <a class="selectable {% if selected %} selected{% endif %}" id="{{ tag.pk }}"> {{ tag.title }}</a>
+      {% endfor %}
+    </div>
+    </li>
+    <li>
+    <form method="post" action="/editor/create_model/">
+      <table>
+	<tr><td><p> Create a new tag. </p></td></tr>
+	<tr><td>Title: </td><td><input name="title"></td></tr>
+	<input type="hidden" value="tag" name="model">
+    	<tr><td></td><td><button type="submit" class="button positive"> Create </a></td></tr>
+      </table>
+      </form>
+    </li>
+  </ul>
+</div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/editor/edit_one.html b/templates/lifeflow/editor/edit_one.html
new file mode 100644
index 0000000..3f07468
--- /dev/null
+++ b/templates/lifeflow/editor/edit_one.html
@@ -0,0 +1,38 @@
+{% extends "lifeflow/editor/base.html" %}
+
+{% block body %}
+<script>
+var update = function() {
+  var data = { title:$("#title").val(), summary:$("#text").val()};
+  update_model("{{ model }}", {{ object.pk }}, data);
+}
+
+$(document).ready(function() {
+  $("#title").hover(function(){},function(){ update(); });
+  $("#text").hover(function(){},function(){ update(); });
+});
+</script>
+
+<div class="breadcrumbs">
+  <span class="selected"> Title & Summary </span>
+  <span> <a href="../2/">Body & Files</a> </span>
+  <span> <a href="../3/">Flows</a> </span>
+  <span> <a href="../4/">Tags</a> </span>
+  <span> <a href="../5/">Series</a> </span>
+  <span> <a href="../6/">Date & Options</a> </span>
+  <span> <a href="../7/">Authors & Translations</a> </span>
+</div>
+
+<div class="editing">
+  <ul>
+    <li>
+      <p> Choose a title for your entry. </p>
+      <input id="title" value="{{ object.title }}">
+    </li>
+    <li>
+      <p> Write a brief summary of your entry (using html). </p>
+      <textarea id="text">{{ object.summary }}</textarea>
+    </li>
+  </ul>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/editor/edit_seven.html b/templates/lifeflow/editor/edit_seven.html
new file mode 100644
index 0000000..a6abe4f
--- /dev/null
+++ b/templates/lifeflow/editor/edit_seven.html
@@ -0,0 +1,100 @@
+{% extends "lifeflow/editor/base.html" %}
+
+{% block body %}
+<div class="breadcrumbs">
+  <span> <a href="../1/">Title & Summary</a> </span>
+  <span> <a href="../2">Body & Files</a> </span>
+  <span>  <a href="../3/">Flows</a> </span>
+  <span> <a href="../5/">Tags</a> </span>
+  <span>  <a href="../4/">Series </span>
+  <span> <a href="../6/">Date & Options</a> </span>
+  <span class="selected">Authors & Translations</a> </span>
+</div>
+
+<script>
+var pkForId = function(id) {
+  var lst = $("#"+id);
+  var index = lst[0].selectedIndex;
+  if (index != -1) {
+    var chosen = lst.children()[index];
+    return chosen.value;
+  }
+};
+var updateTranslation = function(translation,original,language) {
+  var data = {"pk":{{ object.pk }},"original":original, "language":language};
+  var onComplete = function(res,status) {  
+    $("#translations")[0].innerHTML = res.responseText;
+  };
+  create_model("translation", data, onComplete);
+};
+
+$(document).ready(function() {
+  $("#translation-remove").click(function() {
+    updateTranslation({{object.pk}},-1,-1);
+  });
+  $("#translation-update").click(function() {
+    var language = pkForId("language");
+    var original = pkForId("original");
+    if (original && language) {
+      updateTranslation({{object.pk}},original,language);
+    }
+    else {
+      display_error("Please select a language and original.");
+    };
+  });
+  $("a.selectable").click(function () {
+    $(this).toggleClass("selected");
+  });
+  $("#select-list").hover(
+  function() {},
+  function() {
+    var selected = $.map($("a.selected"),function(x) { return x.id; });
+    var data = {"authors":selected};
+    update_model("{{ model }}",{{ object.pk }}, data);
+  });
+});
+</script>
+
+<div class="editing">
+  <ul>
+    <li id="select-list">
+    <p> Click on the authors to associate with this article. </p>
+    <div id="selectables" class="selectables">
+      {% for author, selected in authors %}
+      <a class="selectable {% if selected %} selected{% endif %}" id="{{ author.pk }}"> {{ author.name }}</a>
+      {% endfor %}
+    </div>
+    </li>
+    <li>
+    <p> Select the original entry, and the language of the translation. To finalize the selection click the <strong>Add</strong> button. To remove translations relationship, then use the <strong>Remove All</strong> button.</p>
+    <div id="translations">
+    {% include "lifeflow/editor/translations.html" %}
+    </div>
+    {% ifequal model "entry" %}
+    <div class="panel wide">
+      {% with entries as object_list %}
+      <select class="small" id="original" size="10" name="Original Entry">
+	{% include "lifeflow/editor/entries.html" %}
+      </select>
+      {% endwith %}
+    </div>
+    <div class="panel narrow">
+      <select class="small" id="language" size="10" name="Language">
+	{% with langs as object_list %}
+	{% for object in object_list %}
+	<option value="{{ object.pk }}"> {{ object }} </option>
+	  {% endfor %}
+	  {% endwith %}
+      </select>
+    </div>
+    <div class="panel narrow bottom">
+      <a class="button positive" id="translation-update"> Add </a>
+      <a class="button negative" id="translation-remove"> Remove All </a>
+    </div>
+    {% else %}
+    <p><em> Drafts cannot participate in translations. </em></p>
+    {% endifequal %}
+    </li>    
+  </ul>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/editor/edit_six.html b/templates/lifeflow/editor/edit_six.html
new file mode 100644
index 0000000..3b8be3c
--- /dev/null
+++ b/templates/lifeflow/editor/edit_six.html
@@ -0,0 +1,53 @@
+{% extends "lifeflow/editor/base.html" %}
+
+{% block body %}
+<script>
+var update = function() {
+  var send_ping = $("#send_ping").attr('value');
+  var allow_comments = $("#allow_comments").attr('value')
+  var data = {allow_comments:allow_comments, send_ping:send_ping};
+  update_model("{{model}}",{{object.pk}},data);
+}
+
+$(document).ready(function() {
+  $("#send_ping").change(function(){ update(); });
+  $("#allow_comments").change(function(){ update(); });
+});
+</script>
+
+<div class="breadcrumbs">
+  <span > <a href="../1/">Title & Summary</a> </span>
+  <span> <a href="../2/">Body & Files</a> </span>
+  <span> <a href="../3/">Flows</a> </span>
+  <span> <a href="../4/">Tags</a> </span>
+  <span> <a href="../5/">Series</a> </span>
+  <span class="selected"> Date & Options </span>
+  <span> <a href="../7/">Authors & Translations</a> </span>
+</div>
+
+<div class="editing">
+  <form>
+  <ul>
+    <li>
+      <p> Please select the date and time to publish this entry. </p>
+      <p> {{ object.pub_date }} </p>
+      <p> Not implemented yet. :-/ Currently, the pub_date is set to the current time the first time you move a draft into the published bucket, and that time will be retained. </p>
+    </li>
+    <li>
+      <p class="dropdown"> Would you like to ping Technocratic when you publish this entry?</p>
+    <select name="send_ping" class="dropdown" id="send_ping">
+      <option value="true"{% if object.send_ping %} selected="selected"{% endif %}>Yes</option>
+      <option value="false" {% if not object.send_ping %} selected="selected"{% endif %}>No</option>
+    </select>
+    </li>
+    <li>
+      <p class="dropdown"> Do you want to allow comments on this entry? </p>
+      <select name="allow_comments" class="dropdown" id="allow_comments">
+      <option value="true"{% if object.allow_comments %} selected="selected"{% endif %}>Yes</option>
+      <option value="false" {% if not object.allow_comments %} selected="selected"{% endif %}>No</option>
+    </select>
+    </li>
+  </ul>
+  </form>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/editor/edit_three.html b/templates/lifeflow/editor/edit_three.html
new file mode 100644
index 0000000..27e5211
--- /dev/null
+++ b/templates/lifeflow/editor/edit_three.html
@@ -0,0 +1,54 @@
+{% extends "lifeflow/editor/base.html" %}
+
+{% block body %}
+
+<script>
+$(document).ready(function() {
+  $("a.selectable").click(function () {
+    $(this).toggleClass("selected");
+  });
+  $("#select-list").hover(
+  function() {},
+  function() {
+    var selected = $.map($("a.selected"),function(x) { return x.id; });
+    var data = {"flows":selected};
+    update_model("{{model}}",{{object.pk}},data);
+  });
+});
+</script>
+
+<div class="breadcrumbs">
+  <span > <a href="../1/">Title & Summary</a> </span>
+  <span > <a href="../2">Body & Files</a> </span>
+  <span class="selected"> Flows </span>
+  <span> <a href="../4/">Tags</a> </span>
+  <span> <a href="../5/">Series</a> </span>
+  <span> <a href="../6/">Date & Options</a> </span>
+  <span> <a href="../7/">Authors & Translations</a> </span>
+</div>
+
+<div class="editing">
+  <ul>
+    <li id="select-list">
+    <p> Click on the flows you want to include this article in. </p>
+    <div id="selectables" class="selectables">
+      {% for flow, selected in flows %}
+      <a class="selectable {% if selected %} selected{% endif %}" id="{{ flow.pk }}"> {{ flow.title }}</a>
+      {% endfor %}
+    </div>
+    </li>
+    <li>
+
+    <form method="post" action="/editor/create_model/">
+      <table>
+	<tr><td><p> Create a new flow. </p></td></tr>
+	<tr><td>Title: </td><td><input name="title"></td></tr>
+	<input type="hidden" value="flow" name="model">
+    	<tr><td></td><td><button type="submit" class="button positive"> Create </button></td></tr>
+      </table>
+      </form>
+    </li>
+  </ul>
+</div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/editor/edit_two.html b/templates/lifeflow/editor/edit_two.html
new file mode 100644
index 0000000..d4964ec
--- /dev/null
+++ b/templates/lifeflow/editor/edit_two.html
@@ -0,0 +1,126 @@
+{% extends "lifeflow/editor/base.html" %}
+
+{% block body %}
+
+
+<script>
+var update = function() {
+  var data = { use_markdown:$("#use_markdown").attr('value'),
+               body:$("#text").val() };
+  update_model("{{model}}",{{object.pk}},data);
+}
+
+$(document).ready(function() {
+  $("#text").hover(function(){},function(){ update(); });
+  $("#use_markdown").change(function(){ update(); });
+});
+</script>
+
+<div class="breadcrumbs">
+  <span > <a href="../1/">Title & Summary</a> </span>
+  <span class="selected"> Body & Files </span>
+  <span> <a href="../3/">Flows</a> </span>
+  <span> <a href="../4/">Tags</a> </span>
+  <span> <a href="../5/">Series</a> </span>
+  <span> <a href="../6/">Date & Options</a> </span>
+  <span> <a href="../7/">Authors & Translations</a> </span>
+</div>
+
+<div class="editing">
+    <div class="li-mimic">
+    <p class="dropdown"> How do you want this text to be rendered? </p>
+    <select name="use_markdown" class="dropdown" id="use_markdown">
+      <option value="true"{% if object.use_markdown %} selected="selected"{% endif %}>Treat is as Markdown.</option>
+      <option value="false" {% if not object.use_markdown %} selected="selected"{% endif %}>Treat it as raw HTML.</option>
+    </select>
+  </div>
+  <div class="writing">
+    <textarea id="text" class="writing">{{ object.body }}</textarea>
+  </div>
+  <div class="buttons writing-buttons">
+    <script>
+    $(document).ready(function() {$("#render-button").click(function() {
+      $("#render").load('/editor/render/{{ model }}/{{ object.pk }}/', {'txt':$("#text").text()}).show();
+      $("#hide-button").show();
+    })});
+    $(document).ready(function() {$("#hide-button").click(function() {
+      $("#render").hide();
+      $("#hide-button").hide();
+    })});
+    $(document).ready(function() {$("#add-file-button").click(function() {
+    $("#resource").hide();
+    $("#add-resource").show();
+    })});
+    </script>
+    <a class="button positive" id="add-file-button"> Add File </a>
+    <a class="button neutral" id="render-button"> Render </a>
+    <a class="button negative" id="hide-button" style="display: none;"> Hide Rendering </a>
+  </div>
+  <div id="render" class="render li-mimic" style="display: none;"></div>
+  
+
+<script>
+$(document).ready(function() {$("#resources").change(function() {
+  var res = $("#resources");
+  var index = res[0].selectedIndex;
+  var pk = res[0][index].value;
+  $("#resource").load('/editor/display_resource/' + pk + '/').show();
+  $("#add-resource").hide();
+})});
+
+
+$(document).ready(function() {$("#resource-delete").click(function() {
+  var lst = $("#resources");
+  var index = lst[0].selectedIndex;
+  if (index == -1) { display_error("Please select a resource to delete.", "#resource-errors"); }
+  var chosen = lst.children()[index];
+  var pk = chosen.value;
+  $.ajax({url:"/editor/delete_model/", type:"post", data:{model:"resource", pk:pk}, complete:function(res, status) {
+    if (status == "success") {
+      chosen.parentNode.removeChild(chosen);
+      lst[0].selectedIndex = -1;
+      $("#resource").hide();
+    }
+    else { display_error(res.responseText); }
+}})})});
+</script>
+  <div class="error-msg" id="resource-errors" style="display: none"></div>
+  <div class="li-mimic resources">
+    <div class="resource-select">
+      <select id="resources" size="10">
+      {% for resource in resources %}
+        <option value="{{ resource.pk }}"> {{ resource.title }}</option>
+      {% endfor %}
+      </select>
+      <a class="button negative" id="resource-delete"> Delete Resource </a>
+    </div>
+    <div class="resource" id="resource"></div>
+    <div class="add-resource" id="add-resource" style="display: none;">
+      <form action="/editor/add_resource/" method="post" enctype="multipart/form-data">
+      <table>
+	<tr>
+	  <td> Title: </td>
+	  <td><input name="title" ></td>
+	</tr>
+	<tr>
+	  <td> Markdown ID: </td>
+	  <td><input name="markdown_id" ></td>
+	</tr>
+	<tr>
+	  <td> File </td>
+	  <td><input type="file" name="file" ></td>
+	</tr>
+	<tr>
+	  <td></td>
+	  <input type="hidden" name="pk" value="{{ object.pk }}">
+	  <input type="hidden" name="model" value="{{ model }}">
+	  <td><input type="submit" value="Upload"></td>
+	</tr>
+      </table>
+      </form>
+    </div>
+  </div>
+
+</div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/editor/entries.html b/templates/lifeflow/editor/entries.html
new file mode 100644
index 0000000..84d5243
--- /dev/null
+++ b/templates/lifeflow/editor/entries.html
@@ -0,0 +1,7 @@
+{% for object in object_list %}
+<option value="{{ object.pk }}"> {{ object }} </option>
+{% endfor %}
+
+
+
+
diff --git a/templates/lifeflow/editor/files.html b/templates/lifeflow/editor/files.html
new file mode 100644
index 0000000..08c4605
--- /dev/null
+++ b/templates/lifeflow/editor/files.html
@@ -0,0 +1,71 @@
+{% extends "lifeflow/editor/base.html" %}
+
+{% block body %}
+<script>
+$(document).ready(function() {$("#resources").change(function() {
+  var res = $("#resources");
+  var index = res[0].selectedIndex;
+  var pk = res[0][index].value;
+  $("#resource").load('/editor/display_resource/' + pk + '/').show();
+  $("#add-resource").hide();
+})});
+
+$(document).ready(function() {$("#add-file-button").click(function() {
+  $("#resource").hide();
+  $("#add-resource").show();
+})});
+
+$(document).ready(function() {$("#resource-delete").click(function() {
+  var lst = $("#resources");
+  var index = lst[0].selectedIndex;
+  if (index == -1) { display_error("Please select a resource to delete."); }
+  var chosen = lst.children()[index];
+  var pk = chosen.value;
+  $.ajax({url:"/editor/delete_model/", type:"post", data:{model:"resource", pk:pk}, complete:function(res, status) {
+    if (status == "success") {
+      chosen.parentNode.removeChild(chosen);
+      lst[0].selectedIndex = -1;
+      $("#resource").hide();
+    }
+    else { display_error(res.responseText); }
+}})})});
+</script>
+
+<div class="files">
+<div class="selections">
+  <a class="button positive" id="add-file-button"> Add File </a>
+  <a class="button negative" id="resource-delete"> Delete File </a>
+  <select id="resources" size="20">
+    {% for resource in resources %}
+    <option value="{{ resource.pk }}"> {{ resource.title }}</option>
+      {% endfor %}
+  </select>
+</div>
+<div class="resource" id="resource"></div>
+<div class="add" id="add-resource" style="display: none;">
+  <form action="/editor/add_resource/" method="post" enctype="multipart/form-data">
+  <table>
+    <tr>
+      <td> Title: </td>
+      <td><input name="title" ></td>
+    </tr>
+    <tr>
+      <td> Markdown ID: </td>
+      <td><input name="markdown_id" ></td>
+    </tr>
+    <tr>
+      <td> File </td>
+	  <td><input type="file" name="file" ></td>
+	</tr>
+	<tr>
+	  <td></td>
+	  <input type="hidden" name="pk" value="{{ object.pk }}">
+	  <input type="hidden" name="model" value="{{ model }}">
+	  <td><input type="submit" value="Upload"></td>
+	</tr>
+      </table>
+      </form>
+    </div>
+    </div>
+    
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/editor/login.html b/templates/lifeflow/editor/login.html
new file mode 100644
index 0000000..173f514
--- /dev/null
+++ b/templates/lifeflow/editor/login.html
@@ -0,0 +1,18 @@
+    {% extends "lifeflow/editor/base.html" %}
+
+    {% block body %}
+
+<div class="login">
+    {% if error_message %}
+    <p> {{ error_message }}</p>
+    {% endif %}
+    <form method="post" action=".">
+    <table>
+    <tr><td><label for="id_username">Username</label></td><td><input name="username"></tr>
+    <tr><td><label for="id_password">Password</label></td><td><input type="password" name="password"></td></tr>
+    </table>
+    <button class="button positive" type="submit">Login!</button>
+    </form>
+  </div>
+
+  {% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/editor/overview.html b/templates/lifeflow/editor/overview.html
new file mode 100644
index 0000000..a30579d
--- /dev/null
+++ b/templates/lifeflow/editor/overview.html
@@ -0,0 +1,85 @@
+{% extends "lifeflow/editor/base.html" %}
+
+{% block body %}
+<script>
+$(document).ready(function () {
+    var rough_advance_func = function() {
+      move($("#rough-entries"), $("#edited-entries"), "rough_to_edited");
+    }
+    $("#rough-advance").click(rough_advance_func);
+    var edited_retreat_func = function() {
+      move($("#edited-entries"), $("#rough-entries"), "edited_to_rough");
+    }
+    $("#edited-retreat").click(edited_retreat_func);
+    var edited_advance_func = function() {
+      move($("#edited-entries"), $("#published-entries"), "edited_to_published");
+    }
+    $("#edited-advance").click(edited_advance_func);
+    var published_retreat_func = function() {
+      move($("#published-entries"), $("#edited-entries"), "published_to_edited");
+    }
+    $("#published-retreat").click(published_retreat_func);
+    $("#rough-delete").click(function() {
+	var lst = $("#rough-entries");
+	var index = lst[0].selectedIndex;
+	if (index == -1) {
+	  display_error("Please select a rough draft to delete.");
+        }
+	else {
+	  var chosen = lst.children()[index];
+	  var pk = chosen.value;
+	  var onComplete = function(res,status) {
+	    if (status == "success")
+              chosen.parentNode.removeChild(chosen);
+	    else
+              display_error(res.responseText);
+	  };
+	  delete_model("draft", pk, onComplete);
+	}
+      })});
+</script>
+
+<div class="panels">
+  <div class="rough panel">
+    <h3> Rough </h3>
+    <div class="top buttons">
+      <a class="button positive" id="write" href="create/"> New </a>
+      <a class="button neutral" id="rough-edit" onclick='edit($("#rough-entries"), "draft");'> Edit </a>
+      <a class="button negative" id="rough-advance"> >> </a>
+    </div>
+    {% with rough as object_list %}
+    <select id="rough-entries" size="20" name="Rough Drafts">
+      {% include "lifeflow/editor/entries.html" %}
+    </select>
+    {% endwith %}
+    <div class="bottom buttons">
+      <a class="button negative" id="rough-delete"> Delete </a>
+    </div>
+  </div>
+  <div class="edited panel">
+    <h3> Edited </h3>
+    <div class="top buttons">
+      <a class="button positive" id="edited-retreat"> << </a>
+      <a class="button neutral" id="edited-edit" onclick='edit($("#edited-entries"), "draft");'> Edit </a>
+      <a class="button negative" id="edited-advance"> >> </a>
+    </div>
+    {% with edited as object_list %}
+    <select id="edited-entries" size="20" name="Rough Drafts">
+      {% include "lifeflow/editor/entries.html" %}
+    </select>
+    {% endwith %}
+  </div>
+  <div class="published panel">
+    <h3> Published </h3>
+    <div class="top buttons">
+      <a class="button positive" id="published-retreat"> << </a>
+      <a class="button neutral" id="published-edit" onclick='edit($("#published-entries"), "entry");'> Edit </a>
+    </div>
+    {% with published as object_list %}
+    <select id="published-entries" size="20" name="Published Drafts">
+      {% include "lifeflow/editor/entries.html" %}
+    </select>
+    {% endwith %}
+  </div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/editor/project_body.html b/templates/lifeflow/editor/project_body.html
new file mode 100644
index 0000000..4b5390d
--- /dev/null
+++ b/templates/lifeflow/editor/project_body.html
@@ -0,0 +1,119 @@
+{% extends "lifeflow/editor/base.html" %}
+
+{% block body %}
+<script>
+var update = function() {
+  var data = { use_markdown:$("#use_markdown").attr('value'),
+               body:$("#text").val() };
+  update_model("project",{{object.pk}},data);
+}
+
+$(document).ready(function() {
+  $("#text").hover(function(){},function(){ update(); });
+  $("#use_markdown").change(function(){ update(); });
+});
+</script>
+
+<div class="breadcrumbs">
+  <span class="selected"> <a href="../details/">Details</a> </span>
+  <span> <a href="../body/">Body & Files</a> </span>
+</div>
+
+<div class="editing">
+    <div class="li-mimic">
+    <p class="dropdown"> How do you want this text to be rendered? </p>
+    <select name="use_markdown" class="dropdown" id="use_markdown">
+      <option value="true"{% if object.use_markdown %} selected="selected"{% endif %}>Treat is as Markdown.</option>
+      <option value="false" {% if not object.use_markdown %} selected="selected"{% endif %}>Treat it as raw HTML.</option>
+    </select>
+  </div>
+  <div class="writing">
+    <textarea id="text" class="writing">{{ object.body }}</textarea>
+  </div>
+  <div class="buttons writing-buttons">
+    <script>
+    $(document).ready(function() {$("#render-button").click(function() {
+      $("#render").load('/editor/render/project/{{ object.pk }}/', {'txt':$("#text").text()}).show();
+      $("#hide-button").show();
+    })});
+    $(document).ready(function() {$("#hide-button").click(function() {
+      $("#render").hide();
+      $("#hide-button").hide();
+    })});
+    $(document).ready(function() {$("#add-file-button").click(function() {
+    $("#resource").hide();
+    $("#add-resource").show();
+    })});
+    </script>
+    <a class="button positive" id="add-file-button"> Add File </a>
+    <a class="button neutral" id="render-button"> Render </a>
+    <a class="button negative" id="hide-button" style="display: none;"> Hide Rendering </a>
+  </div>
+  <div id="render" class="render li-mimic" style="display: none;"></div>
+  
+
+<script>
+$(document).ready(function() {$("#resources").change(function() {
+  var res = $("#resources");
+  var index = res[0].selectedIndex;
+  var pk = res[0][index].value;
+  $("#resource").load('/editor/display_resource/' + pk + '/').show();
+  $("#add-resource").hide();
+})});
+
+
+$(document).ready(function() {$("#resource-delete").click(function() {
+  var lst = $("#resources");
+  var index = lst[0].selectedIndex;
+  if (index == -1) { display_error("Please select a resource to delete.", "#resource-errors"); }
+  var chosen = lst.children()[index];
+  var pk = chosen.value;
+  $.ajax({url:"/editor/delete_model/", type:"post", data:{model:"resource", pk:pk}, complete:function(res, status) {
+    if (status == "success") {
+      chosen.parentNode.removeChild(chosen);
+      lst[0].selectedIndex = -1;
+      $("#resource").hide();
+    }
+    else { display_error(res.responseText); }
+}})})});
+</script>
+  <div class="error-msg" id="resource-errors" style="display: none"></div>
+  <div class="li-mimic resources">
+    <div class="resource-select">
+      <select id="resources" size="10">
+      {% for resource in resources %}
+        <option value="{{ resource.pk }}"> {{ resource.title }}</option>
+      {% endfor %}
+      </select>
+      <a class="button negative" id="resource-delete"> Delete Resource </a>
+    </div>
+    <div class="resource" id="resource"></div>
+    <div class="add-resource" id="add-resource" style="display: none;">
+      <form action="/editor/add_resource/" method="post" enctype="multipart/form-data">
+      <table>
+	<tr>
+	  <td> Title: </td>
+	  <td><input name="title" ></td>
+	</tr>
+	<tr>
+	  <td> Markdown ID: </td>
+	  <td><input name="markdown_id" ></td>
+	</tr>
+	<tr>
+	  <td> File </td>
+	  <td><input type="file" name="file" ></td>
+	</tr>
+	<tr>
+	  <td></td>
+	  <input type="hidden" name="pk" value="{{ object.pk }}">
+	  <input type="hidden" name="model" value="project">
+	  <td><input type="submit" value="Upload"></td>
+	</tr>
+      </table>
+      </form>
+    </div>
+  </div>
+
+</div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/editor/project_details.html b/templates/lifeflow/editor/project_details.html
new file mode 100644
index 0000000..9af74ce
--- /dev/null
+++ b/templates/lifeflow/editor/project_details.html
@@ -0,0 +1,60 @@
+{% extends "lifeflow/editor/base.html" %}
+
+{% block body %}
+<script>
+var update = function() {
+  var size = $("#size");
+  var selected = size.children()[size[0].selectedIndex].value;
+  var data = { title:$("#title").val(),summary:$("#summary").val(),slug:$("#slug").val(),language:$("#language").val(),size:selected };
+  update_model("project", {{ object.pk }}, data);
+}
+
+$(document).ready(function() {
+  $("#details").hover(function(){},function(){ update(); });
+  $("#summary").hover(function(){},function(){ update(); });
+});
+</script>
+
+<div class="breadcrumbs">
+  <span class="selected"> <a href="../details/">Details</a> </span>
+  <span> <a href="../body/">Body & Files</a> </span>
+</div>
+
+<div class="editing">
+  <ul>
+    <li id="details">
+    <p> Edit the details for this project. </p>
+    
+    <table>
+      <tr>
+	<td> Title </td> <td><input id="title" value="{{ object.title }}"> </td>
+      </tr>
+      <tr>
+	<td> Slug </td> <td><input id="slug" value="{{ object.slug }}"></td>
+      </tr>
+      <tr>
+	<td> Language </td> <td><input id="language" value="{{ object.language }}"></td>
+      </tr>
+      <tr>
+	<td> Size </td>
+	<td>
+	  <select id="size" name="size">
+	    {% with object.size as size %}
+	    <option {% ifequal size "3" %}selected="yes"{% endifequal %} value="3">Large </option>
+	    <option {% ifequal size "2" %}selected="yes"{% endifequal %} value="2">Medium</option>
+	    <option {% ifequal size "1" %}selected="yes"{% endifequal %} value="1">Small</option>
+	    <option {% ifequal size "0" %}selected="yes"{% endifequal %} value="0">Script</option>
+	    {% endwith %}
+	  </select>
+	</td>
+      </tr>
+    </table>
+    </li>
+    
+    <li>
+      <p> Write a brief summary for this project (using html). </p>
+      <textarea id="summary">{{ object.summary }}</textarea>
+    </li>
+  </ul>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/editor/projects.html b/templates/lifeflow/editor/projects.html
new file mode 100644
index 0000000..19d4b19
--- /dev/null
+++ b/templates/lifeflow/editor/projects.html
@@ -0,0 +1,54 @@
+{% extends "lifeflow/editor/base.html" %}
+
+{% block body %}
+<script>
+$(document).ready(function () {
+  $("#edit").click(function() {
+    var lst = $("#projects");
+    var index = lst[0].selectedIndex;
+    if (index == -1)
+      display_error("Please select a project to edit!");
+    else {
+      var chosen = lst.children()[index];
+      var pk = chosen.value;
+      edit_project(pk);
+    }
+  });
+  $("#delete").click(function() {
+    var lst = $("#projects");
+    var index = lst[0].selectedIndex;
+    if (index == -1)
+      display_error("Please select a project to delete!");
+    else {
+      var chosen = lst.children()[index];
+      var onComplete = function(res,status) {
+        if (status == "success")
+          chosen.parentNode.removeChild(chosen);
+        else
+          display_error(res.responseText);
+      };
+      var pk = chosen.value;
+      delete_model("project",pk,onComplete);
+    }
+  });
+
+});
+
+
+</script>
+
+<div class="li-mimic projects">
+    <div class="top buttons">
+      <a class="button positive" id="create" href="create/"> New Project </a>
+      <a class="button neutral" id="edit" onclick=''> Edit Project </a>
+    </div>
+    <select id="projects" size="20" name="Projects">
+      {% for project in projects %}
+      <option value="{{ project.pk }}"> {{ project }} </option>
+      {% endfor %}
+    </select>
+    <div class="bottom buttons">
+      <a class="button negative" id="delete"> Delete Project </a>
+    </div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/editor/resource.html b/templates/lifeflow/editor/resource.html
new file mode 100644
index 0000000..cc089ea
--- /dev/null
+++ b/templates/lifeflow/editor/resource.html
@@ -0,0 +1,21 @@
+<div class="details">
+  <span><strong>Title:</strong> {{ object.title }}</span>
+  <br>
+  <span><strong>Markdown ID:</strong> {{ object.markdown_id }}</span>
+  <br>
+  <span><strong>File:</strong> <a href="{{ object.get_relative_url }}">{{ file }}</a></span>
+  <br>
+</div>
+
+
+{% ifequal type "image" %}
+<div class="extra">
+<img width="100%" height="100%" src="{{ object.get_relative_url }}">
+</div>
+{% endifequal %}
+
+{% ifequal type "zip" %}
+{% endifequal %}
+
+{% ifequal type "code" %}
+{% endifequal %}
\ No newline at end of file
diff --git a/templates/lifeflow/editor/translations.html b/templates/lifeflow/editor/translations.html
new file mode 100644
index 0000000..752167d
--- /dev/null
+++ b/templates/lifeflow/editor/translations.html
@@ -0,0 +1,7 @@
+{% if translations %}
+<div class="li-mimic">
+  {% for obj in translations %}
+  <p> Is a <em>{{ obj.language }}</em> translation of <strong>{{ obj.original }}</strong>.</p>
+  {% endfor %}
+</div>
+{% endif %}
\ No newline at end of file
diff --git a/templates/lifeflow/entry_archive.html b/templates/lifeflow/entry_archive.html
new file mode 100644
index 0000000..070c6c6
--- /dev/null
+++ b/templates/lifeflow/entry_archive.html
@@ -0,0 +1,14 @@
+{% extends "lifeflow/lifeflow_base.html" %}
+
+{% block title %} Archive {% endblock %}
+
+
+{% block body %}
+<h2> Archive for Irrational Exuberance </h2>
+<ol>
+  {% for date in date_list %}
+  <li><a href="{{ date.year }}/">Archive for {{ date.year }}</a></li>
+  {% endfor %}
+</ol>
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/entry_archive_month.html b/templates/lifeflow/entry_archive_month.html
new file mode 100644
index 0000000..c454072
--- /dev/null
+++ b/templates/lifeflow/entry_archive_month.html
@@ -0,0 +1,51 @@
+{% extends "lifeflow/lifeflow_base.html" %}
+{% block title %}Year Archive{% endblock %}
+{% block body %}
+<h2> Archive for {{ month|date:"F, Y" }}</h2>
+<ol>
+  {% for entry in object_list %}
+  <li>
+  <span><strong>Title:</strong> </span> <a href="{{ entry.get_absolute_url}}">{{ entry }}</a>
+  {% with entry.tags.all as tags %}
+  {% if tags %}
+  <br>
+  <span><em>Tags</em></span>
+  {% for tag in tags %}
+  <span class="tag">
+  <a href="{{ tag.get_absolute_url }}"> {{ tag.title }}</a>
+  </span>
+  {% endfor %}
+  {% endif %}
+  {% endwith %}
+
+  {% with entry.series.all as series %}
+  {% if series %}
+  <br>
+  <span><em>Series</em></span>
+  {% for a_series in series %}
+  <span><a href="{{ entry.get_absolute_url }}">{{ entry.title }}</a></span>
+  {% endfor %}
+  {% endif %}
+  {% endwith %}
+
+  {% with entry.translation_set.all as translations %}
+  {% if translations %}
+  <br>
+  <span><em>Translations: </em></span>
+  {% for translation in translations %}<span class="translation"{{ translation.get_link|safe }}</span>{% endfor %}
+  {% endif %}
+  {% endwith %}
+  
+  {% with entry.translated.all as translated %}
+  {% if translated %}
+  <br>
+  <span><em>Translation of</em></span>
+  {% for translation in translated %}<span class="translation"><a href="{{ translation.original.get_absolute_url }}">{{ translation.original.title|safe  }}</a> <strong>in</strong> <a href="{{ translation.language.get_absolute_url}}">{{ translation.language }}</a></span>{% endfor %}
+  {% endif %}
+  {% endwith %}
+  <p> {{ entry.summary }} </p>
+  
+  {% endfor %}
+</ol>
+
+{% endblock %}
diff --git a/templates/lifeflow/entry_archive_year.html b/templates/lifeflow/entry_archive_year.html
new file mode 100644
index 0000000..630baf8
--- /dev/null
+++ b/templates/lifeflow/entry_archive_year.html
@@ -0,0 +1,11 @@
+{% extends "lifeflow/lifeflow_base.html" %}
+{% block title %}Year Archive{% endblock %}
+{% block body %}
+<h2> Archive for {{ year }}</h2>
+<ol>
+  {% for date in date_list %}
+  <li> <a href="{{ date|date:"b" }}/">View entries from {{ date|date:"F, Y" }} </li>
+  {% endfor %}
+</ol>
+
+{% endblock %}
diff --git a/templates/lifeflow/entry_detail.html b/templates/lifeflow/entry_detail.html
new file mode 100644
index 0000000..7a539de
--- /dev/null
+++ b/templates/lifeflow/entry_detail.html
@@ -0,0 +1,93 @@
+{% extends "lifeflow/lifeflow_base.html" %}
+{% block title %}{{ object.title|escape }}{% endblock %}
+{% block body %}
+<h1>{{ object.title|escape }}</h1>
+<div class="article-header">
+  {% with object.authors.all as authors %}
+  {% if authors %}
+  <span class="authors">by {% for author in authors %}{{ author.name_with_link|safe }}{% endfor %}</span>
+  <br>
+  {% endif %}
+  {% endwith %}
+  <span class="date">
+  {{ object.pub_date|date:"F j, Y" }}
+  </span>
+  {% for tag in object.tags.all %}
+  <span class="tag">
+  <a href="{{ tag.get_absolute_url }}"> {{ tag.title }}</a>
+  </span>
+  {% endfor %}
+  
+  <br>
+  {% with object.translation_set.all as translations %}
+  {% if translations %}
+  <span class="translation-header">Translations: </span>
+  {% for translation in translations %}<span class="translation"{{ translation.get_link|safe }}</span>{% endfor %}
+  {% endif %}
+  {% endwith %}
+  {% with object.translated.all as translated %}
+  {% if translated %}
+  <span class="translation-header">Translation of </span>
+  {% for translation in translated %}<span class="translation"><a href="{{ translation.original.get_absolute_url }}">{{ translation.original.title|safe  }}</a> in <a href="{{ translation.language.get_absolute_url}}">{{ translation.language }}</a></span>{% endfor %}
+  {% endif %}
+  {% endwith %}
+</div>
+<br>
+
+{% with object.series.all as series %}
+{% if series %}
+<div class="column span-6 first series-list">
+  {% for article_series in series %}
+  <ul class="navLinks">
+    <li><strong> {{ article_series.title|escape }}</strong> <a href="/feeds/series/{{ article_series.slug }}/">subscribe</a> </li>
+    {% for entry in article_series.entry_set.all %}
+    <li>
+    <a href="{{ entry.get_absolute_url }}">
+    {{ entry.title|escape|truncatewords:5 }}
+    </a>
+    </li>
+    {% endfor %}
+  </ul>
+  {% endfor %}
+</div>
+{% endif %}
+{% endwith %}
+
+<div class="article-body">
+{{ object.body_html|safe }}
+</div>
+
+<div>
+  {% include "lifeflow/social_submit.html" %}
+</div>
+
+{% if object.allow_comments %}
+<div class="comments">
+  {% include "lifeflow/comment_list.html" %}
+</div>
+{% endif %}
+
+{% endblock %}
+
+
+{% block extra_sidebar %}
+{% with object.get_next_article as next %}
+{% with object.get_previous_article as previous %}
+{% if next or previous %}
+
+{% if next %}
+<ul class="nav-links">
+<li class="nav-link nav-link-header"><strong>Next Entry</strong></li>
+<li class="nav-link"><a href="{{ next.get_absolute_url }}">{{ next.title|escape }}</a></li>
+</ul>
+{% endif %}
+{% if previous %}
+<ul class="nav-links">
+<li class="nav-link nav-link-header"><strong>Previous Entry</strong></li>
+<li class="nav-link"><a href="{{ previous.get_absolute_url }}">{{ previous.title|escape }}</a></li>
+</ul>
+{% endif %}
+{% endif %}
+{% endwith %}
+{% endwith %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/flow_detail.html b/templates/lifeflow/flow_detail.html
new file mode 100644
index 0000000..33f8a8d
--- /dev/null
+++ b/templates/lifeflow/flow_detail.html
@@ -0,0 +1,22 @@
+{% extends "lifeflow/lifeflow_base.html" %}
+{%block body %}
+{% if not at_start %}
+<p>
+  <a href="{{ object.get_absolute_url }}?end_at={{ previous }}">
+    View more recent entries
+  </a>
+</p>
+{% endif %}
+
+{% with object_list as article_list %}
+{% include "lifeflow/show_articles_list.html" %}
+{% endwith %}
+
+{% if not at_end %}
+<p>
+  <a href="{{ object.get_absolute_url }}?end_at={{ last }}">
+    View older entries
+  </a>
+</p>
+{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/front.html b/templates/lifeflow/front.html
new file mode 100644
index 0000000..d8365da
--- /dev/null
+++ b/templates/lifeflow/front.html
@@ -0,0 +1,22 @@
+{% extends "lifeflow/lifeflow_base.html" %}
+
+{% block body %}
+
+{% with recent_entries as article_list %}
+{% include "lifeflow/show_articles_list.html" %}
+{% endwith %}
+
+  
+{% if comments %}
+<hr>
+<h3> Latest Comments </h3>
+<ul>
+{% for comment in comments %}
+  <li>
+  <span><strong> {{ comment.name }} on  <a href="{{ comment.get_absolute_url }}"> {{ comment.entry.title }}</a></strong>, posted on {{ comment.date|date:"F j, Y" }}</span>
+  </li>
+{% endfor %}
+</ul>
+{% endif %}
+{% endblock %}
+
diff --git a/templates/lifeflow/language_detail.html b/templates/lifeflow/language_detail.html
new file mode 100644
index 0000000..5f74499
--- /dev/null
+++ b/templates/lifeflow/language_detail.html
@@ -0,0 +1,21 @@
+{% extends "lifeflow/lifeflow_base.html" %}
+
+{% block title %}Translations: {{ object }}{% endblock %}
+
+{% block body %}
+
+
+<span><a href="/language/">See other languages</a></span>
+<br>
+<span><a href="/feeds/language/{{ object.slug }}/">Subscribe to RSS for {{ object }}</a></span>
+<br>
+
+<h2> Translations in {{ object }}</h2>
+
+<ul>
+  {% for translation in object.translation_set.all %}
+  <li><a href="{{ translation.translated.get_absolute_url }}">{{ translation.translated.title }}</a></li>
+  {% endfor %}
+</ul>
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/language_list.html b/templates/lifeflow/language_list.html
new file mode 100644
index 0000000..16116a6
--- /dev/null
+++ b/templates/lifeflow/language_list.html
@@ -0,0 +1,15 @@
+{% extends "lifeflow/lifeflow_base.html" %}
+
+{% block title %} Languages {% endblock %}
+
+{% block body %}
+
+<div class="languages-list">
+  <ul>
+  {% for object in object_list %}
+    <li> <a href="{{ object.slug }}/">{{ object }}</a></li>
+  {% endfor %}
+  </ul>
+</div>
+
+{% endblock %}
diff --git a/templates/lifeflow/lifeflow_base.html b/templates/lifeflow/lifeflow_base.html
new file mode 100644
index 0000000..12261b0
--- /dev/null
+++ b/templates/lifeflow/lifeflow_base.html
@@ -0,0 +1,38 @@
+{% extends "base.html" %}
+
+
+
+{% block sidebar %}
+
+{% block extra_sidebar %}{% endblock %}
+
+<ul class="nav-links">
+  <li class="nav-link nav-link-header"><strong>Recent Entries</strong></li>
+  {% for entry in recent_entries %}<li><a href="{{ entry.get_absolute_url }}">{{ entry }}</a></li>{% endfor %}
+</ul>
+<ul class="nav-links">
+  <li class="nav-link nav-link-header"><strong> Meta </strong></li>
+  <li class="nav-link"><a href="/author/{{ lifeflow_author_slug }}/">About</a></li>
+  <li class="nav-link"><a href="/entry/">Archive</a></li>
+  <li class="nav-link"><a href="/meta/rss/">RSS</a></li>
+  <li class="nav-link"><a href="/tags/">Tag Cloud</a></li>
+  <li class="nav-link"><a href="/language/">Translations</a></li>
+</ul>
+
+{% if blog_roll %}
+<ul class="nav-links">
+  <li class="nav-link nav-link-header"><strong>Blogs-To-See</strong></li>
+  {% for blog in blog_roll %}
+  <li class="nav-link"><a href="{{ blog.url }}">{{ blog.title|escape }}</a></li>
+  {% endfor %}
+</ul>
+{% endif %}
+
+<ul class="nav-links">
+  <li class="nav-link nav-link-header"><strong>Random</strong></li>
+  {% for rand in random_entries %}
+  <li class="nav-link"><a href="{{ rand.get_absolute_url }}">{{ rand.title|escape }}</a></li>
+  {% endfor %}
+</ul>  
+</div>
+{% endblock %}
diff --git a/templates/lifeflow/meta_rss.html b/templates/lifeflow/meta_rss.html
new file mode 100644
index 0000000..3944685
--- /dev/null
+++ b/templates/lifeflow/meta_rss.html
@@ -0,0 +1,22 @@
+{% extends "lifeflow/lifeflow_base.html" %}
+{% block title %} RSS {% endblock %}
+{% block body %}
+<h3> General Feeds </h3>
+
+<p><a href="/feeds/all/"> All Feed </a>: contains all entries. </p>
+<p><a href="/feeds/comment/"> Comment Feed </a>: contains recent comments. </p>
+{% for flow in flows %}
+<p><a href="/feeds/flow/{{ flow.slug }}/"> {{ flow.title }} Feed </a>: contains entries from the {{ flow.title }} flow. </p>
+{% endfor %}
+<p><a href="/feeds/projects/"> Project Feed </a>: contains all projects. </p>
+<p><a href="/feeds/translations/"> Translation Feed </a>: contains all translations. </p>
+
+<h3> Focused Feeds </h3>
+
+<p> Each <a href="/language/">language</a> has its own feed containing only translations in that specific language.</p>
+<p> Each entry has a feed for comments posted to it.</p>
+<p> Each <a href="/articles/">series</a> has its own feed. </p>
+<p> Each <a href="/tags/">tag</a> has its own feed. </p>
+<p> Each <a href="/author/">author</a> has its own feed as well. </p>
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/project_detail.html b/templates/lifeflow/project_detail.html
new file mode 100644
index 0000000..c752be2
--- /dev/null
+++ b/templates/lifeflow/project_detail.html
@@ -0,0 +1,12 @@
+{% extends "lifeflow/lifeflow_base.html" %}
+
+{% block title %}{{ object.title }}{% endblock %}
+
+{% block body %}
+<a href="/projects/">Up to projects</a>
+
+<h1> {{ object.title }} </h1>
+
+{{ object.body_html|safe }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/project_list.html b/templates/lifeflow/project_list.html
new file mode 100644
index 0000000..7fa3e9d
--- /dev/null
+++ b/templates/lifeflow/project_list.html
@@ -0,0 +1,20 @@
+{% extends "lifeflow/lifeflow_base.html" %}
+
+{% block title %} Projects {% endblock %}
+
+{% block body %}
+
+{% for object in object_list %}
+
+<h3><a href="{{ object.get_absolute_url }}">{{ object.title }}</a></h3>
+<span><strong>License: </strong> {{ object.license }} </span>
+<span><strong>Language: </strong> {{ object.language }} </span>
+<span><strong>Size: </strong> {{ object.size_string }} </span>
+<p> {{ object.summary|safe }} </p>
+
+
+
+
+{% endfor %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/show_articles_list.html b/templates/lifeflow/show_articles_list.html
new file mode 100644
index 0000000..6b8154f
--- /dev/null
+++ b/templates/lifeflow/show_articles_list.html
@@ -0,0 +1,37 @@
+<ol class="entry-list">
+  {% for object in article_list %}
+  <li class="entry-in-entry-list">
+  <h2>
+    <a href="{{ object.get_absolute_url }}">
+      {{ object.title|escape }}
+    </a>
+  </h2>
+  <div class="article-header">
+    {% with object.authors.all as authors %}
+    {% if authors %}
+    <span class="authors"> by {% for author in authors %}{{ author.name_with_link|safe }}{% endfor %} </span>
+    <br>
+    {% endif %}
+    {% endwith %}
+    
+    <span class="date">
+      {{ object.pub_date|date:"F j, Y" }}
+    </span>
+    {% for tag in object.tags.all %}
+    <span class="tag">
+      <a href="{{ tag.get_absolute_url }}"> {{ tag.title }}</a>
+    </span>
+    {% endfor %}
+    <br>
+    {% with object.translation_set.all as translations %}
+    {% if translations %}
+    <span class="translation-header">Translations: </span>
+    {% for translation in translations %}<span class="translation"{{ translation.get_link|safe }}</span>{% endfor %}
+    {% endif %}
+    {% endwith %}
+
+  </div>
+<p class="summary">{{ object.summary|safe }}</p>
+</li>
+{% endfor %}
+</ol>
\ No newline at end of file
diff --git a/templates/lifeflow/social_submit.html b/templates/lifeflow/social_submit.html
new file mode 100644
index 0000000..18fbcf2
--- /dev/null
+++ b/templates/lifeflow/social_submit.html
@@ -0,0 +1,14 @@
+{% with object.get_absolute_url|urlencode as obj_url %}
+{% with object.title|urlencode as obj_title %}
+{% with site.domain|urlencode as obj_domain %}
+<hr>
+<div class="social">
+  <span class="social"><a href="http://reddit.com/submit?url=http://{{ obj_domain }}{{ obj_url }}&title={{ obj_title }}">Reddit</a></span>
+  <span class="social"><a href="http://del.icio.us/post?url={{ obj_domain }}{{ obj_url }}&title={{ obj_title }}">Del.icio.us</a></span>
+  <span class="social"><a href="http://www.stumbleupon.com/submit?url={{ obj_domain }}{{ obj_url }}&title={{ obj_title }}">StumbleUpon</a></span>
+  <span class="social"><a href="http://digg.com/submit?phase=2&url={{ obj_domain }}{{ obj_url }}&title={{ obj_title }}">Digg</a></span>
+</div>
+<hr>
+{% endwith %}
+{% endwith %}
+{% endwith %}
\ No newline at end of file
diff --git a/templates/lifeflow/tag_detail.html b/templates/lifeflow/tag_detail.html
new file mode 100644
index 0000000..21da8d2
--- /dev/null
+++ b/templates/lifeflow/tag_detail.html
@@ -0,0 +1,20 @@
+{% extends "lifeflow/lifeflow_base.html" %}
+
+{% block title %}{{ object }}{% endblock %}
+
+{% block body %}
+
+
+<span><a href="/tags/"> Up to tag cloud </a></span>
+<br>
+<span><a href="/feeds/tag/{{ object.slug }}/"> Subscribe to a RSS feed for this tag </a></span>
+
+<h2> Entries tagged with {{ object }}</h2>
+
+<ul>
+  {% for entry in object.latest %}
+  <li><a href="{{ entry.get_absolute_url }}">{{ entry }}</a></li>
+  {% endfor %}
+</ul>
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/lifeflow/tag_list.html b/templates/lifeflow/tag_list.html
new file mode 100644
index 0000000..3ef5e11
--- /dev/null
+++ b/templates/lifeflow/tag_list.html
@@ -0,0 +1,13 @@
+{% extends "lifeflow/lifeflow_base.html" %}
+
+{% block title %} Tag Cloud {% endblock %}
+
+{% block body %}
+
+<div class="tag-cloud">
+  {% for object in object_list %}
+  <span class="{{ object.tag_size }}"><a href="{{ object.get_absolute_url }}">{{ object }}</a></span>
+  {% endfor %}
+</div>
+
+{% endblock %}
diff --git a/templates/sitemap.xml b/templates/sitemap.xml
new file mode 100644
index 0000000..16d9a0b
--- /dev/null
+++ b/templates/sitemap.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+{% spaceless %}
+{% for url in urlset %}
+  <url>
+    <loc>{{ url.location|escape }}</loc>
+    {% if url.lastmod %}<lastmod>{{ url.lastmod|date:"Y-m-d" }}</lastmod>{% endif %}
+    {% if url.changefreq %}<changefreq>{{ url.changefreq }}</changefreq>{% endif %}
+    {% if url.priority %}<priority>{{ url.priority }}</priority>{% endif %}
+   </url>
+{% endfor %}
+{% endspaceless %}
+</urlset>
diff --git a/templates/sitemap_index.xml b/templates/sitemap_index.xml
new file mode 100644
index 0000000..a2bcce8
--- /dev/null
+++ b/templates/sitemap_index.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+{% for location in sitemaps %}<sitemap><loc>{{ location|escape }}</loc></sitemap>{% endfor %}
+</sitemapindex>
diff --git a/templatetags/__init__.py b/templatetags/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/templatetags/lifeflow.py b/templatetags/lifeflow.py
new file mode 100644
index 0000000..5d5419e
--- /dev/null
+++ b/templatetags/lifeflow.py
@@ -0,0 +1,20 @@
+from django import template
+register = template.Library()
+
+def boundary(value, arg):
+    """Defines a boundary for an integer. If the value of the integer
+    is higher than the boundary, then the boundary is returned instead.
+
+    Example:  {{ comment.depth|:"4" }} will return 4 if the value of
+    comment.depth is 4 or higher, but will return 1, 2 or 3 if the
+    value of comment.depth is 1, 2 or 3 respectively.
+    """
+    value = int(value)
+    boundary = int(arg)
+    if value > boundary:
+        return boundary
+    else:
+        return value
+
+register.filter('boundary', boundary)
+
diff --git a/tests.py b/tests.py
new file mode 100644
index 0000000..051e7ae
--- /dev/null
+++ b/tests.py
@@ -0,0 +1,127 @@
+import unittest
+from django.test.client import Client
+from lifeflow.models import *
+import datetime
+import pygments.lexers as lexers
+
+
+
+#response = self.client.get('/api/case/retrieve/', {})
+#self.assertEquals(response.content, 'etc')
+
+class commentTest(unittest.TestCase):
+    def setUp(self):
+        self.client = Client()
+
+    def test_organize_comments(self):
+        "models.py: test organize_comments method for Entry"
+        e = Entry(title="My Entry",
+                  pub_date=datetime.datetime.now(),
+                  summary="A summary",
+                  body="Some text")
+        e.save()
+        c1 = Comment(entry=e, body="Some comment one.")
+        c1.save()
+        self.assertEquals([[c1, 0]], e.organize_comments())
+        c2 = Comment(entry=e, name="Two", body="Some comment two.")
+        c2.save()
+        self.assertEquals([[c2,0],[c1,0]], e.organize_comments())
+        c3 = Comment(entry=e, name="Three", parent=c1, body="Three")
+        c3.save()
+        self.assertEquals([[c2, 0], [c1,0], [c3,1]],
+                          e.organize_comments())
+        c4 = Comment(entry=e, name="Four", parent=c2, body="Four")
+        c4.save()
+        self.assertEquals([[c2,0], [c4, 1], [c1,0], [c3,1]],
+                          e.organize_comments())
+
+
+class codeMarkupTest(unittest.TestCase):
+    def test_markup(self):
+        "markup/markdown.py: test markdown"
+        txt = "this is some text"
+        expected = u"<p>this is some text\n</p>"
+        rendered = dbc_markup(txt).strip("\n")
+        self.assertEqual(expected, rendered)
+        
+    def test_code_markup(self):
+        "markup/code.py: test code markup"
+
+        txt = u"    some code in a code block\n    is nice\n"
+        expected = u'<pre><code>some code in a code block\nis nice\n</code></pre>'
+        self.assertEqual(expected, dbc_markup(txt))
+
+        txt = u"<pre>this is some stuff\nthat I am concerned about</pre>"
+        self.assertEqual(txt, dbc_markup(txt))
+
+        txt = u"@@ python\nx = 10 * 5\n@@\n"
+        expected = u'<div class="highlight"><pre><span class="n">x</span> <span class="o">=</span> <span class="mi">10</span> <span class="o">*</span> <span class="mi">5</span>\n</pre></div>'
+        self.assertEqual(expected, dbc_markup(txt))
+
+
+        txt = u"@@ python\ndef test(a,b):\n    return x + y\n@@\n"
+        expected = u'<div class="highlight"><pre><span class="k">def</span> <span class="nf">test</span><span class="p">(</span><span class="n">a</span><span class="p">,</span><span class="n">b</span><span class="p">):</span>\n    <span class="k">return</span> <span class="n">x</span> <span class="o">+</span> <span class="n">y</span>\n</pre></div>'
+        self.assertEqual(expected, dbc_markup(txt))
+
+        
+
+
+    def test_using_non_existant_language(self):
+        "markup/code.py: test improperly formed code markup"
+        cases = (
+            u"@@\ndef test(a,b):\n@@\n",
+            u"@@ fake-language\n(+ 1 2 3)\n@@\n",
+            )
+        for case in cases:     
+            self.assertRaises(lexers.ClassNotFound, 
+                              lambda : dbc_markup(case))
+         
+
+    def test_lfmu(self):
+        "markup/lifeflowmarkdown.py: test lifeflow markup"
+        e = Entry(title="My Entry",
+                  pub_date=datetime.datetime.now(),
+                  summary="A summary",
+                  body="Some text")
+        e.save()
+
+        a = Author(name="Will Larson",
+                   slug="will-larson",
+                   link="a")
+        a.save()
+
+        e2= Entry(title="My Entry",
+                  pub_date=datetime.datetime.now(),
+                  summary="A summary",
+                  body="Some text",
+                  )
+        e2.save()
+        e2.authors.add(a)
+        e2.save()
+
+        t = Tag(title="LifeFlow", slug="lifeflow")
+        t.save()
+
+        c1 = Comment(entry=e, body="Some comment one.")
+        c1.save()
+
+        p = Project(title="Lifeflow",
+                    slug="lifeflow",
+                  summary="A summary",
+                  body="Some text")
+        p.save()
+
+        
+        self.assertEqual(dbc_markup("[trying out a tag][tag lifeflow]", e),
+                         u'<p><a href="/tags/lifeflow/">trying out a tag</a>\n</p>')
+        self.assertEqual(dbc_markup("[and the author][author]", e),
+                         u'<p><a href="/author/">and the author</a>\n</p>')
+        self.assertEqual(dbc_markup("[about will][author]", e2),
+                      u'<p><a href="/author/will-larson/">about will</a>\n</p>')
+        #self.assertEqual(dbc_markup("[the first comment][comment 1]", e),
+        #                 u'<p><a href="/entry/2008/jan/12//#comment_1">the first comment</a>\n</p>')
+        self.assertEqual(dbc_markup("[lf proj][project lifeflow]", e),
+                         u'<p><a href="/projects/lifeflow/">lf proj</a>\n</p>')
+
+        # test for [file name]
+        # test for [f name]
diff --git a/urls.py b/urls.py
new file mode 100644
index 0000000..4c1359c
--- /dev/null
+++ b/urls.py
@@ -0,0 +1,96 @@
+from django.conf.urls.defaults import *
+from lifeflow.feeds import *
+from lifeflow.models import *
+from lifeflow.sitemaps import ProjectSitemap
+from django.contrib.sitemaps import GenericSitemap
+
+
+
+flows = Flow.objects.all()
+
+projects = Project.objects.all()
+
+tags = Tag.objects.all().order_by('title')
+
+languages = Language.objects.all()
+
+authors = Author.objects.all().order_by('name')
+
+feeds = {
+    'author': AuthorFeed,
+    'all' : AllFeed,
+    'flow' : FlowFeed,
+    'tag' : TagFeed,
+    'series' : SeriesFeed,
+    'translations' : TranslationFeed,
+    'projects' : ProjectFeed,
+    'comment' : CommentFeed,
+    'entry_comment' : EntryCommentFeed,
+    'language' : LanguageFeed,
+}
+
+all_dict = {
+    'queryset' : Entry.objects.all(),
+    'date_field' : 'pub_date',
+}
+
+sitemaps = {
+    'projects' : ProjectSitemap,
+    'entries' : GenericSitemap(all_dict, priority=0.6),
+}
+
+urlpatterns = patterns('',
+    (r'^$', 'lifeflow.views.front'),
+
+    # sitemap
+    (r'^sitemap.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps}),
+
+    # comments
+    (r'^comments/create/$', 'lifeflow.views.comments'),
+    (r'^comments/create/(?P<entry_id>\d+)/$', 'lifeflow.views.comments'),
+    (r'^comments/create/(?P<entry_id>\d+)/(?P<parent_id>\d+)/$', 'lifeflow.views.comments'),
+
+    # feeds and rss views
+    (r'^feeds/(?P<url>.*)/$', 
+     'django.contrib.syndication.views.feed', 
+     {'feed_dict': feeds}),
+    (r'^meta/rss/$', 'lifeflow.views.rss'),
+
+    # date based generic views
+    (r'^entry/(?P<year>\d{4})/(?P<month>[a-z]{3})/(?P<day>\w{1,2})/(?P<slug>[-\w]+)/$',
+     'django.views.generic.date_based.object_detail',
+     dict(all_dict, slug_field='slug')),
+    (r'^entry/(?P<year>\d{4})/(?P<month>[a-z]{3})/(?P<day>\w{1,2})/$', 'django.views.generic.date_based.archive_day',   all_dict),
+    (r'^entry/(?P<year>\d{4})/(?P<month>[a-z]{3})/$', 'django.views.generic.date_based.archive_month', all_dict),
+    (r'^entry/(?P<year>\d{4})/$', 'django.views.generic.date_based.archive_year',  all_dict),
+    (r'^entry/$', 'django.views.generic.date_based.archive_index', all_dict),
+
+    # tag generic views
+    (r'^tags/$', 'django.views.generic.list_detail.object_list', dict(queryset=tags)),
+    (r'^tags/(?P<slug>[-\w]+)/$', 'django.views.generic.list_detail.object_detail', dict(queryset=tags, slug_field='slug')),
+
+    # language generic views
+    (r'^language/$', 'django.views.generic.list_detail.object_list', dict(queryset=languages)),
+    (r'^language/(?P<slug>[-\w]+)/$', 'django.views.generic.list_detail.object_detail', dict(queryset=languages, slug_field='slug')),
+
+    # author generic views
+    (r'^author/(?P<slug>[-\w]+)/$', 'django.views.generic.list_detail.object_detail', dict(queryset=authors, slug_field='slug')),
+    (r'^author/$', 'django.views.generic.list_detail.object_list', dict(queryset=authors)),
+
+    # articles views (custom view)
+    (r'^articles/$', 'lifeflow.views.articles'),
+
+    # projects views
+    (r'^projects/$',
+     'django.views.generic.list_detail.object_list',
+     dict(queryset=projects)),
+    (r'^projects/(?P<slug>[-\w]+)/$',
+     'django.views.generic.list_detail.object_detail',
+     dict(queryset=projects, slug_field='slug')),
+
+    # editor
+    (r'^editor/', include('lifeflow.editor.urls')),
+
+    # flows
+    (r'^(?P<slug>[-\w]+)/$', 'lifeflow.views.flow'),
+)
diff --git a/views.py b/views.py
new file mode 100644
index 0000000..94604e9
--- /dev/null
+++ b/views.py
@@ -0,0 +1,170 @@
+"""
+Views.py
+
+Author: Will Larson
+Contact: lethain@gmail.com
+
+
+Contains one custom view for displaying articles.
+Mostly necessary to presort the articles in order
+of descending size.
+
+"""
+import datetime, time, random, cgi, md5
+from django.template import RequestContext
+from django.shortcuts import render_to_response
+from django.http import Http404, HttpResponseRedirect
+from django.conf import settings
+from lifeflow.models import Series, Flow, Entry, Comment
+from lifeflow.forms import CommentForm
+
+
+def articles(request):
+    def comp(a,b):
+        result = b.num_articles() - a.num_articles()
+        return int(result)
+        
+    object_list = Series.objects.all()._get_data()
+    object_list.sort(comp)
+    return render_to_response(
+        'lifeflow/articles.html',
+        {'object_list' : object_list},
+        RequestContext(request, {}),
+        )
+
+
+def comments(request, entry_id=None, parent_id=None):
+    def make_identifier(id, time):
+        secret = getattr(settings, 'SECRET_KEY')
+        time = time[:-4]
+        data = "%s%s%s%s" % ("lifeflow", id, time, secret)
+        return md5.md5(data).hexdigest()
+
+    # if an entry ID has been posted, use that
+    if request.POST.has_key('entry_id'):
+        id = int(request.POST['entry_id'])
+    # otherwise use the parameter
+    else:
+        id = int(entry_id)
+    # TODO: validate ID, throw 500 otherwise
+    entry = Entry.objects.get(pk=id)
+    
+
+    if request.POST.has_key('parent_id') and request.POST['parent_id'] != u"":
+        parent_id = int(request.POST['parent_id'])
+        parent = Comment.objects.get(pk=parent_id)
+    elif parent_id is None:
+        parent = None
+    else:
+        parent_id = int(parent_id)
+        parent = Comment.objects.get(pk=parent_id)
+
+    # add an identifier to the post, part of the
+    # anti-spam implementation
+    if request.POST.has_key('identifier') is False:
+        now = unicode(time.time()).split('.')[0]
+        identifier = make_identifier(id, now)
+    # or make a new identifier
+    else:
+        identifier = request.POST['identifier']
+        now = request.POST['time']
+        
+    form = CommentForm(request.POST)
+    form.is_valid()
+
+    # Initial submission from entry_detail.html
+    if request.POST.has_key('submit'):
+        for i in xrange(5,8):
+            name = u"honey%s" % i 
+            value = request.POST[name]
+            if value != u"":
+                raise Http404
+        if time.time() - int(now) > 3600:
+            raise Http404
+        if identifier != make_identifier(id, now):
+            raise Http404
+
+
+        name = form.cleaned_data['name']
+        email = form.cleaned_data['email']
+        webpage = form.cleaned_data['webpage']
+        rendered = form.cleaned_data['rendered']
+        c = Comment(entry=entry,
+                    parent=parent,
+                    name=name,
+                    email=email,
+                    webpage=webpage,
+                    body="",
+                    html=rendered,
+                    )
+        c.save()
+        url = u"%s#comment_%s" % (entry.get_absolute_url(), c.pk)
+        return HttpResponseRedirect(url)
+
+    return render_to_response(
+        'lifeflow/comment.html',
+        {'object': entry,
+         'parent': parent,
+         'identifier' : identifier,
+         'time' : now,
+         'form': form,
+         },
+        RequestContext(request, {}),
+        )
+
+
+
+def flow(request, slug):
+    num_per_page = 10
+    try:
+        first = request.GET["end_at"]
+        first = int(first)
+        last = first + num_per_page
+    except KeyError:
+        first = 0
+        last = num_per_page
+    flow = Flow.objects.get(slug=slug)
+    object_list = flow.latest()[first:last]
+    count = flow.entry_set.all().count()
+    if last >= count:
+        at_end = True
+    else:
+        at_end = False
+    if first > 0:
+        at_start = False
+        previous = first - num_per_page
+    else:
+        at_start = True
+        previous = None
+
+    return render_to_response(
+        'lifeflow/flow_detail.html',
+        {
+            'object' : flow,
+            'object_list' : object_list,
+            'last' : last,
+            'previous' : previous,
+            'at_start' : at_start,
+            'at_end' : at_end,
+         },
+        RequestContext(request, {}),
+        )
+
+
+def front(request):
+    comments = Comment.objects.all().order_by('-date')[:5]
+    return render_to_response(
+        'lifeflow/front.html',
+        {'comments':comments,},
+        RequestContext(request, {}),
+        )
+
+
+
+def rss(request):
+    flows = Flow.objects.all()
+    return render_to_response(
+        'lifeflow/meta_rss.html',
+        {'flows' : flows },
+        RequestContext(request, {}),
+        )