Merge lp:~salgado/launchpad/polls-three-o into lp:launchpad

[Guilherme Salgado]

[Guilherme Salgado (salgado)]

= Summary =

Convert a few poll pages to 3.0

== Proposed fix ==

Convert the easy edit pages and turn the action menu into a related
pages section at the bottom.

before/after screenshots at
https://devpad.canonical.com/~salgado/poll-shots/

== Pre-implementation notes ==

== Implementation details ==

== Tests ==

./bin/test -vvt stories.team-polls

== Demo and Q/A ==

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/registry/browser/configure.zcml
  lib/lp/registry/templates/poll-newoption.pt
  lib/lp/registry/stories/team-polls/edit-options.txt
  lib/lp/registry/templates/team-polls.pt
  lib/lp/registry/templates/polloption-edit.pt
  lib/lp/registry/browser/poll.py
  lib/lp/registry/templates/poll-edit.pt
  lib/lp/registry/stories/team-polls/create-poll-options.txt

[Jeroen T. Vermeulen (jtv)]

Hi Salgado,

I stubbed my toe a few times looking at the UI changes, until I realized
that I'm really missing a breadcrumb for the poll. Once you've drilled
down into a poll, everything you do in there refers back to the team.
On the edit-option page I found no reference to the poll whatsoever:
it's like you're editing a direct property of the team itself. Having
the poll shown as a first-class entity would make a big difference, I
think. But that's not for a template conversion to fix.

There were a few small inconsistencies, or at least things that I think
are inconsistent: adding an option gives me "Show options" and "Change
details" as related pages, plus a Save button, but editing one gives me
Save plus the Cancel link. Is there a reason why these are so
different?

Something that may force the issue is that the "Change details" link on
the new-option page is for the poll. Had I not known where this UI
element came from, I might have expected it to apply to the option I'm
adding. So I think it'd be more intuitive to remove these "related
pages" links from the new-option page and add a Cancel link back to the
poll instead.

Similarly, unless Martin has a rule against it, I think the poll edit
form should have a Cancel link. Right now there's no direct way back to
the poll page.

(The same goes for the options overview by the way, which is the only
place where I would really expect to be able to add or edit options. It
looks to me as though the options page wants to be integrated into the
poll page, with an "Add new option" link inline and without any remnants
of this old actions menu anywhere. Maybe that's what you have planned
anyway.)

Another very minor annoyance is that some of the page headings look a
little redundant. Sometimes they include the poll name, sometimes they
don't. Where they do, they duplicate the poll title displayed in small
font right above the heading. But I don't see any way of fixing that
without either removing that small title (which seems to be baked into
the application menu above it) or removing the poll name from the page
title--both of which sound like bad alternatives.

Speaking of headings: your branch sets the label for the poll edit form
to "Edit poll details." What exactly that text should read is an
ongoing discussion (started by Curtis on the mailing list), but more to
the point, I don't see it show up anywhere! If you provide a page_title
in this view it'll get picked up (and the one in pagetitles.py will no
longer be needed), but label doesn't seem to be.

Apart from that, the code as such looks good to me. Nice use of a mixin
for the navigation menu, though in this case I'd leave it out altogether
instead of migrating it to the 3.0 setup.

Jeroen

review: Needs Fixing

[Guilherme Salgado (salgado)]

On Wed, 2009-08-19 at 08:13 +0000, Jeroen T. Vermeulen wrote:
> Review: Needs Fixing
> Hi Salgado,
>
> I stubbed my toe a few times looking at the UI changes, until I realized
> that I'm really missing a breadcrumb for the poll. Once you've drilled
> down into a poll, everything you do in there refers back to the team.
> On the edit-option page I found no reference to the poll whatsoever:
> it's like you're editing a direct property of the team itself. Having
> the poll shown as a first-class entity would make a big difference, I
> think. But that's not for a template conversion to fix.

I think everybody who's used polls had a similar experience to yours.
They were written a long time ago and were left mostly untouched since
then, even when we redesigned navigation/UI for 1.0 and 2.0

