Changeset 1283

Timestamp:

10/23/07 13:12:39 (12 months ago)

Author:

JensDiemer

Message:

-"add_css_tag" for _command, too.
-rename settings.CSS_DIV_CLASS_NAME -> settings.CSS_PLUGIN_CLASS_NAME

Location:

trunk/pylucid/PyLucid

Files:

• defaulttags/lucidTag.py (modified) (3 diffs)
• index.py (modified) (2 diffs)
• settings_example.py (modified) (1 diff)
• system/context_processors.py (modified) (2 diffs)
• tools/content_processors.py (modified) (1 diff)

trunk/pylucid/PyLucid/defaulttags/lucidTag.py

@@ -25 +25 @@
 from PyLucid.system.plugin_manager import run
 from PyLucid.system.response import SimpleStringIO
-from PyLucid.tools.shortcuts import makeUnique
+from PyLucid.system.context_processors import add_css_tag
 
 from django.conf import settings
@@ -62 +62 @@
         )
 
-    def _add_unique_div(self, context, content):
-        """
-        Add a html DIV tag with a unique CSS-ID and a class name defined in
-        the settings.py
-        """
-        id = self.plugin_name + "_" + self.method_name
-        id = makeUnique(id, context["CSS_ID_list"])
-        context["CSS_ID_list"].append(id)
-
-        try:
-            return u'<div class="%s %s" id="%s">\n%s\n</div>\n' % (
-                settings.CSS_DIV_CLASS_NAME, self.plugin_name, id, content
-            )
-        except UnicodeDecodeError:
-            # FIXME: In some case (with mysql_old) we have trouble here.
-            # I get this traceback on www.jensdiemer.de like this:
-            #
-            #Traceback (most recent call last):
-            #File ".../django/template/__init__.py" in render_node
-            #    750. result = node.render(context)
-            #File ".../PyLucid/defaulttags/lucidTag.py" in render
-            #    102. content = self._add_unique_div(context, content)
-            #File ".../PyLucid/defaulttags/lucidTag.py" in _add_unique_div
-            #    73. return u'<div class="%s" id="%s">\n%s\n</div>\n' % (
-            #
-            #UnicodeDecodeError at /FH-D-sseldorf/
-            #'ascii' codec can't decode byte 0xc3 in position 55: ordinal not in range(128)
-            #
-            #content += "UnicodeDecodeError hack active!"
-            return '<div class="%s %s" id="%s">\n%s\n</div>\n' % (
-                settings.CSS_DIV_CLASS_NAME, str(self.plugin_name), str(id),
-                content
-            )
-
-
     def render(self, context):
         local_response = SimpleStringIO()
@@ -120 +85 @@
             raise AssertionError(msg)
 
-        content = self._add_unique_div(context, content)
+        content = add_css_tag(
+            context, content, self.plugin_name, self.method_name
+        )
 
         return content

trunk/pylucid/PyLucid/index.py

@@ -36 +36 @@
 from PyLucid.system.URLs import URLs
 from PyLucid.system.context_processors import add_dynamic_context
+from PyLucid.system.context_processors import add_css_tag
 
 from PyLucid.tools.content_processors import apply_markup, \
@@ -274 +275 @@
 #    print "---"
 
+    page_content = add_css_tag(
+        context, page_content, module_name, method_name
+    )
+
     return _render_cms_page(context, page_content)
 

trunk/pylucid/PyLucid/settings_example.py

@@ -382 +382 @@
 ALLOW_SEND_MAILS = True
 
-# Every Plugin output clasp around with a html DIV tag.
-# Here you can defined witch CSS class name the DIV tag should used:
-CSS_DIV_CLASS_NAME = "PyLucidPlugins"
+# Every Plugin output gets a html SPAN tag around.
+# Here you can defined witch CSS class name the tag should used:
+CSS_PLUGIN_CLASS_NAME = "PyLucidPlugins"

trunk/pylucid/PyLucid/system/context_processors.py

@@ -7 +7 @@
 
 from PyLucid import PYLUCID_VERSION_STRING
+from PyLucid.tools.shortcuts import makeUnique
+
 from django.conf import settings
 
@@ -55 +57 @@
 
 
+
+def add_css_tag(context, content, plugin_name, method_name):
+    """
+    Add a unique CSS-ID and a class name defined in the settings.py
+    """
+    id = plugin_name + "_" + method_name
+    id = makeUnique(id, context["CSS_ID_list"])
+    context["CSS_ID_list"].append(id)
+    class_name = getattr(settings, "CSS_PLUGIN_CLASS_NAME", "PyLucidPlugins")
+
+    try:
+        return u'<span class="%s %s" id="%s">\n%s\n</span>\n' % (
+            class_name, plugin_name, id, content
+        )
+    except UnicodeDecodeError:
+        # FIXME: In some case (with mysql_old) we have trouble here.
+        # I get this traceback on www.jensdiemer.de like this:
+        #
+        #Traceback (most recent call last):
+        #File ".../django/template/__init__.py" in render_node
+        #    750. result = node.render(context)
+        #File ".../PyLucid/defaulttags/lucidTag.py" in render
+        #    102. content = self._add_unique_div(context, content)
+        #File ".../PyLucid/defaulttags/lucidTag.py" in _add_unique_div
+        #    73. return u'<div class="%s" id="%s">\n%s\n</div>\n' % (
+        #
+        #UnicodeDecodeError at /FH-D-sseldorf/
+        #'ascii' codec can't decode byte 0xc3 in position 55: ordinal not in range(128)
+        #
+        #content += "UnicodeDecodeError hack active!"
+        return '<span class="%s %s" id="%s">\n%s\n</span>\n' % (
+            class_name, str(plugin_name), str(id),
+            content
+        )

trunk/pylucid/PyLucid/tools/content_processors.py

@@ -108 +108 @@
 
 
+
 def replace_add_data(context, content):
     """