Merge lp:~thumper/launchpad/refactor-lazrjs-text-widgets into lp:launchpad

[Tim Penhey]

[r=flacoste][ui=none][bug=708267,708980] Refactor the text lazrjs widgets.

This branch started out as a quick refactoring of the TextLineEditorWidget and the TextAreaEditorWidget.

It rapidly grew to tearing the widgets to shreds and remaking them.

The code that is now needed in the view classes to create the widgets is greatly reduced, and rendering the widgets is trivial regardless of their type.

The documentation was updated significantly, and is now actual documentation on use of the widgets.

[Francis J. Lacoste (flacoste)]

Hi Tim,

This is a very nice consolidation of the widget infrastructure! I have a
couple of questions and suggestion for enhancements.

Cheers

> === modified file 'lib/canonical/widgets/lazrjs.py'
> +class WidgetBase:
> + """Useful methods for all widgets."""
>
> + def __init__(self, context, exported_field, content_box_id):
> + self.context = context
> + self.exported_field = exported_field
> +
> + self.request = get_current_browser_request()

That makes us depend on global state. To unit test widget python code, it will
require setting the interaction.

Maybe it's not that much of a problem...

> + self.attribute_name = exported_field.__name__
> +
> + if content_box_id is None:
> + content_box_id = "edit-%s" % self.attribute_name

We need to cater for the use-case when we'll have multiple edit widget on the
page, so I'd suggest putting in a counter there. (That's why we were using
_generate_id() before)

> + self.content_box_id = content_box_id
> +
> + self.mutator_method_name = None
> + ws_stack = exported_field.queryTaggedValue(LAZR_WEBSERVICE_EXPORTED)
> + if ws_stack is None:
> + # The field may be a copy, or similarly named to one we care
> + # about.
> + self.api_attribute = self.attribute_name
> + else:
> + self.api_attribute = ws_stack['as']
> + mutator_info = ws_stack.get('mutator_annotations')
> + if mutator_info is not None:
> + mutator_method, mutator_extra = mutator_info
> + self.mutator_method_name = mutator_method.__name__

Why do we need to care about the mutator method name? It should be
transparent: you simply PATCH the field to the new value and lazr.restful will
call the mutator appropriately automatically. The 'as' stuff is required
though.

> +
> + @property
> + def resource_uri(self):
> + return canonical_url(self.context, force_local_path=True)
> +

Why force_local_path? (Subtle hint to add a comment there.)

> + @property
> + def json_resource_uri(self):
> + return simplejson.dumps(self.resource_uri)
> +
> + @classmethod
> + def _generate_id(cls):
> + """Return a presumably unique id for this widget."""
> + cls.last_id += 1
> + return '%s-id-%d' % (cls.widget_type, cls.last_id)
> +
> + @property
> + def can_write(self):
> + if canWrite(self.context, self.attribute_name):
> + return True
> + elif self.mutator_method_name is not None:
> + # The user may not have write access on the attribute itself, but
> + # the REST API may have a mutator method configured, such as
> + # transitionToAssignee.
> + return canAccess(self.context, self.mutator_method_name)
> + else:
> + return False

Hmm, I see why you need to look at the mutator then. Might want to add a
comment to explain it.

> +
> +
> +class TextWidgetBase(WidgetBase):
> +
> + def __init__(self, context, exported_field, content_box_id,
> + accept_empty, title, edit_view, edit_url):
> + super(TextWidgetBase, self)....

review: Needs Information

[Tim Penhey (thumper)]

On Fri, 28 Jan 2011 05:43:28 Francis J. Lacoste wrote:
> > === modified file 'lib/canonical/widgets/lazrjs.py'
> > +class WidgetBase:
> > + """Useful methods for all widgets."""
> >
> > + def __init__(self, context, exported_field, content_box_id):
> > + self.context = context
> > + self.exported_field = exported_field
> > +
> > + self.request = get_current_browser_request()
>
> That makes us depend on global state. To unit test widget python code, it
> will require setting the interaction.

The widgets have always depended on global state as they call the
canonical_url method. This just makes that more dependency explicit.

> Maybe it's not that much of a problem...
>
> > + self.attribute_name = exported_field.__name__
> > +
> > + if content_box_id is None:
> > + content_box_id = "edit-%s" % self.attribute_name
>
> We need to cater for the use-case when we'll have multiple edit widget on
> the page, so I'd suggest putting in a counter there. (That's why we were
> using _generate_id() before)

As we discussed, the _generate_id method was never called from any call-site
as they almost all used "edit-foo" where foo was the attribute being edited.
I updated the default to do this, and removed the extra parameter from the
call sites to make them simpler.

If for some reason there are multiple widgets on a page for editing a single
attribute name (perhaps like bug task assignees), then the call site will need
to specify the id.

> Why do we need to care about the mutator method name? It should be
> transparent: you simply PATCH the field to the new value and lazr.restful
> will call the mutator appropriately automatically. The 'as' stuff is
> required though.

Comment added.

> > + @property
> > + def resource_uri(self):
> > + return canonical_url(self.context, force_local_path=True)
> > +
>
> Why force_local_path? (Subtle hint to add a comment there.)

Docstring added.

> > +class TextWidgetBase(WidgetBase):
> > +
> > + def __init__(self, context, exported_field, content_box_id,
> > + accept_empty, title, edit_view, edit_url):
> > + super(TextWidgetBase, self).__init__(
> > + context, exported_field, content_box_id)
> > + if edit_url is None:
> > + edit_url = canonical_url(self.context, view_name=edit_view)
>
> If edit_url can be None, why not make it an optional argument? I see that
> you made it so in the descendant class.

No I don't want it optional here. TextWidgetBase is an abstract base class
for the text editor widgets. Even though they have the paramter as optional,
it is explicitly passed through to the base class constructor.

> > + resource_uri = LP.client.normalize_uri(resource_uri)
>
> Aren't you missing a var here?

Nope. It is altering the function parameter.

> WHy do we have 'Set description' links in addition to the widget? If it's
> for graceful degradation, could we make that part of the widget API? Like
> it is for the inline textline widget?

This is due to the behaviour on the merge proposal page for empty text areas
not showing, and a link appearing. As we discussed it may be...

[Francis J. Lacoste (flacoste)]

Really nice!

Thanks for the extensive rewrite of the documentation!

review: Approve

