Merge lp:~sinzui/launchpad/answers-ui-fixes into lp:launchpad

[Curtis Hovey]

[Curtis Hovey (sinzui)]

This is my branch to fix faq and question 3.0 bugs.

    lp:~sinzui/launchpad/faqs-ui-fixes
    Diff size: 562
    Launchpad bug: https://bugs.launchpad.net/bugs/435743
                   https://bugs.launchpad.net/bugs/435973
                   https://bugs.launchpad.net/bugs/434715
    Test command: /bin/test -vvc -t answers.*(browser|stories)
    Pre-implementation: no one
    Target release: 3.1.11

= Convert faq layouts to 3.0 =

Bug 435743 [Bread crumb missing for question and FAQ]
    The last segment of the breadcrumb is missing.

Bug 435973 [FAQ page headings are too verbose]
    The heading should be the FAQ title, but it contains the project and
    id that is expected to appear in the breadcrumbs

Bug 434715 [Button for asking a question is labeled "Add"]
    Change the action from Add to Post Question,

== Rules ==

Bug 435743 [Bread crumb missing for question and FAQ]
    * The FAQ is missing a Breadcrumb adapter; add one:
      FAQ #1234

Bug 435973 [FAQ page headings are too verbose]
    * The heading should be the FAQ title, no more.

Bug 434715 [Button for asking a question is labeled "Add"]
    Change the action from Add to Post Question.

== QA ==

Bug 435743 [Bread crumb missing for question and FAQ]
    Visit an FAQ and verify the breadcrumbs are:
    <project> : questions : faqs : FAQ #<id>

Bug 435973 [FAQ page headings are too verbose]
    Visit an FAQ and verify that the FAQ title is the entire heading

Bug 434715 [Button for asking a question is labeled "Add"]
    Verify the action to create a question is Post Question,

== Lint ==

Linting changed files:
  lib/lp/answers/browser/configure.zcml
  lib/lp/answers/browser/faq.py
  lib/lp/answers/browser/question.py
  lib/lp/answers/browser/tests/test_breadcrumbs.py
  lib/lp/answers/stories/faq-add.txt
  lib/lp/answers/stories/faq-browse-and-search.txt
  lib/lp/answers/stories/faq-edit.txt
  lib/lp/answers/stories/project-add-question.txt
  lib/lp/answers/stories/question-add-in-other-languages.txt
  lib/lp/answers/stories/question-add.txt
  lib/lp/answers/stories/question-answer-contact.txt
  lib/lp/answers/stories/question-browse-and-search.txt
  lib/lp/answers/stories/question-message.txt
  lib/lp/answers/stories/question-obfuscation.txt
  lib/lp/answers/stories/question-overview.txt
  lib/lp/answers/stories/this-is-a-faq.txt

== Test ==

    * lib/lp/answers/browser/tests/test_breadcrumbs.py
      * Added tests for FAQ and Question Breadcrumbs
    * lib/lp/answers/stories/faq-add.txt
      * Updated tests to verify FAQ titles.
    * lib/lp/answers/stories/faq-browse-and-search.txt
      * Updated tests to verify FAQ titles.
    * lib/lp/answers/stories/faq-edit.txt
      * Updated tests to verify FAQ titles.
    * lib/lp/answers/stories/project-add-question.txt
      * Updated tests to verify the create action is Post Question.
      * Updated tests to verify Question titles.
    * lib/lp/answers/stories/question-add-in-other-languages.txt
      * Updated tests to verify the create action is Post Question.
      * Updated tests to verify Question titles.
    * lib/lp/answers/stories/question-add.txt
      * Updated tests to verify the create action is Post Qu...