>
> There were a few small inconsistencies, or at least things that I think
> are inconsistent: adding an option gives me "Show options" and "Change
> details" as related pages, plus a Save button, but editing one gives me
> Save plus the Cancel link. Is there a reason why these are so
> different?

That's because URL of these related pages are relative, so they work on
IPoll pages (like +newoption) but not on IPollOption ones (like
+option/id). The Cancel link was added there only to make it possible
to return to the +options page, but all forms should have a Cancel link.

>
> Something that may force the issue is that the "Change details" link on
> the new-option page is for the poll. Had I not known where this UI
> element came from, I might have expected it to apply to the option I'm
> adding. So I think it'd be more intuitive to remove these "related
> pages" links from the new-option page and add a Cancel link back to the
> poll instead.

I think that's a good thing to do.

>
> Similarly, unless Martin has a rule against it, I think the poll edit
> form should have a Cancel link. Right now there's no direct way back to
> the poll page.

They all should have a Cancel button.

>
> (The same goes for the options overview by the way, which is the only
> place where I would really expect to be able to add or edit options. It
> looks to me as though the options page wants to be integrated into the
> poll page, with an "Add new option" link inline and without any remnants
> of this old actions menu anywhere. Maybe that's what you have planned
> anyway.)

In fact, my only plan is to migrate these pages without making things
any worse than they already are and spend the least possible amount of
time doing so.

But I really liked your suggestion, so I filed
https://bugs.edge.launchpad.net/bugs/415896

>
> Another very minor annoyance is that some of the page headings look a
> little redundant. Sometimes they include the poll name, sometimes they
> don't. Where they do, they duplicate the poll title displayed in small
> font right above the heading. But I don't see any way of fixing that
> without either removing that small title (which seems to be baked into
> the application menu above it) or removing the poll name from the page
> title--both of which sound like bad alternatives.
>
> Speaking of headings: your branch sets the label for the pol...

[Guilherme Salgado (salgado)]

I liked so much the changes proposed by Jeroen on https://code.launchpad.net/~salgado/launchpad/polls-three-o/+merge/10343 that I decided to implement them while he was asleep to give him a surprise when he awakes, so here it is.

This branch converts the pages he already reviewed on the MP above and the remaining poll-related ones. Incremental diff: http://paste.ubuntu.com/255907/

https://devpad.canonical.com/~salgado/poll-shots/ has before/after screenshots for the pages I converted after Jeroen's review.

[Jeroen T. Vermeulen (jtv)]

A surprise indeed! This is wonderful. It looks gorgeous, it's not as crowded as it was, even more pages go to 3.0, and it all works sensibly. I had to force myself to look at the code as well before approving the branch.

That was no less rewarding: you seem to have done the job without growing the code. Plus you cleaned up some titles, and introduced sprites. Approved without reservations.

What would it take to get you on our team? :-)

Jeroen

review: Approve (code)

=== modified file 'lib/canonical/launchpad/icing/style-3-0.css'
--- lib/canonical/launchpad/icing/style-3-0.css	2009-08-18 03:59:41 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css	2009-08-19 19:48:09 +0000
@@ -398,7 +398,7 @@
     clear: both;
     visibility: hidden;
 }