=== renamed file 'lib/canonical/widgets/lazrjs.py' => 'lib/lp/app/browser/lazrjs.py'
--- lib/canonical/widgets/lazrjs.py	2011-01-21 04:32:26 +0000
+++ lib/lp/app/browser/lazrjs.py	2011-01-30 20:24:55 +0000
@@ -1,19 +1,18 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Wrappers for lazr-js widgets."""
 
 __metaclass__ = type
 __all__ = [
+    'InlineEditPickerWidget',
+    'standard_text_html_representation',
     'TextAreaEditorWidget',
-    'InlineEditPickerWidget',
+    'TextLineEditorWidget',
     'vocabulary_to_choice_edit_items',
-    'TextLineEditorWidget',
     ]
 
-import cgi
 import simplejson
-from textwrap import dedent
 
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from zope.component import getUtility
@@ -21,255 +20,209 @@
 from zope.schema.interfaces import IVocabulary
 from zope.schema.vocabulary import getVocabularyRegistry
 
-from lazr.restful.interfaces import IWebServiceClientRequest
+from lazr.restful.declarations import LAZR_WEBSERVICE_EXPORTED
+from canonical.lazr.utils import get_current_browser_request
 from canonical.lazr.utils import safe_hasattr
 
 from canonical.launchpad.webapp.interfaces import ILaunchBag
 from canonical.launchpad.webapp.publisher import canonical_url
 from canonical.launchpad.webapp.vocabulary import IHugeVocabulary
+from lp.app.browser.stringformatter import FormattersAPI
 from lp.services.propertycache import cachedproperty
 
 
-class TextLineEditorWidget:
+class WidgetBase:
+    """Useful methods for all widgets."""
+
+    def __init__(self, context, exported_field, content_box_id):
+        self.context = context
+        self.exported_field = exported_field
+
+        self.request = get_current_browser_request()
+        self.attribute_name = exported_field.__name__
+        self.optional_field = not exported_field.required
+
+        if content_box_id is None:
+            content_box_id = "edit-%s" % self.attribute_name
+        self.content_box_id = content_box_id
+
+        # The mutator method name is used to determine whether or not the
+        # current user has permission to alter the attribute if the attribute
+        # is using a mutator function.
+        self.mutator_method_name = None
+        ws_stack = exported_field.queryTaggedValue(LAZR_WEBSERVICE_EXPORTED)
+        if ws_stack is None:
+            # The field may be a copy, or similarly named to one we care
+            # about.
+            self.api_attribute = self.attribute_name
+        else:
+            self.api_attribute = ws_stack['as']
+            mutator_info = ws_stack.get('mutator_annotations')
+            if mutator_info is not None:
+                mutator_method, mutator_extra = mutator_info
+                self.mutator_method_name = mutator_method.__name__
+
+    @property
+    def resource_uri(self):
+        """A local path to the context object.
+
+        The javascript uses the normalize_uri method that adds the appropriate
+        prefix to the uri.  Doing it this way avoids needing to adapt the
+        current request into a webservice request in order to get an api url.
+        """
+        return canonical_url(self.context, force_local_path=True)
+
+    @property
+    def json_resource_uri(self):
+        return simplejson.dumps(self.resource_uri)
+
+    @property
+    def can_write(self):
+        """Can the current user write to the attribute."""
+        if canWrite(self.context, self.attribute_name):
+            return True
+        elif self.mutator_method_name is not None:
+            # The user may not have write access on the attribute itself, but
+            # the REST API may have a mutator method configured, such as
+            # transitionToAssignee.
+            return canAccess(self.context, self.mutator_method_name)
+        else:
+            return False
+
+
+class TextWidgetBase(WidgetBase):
+    """Abstract base for the single and multiline text editor widgets."""
+
+    def __init__(self, context, exported_field, title, content_box_id,
+                 edit_view, edit_url):
+        super(TextWidgetBase, self).__init__(
+            context, exported_field, content_box_id)
+        if edit_url is None:
+            edit_url = canonical_url(self.context, view_name=edit_view)
+        self.edit_url = edit_url
+        self.accept_empty = simplejson.dumps(self.optional_field)
+        self.title = title
+        self.json_attribute = simplejson.dumps(self.api_attribute)
+        self.widget_css_selector = simplejson.dumps('#' + self.content_box_id)
+
+    @property
+    def json_attribute_uri(self):
+        return simplejson.dumps(self.resource_uri + '/' + self.api_attribute)
+
+
+class TextLineEditorWidget(TextWidgetBase):
     """Wrapper for the lazr-js inlineedit/editor.js widget."""
 
-    # Class variable used to generate a unique per-page id for the widget
-    # in case it's not provided.
-    last_id = 0
-
-    # The HTML template used to render the widget.
-    # Replacements:
-    #   activation_script: the JS script to active the widget
-    #   attribute: the name of the being edited
-    #   context_url: the url to the current context
-    #   edit_url: the URL used to edit the value when JS is turned off
-    #   id: the widget unique id
-    #   title: the widget title
-    #   trigger: the trigger (button) HTML code
-    #   value: the current field value
-    WIDGET_TEMPLATE = dedent(u"""\
-        <%(tag)s id="%(id)s"><span
-            class="yui3-editable_text-text">%(value)s</span>
-            %(trigger)s
-        </%(tag)s>
-        %(activation_script)s
-        """)
-
-    # Template for the trigger button.
-    TRIGGER_TEMPLATE = dedent(u"""\
-        <a href="%(edit_url)s" class="yui3-editable_text-trigger sprite edit"
-        ></a>
-        """)
-
-    # Template for the activation script.
-    ACTIVATION_TEMPLATE = dedent(u"""\
-        <script>
-        LPS.use('lazr.editor', 'lp.client.plugins', function (Y) {
-            var widget = new Y.EditableText({
-                contentBox: '#%(id)s',
-                accept_empty: %(accept_empty)s,
-                width: '%(width)s',
-                initial_value_override: %(initial_value_override)s
-            });
-            widget.editor.plug({
-                fn: Y.lp.client.plugins.PATCHPlugin, cfg: {
-                  patch: '%(public_attribute)s',
-                  resource: '%(context_url)s'}});
-            widget.render();
-        });
-        </script>
-        """)
-
-    def __init__(self, context, attribute, edit_url, id=None, title="Edit",
-                 tag='h1', public_attribute=None, accept_empty=False,
+    __call__ = ViewPageTemplateFile('../templates/text-line-editor.pt')
+
+    def __init__(self, context, exported_field, title, tag,
+                 content_box_id=None, edit_view="+edit", edit_url=None,
                  default_text=None, initial_value_override=None, width=None):
         """Create a widget wrapper.
 
         :param context: The object that is being edited.
-        :param attribute: The name of the attribute being edited.
-        :param edit_url: The URL to use for editing when the user isn't logged
-            in and when JS is off.
-        :param id: The HTML id to use for this widget. Automatically
-            generated if this is not provided.
-        :param title: The string to use as the link title. Defaults to 'Edit'.
+        :param exported_field: The attribute being edited. This should be
+            a field from an interface of the form ISomeInterface['fieldname']
+        :param title: The string to use as the link title.
         :param tag: The HTML tag to use.