[Henning Eggers (henninge)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Am 01.11.2009 06:30, Curtis Hovey schrieb:
> Curtis Hovey has proposed merging lp:~sinzui/launchpad/answers-ui-fixes into lp:launchpad/devel.
> This is my branch to fix faq and question 3.0 bugs.

Wonderful! Thank you for doing this, including the tedious work of
fixing all tests. Thank you. I am just curious, why you changed some
page title tests to leave out the greater context, like this:

> - Questions : Ubuntu
> + Question #11 : ...

since you did this in other places:

> - Questions : Ubuntu
> + FAQ #4 : Questions : Ubuntu

No big deal, but it actually seems more work to me to remove the context
and I just wonder if you did it consciously.

One more thing:

> === modified file 'lib/lp/answers/browser/tests/test_breadcrumbs.py'
> --- lib/lp/answers/browser/tests/test_breadcrumbs.py 2009-09-22 18:45:02 +0000
> +++ lib/lp/answers/browser/tests/test_breadcrumbs.py 2009-11-01 05:30:29 +0000
> @@ -9,6 +9,8 @@
> from canonical.launchpad.webapp.tests.breadcrumbs import (
> BaseBreadcrumbTestCase)
>
> +from lp.testing import login_person
> +
>
> class TestQuestionTargetProjectAndPersonBreadcrumbOnAnswersVHost(
> BaseBreadcrumbTestCase):
> @@ -55,5 +57,31 @@
> self.assertEquals(last_crumb.text, 'Questions')
>
>
> +class TestAnswersBreadcrumb(BaseBreadcrumbTestCase):
> + """Test Breadcrumbs for answer module objects."""
> +
> + def setUp(self):
> + super(TestAnswersBreadcrumb, self).setUp()
> + self.product = self.factory.makeProduct(name="mellon")
> + login_person(self.product.owner)
> + self.question = self.factory.makeQuestion(
> + target=self.product, title='Seeds are hard to chew')
> + self.question_url = canonical_url(self.question, rootsite='answers')

self.question and self.question_url are not needed in all tests, are
they? I think they should be local to test_question.

> + self.faq = self.factory.makeFAQ(target=self.product, title='Seedless')
> + self.faq_url = canonical_url(self.faq, rootsite='answers')

Same goes for self.faq and self.faq_url

> +
> + def test_question(self):

question = ...
question_url = ...

(You get my point ... ;-)

> + crumbs = self._getBreadcrumbs(
> + self.question_url, [self.root, self.product, self.question])
> + last_crumb = crumbs[-1]
> + self.assertEquals(last_crumb.text, 'Question #%d' % self.question.id)
> +
> + def test_faq(self):
> + crumbs = self._getBreadcrumbs(
> + self.faq_url, [self.root, self.product, self.faq])
> + last_crumb = crumbs[-1]
> + self.assertEquals(last_crumb.text, 'FAQ #%d' % self.faq.id)
> +
> +
> def test_suite():
> return unittest.TestLoader().loadTestsFromName(__name__)

 review approve code
 merge approved

Cheers,
Henning
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkrux6QACgkQBT3oW1L17iiQQwCg3MatFcXV44ulMsjsmf10Ihwx
AfsAoMHKgRGxivRfTfQij6B397j4/uIR
=dWuq
-----END PGP SIGNATURE-----

review: Approve (code)

[Curtis Hovey (sinzui)]

On Mon, 2009-11-02 at 11:51 +0000, Henning Eggers wrote:
> Review: Approve code
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Am 01.11.2009 06:30, Curtis Hovey schrieb:
> > Curtis Hovey has proposed merging lp:~sinzui/launchpad/answers-ui-fixes into lp:launchpad/devel.
> > This is my branch to fix faq and question 3.0 bugs.
>
> Wonderful! Thank you for doing this, including the tedious work of
> fixing all tests. Thank you. I am just curious, why you changed some
> page title tests to leave out the greater context, like this:
>
> > - Questions : Ubuntu
> > + Question #11 : ...
>
> since you did this in other places:
>
> > - Questions : Ubuntu
> > + FAQ #4 : Questions : Ubuntu
>
> No big deal, but it actually seems more work to me to remove the context
> and I just wonder if you did it consciously.

I wanted to know all "add question" or "retarget question" titles
because the pillar is not always the same as it was.

I ellipsised the other titles that user is viewing because the
breadcrumb/title rules are well tested. These will not break if a
retargeting test is inserted.

> One more thing:
>
> > === modified file 'lib/lp/answers/browser/tests/test_breadcrumbs.py'
> > --- lib/lp/answers/browser/tests/test_breadcrumbs.py 2009-09-22 18:45:02 +0000
> > +++ lib/lp/answers/browser/tests/test_breadcrumbs.py 2009-11-01 05:30:29 +0000
...
> > +class TestAnswersBreadcrumb(BaseBreadcrumbTestCase):
> > + """Test Breadcrumbs for answer module objects."""
> > +
> > + def setUp(self):
> > + super(TestAnswersBreadcrumb, self).setUp()
> > + self.product = self.factory.makeProduct(name="mellon")
> > + login_person(self.product.owner)
> > + self.question = self.factory.makeQuestion(
> > + target=self.product, title='Seeds are hard to chew')
> > + self.question_url = canonical_url(self.question, rootsite='answers')
>
> self.question and self.question_url are not needed in all tests, are
> they? I think they should be local to test_question.

I moved them.

--
__Curtis C. Hovey_________
http://launchpad.net/

=== modified file 'lib/lp/answers/browser/configure.zcml'
--- lib/lp/answers/browser/configure.zcml	2009-09-18 20:03:54 +0000
+++ lib/lp/answers/browser/configure.zcml	2009-11-07 04:51:13 +0000
@@ -136,6 +136,12 @@
     rootsite="answers"
     />
 
+  <adapter
+    provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
+    for="lp.answers.interfaces.question.IQuestion"
+    factory="lp.answers.browser.question.QuestionBreadcrumb"
+    permission="zope.Public"/>
+
   <browser:pages
     for="lp.answers.interfaces.question.IQuestion"
     permission="zope.Public"
@@ -343,6 +349,11 @@
     permission="launchpad.Edit"
     template="../../app/templates/generic-edit.pt"
     />
+  <adapter
+    provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
+    for="lp.answers.interfaces.faq.IFAQ"
+    factory="lp.answers.browser.faq.FAQBreadcrumb"
+    permission="zope.Public"/>
 
   <browser:defaultView
     for="canonical.launchpad.interfaces.IPerson"

=== modified file 'lib/lp/answers/browser/faq.py'
--- lib/lp/answers/browser/faq.py	2009-09-18 20:03:54 +0000
+++ lib/lp/answers/browser/faq.py	2009-11-07 04:51:13 +0000
@@ -6,6 +6,7 @@
 __metaclass__ = type
 
 __all__ = [
+    'FAQBreadcrumb',
     'FAQNavigationMenu',
     'FAQEditView',
     'FAQView',
@@ -15,6 +16,7 @@
 from canonical.launchpad.webapp import (
     action, NavigationMenu, canonical_url, enabled_with_permission,
     LaunchpadView, LaunchpadEditFormView, Link)
+from canonical.launchpad.webapp.breadcrumb import Breadcrumb
 
 from lp.answers.browser.faqcollection import FAQCollectionMenu
 from lp.answers.interfaces.faq import IFAQ
@@ -44,19 +46,22 @@
         return Link(url, 'List all FAQs', icon='info')
 
 
+class FAQBreadcrumb(Breadcrumb):
+    """Builds a breadcrumb for an `IFAQ`."""
+
+    @property
+    def text(self):
+        return 'FAQ #%d' % self.context.id
+
+
 class FAQView(LaunchpadView):
     """View for the FAQ index."""
 
     __used_for__ = IFAQ
 
     @property
-    def page_title(self):
-        return '%s FAQ #%d: "%s"' % (
-            self.context.target.displayname,
-            self.context.id,
-            self.context.title)
-
-    label = page_title
+    def label(self):
+        return self.context.title
 
 
 class FAQEditView(LaunchpadEditFormView):

=== modified file 'lib/lp/answers/browser/question.py'
--- lib/lp/answers/browser/question.py	2009-10-05 15:32:50 +0000
+++ lib/lp/answers/browser/question.py	2009-11-07 04:51:13 +0000
@@ -8,6 +8,7 @@
 __all__ = [
     'SearchAllQuestionsView',
     'QuestionAddView',
+    'QuestionBreadcrumb',
     'QuestionChangeStatusView',
     'QuestionConfirmAnswerView',
     'QuestionCreateFAQView',
@@ -65,6 +66,7 @@
     LaunchpadFormView, LaunchpadEditFormView, custom_widget, redirection,
     safe_action, NavigationMenu)
 from canonical.launchpad.webapp.authorization import check_permission
+from canonical.launchpad.webapp.breadcrumb import Breadcrumb
 from canonical.launchpad.webapp.interfaces import IAlwaysSubmittedWidget
 from canonical.launchpad.webapp.menu import structured
 from canonical.widgets import LaunchpadRadioWidget, TokensTextWidget
@@ -191,6 +193,14 @@
         return redirection(canonical_url(question), status=301)
 
 
+class QuestionBreadcrumb(Breadcrumb):
+    """Builds a breadcrumb for an `IQuestion`."""
+
+    @property
+    def text(self):
+        return 'Question #%d' % self.context.id
+
+
 class QuestionSetView(LaunchpadFormView):
     """View for the Answer Tracker index page."""
 
@@ -592,10 +602,7 @@
             return self.search_template()
         return self.continue_action.success(data)
 
-    # XXX flacoste 2006-07-26: We use the method here instead of
-    # using the method name 'handleAddError' because of Zope issue 573
-    # which is fixed in 3.3.0b1 and 3.2.1
-    @action(_('Add'), failure=handleAddError)
+    @action(_('Post Question'), name='add', failure='handleAddError')
     def add_action(self, action, data):
         """Add a Question to an `IQuestionTarget`."""
         if self.shouldWarnAboutUnsupportedLanguage():

=== modified file 'lib/lp/answers/browser/tests/test_breadcrumbs.py'
--- lib/lp/answers/browser/tests/test_breadcrumbs.py	2009-09-22 18:45:02 +0000
+++ lib/lp/answers/browser/tests/test_breadcrumbs.py	2009-11-07 04:51:13 +0000
@@ -9,6 +9,8 @@
 from canonical.launchpad.webapp.tests.breadcrumbs import (
     BaseBreadcrumbTestCase)
 
+from lp.testing import login_person
+
 
 class TestQuestionTargetProjectAndPersonBreadcrumbOnAnswersVHost(
         BaseBreadcrumbTestCase):
@@ -55,5 +57,31 @@
         self.assertEquals(last_crumb.text, 'Questions')
 
 
+class TestAnswersBreadcrumb(BaseBreadcrumbTestCase):
+    """Test Breadcrumbs for answer module objects."""
+
+    def setUp(self):
+        super(TestAnswersBreadcrumb, self).setUp()
+        self.product = self.factory.makeProduct(name="mellon")
+        login_person(self.product.owner)
+
+    def test_question(self):
+        self.question = self.factory.makeQuestion(
+            target=self.product, title='Seeds are hard to chew')
+        self.question_url = canonical_url(self.question, rootsite='answers')
+        crumbs = self._getBreadcrumbs(
+            self.question_url, [self.root, self.product, self.question])
+        last_crumb = crumbs[-1]
+        self.assertEquals(last_crumb.text, 'Question #%d' % self.question.id)
+
+    def test_faq(self):
+        self.faq = self.factory.makeFAQ(target=self.product, title='Seedless')
+        self.faq_url = canonical_url(self.faq, rootsite='answers')
+        crumbs = self._getBreadcrumbs(
+            self.faq_url, [self.root, self.product, self.faq])
+        last_crumb = crumbs[-1]
+        self.assertEquals(last_crumb.text, 'FAQ #%d' % self.faq.id)
+
+
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/answers/stories/faq-add.txt'
--- lib/lp/answers/stories/faq-add.txt	2009-09-23 14:40:53 +0000
+++ lib/lp/answers/stories/faq-add.txt	2009-11-07 04:51:13 +0000
@@ -67,7 +67,7 @@
     >>> owner_browser.url
     'http://answers.launchpad.dev/firefox/+faq/...'
     >>> print owner_browser.title
-    Questions : Mozilla Firefox
+    FAQ #12 : Questions : Mozilla Firefox
 
     >>> content = find_main_content(owner_browser.contents)
     >>> extract_text(content.find('div', {'id' : 'faq-keywords'}))

=== modified file 'lib/lp/answers/stories/faq-browse-and-search.txt'
--- lib/lp/answers/stories/faq-browse-and-search.txt	2009-09-23 14:40:53 +0000
+++ lib/lp/answers/stories/faq-browse-and-search.txt	2009-11-07 04:51:13 +0000
@@ -70,7 +70,7 @@
 
     >>> browser.getLink('How can I play MP3/Divx').click()
     >>> print backslashreplace(browser.title)
-    Questions : Ubuntu
+    FAQ #6 : Questions : Ubuntu
     >>> print browser.url
     http://answers.launchpad.dev/ubuntu/+faq/6
 

=== modified file 'lib/lp/answers/stories/faq-edit.txt'
--- lib/lp/answers/stories/faq-edit.txt	2009-09-23 14:40:53 +0000
+++ lib/lp/answers/stories/faq-edit.txt	2009-11-07 04:51:12 +0000
@@ -11,7 +11,7 @@
     >>> from canonical.launchpad.helpers import backslashreplace
     >>> anon_browser.open('http://answers.launchpad.dev/firefox/+faq/7')
     >>> print backslashreplace(anon_browser.title)
-    Questions : Mozilla Firefox
+    FAQ #7 : Questions : Mozilla Firefox
 
     >>> anon_browser.getLink('Edit FAQ')
     Traceback (most recent call last):

=== modified file 'lib/lp/answers/stories/project-add-question.txt'
--- lib/lp/answers/stories/project-add-question.txt	2009-09-23 14:40:53 +0000
+++ lib/lp/answers/stories/project-add-question.txt	2009-11-07 04:51:13 +0000
@@ -85,7 +85,7 @@
 as he revises the summary after reading the similar questions.
 
     >>> user_browser.getControl('Summary').value = ''
-    >>> user_browser.getControl('Add').click()
+    >>> user_browser.getControl('Post Question').click()
 
 An error message in the page informs the user that the summary is
 missing:
@@ -114,13 +114,13 @@
     entered.
 
 The user then elaborates upon his question by entering a description
-of the problem. He submits the form using the 'Add' button.
+of the problem. He submits the form using the 'Post Question' button.
 
     >>> user_browser.getControl('Description').value = (
     ... "I received an HTML message containing an inlined SVG\n"
     ... "representation of a chessboard. It didn't displayed properly.\n"
     ... "Is there a way to configure Thunderbird to display SVG properly?\n")
-    >>> user_browser.getControl('Add').click()
+    >>> user_browser.getControl('Post Question').click()
 
 No Privileged Person is taken to page displaying his question. From
 this point on, the user's interaction with the question follows to
@@ -129,7 +129,7 @@
     >>> user_browser.url
     '.../thunderbird/+question/...'
     >>> print user_browser.title
-    Questions : Mozilla Thunderbird
+    Question #... : Questions : Mozilla Thunderbird
 
 
 == Supported Language behaviour ==
@@ -275,7 +275,7 @@
 supported by Dafydd, but No Privileges Person will never know that.
 Let's stop here. The rest of this scenario is just adding a question
 as described above--filling in a description and submitting the data
-with the 'Add' button.
+with the 'Post Question' button.
 
 ==== Supported languages are displayed after the submitting a product ====
 
@@ -311,7 +311,7 @@
 
 No Privileges Person sets the language to Japanese, changes his
 question summary, writes a description, and submits the form with the
-'Add' button.
+'Post Question' button.
 
     >>> print user_browser.getControl('Project').displayValue
     ['Mozilla Thunderbird']
@@ -320,7 +320,7 @@
     ...     'Pretend this is written in Japanese')
     >>> user_browser.getControl('Description').value = (
     ... "Something in kanji and hiragana.")
-    >>> user_browser.getControl('Add').click()
+    >>> user_browser.getControl('Post Question').click()
 
 The user is taken to page displaying his question. Changing the
 language or the summary did not search for similar questions
@@ -329,4 +329,4 @@
     >>> user_browser.url
     '.../thunderbird/+question/...'
     >>> print user_browser.title
-    Questions : Mozilla Thunderbird
+    Question #... : Questions : Mozilla Thunderbird

=== modified file 'lib/lp/answers/stories/question-add-in-other-languages.txt'
--- lib/lp/answers/stories/question-add-in-other-languages.txt	2009-09-23 14:40:53 +0000
+++ lib/lp/answers/stories/question-add-in-other-languages.txt	2009-11-07 04:51:13 +0000
@@ -74,11 +74,11 @@
     ...     u'carrega corretamente e mostra a minha versao do java. No '
     ...     u'entanto, mover o mouse na pagina faz com que o firefox quebre.'
     ...     ).encode('utf-8')