-.portlet dt {
+dt {
     font-weight: bold;
     }
 .portlet dd {

=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2009-08-18 04:57:21 +0000
+++ lib/lp/registry/browser/configure.zcml	2009-08-19 19:48:09 +0000
@@ -600,7 +600,9 @@
         <browser:menus
             module="lp.registry.browser.poll"
             classes="
-                PollContextMenu"/>
+                PollOverviewMenu
+                PollActionNavigationMenu
+                PollEditNavigationMenu"/>
         <browser:defaultView
             for="lp.registry.interfaces.poll.IPoll"
             name="+index"/>
@@ -625,9 +627,6 @@
             permission="zope.Public"
             class="lp.registry.browser.poll.BasePollView">
             <browser:page
-                name="+options"
-                template="../templates/poll-options.pt"/>
-            <browser:page
                 name="+portlet-details"
                 template="../templates/poll-portlet-details.pt"/>
             <browser:page

=== modified file 'lib/lp/registry/browser/poll.py'
--- lib/lp/registry/browser/poll.py	2009-06-25 04:06:00 +0000
+++ lib/lp/registry/browser/poll.py	2009-08-19 19:48:09 +0000
@@ -6,39 +6,34 @@
 __all__ = [
     'BasePollView',
     'PollAddView',
-    'PollContextMenu',
+    'PollEditNavigationMenu',
     'PollEditView',
     'PollNavigation',
     'PollOptionAddView',
     'PollOptionEditView',
+    'PollOverviewMenu',
     'PollView',
     'PollVoteView',
     ]
 
 from zope.event import notify
 from zope.component import getUtility
+from zope.interface import implements, Interface
 from zope.lifecycleevent import ObjectCreatedEvent
 from zope.app.form.browser import TextWidget
 
 from canonical.launchpad.webapp import (
-    action, canonical_url, ContextMenu, custom_widget,
+    action, ApplicationMenu, canonical_url, custom_widget,
     enabled_with_permission, LaunchpadEditFormView, LaunchpadFormView, Link,
-    Navigation, stepthrough)
-from canonical.launchpad.webapp.interfaces import ILaunchBag
+    Navigation, NavigationMenu, stepthrough)
+from canonical.launchpad.webapp import LaunchpadView
 from lp.registry.interfaces.poll import (
     IPoll, IPollOption, IPollOptionSet, IPollSubset, IVoteSet, PollAlgorithm,
     PollSecrecy)
 from canonical.launchpad.helpers import shortlist
 
 
-class PollContextMenu(ContextMenu):
-
-    usedfor = IPoll
-    links = ['showall', 'addnew', 'edit']
-
-    def showall(self):
-        text = 'Show option details'
-        return Link('+options', text, icon='info')
+class PollEditLinksMixin:
 
     @enabled_with_permission('launchpad.Edit')
     def addnew(self):
@@ -51,6 +46,31 @@
         return Link('+edit', text, icon='edit')
 
 
+class PollOverviewMenu(ApplicationMenu, PollEditLinksMixin):
+    usedfor = IPoll
+    facet = 'overview'
+    links = ['addnew']
+
+
+class IPollEditMenu(Interface):
+    """A marker interface for the edit navigation menu."""
+
+
+class PollEditNavigationMenu(NavigationMenu, PollEditLinksMixin):
+    usedfor = IPollEditMenu
+    facet = 'overview'
+    links = ['addnew', 'edit']
+
+
+class IPollActionMenu(Interface):
+    """A marker interface for the action menu."""
+
+
+class PollActionNavigationMenu(PollEditNavigationMenu):
+    usedfor = IPollActionMenu
+    links = ['edit']
+
+
 class PollNavigation(Navigation):
 
     usedfor = IPoll
@@ -61,16 +81,12 @@
             self.context, int(name))
 
 
-class BasePollView:
+class BasePollView(LaunchpadView):
     """A base view class to be used in other poll views."""
 
-    def __init__(self, context, request):
-        self.context = context
-        self.request = request
-        self.user = getUtility(ILaunchBag).user
-        self.token = None
-        self.gotTokenAndVotes = False
-        self.feedback = ""
+    token = None
+    gotTokenAndVotes = False
+    feedback = ""
 
     def setUpTokenAndVotes(self):
         """Set up the token and votes to be displayed."""
@@ -172,12 +188,14 @@
 
 class PollView(BasePollView):
     """A view class to display the results of a poll."""
+    implements(IPollActionMenu)
 
-    def __init__(self, context, request):
-        BasePollView.__init__(self, context, request)
-        if (self.userCanVote() and context.isOpen() and
-            context.getActiveOptions()):
-            context_url = canonical_url(context)
+    def initialize(self):
+        super(PollView, self).initialize()
+        request = self.request
+        if (self.userCanVote() and self.context.isOpen() and
+            self.context.getActiveOptions()):
+            context_url = canonical_url(self.context)
             if self.isSimple():
                 request.response.redirect("%s/+vote-simple" % context_url)
             elif self.isCondorcet():