-        :param public_attribute: If given, the name of the attribute in the
-            public webservice API.
-        :param accept_empty: Whether the field accepts empty input or not.
+        :param content_box_id: The HTML id to use for this widget.
+            Defaults to edit-<attribute name>.
+        :param edit_view: The view name to use to generate the edit_url if
+            one is not specified.
+        :param edit_url: The URL to use for editing when the user isn't logged
+            in and when JS is off.  Defaults to the edit_view on the context.
         :param default_text: Text to show in the unedited field, if the
             parameter value is missing or None.
         :param initial_value_override: Use this text for the initial edited
             field value instead of the attribute's current value.
         :param width: Initial widget width.
         """
-        self.context = context
-        self.attribute = attribute
-        self.edit_url = edit_url
+        super(TextLineEditorWidget, self).__init__(
+            context, exported_field, title, content_box_id,
+            edit_view, edit_url)
         self.tag = tag
-        if accept_empty:
-            self.accept_empty = 'true'
-        else:
-            self.accept_empty = 'false'
-        if public_attribute is None:
-            self.public_attribute = attribute
-        else:
-            self.public_attribute = public_attribute
-        if id is None:
-            self.id = self._generate_id()
-        else:
-            self.id = id
-        self.title = title
         self.default_text = default_text
-        self.initial_value_override = initial_value_override
-        self.width = width
-
-    @classmethod
-    def _generate_id(cls):
-        """Return a presumably unique id for this widget."""
-        cls.last_id += 1
-        return 'inline-textline-editor-id%d' % cls.last_id
-
-    def __call__(self):
-        """Return the HTML to include to render the widget."""
-        # We can't use the value None because of the cgi.escape() and because
-        # that wouldn't look very good in the ui!
-        value = getattr(self.context, self.attribute, self.default_text)
-        if value is None:
-            value = self.default_text
-        params = {
-            'activation_script': '',
-            'trigger': '',
-            'edit_url': self.edit_url,
-            'id': self.id,
-            'title': self.title,
-            'value': cgi.escape(value),
-            'context_url': canonical_url(
-                self.context, path_only_if_possible=True),
-            'attribute': self.attribute,
-            'tag': self.tag,
-            'public_attribute': self.public_attribute,
-            'accept_empty': self.accept_empty,
-            'initial_value_override': simplejson.dumps(
-                self.initial_value_override),
-            'width': self.width,
-            }
-        # Only display the trigger link and the activation script if
-        # the user can write the attribute.
-        if canWrite(self.context, self.attribute):
-            params['trigger'] = self.TRIGGER_TEMPLATE % params
-            params['activation_script'] = self.ACTIVATION_TEMPLATE % params
-        return self.WIDGET_TEMPLATE % params 
-
-
-class TextAreaEditorWidget(TextLineEditorWidget):
+        self.initial_value_override = simplejson.dumps(initial_value_override)
+        self.width = simplejson.dumps(width)
+
+    @property
+    def open_tag(self):
+        return '<%s id="%s">' % (self.tag, self.content_box_id)
+
+    @property
+    def close_tag(self):
+        return '</%s>' % self.tag
+
+    @property
+    def value(self):
+        text = getattr(self.context, self.attribute_name, self.default_text)
+        if text is None:
+            text = self.default_text
+        return text
+
+
+class TextAreaEditorWidget(TextWidgetBase):
     """Wrapper for the multine-line lazr-js inlineedit/editor.js widget."""
 
-    def __init__(self, *args, **kwds):
-        """Create the widget wrapper."""
-        if 'value' in kwds:
-            self.value = kwds.get('value', '')
-            kwds.pop('value')
-        super(TextAreaEditorWidget, self).__init__(*args, **kwds)
-
-    # The HTML template used to render the widget.
-    # Replacements:
-    #   activation_script: the JS script to active the widget
-    #   attribute: the name of the being edited
-    #   context_url: the url to the current context
-    #   edit_url: the URL used to edit the value when JS is turned off
-    #   id: the widget unique id
-    #   title: the widget title
-    #   trigger: the trigger (button) HTML code
-    #   value: the current field value
-    WIDGET_TEMPLATE = dedent(u"""\
-        <div id="multi-text-editor">
-          <div class="clearfix">
-            %(edit_controls)s
-            <h2>%(title)s</h2>
-          </div>
-          <div class="yui3-editable_text-text">%(value)s</div>
-        </div>
-        %(activation_script)s
-        """)
-
-    CONTROLS_TEMPLATE = dedent(u"""\
-        <div class="edit-controls">
-          &nbsp;
-          %(trigger)s
-        </div>
-        """)
-
-    ACTIVATION_TEMPLATE = dedent(u"""\
-        <script>
-        LPS.use('lazr.editor', 'lp.client.plugins', function (Y) {
-            var widget = new Y.EditableText({
-                contentBox: '#%(id)s',
-                accept_empty: %(accept_empty)s,
-                multiline: true,
-                buttons: 'top'
-            });
-            widget.editor.plug({
-                fn: Y.lp.client.plugins.PATCHPlugin, cfg: {
-                  patch: '%(attribute)s',
-                  resource: '%(context_url)s/%(attribute)s',
-                  patch_field: true,
-                  accept: 'application/xhtml+xml'
-            }});
-            if (!Y.UA.opera) {
-                widget.render();
-            }
-            var lpns = Y.namespace('lp');
-            if (!lpns.widgets) {
-                lpns.widgets = {};
-            }
-            lpns.widgets['%(id)s'] = widget;
-        });
-        </script>
-        """)
-
-    def __call__(self):
-        """Return the HTML to include to render the widget."""
-        params = {
-            'activation_script': '',
-            'trigger': '',
-            'edit_url': self.edit_url,
-            'id': self.id,
-            'title': self.title,
-            'value': self.value,
-            'context_url': canonical_url(
-                self.context, path_only_if_possible=True),
-            'attribute': self.attribute,
-            'accept_empty': self.accept_empty,
-            'edit_controls': '',
-            }
-        # Only display the trigger link and the activation script if
-        # the user can write the attribute.
-        if canWrite(self.context, self.attribute):
-            params['trigger'] = self.TRIGGER_TEMPLATE % params
-            params['activation_script'] = self.ACTIVATION_TEMPLATE % params
-            params['edit_controls'] = self.CONTROLS_TEMPLATE % params
-        return self.WIDGET_TEMPLATE % params
-
-
-class InlineEditPickerWidget:
+    __call__ = ViewPageTemplateFile('../templates/text-area-editor.pt')
+
+    def __init__(self, context, exported_field, title, content_box_id=None,
+                 edit_view="+edit", edit_url=None,
+                 hide_empty=True, linkify_text=True):
+        """Create the widget wrapper.
+
+        :param context: The object that is being edited.
+        :param exported_field: The attribute being edited. This should be
+            a field from an interface of the form ISomeInterface['fieldname']
+        :param title: The string to use as the link title.
+        :param content_box_id: The HTML id to use for this widget.
+            Defaults to edit-<attribute name>.
+        :param edit_view: The view name to use to generate the edit_url if
+            one is not specified.
+        :param edit_url: The URL to use for editing when the user isn't logged
+            in and when JS is off.  Defaults to the edit_view on the context.
+        :param hide_empty: If the attribute has no value, or is empty, then
+            hide the editor by adding the "unseen" CSS class.
+        :param linkify_text: If True the HTML version of the text will have
+            things that look like links made into anchors.
+        """
+        super(TextAreaEditorWidget, self).__init__(
+            context, exported_field, title, content_box_id,
+            edit_view, edit_url)
+        self.hide_empty = hide_empty
+        self.linkify_text = linkify_text
+
+    @property
+    def tag_class(self):
+        """The CSS class for the widget."""
+        classes = ['lazr-multiline-edit']
+        if self.hide_empty and not self.value:
+            classes.append('unseen')
+        return ' '.join(classes)
+
+    @cachedproperty
+    def value(self):
+        text = getattr(self.context, self.attribute_name, None)
+        return standard_text_html_representation(text, self.linkify_text)
+
+
+class InlineEditPickerWidget(WidgetBase):
     """Wrapper for the lazr-js picker widget.
 
     This widget is not for editing form values like the
     VocabularyPickerWidget.
     """
 
-    last_id = 0
-    __call__ = ViewPageTemplateFile('templates/inline-picker.pt')
+    __call__ = ViewPageTemplateFile('../templates/inline-picker.pt')
 
-    def __init__(self, context, request, interface_attribute, default_html,
+    def __init__(self, context, exported_field, default_html,
                  content_box_id=None, header='Select an item',
                  step_title='Search', remove_button_text='Remove',
                  null_display_value='None'):
         """Create a widget wrapper.
 
         :param context: The object that is being edited.
-        :param request: The request object.
-        :param interface_attribute: The attribute being edited. This should be
+        :param exported_field: The attribute being edited. This should be
             a field from an interface of the form ISomeInterface['fieldname']
         :param default_html: Default display of attribute.
         :param content_box_id: The HTML id to use for this widget. Automatically