-    >>> browser.getControl('Add').click()
+    >>> browser.getControl('Post Question').click()
     >>> browser.url
     '.../ubuntu/+question/...'
     >>> print browser.title
-    Questions : Ubuntu
+    Question #... : Questions : Ubuntu
 
 The page reports the question language both in the content and in the
 markup. Search engine robots and browsers will use the lang and dir
@@ -117,7 +117,7 @@
     >>> browser.getControl('Summary').value = 'Gofyn cymorth'
     >>> browser.getControl('Description').value = (
     ...     'Ghai damweiniol gair.')
-    >>> browser.getControl('Add').click()
+    >>> browser.getControl('Post Question').click()
 
     >>> browser.url
     'http://launchpad.dev/ubuntu/+addquestion'
@@ -138,7 +138,7 @@
     ...     u'\u52a9\u3051\u306e\u8981\u6c42'.encode('utf-8'))
     >>> browser.getControl('Description').value = (
     ...     u'\u3042\u308b\u4efb\u610f\u5358\u8a9e\u3002'.encode('utf-8'))
-    >>> browser.getControl('Add').click()
+    >>> browser.getControl('Post Question').click()
 
     >>> for tag in find_tags_by_class(browser.contents, 'warning message'):
     ...     print tag.renderContents()
@@ -151,9 +151,9 @@
 If even after the warning he decides to go ahead, we have to accept the
 new question.
 
