From 441ed176bdff586e94390740969e103d783bd5f8 Mon Sep 17 00:00:00 2001 From: hernani Date: Tue, 29 Jun 2010 10:46:20 +0000 Subject: [PATCH] Adds a head content injection spot for modules, and a new ui object for template inclusion. git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@471 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- forum/modules/ui.py | 2 ++ forum/modules/ui_objects.py | 9 +++++++++ forum/skins/default/templates/base_content.html | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/forum/modules/ui.py b/forum/modules/ui.py index e21527f..49ce249 100644 --- a/forum/modules/ui.py +++ b/forum/modules/ui.py @@ -10,6 +10,7 @@ class Registry(list): self.append(register) +HEAD_CONTENT = 'HEAD_CONTENT' HEADER_LINKS = 'HEADER_LINKS' PAGE_TOP_TABS = 'PAGE_TOP_TABS' FOOTER_LINKS = 'FOOTER_LINKS' @@ -17,6 +18,7 @@ PROFILE_TABS = 'PROFILE_TABS' __CONTAINER = { + HEAD_CONTENT: Registry(), HEADER_LINKS: Registry(), PAGE_TOP_TABS: Registry(), FOOTER_LINKS: Registry(), diff --git a/forum/modules/ui_objects.py b/forum/modules/ui_objects.py index 70bee93..caa221f 100644 --- a/forum/modules/ui_objects.py +++ b/forum/modules/ui_objects.py @@ -1,5 +1,6 @@ from django.core.urlresolvers import reverse from django.template.defaultfilters import slugify +from django import template from forum.utils import html class Visibility(object): @@ -82,6 +83,14 @@ class Link(ObjectBase): html.hyperlink(self.url(context), self.text(context), **self.attrs(context)), self.post_code(context)) +class Include(ObjectBase): + def __init__(self, tpl, visibility=None, weight=500): + super(Include, self).__init__(visibility, weight) + self.template = template.loader.get_template(tpl) + + def render(self, context): + return self.template.render(context) + class LoopContext(LoopBase): def __init__(self, loop_context, visibility=None, weight=500): diff --git a/forum/skins/default/templates/base_content.html b/forum/skins/default/templates/base_content.html index 4f0aa30..62d2176 100644 --- a/forum/skins/default/templates/base_content.html +++ b/forum/skins/default/templates/base_content.html @@ -1,6 +1,6 @@ -{% load i18n extra_tags extra_filters markup %} +{% load i18n extra_tags extra_filters markup ui_registry %} {% block fulltitle %}{% block title %}{% endblock %} - {{ settings.APP_SHORT_NAME }}{% endblock %} @@ -55,6 +55,7 @@ {% endif %} {% block forejs %}{% endblock %} + {% loadregistry head_content %}{% endloadregistry %}