@@ -279,17 +232,9 @@
         :param remove_button_text: Override default button text: "Remove"
         :param null_display_value: This will be shown for a missing value
         """
-        self.context = context
-        self.request = request
+        super(InlineEditPickerWidget, self).__init__(
+            context, exported_field, content_box_id)
         self.default_html = default_html
-        self.interface_attribute = interface_attribute
-        self.attribute_name = interface_attribute.__name__
-
-        if content_box_id is None:
-            self.content_box_id = self._generate_id()
-        else:
-            self.content_box_id = content_box_id
-
         self.header = header
         self.step_title = step_title
         self.remove_button_text = remove_button_text
@@ -297,26 +242,29 @@
 
         # JSON encoded attributes.
         self.json_content_box_id = simplejson.dumps(self.content_box_id)
-        self.json_attribute = simplejson.dumps(self.attribute_name + '_link')
+        self.json_attribute = simplejson.dumps(self.api_attribute + '_link')
         self.json_vocabulary_name = simplejson.dumps(
-            self.interface_attribute.vocabularyName)
-        self.show_remove_button = not self.interface_attribute.required
+            self.exported_field.vocabularyName)
 
     @property
     def config(self):
-        return simplejson.dumps(
-            dict(header=self.header, step_title=self.step_title,
-                 remove_button_text=self.remove_button_text,
-                 null_display_value=self.null_display_value,
-                 show_remove_button=self.show_remove_button,
-                 show_assign_me_button=self.show_assign_me_button,
-                 show_search_box=self.show_search_box))
+        return dict(
+            header=self.header, step_title=self.step_title,
+            remove_button_text=self.remove_button_text,
+            null_display_value=self.null_display_value,
+            show_remove_button=self.optional_field,
+            show_assign_me_button=self.show_assign_me_button,
+            show_search_box=self.show_search_box)
+
+    @property
+    def json_config(self):
+        return simplejson.dumps(self.config)
 
     @cachedproperty
     def vocabulary(self):
         registry = getVocabularyRegistry()
         return registry.get(
-            IVocabulary, self.interface_attribute.vocabularyName)
+            IVocabulary, self.exported_field.vocabularyName)
 
     @property
     def show_search_box(self):
@@ -329,43 +277,6 @@
         user = getUtility(ILaunchBag).user
         return user and user in vocabulary
 
-    @classmethod
-    def _generate_id(cls):
-        """Return a presumably unique id for this widget."""
-        cls.last_id += 1
-        return 'inline-picker-activator-id-%d' % cls.last_id
-
-    @property
-    def json_resource_uri(self):
-        return simplejson.dumps(
-            canonical_url(
-                self.context, request=IWebServiceClientRequest(self.request),
-                path_only_if_possible=True))
-
-    @property
-    def can_write(self):
-        if canWrite(self.context, self.attribute_name):
-            return True
-        else:
-            # The user may not have write access on the attribute itself, but
-            # the REST API may have a mutator method configured, such as
-            # transitionToAssignee.
-            #
-            # We look at the top of the annotation stack, since Ajax
-            # requests always go to the most recent version of the web
-            # service.
-            try:
-                exported_tag_stack = self.interface_attribute.getTaggedValue(
-                    'lazr.restful.exported')
-            except KeyError:
-                return False
-            mutator_info = exported_tag_stack.get('mutator_annotations')
-            if mutator_info is not None:
-                mutator_method, mutator_extra = mutator_info
-                return canAccess(self.context, mutator_method.__name__)
-            else:
-                return False
-
 
 def vocabulary_to_choice_edit_items(
     vocab, css_class_prefix=None, disabled_items=None, as_json=False,
@@ -412,3 +323,13 @@
     else:
         return items
 
+
+def standard_text_html_representation(value, linkify_text=True):
+    """Render a string for html display.
+
+    For this we obfuscate email and render as html.
+    """
+    if value is None:
+        return ''
+    nomail = FormattersAPI(value).obfuscate_email()
+    return FormattersAPI(nomail).text_to_html(linkify_text=linkify_text)

=== renamed file 'lib/canonical/widgets/tests/test_inlineeditpickerwidget.py' => 'lib/lp/app/browser/tests/test_inlineeditpickerwidget.py'
--- lib/canonical/widgets/tests/test_inlineeditpickerwidget.py	2011-01-20 21:16:36 +0000
+++ lib/lp/app/browser/tests/test_inlineeditpickerwidget.py	2011-01-30 20:24:55 +0000
@@ -9,7 +9,7 @@
 from zope.schema import Choice
 
 from canonical.testing.layers import DatabaseFunctionalLayer
-from canonical.widgets.lazrjs import InlineEditPickerWidget
+from lp.app.browser.lazrjs import InlineEditPickerWidget
 from lp.testing import (
     login_person,
     TestCaseWithFactory,
@@ -23,35 +23,35 @@
     def getWidget(self, **kwargs):
         class ITest(Interface):
             test_field = Choice(**kwargs)
-        return InlineEditPickerWidget(None, None, ITest['test_field'], None)
+        return InlineEditPickerWidget(None, ITest['test_field'], None)
 
     def test_huge_vocabulary_is_searchable(self):
         # Make sure that when given a field for a huge vocabulary, the picker
         # is set to show the search box.
         widget = self.getWidget(vocabulary='ValidPersonOrTeam')
-        self.assertTrue(widget.show_search_box)
+        self.assertTrue(widget.config['show_search_box'])
 
     def test_normal_vocabulary_is_not_searchable(self):
         # Make sure that when given a field for a normal vocabulary, the picker
         # is set to show the search box.
         widget = self.getWidget(vocabulary='UserTeamsParticipation')
-        self.assertFalse(widget.show_search_box)
+        self.assertFalse(widget.config['show_search_box'])
 
     def test_required_fields_dont_have_a_remove_link(self):
         widget = self.getWidget(vocabulary='ValidPersonOrTeam', required=True)
-        self.assertFalse(widget.show_remove_button)
+        self.assertFalse(widget.config['show_remove_button'])
 
     def test_optional_fields_do_have_a_remove_link(self):
         widget = self.getWidget(
             vocabulary='ValidPersonOrTeam', required=False)
-        self.assertTrue(widget.show_remove_button)
+        self.assertTrue(widget.config['show_remove_button'])
 
     def test_assign_me_exists_if_user_in_vocabulary(self):
         widget = self.getWidget(vocabulary='ValidPersonOrTeam', required=True)
         login_person(self.factory.makePerson())
-        self.assertTrue(widget.show_assign_me_button)
+        self.assertTrue(widget.config['show_assign_me_button'])
 
     def test_assign_me_not_shown_if_user_not_in_vocabulary(self):
         widget = self.getWidget(vocabulary='TargetPPAs', required=True)
         login_person(self.factory.makePerson())
-        self.assertFalse(widget.show_assign_me_button)
+        self.assertFalse(widget.config['show_assign_me_button'])

=== modified file 'lib/lp/app/browser/webservice.py'
--- lib/lp/app/browser/webservice.py	2011-01-20 22:27:42 +0000
+++ lib/lp/app/browser/webservice.py	2011-01-30 20:24:55 +0000
@@ -18,7 +18,7 @@
     )
 from zope.schema.interfaces import IText
 
-from lp.app.browser.stringformatter import FormattersAPI
+from lp.app.browser.lazrjs import standard_text_html_representation
 from lp.app.browser.tales import format_link
 
 
@@ -44,12 +44,4 @@
 @implementer(IFieldHTMLRenderer)
 def text_xhtml_representation(context, field, request):
     """Render text as XHTML using the webservice."""
-    formatter = FormattersAPI
-
-    def renderer(value):
-        if value is None:
-            return ''
-        nomail = formatter(value).obfuscate_email()
-        return formatter(nomail).text_to_html()
-
-    return renderer
+    return standard_text_html_representation

=== renamed file 'lib/canonical/launchpad/doc/lazr-js-widgets.txt' => 'lib/lp/app/doc/lazr-js-widgets.txt'
--- lib/canonical/launchpad/doc/lazr-js-widgets.txt	2011-01-21 04:36:36 +0000
+++ lib/lp/app/doc/lazr-js-widgets.txt	2011-01-30 20:24:55 +0000
@@ -1,31 +1,40 @@
 LAZR JS Wrappers
 ================
 
-The canonical.widgets.lazrjs module contains a bunch of wrapper
-for widgets defined in Lazr-JS.
+The lp.app.browser.lazrjs module contains several classes that simplify the
+use of widgets defined in Lazr-JS.
+
+When rendering these widgets in page templates, all you need to do is 'call'
+them.  TAL will do this for you.
+
+  <tal:widget replace="structure view/nifty_widget"/>
+
 
 TextLineEditorWidget
---------------------------
+--------------------
 
 We have a convenient wrapper for the inlineedit/editor JS widget in
 TextLineEditorWidget.
 
-    >>> from canonical.launchpad.webapp.publisher import canonical_url
-    >>> from canonical.widgets.lazrjs import TextLineEditorWidget
-    >>> bug = factory.makeBug(title='My bug is > important')
-
-The wrapper takes as arguments the object and the attribute of the
-object that is being edited, as well as the URL to use for editing when
-when JS is turned off.
-
-    >>> widget = TextLineEditorWidget(
-    ...     bug, 'title', canonical_url(bug.bugtasks[0], view_name='+edit'))
+    >>> from lp.app.browser.lazrjs import TextLineEditorWidget
+
+The bare minimum that you need to provide the widget is the object that you
+are editing, and the exported field that is being edited, and a title for the
+edit link that is rendered as the itle of the anchor so it shows on mouse
+over, and the tag that surrounds the text.
+
+    >>> from lp.registry.interfaces.product import IProduct
+    >>> product = factory.makeProduct(
+    ...     name='widget', title='Widgets > important')
+    >>> title_field = IProduct['title']
+    >>> title = 'Edit the title'
+    >>> widget = TextLineEditorWidget(product, title_field, title, 'h1')
 
 The widget is rendered by executing it, it prints out the attribute
 content.
 
     >>> print widget()
-    <h1 id="..."><span class="yui3-editable_text-text">My bug is &gt;
+    <h1 id="edit-title"><span class="yui3-editable_text-text">Widgets &gt;
         important</span>
     </h1>
 
@@ -33,97 +42,229 @@
 the edit view that appears as well as a <script> tag that will change that
 link into an AJAX control when JS is available:
 
-    >>> login('[e-mail]')
+    >>> login_person(product.owner)
     >>> print widget()
-    <h1 id="..."><span class="yui3-editable_text-text">My bug is &gt;
+    <h1 id="edit-title"><span class="yui3-editable_text-text">Widgets &gt;
         important</span>
-        <a href="http://bugs.launchpad.dev/.../+edit"
-           class="yui3-editable_text-trigger sprite edit"
-        ></a>
+        <a class="yui3-editable_text-trigger sprite edit"
+           href="http://launchpad.dev/widget/+edit"></a>
     </h1>
     <script>
     ...
     </script>
 
-The id and title attribute to use can be passed via parameters to the
-constructor:
-
-    >>> widget = TextLineEditorWidget(
-    ...     bug, 'title', canonical_url(bug.bugtasks[0], view_name='+edit'),
-    ...     id="bug-title", title="Edit this summary")
-    >>> print widget()
-    <h1 id="bug-title">...
-        ...class="yui3-editable_text-trigger sprite edit"...
-
-The initial_value_override parameter is passed as a JSON-serialized value.
-
-    >>> widget = TextLineEditorWidget(
-    ...     bug, 'title', canonical_url(bug.bugtasks[0], view_name='+edit'),
-    ...     id="bug-title", title="Edit this summary",
-    ...     initial_value_override='This bug has no title')
-    >>> print widget()
-    <h1 id="bug-title">...
-        ...initial_value_override: "This bug has no title"...
-
-When the value isn't supplied it defaults to None, which is serialized as a
-Javascript null.
-
-    >>> widget = TextLineEditorWidget(
-    ...     bug, 'title', canonical_url(bug.bugtasks[0], view_name='+edit'),
-    ...     id="bug-title", title="Edit this summary")
-    >>> print widget()
-    <h1 id="bug-title">...
-        ...initial_value_override: null...
+
+Changing the tag
+****************
+
+The id of the surrounding tag defaults to "edit-" followed by the name of the
+attribute being edited.  This can be overridden if needed using the
+"content_box_id" constructor argument.
+
+    >>> span_widget = TextLineEditorWidget(
+    ...     product, title_field, title, 'span', content_box_id="overridden")
+    >>> login(ANONYMOUS) # To not get the script tag rendered
+    >>> print span_widget()
+    <span id="overridden">...</span>
+
+
+Changing the edit link
+**********************
+
+When there is a logged in user that has edit rights on the field being edited,
+the edit button is shown, and has a link that takes to the user to a normal
+edit page if javascript is disabled.  This link defaults to the '+edit' view
+of the object being edited.  This can be overridden in two ways:
+  * change the 'edit_view' parameter to be a different view
+  * provide an 'edit_url' to use instead
+
+    >>> print widget.edit_url
+    http://launchpad.dev/widget/+edit
+
+    >>> diff_view = TextLineEditorWidget(
+    ...     product, title_field, title, 'h1', edit_view='+edit-people')
+    >>> print diff_view.edit_url
+    http://launchpad.dev/widget/+edit-people
+
+    >>> diff_url = TextLineEditorWidget(
+    ...     product, title_field, title, 'h1', edit_url='http://example.com/')
+    >>> print diff_url.edit_url
+    http://example.com/
+
+
+Other nifty bits
+****************
+
+You are also able to set the default text to show if the attribute has no
+value using the 'default_text' parameter.  The 'initial_value_override' is
+used by the javascript widget to provide that text instead of the objects
+value (of the default_text).  The width of the field can also be specified
+using the 'width' parameter (please use 'em's).
+
+For an example of these parameters, see the editor for a products programming
+languages.
+
+
+TextAreaEditorWidget
+--------------------
+
+This widget renders a multi-line editor.  Example uses of this widget are:
+  * editing a bug's description
+  * editing a merge proposal's commit message or description
+  * editing a PPA's description
+
+    >>> from lp.app.browser.lazrjs import TextAreaEditorWidget
+
+The bare minimum that you need to provide the widget is the object that you
+are editing, and the exported field that is being edited, and a title for the
+edit link that is rendered as the itle of the anchor so it shows on mouse
+over.
+
+    >>> eric = factory.makePerson(name='eric')
+    >>> archive = factory.makeArchive(
+    ...     owner=eric, name='ppa', description='short description')
+    >>> from lp.soyuz.interfaces.archive import IArchive
+    >>> description = IArchive['description']
+    >>> widget = TextAreaEditorWidget(archive, description, 'A title')
+
+With no-one logged in, there are no edit buttons.
+
+    >>> print widget()
+    <div id="edit-description" class="lazr-multiline-edit">
+      <div class="clearfix">
+        <h2>A title</h2>
+      </div>
+      <div class="yui3-editable_text-text"><p>short description</p></div>
+    </div>
+
+The initial text defaults to the value of the attribute, which is then passed
+through two string formatter methods to obfuscate the email and then return
+the text as HTML.
+
+When the logged in user has edit permission, the edit button is shown, and
+javascript is written to the page to hook up the links to show the multiline
+editor.
+
+    >>> login_person(eric)
+    >>> print widget()
+    <div id="edit-description" class="lazr-multiline-edit">
+      <div class="clearfix">
+        <div class="edit-controls">
+          &nbsp;
+          <a class="yui3-editable_text-trigger sprite edit"
+             href="http://launchpad.dev/~eric/+archive/ppa/+edit"></a>
+        </div>
+        <h2>A title</h2>
+      </div>
+      <div class="yui3-editable_text-text"><p>short description</p></div>
+      <script>...</script>
+    </div>
+
+
+Changing the edit link
+**********************
+
+The edit link can be changed in exactly the same way as for the
+TextLineEditorWidget above.
+
+
+Hiding the widget for empty fields
+**********************************
+
+Sometimes you don't want to show the widget if there is no content.  An
+example of this can be found in the branch merge proposal view for editing the
+description or the commit message.  This uses links when there is no content.
+Ideally the interaction with the links would be encoded as part of the widget
+itself, but that is an exercise left for another yak shaver.
+
+Hiding the widget is done by appending the "unseen" CSS class to the outer
+tag.
+
+    >>> archive.description = None
+    >>> from lp.services.propertycache import clear_property_cache
+    >>> clear_property_cache(widget)
+    >>> print widget()
+    <div id="edit-description" class="lazr-multiline-edit unseen">
+    ...
+
+This behaviour can be overridden by setting the "hide_empty" parameter to
+False.
+
+    >>> widget = TextAreaEditorWidget(
+    ...     archive, description, 'A title', hide_empty=False)
+    >>> print widget()
+    <div id="edit-description" class="lazr-multiline-edit">
+    ...
+
+
+Not linkifying the text
+***********************
+
+A part of the standard HTML rendering is to "linkify" links.  That is, turn
+words that look like hyperlinks into anchors.  This is not always considered a
+good idea as some spammers can create PPAs and link to other sites in the
+descriptions.  since the barrier to create a PPA is relatively low, we
+restrict the linkability of some fields.  The constructor provides a
+"linkify_text" parameter that defaults to True.  Set this to False to avoid
+the linkification of text.  See the IArchive['description'] editor for an example.
 
 
 InlineEditPickerWidget
 ----------------------
 
-The InlineEditPickerWidget can be used for any interface attribute that
-has a vocabulary defined for it.
-
-    >>> from zope.component import getUtility
-    >>> from canonical.widgets.lazrjs import InlineEditPickerWidget
-    >>> from lp.bugs.interfaces.bugtask import IBugTask, IBugTaskSet
-    >>> bugtask = getUtility(IBugTaskSet).get(2)
-    >>> def create_inline_edit_picker_widget():
-    ...     view = create_initialized_view(bugtask, '+index')
-    ...     return InlineEditPickerWidget(
-    ...         context=view.context,
-    ...         request=view.request,
-    ...         interface_attribute=IBugTask['assignee'],
-    ...         default_html='default-html',
-    ...         header='Change assignee',
-    ...         step_title='Search for people or teams',
-    ...         remove_button_text='Remove Assignee',
-    ...         null_display_value='Nobody')
-
-An unauthenticated user cannot see the activator's edit button, which
-is revealed by Y.lp.app.picker.addPickerPatcher.
-
-    >>> login(ANONYMOUS)
-    >>> widget = create_inline_edit_picker_widget()
-    >>> print widget.can_write
-    False
-    >>> print widget()
-    <span id="inline-picker-activator-id-...">...
-    <div class="yui3-activator-message-box yui3-activator-hidden" />
-    </span>
-
-The foo.bar user can see the activator's edit button.
-
-    >>> login('[e-mail]')
-    >>> widget = create_inline_edit_picker_widget()
-    >>> print widget.can_write
-    True
-    >>> print widget()
-    <span id="inline-picker-activator-id-...">
-    ...<div class="yui3-activator-message-box yui3-activator-hidden" />
-    </span>
-    ...Y.lp.app.picker.addPickerPatcher(...
-
-The json_resource_uri is the canonical_url for the object in
-WebServiceClientRequests.
-
-    >>> print widget.json_resource_uri
-    "/firefox/+bug/1"
+The InlineEditPickerWidget provides a simple way to create a popup selector
+widget to choose items from a vocabulary.
+
+    >>> from lp.app.browser.lazrjs import InlineEditPickerWidget
+
+The bare minimum that you need to provide the widget is the object that you
+are editing, and the exported field that is being edited, and the default
+HTML representation of the field you are editing.
+
+Since most of the things that are being chosen are entities in Launchpad, and
+most of those entities have URLs, a common approach is to have the default
+HTML be a link to that entity.  There is a utility function called format_link
+that does the equivalent of the TALES expression 'obj/fmt:link'.
+
+    >>> from lp.app.browser.tales import format_link
+    >>> default_text = format_link(archive.owner)
+
+The vocabulary is determined from the field passed in.  If the vocabulary is a
+huge vocabulary (one that provides a search), then the picker is shown with an
+entry field to allow the user to search for an item.  If the vocabulary is not
+huge, the different items are shown in the normal paginated way for the user
+to select.
+
+    >>> owner = IArchive['owner']
+    >>> widget = InlineEditPickerWidget(archive, owner, default_text)
+    >>> print widget()
+    <span id="edit-owner">
+      <span class="yui3-activator-data-box">
+        <a...>Eric</a>
+      </span>
+      <button class="lazr-btn yui3-activator-act yui3-activator-hidden">
+        Edit
+      </button>
+      <div class="yui3-activator-message-box yui3-activator-hidden" />
+    </span>
+
+
+Picker headings
+***************
+
+The picker has two headings that are almost always desirable to customize.
+  * "header" - Shown at the top of the picker
+  * "step_title" - Shown just below the green progress bar
+
+To customize these, pass the named parameters into the constructor of the
+widget.
+
+
+Other nifty links
+*****************
+
+If the logged in user is in the defined vocabulary (only occurs with people
+type vocabularies), a link is shown "Assign me'.
+
+If the field is optional, a "Remove" link is shown.  The "Remove" text is
+customizable thought the "remove_button_text" parameter.

=== modified file 'lib/lp/app/javascript/picker.js'
--- lib/lp/app/javascript/picker.js	2011-01-20 21:26:07 +0000
+++ lib/lp/app/javascript/picker.js	2011-01-30 20:24:55 +0000
@@ -39,6 +39,7 @@
     var remove_button_text = 'Remove';
     var null_display_value = 'None';
     var show_search_box = true;
+    resource_uri = LP.client.normalize_uri(resource_uri)
     var full_resource_uri = LP.client.get_absolute_uri(resource_uri);
     var current_context_uri = LP.client.cache['context']['self_link'];
     var editing_main_context = (full_resource_uri == current_context_uri);

=== renamed file 'lib/canonical/widgets/templates/inline-picker.pt' => 'lib/lp/app/templates/inline-picker.pt'
--- lib/canonical/widgets/templates/inline-picker.pt	2011-01-20 20:24:10 +0000
+++ lib/lp/app/templates/inline-picker.pt	2011-01-30 20:24:55 +0000
@@ -20,7 +20,7 @@
         ${view/json_resource_uri},
         ${view/json_attribute},
         ${view/json_content_box_id},
-        ${view/config});
+        ${view/json_config});
       }, window);
 });
 "/>

=== added file 'lib/lp/app/templates/text-area-editor.pt'
--- lib/lp/app/templates/text-area-editor.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/app/templates/text-area-editor.pt	2011-01-30 20:24:55 +0000
@@ -0,0 +1,40 @@
+<div tal:attributes="id view/content_box_id;
+                     class view/tag_class">
+  <div class="clearfix">
+    <div class="edit-controls" tal:condition="view/can_write">
+      &nbsp;
+      <a tal:attributes="href view/edit_url"
+         class="yui3-editable_text-trigger sprite edit"></a>
+    </div>
+    <h2 tal:condition="view/title"
+        tal:content="view/title">the title</h2>
+  </div>
+  <div class="yui3-editable_text-text"
+       tal:content="structure view/value">some text</div>
+<script tal:condition="view/can_write"
+        tal:content="structure string:
+        LPS.use('lazr.editor', 'lp.client.plugins', function (Y) {
+            var widget = new Y.EditableText({
+                contentBox: ${view/widget_css_selector},
+                accept_empty: ${view/accept_empty},
+                multiline: true,
+                buttons: 'top'
+            });
+            widget.editor.plug({
+                fn: Y.lp.client.plugins.PATCHPlugin, cfg: {
+                  patch: ${view/json_attribute},
+                  resource: ${view/json_attribute_uri},
+                  patch_field: true,
+                  accept: 'application/xhtml+xml'
+            }});
+            if (!Y.UA.opera) {
+                widget.render();
+            }
+            var lpns = Y.namespace('lp');
+            if (!lpns.widgets) {
+                lpns.widgets = {};
+            }
+            lpns.widgets['${view/content_box_id}'] = widget;
+        });
+"/>
+</div>

=== added file 'lib/lp/app/templates/text-line-editor.pt'
--- lib/lp/app/templates/text-line-editor.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/app/templates/text-line-editor.pt	2011-01-30 20:24:55 +0000
@@ -0,0 +1,25 @@
+<tal:open-tag replace="structure view/open_tag"/><span
+  class="yui3-editable_text-text"><tal:text replace="view/value"/></span>
+  <a tal:condition="view/can_write"
+     tal:attributes="href view/edit_url"
+     class="yui3-editable_text-trigger sprite edit"></a>
+<tal:close-tag replace="structure view/close_tag"/>
+
+<script tal:condition="view/can_write"
+        tal:content="structure string:
+        LPS.use('lazr.editor', 'lp.client.plugins', function (Y) {
+            var widget = new Y.EditableText({
+                contentBox: ${view/widget_css_selector},
+                accept_empty: ${view/accept_empty},
+                width: ${view/width},
+                initial_value_override: ${view/initial_value_override}
+                });
+            widget.editor.plug({
+                fn: Y.lp.client.plugins.PATCHPlugin, cfg: {
+                  patch: ${view/json_attribute},
+                  resource: ${view/json_attribute_uri},
+                  patch_field: true
+                  }});
+            widget.render();
+        });
+"/>

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2011-01-18 20:29:21 +0000
+++ lib/lp/bugs/browser/bugtask.py	2011-01-30 20:24:55 +0000
@@ -163,11 +163,6 @@
 from canonical.lazr.interfaces import IObjectPrivacy
 from canonical.lazr.utils import smartquote
 from canonical.widgets.itemswidgets import LabeledMultiCheckBoxWidget
-from canonical.widgets.lazrjs import (
-    TextAreaEditorWidget,
-    TextLineEditorWidget,
-    vocabulary_to_choice_edit_items,
-    )
 from canonical.widgets.project import ProjectScopeWidget
 from lp.answers.interfaces.questiontarget import IQuestionTarget
 from lp.app.browser.launchpadform import (
@@ -176,8 +171,12 @@
     LaunchpadEditFormView,
     LaunchpadFormView,
     )
+from lp.app.browser.lazrjs import (
+    TextAreaEditorWidget,
+    TextLineEditorWidget,
+    vocabulary_to_choice_edit_items,
+    )
 from lp.app.browser.tales import (
-    FormattersAPI,
     ObjectImageDisplayAPI,
     PersonFormatterAPI,
     )
@@ -679,8 +678,8 @@
                 canonical_url(self.context.bug.default_bugtask))
 
         self.bug_title_edit_widget = TextLineEditorWidget(
-            bug, 'title', canonical_url(self.context, view_name='+edit'),
-            id="bug-title", title="Edit this summary")
+            bug, IBug['title'], "Edit this summary", 'h1',
+            edit_url=canonical_url(self.context, view_name='+edit'))
 
         # XXX 2010-10-05 gmb bug=655597:
         #     This line of code keeps the view's query count down,
@@ -1035,16 +1034,12 @@
     @property
     def bug_description_html(self):
         """The bug's description as HTML."""