-    >>> browser.getControl('Add').click()
+    >>> browser.getControl('Post Question').click()
     >>> browser.url
     '.../ubuntu/+question/...'
     >>> print browser.title.decode('utf-8')
-    Questions : Ubuntu
+    Question #... : Questions : Ubuntu
     >>> portlet = find_tag_by_id(browser.contents, 'portlet-details')

=== modified file 'lib/lp/answers/stories/question-add.txt'
--- lib/lp/answers/stories/question-add.txt	2009-09-24 16:07:49 +0000
+++ lib/lp/answers/stories/question-add.txt	2009-11-07 04:51:13 +0000
@@ -123,7 +123,7 @@
 
 If the user doesn't provide details, he'll get an error message:
 
-    >>> user_browser.getControl('Add').click()
+    >>> user_browser.getControl('Post Question').click()
     >>> for message in get_feedback_messages(user_browser.contents):
     ...     print message
     There is 1 error.
@@ -133,7 +133,7 @@
 first step:
 
     >>> user_browser.getControl('Summary').value = ''
-    >>> user_browser.getControl('Add').click()
+    >>> user_browser.getControl('Post Question').click()
     >>> for message in get_feedback_messages(user_browser.contents):
     ...     print message
     There are 2 errors.
@@ -151,11 +151,11 @@
     ... "http://java.com/en/download/help/testvm.xml, the page loads ok and\n"
     ... "shows my java version. But if I move the mouse on the page, firefox\n"
     ... "crashes.\n")