@@ -214,8 +232,9 @@
     change it. Otherwise he can register his vote.
     """
 
-    def processForm(self):
+    def initialize(self):
         """Process the form, if it was submitted."""
+        super(PollVoteView, self).initialize()
         if not self.isSecret() and self.userVoted():
             # For non-secret polls, the user's vote is always displayed
             self.setUpTokenAndVotesForNonSecretPolls()
@@ -353,11 +372,17 @@
 
 class PollEditView(LaunchpadEditFormView):
 
+    implements(IPollEditMenu)
     schema = IPoll
     label = "Edit poll details"
     field_names = ["name", "title", "proposition", "allowspoilt", "dateopens",
                    "datecloses"]
 
+    @property
+    def cancel_url(self):
+        """See `LaunchpadFormView`."""
+        return canonical_url(self.context)
+
     @action("Save", name="save")
     def save_action(self, action, data):
         self.updateContextFromData(data)
@@ -372,6 +397,11 @@
     field_names = ["name", "title"]
     custom_widget("title", TextWidget, width=30)
 
+    @property
+    def cancel_url(self):
+        """See `LaunchpadFormView`."""
+        return canonical_url(self.context.poll)
+
     @action("Save", name="save")
     def save_action(self, action, data):
         self.updateContextFromData(data)
@@ -386,6 +416,11 @@
     field_names = ["name", "title"]
     custom_widget("title", TextWidget, width=30)
 
+    @property
+    def cancel_url(self):
+        """See `LaunchpadFormView`."""
+        return canonical_url(self.context)
+
     @action("Create", name="create")
     def create_action(self, action, data):
         polloption = self.context.newOption(data['name'], data['title'])

=== modified file 'lib/lp/registry/interfaces/poll.py'
--- lib/lp/registry/interfaces/poll.py	2009-06-25 04:06:00 +0000
+++ lib/lp/registry/interfaces/poll.py	2009-08-19 19:48:09 +0000
@@ -108,29 +108,29 @@
         readonly=True)
 
     name = PollNameField(
-        title=_('The unique name of this poll.'),
+        title=_('The unique name of this poll'),
         description=_('A short unique name, beginning with a lower-case '
                       'letter or number, and containing only letters, '
                       'numbers, dots, hyphens, or plus signs.'),
         required=True, readonly=False, constraint=name_validator)
 
     title = TextLine(
-        title=_('The title of this poll.'), required=True, readonly=False)
+        title=_('The title of this poll'), required=True, readonly=False)
 
     dateopens = Datetime(
-        title=_('The date and time when this poll opens.'), required=True,
+        title=_('The date and time when this poll opens'), required=True,
         readonly=False)
 
     datecloses = Datetime(
-        title=_('The date and time when this poll closes.'), required=True,
+        title=_('The date and time when this poll closes'), required=True,
         readonly=False)
 
     proposition = Text(
-        title=_('The proposition that is going to be voted.'), required=True,
+        title=_('The proposition that is going to be voted'), required=True,
         readonly=False)
 
     type = Choice(
-        title=_('The type of this poll.'), required=True,
+        title=_('The type of this poll'), required=True,
         readonly=False, vocabulary=PollAlgorithm,
         default=PollAlgorithm.CONDORCET)
 
@@ -139,7 +139,7 @@
         readonly=False, default=True)
 
     secrecy = Choice(
-        title=_('The secrecy of the Poll.'), required=True,
+        title=_('The secrecy of the Poll'), required=True,
         readonly=False, vocabulary=PollSecrecy,
         default=PollSecrecy.SECRET)
 

=== modified file 'lib/lp/registry/stories/team-polls/create-poll-options.txt'
--- lib/lp/registry/stories/team-polls/create-poll-options.txt	2009-04-17 10:32:16 +0000
+++ lib/lp/registry/stories/team-polls/create-poll-options.txt	2009-08-19 19:48:09 +0000
@@ -37,10 +37,6 @@
 And here we see the option listed as one of the active options for this
 poll.
 
-    >>> team_admin_browser.getLink('Show option details').click()
-    >>> team_admin_browser.url
-    'http://launchpad.dev/~ubuntu-team/+poll/dpl-2080/+options'
-
     >>> print extract_text(
     ...     find_tag_by_id(team_admin_browser.contents, 'options'))
     Name        Title           Active

=== modified file 'lib/lp/registry/stories/team-polls/edit-options.txt'
--- lib/lp/registry/stories/team-polls/edit-options.txt	2008-10-15 17:56:31 +0000
+++ lib/lp/registry/stories/team-polls/edit-options.txt	2009-08-19 19:48:09 +0000
@@ -7,10 +7,11 @@
     >>> user_browser.getLink('A public poll that never closes').click()
     >>> user_browser.url
     'http://launchpad.dev/~ubuntu-team/+poll/never-closes4'
-    >>> user_browser.getLink('Show option details').click()
-    >>> user_browser.url
-    'http://launchpad.dev/~ubuntu-team/+poll/never-closes4/+options'
-    >>> user_browser.getLink('Edit')
+    >>> print extract_text(find_tag_by_id(user_browser.contents, 'options'))
+    Name        Title       Active
+    OptionA     OptionA     Yes
+    ...
+    >>> user_browser.getLink('[Edit]')
     Traceback (most recent call last):
     ...
     LinkNotFoundError
@@ -18,22 +19,14 @@
 And when the poll already started, administrators cannot change the options
 either:
 
+    # Need to craft the URL manually because there's no link to it -- the
+    # option can't be changed, after all.
     >>> browser = setupBrowser(
     ...     auth='Basic [e-mail]:jdub')
-    >>> browser.open('http://launchpad.dev/~ubuntu-team/+poll/never-closes4')
-    >>> browser.getLink('Show option details').click()
-    >>> browser.url
-    'http://launchpad.dev/~ubuntu-team/+poll/never-closes4/+options'
-    >>> browser.getLink('[Edit]').click()
-    >>> browser.url
-    'http://launchpad.dev/~ubuntu-team/+poll/never-closes4/+option/...'
-
-    >>> tags = find_tags_by_class(browser.contents, "error message")
-    >>> for tag in tags:
-    ...     print tag.renderContents()
-    <BLANKLINE>
+    >>> browser.open('http://launchpad.dev/~ubuntu-team/+poll/never-closes4/'
+    ...              '+option/20')
+    >>> print "\n".join(get_feedback_messages(browser.contents))
     You can&#8217;t edit any options because the poll is already open.
-    <BLANKLINE>
 
 Since Jeff is an administrator of ubuntu-team and we have a poll that hasn't
 been opened yet, he should be able to edit its options.
@@ -43,10 +36,6 @@
     >>> browser.url
     'http://launchpad.dev/~ubuntu-team/+poll/not-yet-opened'
 
-    >>> browser.getLink('Show option details').click()
-    >>> browser.url
-    'http://launchpad.dev/~ubuntu-team/+poll/not-yet-opened/+options'
-
     >>> browser.getLink('[Edit]').click()
     >>> browser.url
     'http://launchpad.dev/~ubuntu-team/+poll/not-yet-opened/+option/...'

=== modified file 'lib/lp/registry/stories/team-polls/edit-poll.txt'
--- lib/lp/registry/stories/team-polls/edit-poll.txt	2009-04-17 10:32:16 +0000
+++ lib/lp/registry/stories/team-polls/edit-poll.txt	2009-08-19 19:48:09 +0000
@@ -71,7 +71,8 @@
     >>> team_admin_browser.url
     'http://launchpad.dev/~ubuntu-team/+poll/never-closes/+vote-simple'
 
-    >>> team_admin_browser.getLink('Change details').click()
+    >>> team_admin_browser.open(
+    ...     'http://launchpad.dev/~ubuntu-team/+poll/never-closes/+edit')
     >>> print extract_text(
     ...     find_tag_by_id(team_admin_browser.contents, 'not-editable'))
     This poll can't be edited...

=== modified file 'lib/lp/registry/templates/poll-edit.pt'
--- lib/lp/registry/templates/poll-edit.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/poll-edit.pt	2009-08-18 20:24:56 +0000
@@ -3,19 +3,12 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
+  metal:use-macro="view/macro:page/main_only"
   i18n:domain="launchpad"
 >
 
 <body>
 
-  <metal:portlets fill-slot="portlets">
-    <div tal:replace="structure context/@@+portlet-details" />
-  </metal:portlets>
-
   <div metal:fill-slot="main">
 
     <div tal:condition="context/isNotYetOpened">
@@ -33,6 +26,8 @@
       opens it can't be edited anymore.</p>
     </div>
     
+    <tal:menu replace="structure view/@@+related-pages" /> 
+
   </div>
 
 </body>

=== modified file 'lib/lp/registry/templates/poll-index.pt'
--- lib/lp/registry/templates/poll-index.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/poll-index.pt	2009-08-19 19:48:09 +0000
@@ -1,39 +1,26 @@
-<tal:root
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  omit-tag="">
-
-<tal:do-this-first replace="view/setUpTokenAndVotes" />
 <html
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
+  metal:use-macro="view/macro:page/main_side"
   i18n:domain="launchpad"
 >
 <body>
 
-<metal:leftportlets fill-slot="portlets_one">
-  <div tal:replace="structure context/@@+portlet-details" />
-  <div tal:replace="structure context/team/@@+portlet-details" />
-</metal:leftportlets>
-
-<metal:rightportlets fill-slot="portlets_two">
-  <div tal:replace="structure context/@@+portlet-options" />
-</metal:rightportlets>
+<tal:heading metal:fill-slot="heading">
+  <h1 tal:content="context/title">Mozilla</h1>
+</tal:heading>
 
 <div metal:fill-slot="main">
 
-      <h1 tal:content="context/title" />
-      <div
-        class="highlighted"
-        tal:content="structure context/proposition/fmt:text-to-html"
-      />
+  <tal:do-this-first replace="view/setUpTokenAndVotes" />
+
+  <div
+    class="highlighted"
+    tal:content="structure context/proposition/fmt:text-to-html"
+  />
+  <br />
 
   <p tal:condition="not: context/getActiveOptions">
     This poll does not yet have any voting options. Please <a
@@ -41,6 +28,36 @@
     for a real poll, of course :-)
   </p>
 
+  <div class="two-column-list">
+    <dl>
+      <dt>Opens:</dt>
+      <dd
+        tal:attributes="title context/dateopens/fmt:datetime"
+        tal:content="context/dateopens/fmt:approximatedate" />
+    </dl>
+
+    <dl>
+      <dt>Type:</dt>
+      <dd tal:content="context/type/title" />
+    </dl>
+
+    <dl>
+      <dt>Closes:</dt>
+      <dd
+        tal:attributes="title context/datecloses/fmt:datetime"
+        tal:content="context/datecloses/fmt:approximatedate" />
+    </dl>
+
+    <dl>
+      <dt>Secrecy:</dt>
+      <dd tal:content="context/secrecy/title" />
+    </dl>
+  </div>
+  <br />
+
+  <tal:details replace="structure context/@@+portlet-options" />
+  <br />
+
   <tal:is_open condition="context/isOpen">
     <p tal:condition="not: request/lp:person">
       You need to <a href="+login">login to vote</a>.
@@ -180,6 +197,11 @@
 
 </div>
 
+<div metal:fill-slot="side">
+  <div id="object-actions" class="top-portlet">
+    <tal:menu replace="structure view/@@+global-actions" />
+  </div>
+</div>
+
 </body>
 </html>
-</tal:root>

=== modified file 'lib/lp/registry/templates/poll-newoption.pt'
--- lib/lp/registry/templates/poll-newoption.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/poll-newoption.pt	2009-08-19 19:48:09 +0000
@@ -3,19 +3,12 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
+  metal:use-macro="view/macro:page/main_only"
   i18n:domain="launchpad"
 >
 
 <body>
 
-  <metal:portlets fill-slot="portlets">
-    <div tal:replace="structure context/@@+portlet-details" />
-  </metal:portlets>
-
   <div metal:fill-slot="main">
 
     <tal:block condition="context/isNotYetOpened">

=== removed file 'lib/lp/registry/templates/poll-options.pt'
--- lib/lp/registry/templates/poll-options.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/poll-options.pt	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
-  i18n:domain="launchpad"
->
-<body>
-
-  <metal:portlets fill-slot="portlets">
-    <div tal:replace="structure context/@@+portlet-details" />
-  </metal:portlets>
-
-  <div metal:fill-slot="main">
-
-    <h1>Poll options</h1>
-
-    <tal:block condition="context/getAllOptions">
-      <table class="listing" id="options">
-        <thead>
-          <tr>
-            <th>Name</th>
-            <th>Title</th>
-            <th>Active</th>
-            <th tal:condition="context/required:launchpad.Edit"></th>
-          </tr>
-        </thead>
-        <tr tal:repeat="polloption context/getAllOptions">
-          <td tal:content="polloption/name">mjg59</td>
-          <td tal:content="polloption/title">This guy rocks!</td>
-          <td>
-            <tal:is_active condition="polloption/active">Yes</tal:is_active>
-            <tal:inactive condition="not: polloption/active">No</tal:inactive>
-          </td>
-          <td tal:condition="context/required:launchpad.Edit">
-            <a tal:attributes="href polloption/fmt:url"
-              ><img src="/@@/edit" alt="[Edit]"
-                    title="Change this option details" /></a>
-          </td>
-        </tr>
-      </table>
-    </tal:block>
-
-    <p class="warning message" tal:condition="not: context/getAllOptions">
-      This poll doesn't have any options for people to vote on yet.
-      Make sure you add some options before the poll opens!
-    </p>
-
-  </div>
-
-</body>
-</html>

=== modified file 'lib/lp/registry/templates/poll-portlet-options.pt'
--- lib/lp/registry/templates/poll-portlet-options.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/poll-portlet-options.pt	2009-08-19 19:48:09 +0000
@@ -7,22 +7,38 @@
 <div class="portlet" id="portlet-options">
 
   <h2>Voting options</h2>
-
-  <div class="portletBody portletContent"
-       tal:define="options context/getAllOptions">
-
-    <ul tal:condition="options">
-      <li tal:repeat="option options">
-        <b tal:content="option/name">name</b>:
-        <span tal:replace="option/title">The Title of the option</span>
-        (<span tal:condition="option/active"
-           >active</span><span
-           tal:condition="not: option/active">inactive</span>)
-      </li>
-    </ul>
-    <p tal:condition="not: options">
-      <i>No options yet specified.</i>
-    </p>
-  </div>
+  <tal:block condition="context/getAllOptions">
+    <table class="listing" id="options">
+      <thead>
+        <tr>
+          <th>Name</th>
+          <th>Title</th>
+          <th>Active</th>
+          <th tal:condition="context/required:launchpad.Edit"></th>
+        </tr>
+      </thead>
+      <tr tal:repeat="polloption context/getAllOptions">
+        <td tal:content="polloption/name">mjg59</td>
+        <td tal:content="polloption/title">This guy rocks!</td>
+        <td>
+          <tal:is_active condition="polloption/active">Yes</tal:is_active>
+          <tal:inactive condition="not: polloption/active">No</tal:inactive>
+        </td>
+        <td tal:condition="context/required:launchpad.Edit">
+          <a tal:attributes="href polloption/fmt:url"
+            ><img src="/@@/edit" alt="[Edit]"
+                  title="Change this option details" /></a>
+        </td>
+      </tr>
+    </table>
+  </tal:block>
+
+  <p class="warning message" tal:condition="not: context/getAllOptions">
+    This poll doesn't have any options for people to vote on yet.
+    Make sure you add some options before the poll opens!
+  </p>
+
+  <tal:new-option replace="structure context/menu:overview/addnew/render" />
+
 </div>
 </tal:root>

=== modified file 'lib/lp/registry/templates/poll-vote-condorcet.pt'
--- lib/lp/registry/templates/poll-vote-condorcet.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/poll-vote-condorcet.pt	2009-08-19 19:48:09 +0000
@@ -1,37 +1,20 @@
-<tal:root
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  omit-tag="">
-
-<tal:do-this-first replace="view/processForm" />
 <html
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
+  metal:use-macro="view/macro:page/main_only"
   i18n:domain="launchpad"
 >
 <body>
 
-<metal:leftportlets fill-slot="portlets_one">
-  <div tal:replace="structure context/@@+portlet-details" />
-  <div tal:replace="structure context/team/@@+portlet-details" />
-</metal:leftportlets>
-
-<metal:rightportlets fill-slot="portlets_two">
-  <div tal:replace="structure context/@@+portlet-options" />
-</metal:rightportlets>
+  <tal:heading metal:fill-slot="heading">
+    <h1 tal:content="context/title">Mozilla</h1>
+  </tal:heading>
 
   <div metal:fill-slot="main">
 
     <tal:open-poll condition="context/isOpen">
-    <h1>Condorcet poll</h1>
-
     <tal:can-vote condition="view/userCanVote">
     <p
       tal:condition="view/feedback"
@@ -125,6 +108,7 @@
           <tal:block condition="not: view/userVoted">
             <input type="submit" value="Vote" name="vote" />
           </tal:block>
+          or <a tal:attributes="href context/team/fmt:url/+polls">Cancel</a>
         </td>
       </tr>
     </table>
@@ -144,4 +128,3 @@
   </div>
 </body>
 </html>
-</tal:root>

=== modified file 'lib/lp/registry/templates/poll-vote-simple.pt'
--- lib/lp/registry/templates/poll-vote-simple.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/poll-vote-simple.pt	2009-08-19 19:48:09 +0000
@@ -1,36 +1,19 @@
-<tal:root
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  omit-tag="">
-
-<tal:do-this-first replace="view/processForm" />
 <html
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
+  metal:use-macro="view/macro:page/main_only"
   i18n:domain="launchpad"
 >
 <body>
 
-<metal:leftportlets fill-slot="portlets_one">
-  <div tal:replace="structure context/@@+portlet-details" />
-  <div tal:replace="structure context/team/@@+portlet-details" />
-</metal:leftportlets>
-
-<metal:rightportlets fill-slot="portlets_two">
-  <div tal:replace="structure context/@@+portlet-options" />
-</metal:rightportlets>
+  <tal:heading metal:fill-slot="heading">
+    <h1 tal:content="context/title">Mozilla</h1>
+  </tal:heading>
 
   <div metal:fill-slot="main">
 
-      <h1 tal:content="context/title" />
-
     <tal:open-poll condition="context/isOpen">
 
     <tal:can-vote condition="view/userCanVote">
@@ -134,6 +117,7 @@
           <br />
 
           <input type="submit" value="Continue" name="continue" />
+          or <a tal:attributes="href context/team/fmt:url/+polls">Cancel</a>
         </td>
       </tr>
     </table>
@@ -155,4 +139,3 @@
 
 </body>
 </html>
-</tal:root>

=== modified file 'lib/lp/registry/templates/polloption-edit.pt'
--- lib/lp/registry/templates/polloption-edit.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/polloption-edit.pt	2009-08-18 20:24:56 +0000
@@ -3,19 +3,12 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
+  metal:use-macro="view/macro:page/main_only"
   i18n:domain="launchpad"
 >
 
 <body>
 
-  <metal:portlets fill-slot="portlets">
-    <div tal:replace="structure context/poll/@@+portlet-details" />
-  </metal:portlets>
-
   <div metal:fill-slot="main">
 
     <tal:block condition="context/poll/isNotYetOpened">

=== modified file 'lib/lp/registry/templates/team-polls.pt'
--- lib/lp/registry/templates/team-polls.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/team-polls.pt	2009-08-18 20:24:56 +0000
@@ -78,8 +78,8 @@
 
     <br />
     <tal:block tal:condition="request/lp:person">
-      <ul class="add" tal:condition="context/required:launchpad.Edit">
-        <li><a href="+newpoll">Set up a new poll</a></li>
+      <ul tal:condition="context/required:launchpad.Edit">
+        <li><a class="sprite add" href="+newpoll">Set up a new poll</a></li>
       </ul>
     </tal:block>