-        formatter = FormattersAPI
-        hide_email = formatter(self.context.bug.description).obfuscate_email()
-        description = formatter(hide_email).text_to_html()
+        bug = self.context.bug
+        description = IBug['description']
+        title = "Bug Description"
+        edit_url = canonical_url(self.context, view_name='+edit')
         return TextAreaEditorWidget(
-            self.context.bug,
-            'description',
-            canonical_url(self.context, view_name='+edit'),
-            id="edit-description",
-            title="Bug Description",
-            value=description)
+            bug, description, title, edit_url=edit_url)
 
     @property
     def bug_heat_html(self):

=== modified file 'lib/lp/bugs/templates/bugtask-index.pt'
--- lib/lp/bugs/templates/bugtask-index.pt	2010-12-21 15:07:26 +0000
+++ lib/lp/bugs/templates/bugtask-index.pt	2011-01-30 20:24:55 +0000
@@ -103,9 +103,7 @@
         <tal:description
             define="global description context/bug/description/fmt:obfuscate-email/fmt:text-to-html" />
 
-        <div id="edit-description" class="lazr-multiline-edit"
-          tal:content="structure view/bug_description_html"
-          />
+        <tal:widget replace="structure view/bug_description_html"/>
 
         <div style="margin:-20px 0 20px 5px" class="clearfix">
           <span tal:condition="view/wasDescriptionModified" class="discreet"