-    >>> user_browser.getControl('Add').click()
+    >>> user_browser.getControl('Post Question').click()
     >>> user_browser.url
     '.../ubuntu/+source/mozilla-firefox/+question/...'
-    >>> user_browser.title
-    'Questions : \xe2\x80\x9cmozilla-firefox\xe2\x80\x9d package : Ubuntu'
+    >>> print user_browser.title
+    Question #... : Questions : ...mozilla-firefox... package : Ubuntu
 
     >>> print extract_text(
     ...     find_tag_by_id(user_browser.contents, 'registration'))

=== modified file 'lib/lp/answers/stories/question-answer-contact.txt'
--- lib/lp/answers/stories/question-answer-contact.txt	2009-09-23 14:40:53 +0000
+++ lib/lp/answers/stories/question-answer-contact.txt	2009-11-07 04:51:13 +0000
@@ -193,7 +193,7 @@
 
     >>> browser.getLink('Play DVDs in Totem').click()
     >>> print extract_text(browser.title)
-    Questions : Ubuntu
+    Question #10 : ...
 
     >>> print extract_text(find_tag_by_id(browser.contents, 'question-lang'))
     Language: English
@@ -210,7 +210,7 @@
 
     >>> browser.open('http://answers.launchpad.dev/ubuntu/+question/12')
     >>> print browser.title
