lino 24.6.1__tar.gz → 24.7.0__tar.gz

{lino-24.6.1 → lino-24.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lino
-Version: 24.6.1
+Version: 24.7.0
 Summary: A framework for writing desktop-like sustainably free web applications using Django and ExtJS or React
 Home-page: https://gitlab.com/lino-framework/lino
 Author: Rumma & Ko Ltd

{lino-24.6.1 → lino-24.7.0}/lino/core/actors.py

@@ -44,7 +44,7 @@ from lino.utils.html import E, forcetext, tostring, assert_safe
 from .roles import SiteUser
 
 ACTOR_SEP = "."
-DIVTPL = "<div>{}</div>"
+DIVTPL = '<div class="htmlText">{}</div>'
 btn_sep = mark_safe(" ")
 
 # The well-known standard actions are described by (usually) always a same
@@ -1310,11 +1310,11 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
     @fields.displayfield(_("Description"))
     def detail_link(cls, obj, ar):
         """
-
         A single-paragraph of formatted text that describes this :term:`database
         row`.
 
-        It should contain a clickable link that opens the :term:`detail window`.
+        It should begin with a clickable link that opens the :term:`detail
+        window`.
 
         This is a :term:`htmlbox`. We don't recommend to override this field
         directly.
@@ -1324,7 +1324,9 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
             text = ar.obj2htmls(obj)
         else:
             text = obj.as_paragraph(ar)
-            assert_safe(text)
+            # text = tostring(obj.as_summary_item(ar))
+            # assert_safe(text)
+            # return text
         return format_html("<div>{}</div>", text)
 
     @classmethod
@@ -1829,30 +1831,47 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
 
     @classmethod
     def get_table_summary(cls, obj, ar):
-        """Return the HTML `<div>` to be displayed by
-        :class:`lino.core.elems.TableSummaryPanel`.  That is (1) in a
-        detail form when :attr:`display_mode` is DISPLAY_MODE_SUMMARY or (2)
-        in a grid.
-
-        Lino internally creates a virtualfield ``slave_summary`` on each table
-        that invokes this method.
+        """
+        Return the HTML `<div>` to be displayed by
+        :class:`lino.core.elems.TableSummaryPanel`.
+        It basically just calls :meth:`table_as_summary`.
 
         """
-        # ar = ar.spawn(self, master_instance=obj, is_on_main_actor=False)
-        # sar = ar.spawn_request(actor=cls, master_instance=obj,
-        #     is_on_main_actor=False)
+        if ar is None:
+            return ''
         sar = cls.request(parent=ar, master_instance=obj, is_on_main_actor=False)
+        p = cls.table_as_summary(sar)
+        assert_safe(p)  # temporary 20240506
+        # print("20240712", p)
+        # return format_html(DIVTPL, p)
+        return mark_safe(DIVTPL.format(p))
+
+    @classmethod
+    def table_as_summary(cls, ar):
+        """
+        Return a HTML-formatted text that summarizes this table in a few
+        paragraphs.
+
+        The default implementation return s a comma-separated list of the rows,
+        followed by the `plain toolbar buttons`.
+
+        Application developers can override this method to customize the summary
+        view.
+
+        See :ref:`dev.table_summaries`.
+
+        """
         p = qs2summary(
-            sar,
-            sar.data_iterator,
+            ar,
+            ar.data_iterator,
             separator=cls.summary_sep,
             max_items=cls.preview_limit,
             wraptpl=None,
         )
         # assert isinstance(p, str)
-        assert_safe(p)  # temporary 20240506
+        # assert_safe(p)  # temporary 20240506
         # assert not "&lt;" in p
-        toolbar = sar.plain_toolbar_buttons()
+        toolbar = ar.plain_toolbar_buttons()
         if len(toolbar):
             # p += "<br/>"
             # p += " | "
@@ -1860,10 +1879,7 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
                 p += cls.summary_sep
             for b in toolbar:
                 p += tostring(b) + btn_sep
-
-        assert_safe(p)  # temporary 20240506
-
-        return format_html(DIVTPL, p)
+        return p
 
     @classmethod
     def columns_to_paragraph(cls, self, ar=None, fmt=None):

{lino-24.6.1 → lino-24.7.0}/lino/core/dashboard.py

@@ -152,9 +152,6 @@ class ActorItem(DashboardItem):
 
         for i in self.render_request(ar, sar, **kwargs):
             yield i
-        # return
-        # for e in T.get_story(None, ar):
-        #     yield tostring(e)
 
     def serialize(self):
         d = super().serialize()

{lino-24.6.1 → lino-24.7.0}/lino/core/dbtables.py

@@ -186,7 +186,11 @@ class Table(AbstractTable):
     """
 
     live_panel_update = False
-    """Update this table panel on row modification when visible in react UI"""
+    """
+    Whether the :term:`front end` should update panels on this table when  the
+    underlying database has been modified. This doesn't work unless there is a
+    :manage:`linod` running. Currently works only under the React front end.
+    """
 
     expand_memos = False
     """(No longer used; see :srcref:`docs/tickets/44`).  Whether multi-line text

{lino-24.6.1 → lino-24.7.0}/lino/core/elems.py

@@ -1523,17 +1523,16 @@ class DisplayElement(FieldElement):
         # elif isinstance(v, str) and v.startswith("<"):
         #     v = fromstring(v)
         try:
-            if etree.iselement(v) and v.tag == "div":
-                if etree.iselement(v):
-                    if v.tag == "div":
-                        return E.td(*[child for child in v], **cellattrs)
-                    if v.tag == "td":
-                        return v
-                return E.td(v, **cellattrs)
+            if etree.iselement(v):
+                if v.tag == "div":
+                    return E.td(*[child for child in v], **cellattrs)
+                if v.tag == "td":
+                    return v
                 # return E.td(*[child for child in v.iter()], **cellattrs)
             return E.td(v, **cellattrs)
         except Exception as e:
-            logger.error(e)
+            logger.warning("Exception in value2html of %s:", self)
+            logger.exception(e)
             return E.td(str(e), **cellattrs)
 
     def format_value(self, ar, v):

{lino-24.6.1 → lino-24.7.0}/lino/core/fields.py

@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2008-2022 Rumma & Ko Ltd
+# Copyright 2008-2024 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 """
 Defines extended database field classes and utility functions
@@ -14,14 +14,13 @@ from django import http
 from django.conf import settings
 from django.db import models
 from django.utils.translation import gettext_lazy as _
-from django.utils.html import escape, mark_safe
 from django.utils.text import format_lazy
 from django.core.exceptions import ValidationError
 from django.core.exceptions import FieldDoesNotExist
 from django.db.models.fields import NOT_PROVIDED
 from django.utils.functional import cached_property
 
-from lino.utils.html import E, forcetext, tostring
+from lino.utils.html import E, forcetext, tostring, SafeString, escape, mark_safe
 
 from lino.core.utils import (
     resolve_field,
@@ -1334,7 +1333,9 @@ class TableRow(object):
     def overview(self, ar):
         if ar is None:
             return ""
-        return E.div(*forcetext(self.get_overview_elems(ar)))
+        # return E.div(*forcetext(self.get_overview_elems(ar)))
+        s = "".join(tostring(i) for i in self.get_overview_elems(ar))
+        return SafeString("<div>{}</div>".format(s))
 
     @htmlbox()
     def list_item(self, ar):

{lino-24.6.1 → lino-24.7.0}/lino/core/renderer.py

@@ -12,7 +12,6 @@ import rstgen
 from django.conf import settings
 from django.db import models
 from django.db.models.fields import NOT_PROVIDED
-from django.utils.html import mark_safe, format_html, SafeString
 
 # from django.utils.encoding import force_str
 from django.utils.text import format_lazy
@@ -23,6 +22,7 @@ from etgen.html2rst import RstTable
 # from lino import logger
 from lino.utils import isiterable
 from lino.utils.jsgen import py2js, js_code
+from django.utils.html import mark_safe, format_html, SafeString
 from lino.utils.html import E, tostring, iselement, forcetext, to_rst
 from lino.core import constants
 from lino.utils.html import html2text
@@ -158,9 +158,11 @@ class HtmlRenderer(Renderer):
     A Lino renderer for producing HTML content.
     """
 
-    tableattrs = dict(cellspacing="3px", bgcolor="#ffffff", width="100%")
+    tableattrs = dict(cellspacing="3px", bgcolor="#eeeeee", width="100%")
+    # tableattrs = dict(cellspacing="3px", bgcolor="#ffffff", width="100%")
+    # cellattrs = {"class": "text-cell"}
     # cellattrs = dict(align="left", valign="top", bgcolor="#eeeeee")
-    cellattrs = {"class": "text-cell"}
+    cellattrs = dict(align="left", valign="top", bgcolor="#ffffff")
     """The default attributes to be applied to every table cell.
     """
 
@@ -283,8 +285,9 @@ class HtmlRenderer(Renderer):
 
         if header_level is not None:
             k = "h" + str(header_level)
-            h = getattr(E, k)(str(ar.get_title()))
-            yield h
+            yield SafeString("<{}>{}</{}>".format(k,ar.get_title(),k))
+            # h = getattr(E, k)(str(ar.get_title()))
+            # yield h
 
         if display_mode == constants.DISPLAY_MODE_LIST:
             yield ar.actor.get_table_as_list(ar.master_instance, ar)
@@ -634,6 +637,7 @@ class HtmlRenderer(Renderer):
                     # 20200501 elems.extend(self.table2story(ar, **kwargs))
                     elems += [tostring(e) for e in self.table2story(ar, **kwargs)]
                 elif isinstance(item, TableRequest):
+                    # print("20240712 TableRequest", item)
                     assert item.renderer is not None
                     # 20200501 elems.extend(self.table2story(item, **kwargs))
                     elems += [tostring(e) for e in self.table2story(item, **kwargs)]
@@ -673,7 +677,7 @@ class HtmlRenderer(Renderer):
         # print("20180907 show_story in {} : {}".format(ar.renderer, elems))
         # return E.div(*elems) if len(elems) else ""
         if len(elems):
-            return mark_safe("<div>{}</div>".format("".join(elems)))
+            return SafeString("<div>{}</div>".format("".join(elems)))
         return ""
 
     def show_menu(self, ar, mnu, level=1):
@@ -1010,7 +1014,7 @@ class JsRenderer(HtmlRenderer):
         if not js:
             return None
         js = escape(js, quote=False)
-        return "javascript:" + js
+        return SafeString("javascript:" + js)
 
     def get_action_status(self, ar, ba, obj, **kw):
         kw.update(ar.get_status())

{lino-24.6.1 → lino-24.7.0}/lino/help_texts.py

@@ -29,7 +29,7 @@ help_texts = {
     'lino.mixins.dupable.Dupable.find_similar_instances' : _("""Return a queryset or yield a list of similar objects."""),
     'lino.mixins.dupable.DupableChecker' : _("""Checks for the following repairable problem:"""),
     'lino.mixins.dupable.DupableChecker.model' : _("""alias of Dupable"""),
-    'lino.mixins.dupable.SimilarObjects' : _("""Shows the other objects which are similar to this one."""),
+    'lino.mixins.dupable.SimilarObjects' : _("""Shows the other objects that are similar to this one."""),
     'lino.mixins.duplicable.Duplicate' : _("""Duplicate the selected row."""),
     'lino.mixins.duplicable.Duplicate.run_from_ui' : _("""This actually runs the action."""),
     'lino.mixins.duplicable.Duplicable' : _("""Adds a row action “Duplicate” which duplicates (creates a clone of) the object it was called on."""),
@@ -128,7 +128,7 @@ help_texts = {
     'lino.modlib.extjs.ext_renderer.ExtRenderer.quick_manage_toolbar' : _("""Returns a HTML chunk that displays a “toolbar” with a series of “quick manage buttons”: one “Insert” and another to open the table."""),
     'lino.modlib.extjs.ext_renderer.ExtRenderer.action_call_on_instance' : _("""Note that ba.actor may differ from ar.actor when defined on a different actor. Remember e.g. the “Must read eID card” action button in eid_info of newcomers.NewClients (20140422)."""),
     'lino.modlib.extjs.ext_renderer.ExtRenderer.get_request_url' : _("""Called from ActionRequest.absolute_url() used in Team.eml.html"""),
-    'lino.modlib.extjs.ext_renderer.ExtRenderer.html_text' : _("""Wrap the given html fragment into a <div class="htmlText"> which specifies that this fragment contains simple html text inside an ExtJS component. This is required because ExtJS does a lot of CSS magic which neutralizes the “usual” effects of most html tags."""),
+    'lino.modlib.extjs.ext_renderer.ExtRenderer.html_text' : _("""Wrap the given html fragment into a <div class="htmlText">, which specifies that this fragment contains simple html text inside an ExtJS component. This is required because ExtJS does a lot of CSS magic which neutralizes the “usual” effects of most html tags."""),
     'lino.modlib.extjs.ext_renderer.ExtRenderer.html_page' : _("""Return a string with the index page. Content is mostly in the extjs/index.html template."""),
     'lino.modlib.extjs.ext_renderer.ExtRenderer.html_page_main_window' : _("""Called from https://gitlab.com/lino-framework/lino/blob/master/lino/modlib/extjs/config/extjs/index.html."""),
     'lino.modlib.extjs.ext_renderer.ExtRenderer.html_page_user' : _("""Build the “user menu”, i.e. the menu in the top right corner."""),
@@ -323,8 +323,7 @@ help_texts = {
     'lino.core.model.Model.disabled_fields' : _("""Return a set of field names that should be disabled (i.e. not editable) for this database object."""),
     'lino.core.model.Model.__str__' : _("""Return a translatable text that describes this database row."""),
     'lino.core.model.Model.as_paragraph' : _("""Return a safe HTML string that represents this database row as a paragraph."""),
-    'lino.core.model.Model.as_summary_item' : _("""Return a HTML anchor that points to this database row."""),
-    'lino.core.model.Model.as_summary_row' : _("""Return a safe HTML string that represents this database row in a data table in summary view."""),
+    'lino.core.model.Model.as_summary_item' : _("""Return a HTML element that represents this database row in a data window in display mode “summary”."""),
     'lino.core.model.Model.set_widget_options' : _("""Set default values for the widget options of a given element."""),
     'lino.core.model.Model.get_overview_elems' : _("""Return a list of HTML elements to be shown in overview field."""),
     'lino.core.model.Model.merge_row' : _("""Merge this object into another object of same class."""),
@@ -496,7 +495,6 @@ help_texts = {
     'lino.modlib.comments.MyComments' : _("""Show the comments posted by the current user."""),
     'lino.modlib.comments.RecentComments' : _("""Show the most recent comments that have been posted on this site."""),
     'lino.modlib.comments.CommentsByRFC' : _("""Shows the comments for a given database object."""),
-    'lino.modlib.comments.CommentsByRFC.get_table_summary' : _("""The summary view for this table."""),
     'lino.modlib.comments.CommentEvents' : _("""The choicelist with selections for Comments.observed_event."""),
     'lino.modlib.comments.Emotions' : _("""The list of available values for the Comment.emotion field."""),
     'lino.modlib.comments.CommentType' : _("""The CommentType model is not being used in production, one day we will probably remove it."""),
@@ -558,7 +556,7 @@ help_texts = {
     'lino.modlib.notify.Message.created' : _("""Timestamp of when this message has been emitted."""),
     'lino.modlib.notify.Message.sent' : _("""Timestamp of when this message has been sent via email to its recipient."""),
     'lino.modlib.notify.Message.seen' : _("""Timestamp of when the recipient of this message has marked it as seen."""),
-    'lino.modlib.notify.Message.emit_notification' : _("""Emit a notification message to each the given recipients, respecting their individual user settings."""),
+    'lino.modlib.notify.Message.emit_notification' : _("""Emit a notification message to each of the given recipients, respecting their individual user settings."""),
     'lino.modlib.notify.Message.create_message' : _("""Create a message unless that user has already been notified about that object."""),
     'lino.modlib.notify.Message.send_summary_emails' : _("""Send summary emails for all pending notifications with the given mail_mode mm."""),
     'lino.modlib.notify.Message.send_browser_message_for_all_users' : _("""Send_message to all connected users"""),
@@ -592,7 +590,7 @@ help_texts = {
     'lino.modlib.printing.Printable.get_print_templates' : _("""Return a list of file names of templates for the specified build method. Returning an empty list means that this item is not printable. For subclasses of SimpleBuildMethod the returned list may not contain more than 1 element."""),
     'lino.modlib.printing.Printable.get_printable_context' : _("""Adds a series of names to the context used when rendering printable documents."""),
     'lino.modlib.printing.Printable.get_body_template' : _("""Return the name of the body template to use when rendering this object in a printable excerpt (lino_xl.lib.excerpts). An empty string means that Lino should use the default value defined on the ExcerptType."""),
-    'lino.modlib.printing.Printable.get_printable_demo_objects' : _("""Return an iterable of database objects for which Lino should generate a printable excerpt."""),
+    'lino.modlib.printing.Printable.get_printable_demo_objects' : _("""Return an iterable of database rows for which Lino should generate a printable excerpt."""),
     'lino.modlib.printing.Printable.get_build_method' : _("""Return the build method to use when printing this object."""),
     'lino.modlib.printing.Printable.get_excerpt_options' : _("""Set additional fields of newly created excerpts from this. Called from lino_xl.lib.excerpts.models.ExcerptType.get_or_create_excerpt."""),
     'lino.modlib.printing.Printable.before_printable_build' : _("""This is called by print actions before the printable is being generated. Application code may e.g. raise a Warning exception in order to refuse the print action. The warning message can be a translatable string."""),

{lino-24.6.1 → lino-24.7.0}/lino/mixins/dupable.py

@@ -40,7 +40,7 @@ from django.db import models
 from lino.api import dd, _
 from lino.core.actions import SubmitInsert
 from lino.utils import join_elems
-from lino.utils.html import E
+from lino.utils.html import E, tostring, mark_safe
 from lino.core import constants
 
 
@@ -264,24 +264,12 @@ DupableChecker.activate()
 
 
 class SimilarObjects(dd.VirtualTable):
-    """Shows the other objects which are similar to this one."""
+    """Shows the other objects that are similar to this one."""
 
     display_mode = ((None, constants.DISPLAY_MODE_SUMMARY),)
     master = dd.Model
     abstract = True
 
-    # class Row:
-
-    #     def __init__(self, master, other):
-    #         self.master = master
-    #         self.other = other
-
-    #     def summary_row(self, ar):
-    #         yield ar.obj2html(self.other)
-
-    #     def __unicode__(self):
-    #         return unicode(self.other)
-
     @classmethod
     def get_data_rows(self, ar):
         mi = ar.master_instance
@@ -289,7 +277,6 @@ class SimilarObjects(dd.VirtualTable):
             return
 
         for o in mi.find_similar_instances(4):
-            # yield self.Row(mi, o)
             yield o
 
     @dd.displayfield(_("Similar record"))
@@ -298,13 +285,14 @@ class SimilarObjects(dd.VirtualTable):
         return ar.obj2html(obj)
 
     @classmethod
-    def get_table_summary(self, obj, ar):
+    def table_as_summary(self, ar):
         chunks = []
-        for other in ar.spawn(self, master_instance=obj):
+        for other in ar:
             chunks.append(ar.obj2html(other))
         if len(chunks):
+            obj = ar.master_instance
             s = getattr(obj, obj.dupable_words_field)
             words = ", ".join(obj.get_dupable_words(s))
             chunks.append(_("Phonetic words: {0}").format(words))
-            return E.p(*join_elems(chunks))
-        return ""
+            return tostring(join_elems(chunks))
+        return mark_safe("")

{lino-24.6.1 → lino-24.7.0}/lino/modlib/comments/ui.py

@@ -238,25 +238,6 @@ class CommentsByRFC(CommentsByX):
         else:
             return None
 
-    # @classmethod
-    # def get_table_summary(self, obj, ar):
-    #     sar = self.request_from(ar, master_instance=obj)
-    #     html = obj.get_rfc_description(ar)
-    #     sar = self.insert_action.request_from(sar)
-    #     if sar.get_permission():
-    #         btn = sar.ar2button(None, _("Write comment"), icon_name=None)
-    #         html += "<p>" + tostring(btn) + "</p>"
-    #
-    #     html += "<ul>"
-    #     for c in sar:
-    #         html += "<li>{}<div id=\"{}\">{}</div></li>".format(
-    #             self.get_comment_header(c, sar),
-    #             "comment-" + str(c.id),
-    #             ar.parse_memo(c.body))
-    #
-    #     html += "</ul>"
-    #     return ar.html_text(html)
-
 
 class CommentsByMentioned(CommentsByX):
     # show all comments that mention the master instance

{lino-24.6.1 → lino-24.7.0}/lino/modlib/dupable/models.py

@@ -37,7 +37,7 @@ from django.db import models
 from lino.api import dd, _
 from lino.modlib.gfks.mixins import Controllable
 from lino.utils import join_elems
-from lino.utils.html import E
+from lino.utils.html import E, tostring
 
 from .mixins import Dupable
 from lino.core import constants
@@ -113,25 +113,12 @@ class WordsByOwner(PhoneticWords):
 
 
 class SimilarObjects(dd.VirtualTable):
-    """Shows the other objects which are similar to this one."""
+    """Shows the other objects that are similar to this one."""
 
     label = _("Similar objects")
     display_mode = ((None, constants.DISPLAY_MODE_SUMMARY),)
-    # master = dd.Model
     master = Dupable
 
-    # class Row:
-
-    #     def __init__(self, master, other):
-    #         self.master = master
-    #         self.other = other
-
-    #     def summary_row(self, ar):
-    #         yield ar.obj2html(self.other)
-
-    #     def __unicode__(self):
-    #         return unicode(self.other)
-
     @classmethod
     def get_data_rows(self, ar):
         mi = ar.master_instance
@@ -139,40 +126,21 @@ class SimilarObjects(dd.VirtualTable):
             return
 
         for o in mi.find_similar_instances(4):
-            # yield self.Row(mi, o)
             yield o
 
     @dd.displayfield(_("Similar record"))
     def similar_record(self, obj, ar):
-        # return ar.obj2html(obj.other)
         return ar.obj2html(obj)
 
     @classmethod
-    def get_table_summary(self, obj, ar):
+    def table_as_summary(self, ar):
         chunks = []
-        for other in ar.spawn(self, master_instance=obj):
+        for other in ar:
             chunks.append(ar.obj2html(other))
-
-        # sar = WordsByOwner.default_action.request_from(
-        #     ar, master_instance=obj)
-        # if sar.get_permission():
-        #     if len(chunks):
-        #         chunks.append(E.br())
-        #     s = getattr(obj, obj.dupable_words_field)
-        #     words = ' '.join(obj.get_dupable_words(s))
-        #     label = "({0})".format(words)
-        #     btn = sar.ar2button(label=label)
-        #     chunks.append(btn)
         if len(chunks):
             chunks.append(E.br())
+        obj = ar.master_instance
         s = getattr(obj, obj.dupable_words_field)
         words = " ".join(obj.get_dupable_words(s))
         chunks.append("({0})".format(words))
-        return E.p(*join_elems(chunks))
-        # if len(chunks):
-        #     # s = getattr(obj, obj.dupable_words_field)
-        #     # words = ' '.join(obj.get_dupable_words(s))
-        #     # # chunks.append(_("Phonetic words: {0}").format(words))
-        #     # chunks.append(" ({0})".format(words))
-        #     return E.p(*join_elems(chunks))
-        # return ''
+        return tostring(join_elems(chunks))

{lino-24.6.1 → lino-24.7.0}/lino/modlib/extjs/ext_renderer.py

@@ -368,17 +368,6 @@ class ExtRenderer(JsCacheRenderer):
             "api", ar.actor.app_label, ar.actor.__name__, *args, **kw
         )
 
-    # def show_table(
-    #         self, ar, stripped=True, nosummary=False, **kw):
-    #     """
-    #     Returns a HTML element representing this request as a table.
-    #     Used by appy_pod renderer.
-    #     """
-    #     if ar.actor.master is not None and not nosummary:
-    #         if constants.DISPLAY_MODE_SUMMARY == [dmi[1] for dmi in ar.actor.display_mode if dmi[0] is None][0]:
-    #             return ar.actor.get_table_summary(ar.master_instance, ar)
-    #     return ar.table2xhtml(**kw)
-
     def handler_item(self, mi, handler, help_text):
         # ~ handler = "function(){%s}" % handler
         # ~ d = dict(text=prepare_label(mi),handler=js_code(handler),tooltip="Foo")
@@ -401,7 +390,7 @@ class ExtRenderer(JsCacheRenderer):
 
     def html_text(self, html):
         """
-        Wrap the given html fragment into a ``<div class="htmlText">``
+        Wrap the given html fragment into a ``<div class="htmlText">``,
         which specifies that this fragment contains simple html text
         inside an ExtJS component.  This is required because ExtJS
         does a lot of CSS magic which neutralizes the "usual" effects