=== modified file 'lib/lp/bugs/windmill/tests/test_mark_duplicate.py'
--- lib/lp/bugs/windmill/tests/test_mark_duplicate.py	2010-11-23 14:18:07 +0000
+++ lib/lp/bugs/windmill/tests/test_mark_duplicate.py	2011-01-30 20:24:55 +0000
@@ -115,7 +115,7 @@
         client.click(link=u'bug #1')
         client.waits.forPageLoad(timeout=constants.PAGE_LOAD)
         client.waits.forElement(
-            id=u'bug-title', timeout=constants.FOR_ELEMENT)
+            id=u'edit-title', timeout=constants.FOR_ELEMENT)
 
         # Make sure all js loads are complete before trying the next test.
         client.waits.forElement(

=== modified file 'lib/lp/code/browser/branch.py'
--- lib/lp/code/browser/branch.py	2011-01-28 02:16:33 +0000
+++ lib/lp/code/browser/branch.py	2011-01-30 20:24:55 +0000
@@ -100,13 +100,13 @@
 from canonical.lazr.utils import smartquote
 from canonical.widgets.suggestion import TargetBranchWidget
 from canonical.widgets.itemswidgets import LaunchpadRadioWidgetWithDescription
-from canonical.widgets.lazrjs import vocabulary_to_choice_edit_items
 from lp.app.browser.launchpadform import (
     action,
     custom_widget,
     LaunchpadEditFormView,
     LaunchpadFormView,
     )
+from lp.app.browser.lazrjs import vocabulary_to_choice_edit_items
 from lp.app.errors import NotFoundError
 from lp.blueprints.interfaces.specificationbranch import ISpecificationBranch
 from lp.bugs.interfaces.bug import IBugSet

=== modified file 'lib/lp/code/browser/branchmergeproposal.py'
--- lib/lp/code/browser/branchmergeproposal.py	2011-01-18 20:49:35 +0000
+++ lib/lp/code/browser/branchmergeproposal.py	2011-01-30 20:24:55 +0000
@@ -87,12 +87,11 @@
     LaunchpadEditFormView,
     LaunchpadFormView,
    )