-    Questions : Ubuntu
+    Question #12 : ...
 
     >>> print extract_text(find_tag_by_id(browser.contents, 'question-lang'))
     Language: Spanish

=== modified file 'lib/lp/answers/stories/question-browse-and-search.txt'
--- lib/lp/answers/stories/question-browse-and-search.txt	2009-09-28 09:11:17 +0000
+++ lib/lp/answers/stories/question-browse-and-search.txt	2009-11-07 04:51:13 +0000
@@ -116,7 +116,7 @@
 
     >>> browser.getLink('Slow system').click()
     >>> print browser.title
-    Questions : Ubuntu
+    Question #7 : ...
     >>> soup = find_main_content(browser.contents)
     >>> soup('div', 'report')
     [<div class="report"><p>I get really poor hard drive performance.</p></div>]
@@ -139,7 +139,7 @@
     >>> from canonical.launchpad.helpers import backslashreplace
     >>> locators = find_tags_by_class(browser.contents, 'main')
     >>> print backslashreplace(browser.title)
-    Questions : \u201cmozilla-firefox\u201d package : Ubuntu
+    Question #9 : ...
 
 While reading the Ubuntu forums for a solution to his problem,
 Average Joe finds some unlinked text that refers to how to
@@ -151,7 +151,7 @@
     >>> browser.getControl(name='field.search_text').value = ' #6 '
     >>> browser.getControl('Find Answers').click()
     >>> print backslashreplace(browser.title)
