Changeset 2500

Timestamp:

01/20/10 16:58:21 (7 weeks ago)

Author:

JensDiemer

Message:

• Reimplement old HeadlineAnchorMiddleware? and
• Add TOC plugin

Location:

branches/0.9/pylucid_project

Files:

• apps/pylucid (modified) (1 prop)
• apps/pylucid/system (modified) (1 prop)
• apps/pylucid/system/sub_headline_anchor.py (added)
• apps/pylucid/templates/pylucid (modified) (1 prop)
• apps/pylucid/templates/pylucid/headline_anchor.html (added)
• apps/pylucid/views.py (modified) (2 diffs)
• middlewares (modified) (1 prop)
• middlewares/headline_anchor.py (added)
• pylucid_plugins/TOC (added)
• pylucid_plugins/TOC/templates (added)
• pylucid_plugins/TOC/templates/TOC (added)
• pylucid_plugins/TOC/templates/TOC/TOC.html (added)
• pylucid_plugins/TOC/views.py (added)
• pylucid_plugins/TOC/__init__.py (added)
• settings.py (modified) (1 diff)

branches/0.9/pylucid_project/apps/pylucid/views.py

@@ -6 +6 @@
 from django.template import loader, RequestContext, Context, Template
 from django.utils.translation import ugettext as _
+
 from django_tools.template import render
 
@@ -161 +162 @@
     if page_plugin_response == None and get_view_response == None:
         # No Plugin has changed the PageContent -> apply markup on PageContent
-        raw_html_content = apply_markup(
+        context["page_content"] = apply_markup(
             pagecontent_instance.content, pagecontent_instance.markup, request.page_msg
         )
-    else:
-        raw_html_content = context["page_content"]
 
     # Render django tags in PageContent with the global context
-    pagecontent_html = render.render_string_template(raw_html_content, context)
-    context["page_content"] = pagecontent_html
+    context["page_content"] = render.render_string_template(context["page_content"], context)
 
     pre_render_global_template.send(sender=None, request=request, page_template=page_template)

branches/0.9/pylucid_project/settings.py

@@ -110 +110 @@
     'django.middleware.transaction.TransactionMiddleware',
     'reversion.middleware.RevisionMiddleware',
+
+    # Insert a html link anchor to all headlines:
+    'pylucid_project.middlewares.headline_anchor.HeadlineAnchorMiddleware',
 )
 SLOWER_DEV_SERVER_SLEEP = 0.3 # time.sleep() value (in sec.)