-from lp.app.browser.tales import DateTimeFormatterAPI
-from canonical.widgets.lazrjs import (
+from lp.app.browser.lazrjs import (
     TextAreaEditorWidget,
     vocabulary_to_choice_edit_items,
     )
-from lp.app.browser.stringformatter import FormattersAPI
+from lp.app.browser.tales import DateTimeFormatterAPI
 from lp.code.adapters.branch import BranchMergeProposalDelta
 from lp.code.browser.codereviewcomment import CodeReviewDisplayComment
 from lp.code.browser.decorations import (
@@ -691,40 +690,36 @@
                 for bug in self.context.related_bugs]
 
     @property
+    def edit_description_link_class(self):
+        if self.context.description:
+            return "unseen"
+        else:
+            return ""
+
+    @property
     def description_html(self):
         """The description as widget HTML."""
-        description = self.context.description
-        if description is None:
-            description = ''
-        formatter = FormattersAPI
-        hide_email = formatter(description).obfuscate_email()
-        description = formatter(hide_email).text_to_html()
+        mp = self.context
+        description = IBranchMergeProposal['description']
+        title = "Description of the Change"
         return TextAreaEditorWidget(
-            self.context,
-            'description',
-            canonical_url(self.context, view_name='+edit-description'),
-            id="edit-description",
-            title="Description of the Change",
-            value=description,
-            accept_empty=True)
+            mp, description, title, edit_view='+edit-description')
+
+    @property
+    def edit_commit_message_link_class(self):
+        if self.context.commit_message:
+            return "unseen"
+        else:
+            return ""
 
     @property
     def commit_message_html(self):
         """The commit message as widget HTML."""
-        commit_message = self.context.commit_message
-        if commit_message is None:
-            commit_message = ''
-        formatter = FormattersAPI
-        hide_email = formatter(commit_message).obfuscate_email()
-        commit_message = formatter(hide_email).text_to_html()
+        mp = self.context
+        commit_message = IBranchMergeProposal['commit_message']
+        title = "Commit Message"
         return TextAreaEditorWidget(
-            self.context,
-            'commit_message',
-            canonical_url(self.context, view_name='+edit-commit-message'),
-            id="edit-commit_message",
-            title="Commit Message",
-            value=commit_message,
-            accept_empty=True)
+            mp, commit_message, title, edit_view='+edit-commit-message')
 
     @property
     def status_config(self):

=== modified file 'lib/lp/code/browser/sourcepackagerecipe.py'
--- lib/lp/code/browser/sourcepackagerecipe.py	2011-01-20 20:50:45 +0000
+++ lib/lp/code/browser/sourcepackagerecipe.py	2011-01-30 20:24:55 +0000
@@ -62,7 +62,6 @@
     LabeledMultiCheckBoxWidget,
     LaunchpadRadioWidget,
     )
-from canonical.widgets.lazrjs import InlineEditPickerWidget
 from canonical.widgets.suggestion import RecipeOwnerWidget
 from lp.app.browser.launchpadform import (
     action,
@@ -72,9 +71,8 @@
     LaunchpadFormView,
     render_radio_widget_part,
     )
-from lp.app.browser.tales import (
-    format_link,
-    )
+from lp.app.browser.lazrjs import InlineEditPickerWidget
+from lp.app.browser.tales import format_link
 from lp.code.errors import (
     BuildAlreadyPending,
     NoSuchBranch,
@@ -235,9 +233,8 @@
     @property
     def person_picker(self):
         return InlineEditPickerWidget(
-            self.context, self.request, ISourcePackageRecipe['owner'],
+            self.context, ISourcePackageRecipe['owner'],
             format_link(self.context.owner),
-            content_box_id='recipe-owner',
             header='Change owner',
             step_title='Select a new owner')
 
@@ -248,11 +245,9 @@
             initial_html = 'None'
         else:
             initial_html = format_link(ppa)
+        field = ISourcePackageEditSchema['daily_build_archive']
         return InlineEditPickerWidget(
-            self.context, self.request,
-            ISourcePackageAddSchema['daily_build_archive'],
-            initial_html,
-            content_box_id='recipe-ppa',
+            self.context, field, initial_html,
             header='Change daily build archive',
             step_title='Select a PPA')
 

=== modified file 'lib/lp/code/templates/branchmergeproposal-index.pt'
--- lib/lp/code/templates/branchmergeproposal-index.pt	2010-10-10 21:54:16 +0000
+++ lib/lp/code/templates/branchmergeproposal-index.pt	2011-01-30 20:24:55 +0000
@@ -95,45 +95,23 @@
   </div>
 
   <div id="commit-message" class="yui-g">
-  <tal:no-commit-message condition="not: context/commit_message">
-    <div tal:define="link menu/set_commit_message"
-         tal:condition="link/enabled"
-         tal:content="structure link/render">
-      Set commit message
-    </div>
-    <div id="edit-commit_message" class="lazr-multiline-edit unseen"
-         tal:content="structure view/commit_message_html"/>
-  </tal:no-commit-message>
-  <tal:has-commit-message condition="context/commit_message">
-    <div tal:define="link menu/set_commit_message"
-         tal:condition="link/enabled"
-         tal:content="structure link/render" class="unseen">
-      Set commit message
-    </div>
-    <div id="edit-commit_message" class="lazr-multiline-edit"
-         tal:content="structure view/commit_message_html"/>
-  </tal:has-commit-message>
+    <div tal:define="link menu/set_commit_message"
+         tal:condition="link/enabled"
+         tal:content="structure link/render"
+         tal:attributes="class view/edit_commit_message_link_class">
+      Set commit message
+    </div>
+    <tal:widget replace="structure view/commit_message_html"/>
   </div>
 
   <div id="description" class="yui-g">
-  <tal:no-description condition="not: context/description">
-    <div tal:define="link menu/set_description"
-         tal:condition="link/enabled"
-         tal:content="structure link/render">
-      Set description
-    </div>
-    <div id="edit-description" class="lazr-multiline-edit unseen"
-         tal:content="structure view/description_html"/>
-  </tal:no-description>
-  <tal:has-description condition="context/description">
-    <div tal:define="link menu/set_description"
-         tal:condition="link/enabled"
-         tal:content="structure link/render" class="unseen">
-      Set description
-    </div>
-    <div id="edit-description" class="lazr-multiline-edit"
-         tal:content="structure view/description_html"/>
-  </tal:has-description>
+    <div tal:define="link menu/set_description"
+         tal:condition="link/enabled"
+         tal:content="structure link/render"
+         tal:attributes="class view/edit_description_link_class">
+      Set description
+    </div>
+    <tal:widget replace="structure view/description_html"/>
   </div>
 
   <div class="yui-g" tal:condition="view/has_bug_or_spec">

=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2011-01-20 21:41:13 +0000
+++ lib/lp/registry/browser/product.py	2011-01-30 20:24:55 +0000
@@ -122,7 +122,6 @@
     CheckBoxMatrixWidget,
     LaunchpadRadioWidget,
     )