-    Questions : Mozilla Firefox
+    Question #6 : ...
 
 The Answer Tracker cannot identify Question ids within text. Average
 Joe finds a reference to question 8 in a blog. He copies 'question 8'
@@ -216,8 +216,8 @@
 He clicks on the link to read the question description.
 
     >>> browser.getLink('Firefox is slow').click()
-    >>> browser.title
-    'Questions : \xe2\x80\x9cmozilla-firefox\xe2\x80\x9d package : Ubuntu'
+    >>> print browser.title
+    Question #3 : ...
 
 The user must choose at least one status when searching questions. An
 error is displayed when the user forgets to select a status.

=== modified file 'lib/lp/answers/stories/question-message.txt'
--- lib/lp/answers/stories/question-message.txt	2009-09-28 09:11:17 +0000
+++ lib/lp/answers/stories/question-message.txt	2009-11-07 04:51:13 +0000
@@ -12,7 +12,7 @@
 
     >>> user_browser.open('http://answers.launchpad.dev/ubuntu/+question/11')
     >>> print user_browser.title.decode('utf-8')
-    Questions : Ubuntu
+    Question #11 : ...
 
     >>> user_browser.getControl('Message').value = (
     ...     "Top quoting is bad netiquette.\n"
@@ -37,7 +37,7 @@
 authenticated already, He will see '[e-mail]'
 
     >>> print user_browser.title.decode('utf-8')
-    Questions : Ubuntu
+    Question #11 :  ...
     >>> text = find_tags_by_class(
     ...     user_browser.contents, 'boardCommentBody')[-1]
     >>> print extract_text(text.findAll('p')[-1])
@@ -52,7 +52,7 @@
 
     >>> anon_browser.open('http://answers.launchpad.dev/ubuntu/+question/11')
     >>> print anon_browser.title
-    Questions : Ubuntu
+    Question #11 : ...
 
     >>> text = find_tags_by_class(
     ...     anon_browser.contents, 'boardCommentBody')[-1]

=== modified file 'lib/lp/answers/stories/question-obfuscation.txt'
--- lib/lp/answers/stories/question-obfuscation.txt	2009-09-28 09:11:17 +0000
+++ lib/lp/answers/stories/question-obfuscation.txt	2009-11-07 04:51:13 +0000
@@ -54,7 +54,7 @@
     >>> user_browser.getControl('Link to FAQ').click()
     >>> user_browser.getLink('How can I make VOIP calls?').click()
     >>> print user_browser.title
-    Questions : Ubuntu
+    FAQ #4 : Questions : Ubuntu
 
     >>> portlet = find_portlet(user_browser.contents, 'Related questions')
     >>> portlet.a['title']
@@ -74,9 +74,9 @@
     >>> user_browser.getControl('Continue').click()
     >>> user_browser.getControl('Description').value = (
     ...     'The clicking mailto:[e-mail] crashes the browser.')
-    >>> user_browser.getControl('Add').click()
-    >>> user_browser.title
-    'Questions : \xe2\x80\x9cmozilla-firefox\xe2\x80\x9d package : Ubuntu'
+    >>> user_browser.getControl('Post Question').click()
+    >>> print user_browser.title
+    Question #... : ...
 
     >>> user_browser.open('http://answers.launchpad.dev/')
     >>> question_portlet = find_tag_by_id(
@@ -144,7 +144,7 @@
 
     >>> anon_browser.getLink('How can I make VOIP calls?').click()
     >>> print anon_browser.title
-    Questions : Ubuntu
+    FAQ #4 : Questions : Ubuntu
 
     >>> portlet = find_portlet(anon_browser.contents, 'Related questions')
     >>> portlet.a['title']

=== modified file 'lib/lp/answers/stories/question-overview.txt'
--- lib/lp/answers/stories/question-overview.txt	2009-09-23 14:40:53 +0000
+++ lib/lp/answers/stories/question-overview.txt	2009-11-07 04:51:12 +0000
@@ -53,7 +53,7 @@
 
     >>> browser.getLink('Problem showing the SVG demo on W3C site').click()
     >>> print browser.title
-    Questions : Mozilla Firefox
+    Question #2 : ...
     >>> print find_main_content(browser.contents).first('h1').renderContents()
     Problem showing the SVG demo on W3C site
 

=== modified file 'lib/lp/answers/stories/this-is-a-faq.txt'
--- lib/lp/answers/stories/this-is-a-faq.txt	2009-10-05 15:32:50 +0000
+++ lib/lp/answers/stories/this-is-a-faq.txt	2009-11-07 04:51:13 +0000
@@ -21,7 +21,7 @@
     >>> user_browser.open(
     ...     'http://answers.launchpad.dev/firefox/+question/2')
     >>> print backslashreplace(user_browser.title)
-    Questions : Mozilla Firefox
+    Question #2 : ...
 
     >>> user_browser.getLink('Link to a FAQ').click()
     >>> print backslashreplace(user_browser.title)
@@ -279,7 +279,7 @@
     >>> print owner_browser.url
     http://answers.launchpad.dev/firefox/+faq/...
     >>> print backslashreplace(owner_browser.title)
-    Questions : Mozilla Firefox
+    FAQ #12 : Questions : Mozilla Firefox
 
 The FAQ keywords and content appears just below:
 
@@ -320,7 +320,7 @@
     >>> user_browser.open(
     ...     'http://answers.launchpad.dev/ubuntu/+question/11')
     >>> print user_browser.title
-    Questions : Ubuntu
+    Question #11 : ...
     >>> user_browser.getLink('Link to a FAQ').click()
     >>> print user_browser.title
     Is question #11 a FAQ...
@@ -328,8 +328,8 @@
     >>> user_browser.open(
     ...     'http://answers.launchpad.dev/ubuntu/+source/mozilla-firefox'
     ...     '/+question/8')
-    >>> user_browser.title
-    'Questions : \xe2\x80\x9cmozilla-firefox\xe2\x80\x9d package : Ubuntu'
+    >>> print user_browser.title
+    Question #8 : ...
     >>> user_browser.getLink('Link to a FAQ').click()
     >>> user_browser.title
     'Is question #8 a FAQ...
@@ -365,8 +365,8 @@
 added to the question, and his message was added to the question's
 discussion.
 
-    >>> user_browser.title
-    'Questions : \xe2\x80\x9cmozilla-firefox\xe2\x80\x9d package : Ubuntu'
+    >>> print user_browser.title
+    Question #9 : ...
     >>> print_question_status(user_browser)
     Solved...
 

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-create-question.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-create-question.txt	2009-09-24 17:25:40 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-create-question.txt	2009-11-07 04:51:13 +0000
@@ -102,8 +102,8 @@
 No Privileges Person case see that the question was created from a
 bug. He uses the link to Related bug to return to the bug.
 
-    >>> user_browser.title
-    'Questions : \xe2\x80\x9clinux-source-2.6.15\xe2\x80\x9d package : Ubuntu'
+    >>> print user_browser.title
+    Question #... : Questions : ...linux-source-2.6.15... package : Ubuntu
 
     >>> print extract_text(
     ...     find_tag_by_id(user_browser.contents, 'original-bug'))
@@ -239,7 +239,7 @@
     ...     'Copy, Cut and Delete operations should work on '
     ...     'selections').click()
     >>> print user_browser.title
-    Questions : Jokosher
+    Question #... : Questions : Jokosher
 
     >>> print extract_text(
     ...     find_tag_by_id(user_browser.contents, 'registration'))