-from canonical.widgets.lazrjs import TextLineEditorWidget
 from canonical.widgets.popup import PersonPickerWidget
 from canonical.widgets.product import (
     GhostWidget,
@@ -143,6 +142,7 @@
     ReturnToReferrerMixin,
     safe_action,
     )
+from lp.app.browser.lazrjs import TextLineEditorWidget
 from lp.app.browser.tales import MenuAPI
 from lp.app.enums import ServiceUsage
 from lp.app.errors import NotFoundError
@@ -988,25 +988,21 @@
 
     def initialize(self):
         self.status_message = None
+        product = self.context
+        title_field = IProduct['title']
+        title = "Edit this title"
         self.title_edit_widget = TextLineEditorWidget(
-            self.context, 'title',
-            canonical_url(self.context, view_name='+edit'),
-            id="product-title", title="Edit this title")
+            product, title_field, title, 'h1')
+        programming_lang = IProduct['programminglang']
+        title = 'Edit programming languages'
+        additional_arguments = {'width': '9em'}
         if self.context.programminglang is None:
-            additional_arguments = dict(
+            additional_arguments.update(dict(
                 default_text='Not yet specified',
                 initial_value_override='',
-                )
-        else:
-            additional_arguments = {}
+                ))
         self.languages_edit_widget = TextLineEditorWidget(
-            self.context, 'programminglang',
-            canonical_url(self.context, view_name='+edit'),
-            id='programminglang', title='Edit programming languages',
-            tag='span', public_attribute='programming_language',
-            accept_empty=True,
-            width='9em',
-            **additional_arguments)
+            product, programming_lang, title, 'span', **additional_arguments)
         self.show_programming_languages = bool(
             self.context.programminglang or
             check_permission('launchpad.Edit', self.context))

=== modified file 'lib/lp/registry/windmill/tests/test_product.py'
--- lib/lp/registry/windmill/tests/test_product.py	2010-10-18 12:56:47 +0000
+++ lib/lp/registry/windmill/tests/test_product.py	2011-01-30 20:24:55 +0000
@@ -24,7 +24,7 @@
     def test_title_inline_edit(self):
         test = widgets.InlineEditorWidgetTest(
             url='%s/firefox' % RegistryWindmillLayer.base_url,
-            widget_id='product-title',
+            widget_id='edit-title',
             expected_value='Mozilla Firefox',
             new_value='The awesome Mozilla Firefox',
             name='test_title_inline_edit',
@@ -35,7 +35,7 @@
     def test_programming_languages_edit(self):
         test = widgets.InlineEditorWidgetTest(
             url='%s/firefox' % RegistryWindmillLayer.base_url,
-            widget_id='programminglang',
+            widget_id='edit-programminglang',
             widget_tag='span',
             expected_value='Not yet specified',
             new_value='C++',

=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2011-01-29 07:41:50 +0000
+++ lib/lp/soyuz/browser/archive.py	2011-01-30 20:24:55 +0000
@@ -87,10 +87,6 @@
     LaunchpadDropdownWidget,
     LaunchpadRadioWidget,
     )
-from canonical.widgets.lazrjs import (
-    TextAreaEditorWidget,
-    TextLineEditorWidget,
-    )
 from canonical.widgets.textwidgets import StrippedTextWidget
 from lp.app.browser.launchpadform import (
     action,
@@ -98,6 +94,10 @@
     LaunchpadEditFormView,
     LaunchpadFormView,
     )
+from lp.app.browser.lazrjs import (
+    TextAreaEditorWidget,
+    TextLineEditorWidget,
+    )
 from lp.app.browser.stringformatter import FormattersAPI
 from lp.app.errors import NotFoundError
 from lp.buildmaster.enums import BuildStatus
@@ -863,11 +863,9 @@
 
     @property
     def displayname_edit_widget(self):
-        widget = TextLineEditorWidget(
-            self.context, 'displayname',
-            canonical_url(self.context, view_name='+edit'),
-            id="displayname", title="Edit the displayname")
-        return widget
+        display_name = IArchive['displayname']
+        title = "Edit the displayname"
+        return TextLineEditorWidget(self.context, display_name, title, 'h1')
 
     @property
     def sources_list_entries(self):
@@ -897,25 +895,17 @@
     @property
     def archive_description_html(self):
         """The archive's description as HTML."""
-        formatter = FormattersAPI
-
-        description = self.context.description
-        if description is not None:
-            description = formatter(description).obfuscate_email()
-        else:
-            description = ''
-
+        linkify_text = True
         if self.context.is_ppa:
-            description = formatter(description).text_to_html(
-                linkify_text=(not self.context.owner.is_probationary))
-
+            linkify_text = not self.context.owner.is_probationary
+        archive = self.context
+        description = IArchive['description']
+        title = self.archive_label + " description"
+        # Don't hide empty archive descriptions.  Even though the interface
+        # says they are required, the model doesn't.
         return TextAreaEditorWidget(
-            self.context,
-            'description',
-            canonical_url(self.context, view_name='+edit'),
-            id="edit-description",
-            title=self.archive_label + " description",
-            value=description)
+            archive, description, title, hide_empty=False,
+            linkify_text=linkify_text)
 
     @cachedproperty
     def latest_updates(self):

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-distribution-archives.txt'
--- lib/lp/soyuz/stories/soyuz/xx-distribution-archives.txt	2010-10-17 15:44:08 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-distribution-archives.txt	2011-01-30 20:24:55 +0000
@@ -199,8 +199,9 @@
     Copy archive disabled-security-rebuild for No Privileges Person : Ubuntu
 
     >>> main_content = find_main_content(nopriv_browser.contents)
-    >>> print main_content.h1
-    <h1 id="displayname">...</h1>
+    >>> print main_content.h1['class']
+    Traceback (most recent call last):
+    KeyError: 'class'
 
     >>> print first_tag_by_class(nopriv_browser.contents, 'warning message')
     None

=== modified file 'lib/lp/soyuz/templates/archive-index.pt'
--- lib/lp/soyuz/templates/archive-index.pt	2010-11-10 15:33:47 +0000
+++ lib/lp/soyuz/templates/archive-index.pt	2011-01-30 20:24:55 +0000
@@ -31,9 +31,7 @@
         This archive has been disabled.
       </p>
 
-      <div id="edit-description" class="lazr-multiline-edit"
-        tal:content="structure view/archive_description_html"
-        />
+      <tal:widget replace="structure view/archive_description_html"/>
     </div>
 
     <tal:ppa-upload-hint condition="context/is_ppa">

=== modified file 'lib/lp/soyuz/windmill/tests/test_ppainlineedit.py'
--- lib/lp/soyuz/windmill/tests/test_ppainlineedit.py	2010-10-18 12:56:47 +0000
+++ lib/lp/soyuz/windmill/tests/test_ppainlineedit.py	2011-01-30 20:24:55 +0000
@@ -20,7 +20,7 @@
 
         ppa_displayname_inline_edit_test = widgets.InlineEditorWidgetTest(
             url='%s/~cprov/+archive/ppa' % SoyuzWindmillLayer.base_url,
-            widget_id='displayname',
+            widget_id='edit-displayname',
             expected_value='PPA for Celso Providelo',
             new_value="Celso's default PPA",
             name='test_ppa_displayname_inline_edit',

=== modified file 'lib/lp/translations/browser/hastranslationimports.py'
--- lib/lp/translations/browser/hastranslationimports.py	2010-11-23 23:22:27 +0000
+++ lib/lp/translations/browser/hastranslationimports.py	2011-01-30 20:24:55 +0000
@@ -29,13 +29,13 @@
 from canonical.launchpad.webapp.authorization import check_permission
 from canonical.launchpad.webapp.batching import TableBatchNavigator
 from canonical.launchpad.webapp.vocabulary import ForgivingSimpleVocabulary
-from canonical.widgets.lazrjs import vocabulary_to_choice_edit_items
 from lp.app.browser.launchpadform import (
     action,
     custom_widget,
     LaunchpadFormView,
     safe_action,
     )
+from lp.app.browser.lazrjs import vocabulary_to_choice_edit_items
 from lp.app.errors import UnexpectedFormData
 from lp.registry.interfaces.distribution import IDistribution
 from lp.registry.interfaces.pillar import IPillarNameSet