Merge lp:~mbp/launchpad/798412-plusone into lp:launchpad

[Martin Pool]

This adds some Google Plus +1 buttons on various interesting objects in Launchpad: archive, product, distro, mp, bug, bug comment, answer, specs.

This could be very usefully extended to comments on bmps and answers, but the object needs to have a URL of its own and those don't yet.

We shouldn't add them to every single page, but mostly to things people are likely to express approval of or interest in. I added them on things I already see people sharing, and on things I feel like sharing myself.

There is a feature flag to turn this off. It defaults to on. We might eventually want a per-user opt-out, but people who feel strongly about not having this probably have a browser configuration to get that already.

There are no specific tests for it (yet). I think the most interesting test is really whether it works with the external systems.

I would like to also add this on bmp comments and answer comments, but the object has to have its own url and I think those don't yet.

I don't show the button on private objects, to prevent people accidentally sharing them, and (questionable) to prevent Google seeing the URL exists. This would be cleaner if there was a consistent .private on eg LaunchpadView. I might add one.

Possibly the button should be moved to a TAL macro.

[Aaron Bentley (abentley)]

Comments on BMPs do have URLs, we just don't expose them much. Mainly we expose the reply link.

Comment:
https://code.launchpad.net/~abentley/launchpad/person-bug-listings/+merge/83418/comments/180265

Reply link:
https://code.launchpad.net/~abentley/launchpad/person-bug-listings/+merge/83418/comments/180265/+reply

[Curtis Hovey (sinzui)]

Questions comments do have a URL, but we have not registered a view to format them for the browser.
The URL is /<project>/+question/<question-id>/messages/<question-number> such as /launchpad/+question/168463/messages/1.

[Martin Pool (mbp)]

thanks guys, I will see about adding that.

[Martin Pool (mbp)]

https://answers.launchpad.net/launchpad/+question/168463/messages/1 is 404 even though there is a first message on that question.

I can see zcml that tries to set it up...

[Martin Pool (mbp)]

> Questions comments do have a URL, but we have not registered a view to format
> them for the browser.
> The URL is /<project>/+question/<question-id>/messages/<question-number> such
> as /launchpad/+question/168463/messages/1.

I had a go at trying to enable them, but I can't work it out :-(

[Martin Pool (mbp)]

Ok, the updates here add buttons on merge proposals, though not yet on answers, and factor some of it out into macros used across various pages.

This doesn't yet add or update tests. It probably needs some, probably written looking at the resulting html.

The biggest bug I know of is that it does not stay up to date well when the page is updated by ajax, either for privacy or for adding new comments.

[Robert Collins (lifeless)]

So, this has rather significant private-object implications.

See for instance the discussions we had on-list about trust of third
party js API's that get access to our objects, and also consider that
publicy stating a private object exists is an issue itself.

I think that we can probably tolerate the external js without a
contract / DPA analysis IF and only IF it is not loaded where
personally identifying information and / or private data is accessible
on the page.

I'm not sure how deep that rabbit hole will go; I suggest consulting
with curtis or deryck about this.

[Robert Collins (lifeless)]

(I realise my reply may look like I hadn't read the MP. I had :)).

You cover directly some private objects but not e.g. branch merge
proposals or their comments as being private (or even hidden). So
there is a risk that folk adding this won't cater for privacy in some
contexts, in the current implementation. I'd like to see *something*
done to reduce or mitigate that.

And there is no (apparent) consideration for personally identifying
data (which is a vague concept at best, but consider for instance that
a script running in our context can access an email address that a
script running from a different site cannot.

We also have the trust issue, which really isn't about the code, but
about whether we can trust the google plus API code with private data
(and this applies to non-private pages because a script can make API
calls and access anything you can access).

[Martin Pool (mbp)]

Hi,

I agree we need to get privacy (both data and people) right.

The benefit from all of this, hopefully, is
- more positive feedback for good work people do on Launchpad-hosted projects
- more visibility for Launchpad and projects in Launchpad on the web and on g+
- better search results about Launchpad

The biggest concern I have is not that Google will deploy malicious Javascript, but rather that people will accidentally click to share something that is meant to be private. So I want to hide the buttons on private pages -- and in fact I do, but it is not kept up to date after an ajax privacy change, but that can be done. We actually have belt-and-braces protection against that in that Google pings the page after you +1 it and it will refuse the plusone if the page is not accessible, which our private objects will be.

Showing the buttons in the page where we have control over them arguably makes it less likely people will accidentally click an external share button for a private object. It is more under our control.

My intention here is to provide, through the view.is_private check, a one-stop protection to make sure that these buttons are not rendered and the script is not loaded on views of private objects, without counting on people getting it right on each individual page. I think that means the current code will work ok even on bmps ... and I just tested, and in fact it does.

I ought to add tests that this is and stays correctly hooked up.

Personal data is hairy, arguably even including people's names, in which case every page of Launchpad is affected. What I'm trying to do here is to make it no worse than the current case combination of robots walking Launchpad public/anonymous pages, plus people sharing links through other means. The most relevant thing here is probably non-public email addresses. In a separate prior landing I add a meta description with the email addresses stripped out, so people shouldn't be accidentally sharing this. I'm also not putting this on any pages that are primarily about people, so the biggest risk is when personal information occurs within eg a public bug or mp description or comment.

To sum up the privacy requirements I am aiming for are:
 * do not share any private objects
 * do not encourage people to accidentally share things they shouldn't
 * the framework should be safe by default for new development
 * don't put email addresses into the shared content
 * don't run 3rd party javascript on pages containing private content (any more than we currently do)

[Martin Pool (mbp)]

There's some more discussion of this versus a builtin 'thanks' button in bug 798412.

I'm not sure about it.

It is smaller than a built in thanks mechanism would probably be.

On the other hand there is at least the perception of a privacy problem, perhaps an actual privacy problem, and perhaps ideally a builtin one would be better (though, we could always add this and switch later.)

[Robert Collins (lifeless)]

Hi, sorry to need to reject this, but I've clarified some policy constraints IS have around externally hosted JS. I'll be working up proper policy docs etc soon, but the tl;dr is - we cannot run js that is hosted on a third party site in the LP webapp browser context.

review: Disapprove

[Robert Collins (lifeless)]

One way to move this forward would be to investigate self hosted js that talks to the g+ servers - so a wire protocol rather than JS APIs.

[Martin Pool (mbp)]

> Hi, sorry to need to reject this, but I've clarified some policy constraints IS have around externally hosted JS. I'll be working up proper policy docs etc soon, but the tl;dr is - we cannot run js that is hosted on a third party site in the LP webapp browser context.

That's fine. It was interesting and educational to do this, but there
are enough tradeoffs here that I'm not sure I even want to land it. I
can see now how we could fairly easily hook a similar design in to the
notification system, once that exists. The metadata/microformat
changes make it easier for people to share pages using their own tools
if they want to.

There are some incidental cleanups in this branch that I will pick out
from the plusone bits.

I'm not being snarky by asking: does that policy mean that the
existing externally hosted scripts constitute bugs? Do we perhaps
want to at least squash them on private pages, using a similar check
to in this branch?

--
Martin

[Robert Collins (lifeless)]

On Tue, Nov 29, 2011 at 11:39 AM, Martin Pool <email address hidden> wrote:
> I'm not being snarky by asking: does that policy mean that the
> existing externally hosted scripts constitute bugs?  Do we perhaps
> want to at least squash them on private pages, using a similar check
> to in this branch?

They will have to go from all pages, because of the access they get.
Yes, they will constitute bugs.

-Rob

[Martin Pool (mbp)]

On 29 November 2011 09:24, Robert Collins <email address hidden> wrote:
> One way to move this forward would be to investigate self hosted js that talks to the g+ servers - so a wire protocol rather than JS APIs.

I suspect that would be breaching their TOS, eg "You agree not to
access (or attempt to access) any of the Services by any means other
than through the interface that is provided by Google", and also that
it may be technically fragile.

It wouldn't deal with user concerns about tracking.

Perhaps we can just implement our own "thanks" concept more directly.

--
Martin

[Martin Pool (mbp)]

everything but the plusone bits is now in https://code.launchpad.net/~mbp/launchpad/888353-microformats-2/+merge/83856

=== modified file 'lib/canonical/launchpad/webapp/publisher.py'
--- lib/canonical/launchpad/webapp/publisher.py	2011-11-25 02:19:28 +0000
+++ lib/canonical/launchpad/webapp/publisher.py	2011-11-27 22:43:42 +0000
@@ -75,6 +75,9 @@
     IStructuredString,
     NoCanonicalUrl,
     )
+from canonical.launchpad.interfaces.launchpad import (
+    IPrivacy,
+    )
 from canonical.launchpad.webapp.url import urlappend
 from canonical.launchpad.webapp.vhosts import allvhosts
 from lp.app.errors import NotFoundError
@@ -83,6 +86,7 @@
     defaultFlagValue,
     getFeatureFlag,
     )
+from lp.services.propertycache import cachedproperty
 from lp.services.utils import obfuscate_structure
 
 # Monkeypatch NotFound to always avoid generating OOPS
@@ -397,6 +401,13 @@
             cache, cls=ResourceJSONEncoder,
             media_type=EntryResource.JSON_TYPE)
 
+    @cachedproperty
+    def is_private(self):
+        """True if the object is private.
+        """
+        privacy = IPrivacy(self.context, None)
+        return privacy is not None and privacy.private
+
     def publishTraverse(self, request, name):
         """See IBrowserPublisher."""
         # By default, a LaunchpadView cannot be traversed through.

=== modified file 'lib/lp/answers/stories/question-workflow.txt'
--- lib/lp/answers/stories/question-workflow.txt	2011-10-20 00:53:01 +0000
+++ lib/lp/answers/stories/question-workflow.txt	2011-11-27 22:43:42 +0000
@@ -291,7 +291,8 @@
     True
 
     >>> bestAnswer.first('div', 'boardCommentBody')
-    <div class="boardCommentBody"><p>New version of the firefox package
+    <div class="boardCommentBody" itemprop="commentText"><p>New version
+    of the firefox package
     are available with SVG support enabled. You can use apt-get or adept to
     upgrade.</p></div>
 
@@ -355,13 +356,17 @@
     >>> print extract_text(answerer)
     No Privileges Person (no-priv)
 
-    >>> message = bestAnswer.parent.parent.find(
+    >>> message = soup.find(
     ...     'div', 'boardCommentBody highlighted')
+    >>> print message
+    <div class="boardCommentBody highlighted"
+    itemprop="commentText"><p>New version of the firefox package are
+    available with SVG support enabled. You can use apt-get or adept to
+    upgrade.</p></div>
     >>> print extract_text(message)
     New version of the firefox package are available with SVG support
     enabled. You can use apt-get or adept to upgrade.
 
-
 History
 =======
 

=== modified file 'lib/lp/answers/templates/question-index.pt'
--- lib/lp/answers/templates/question-index.pt	2011-08-20 14:14:26 +0000
+++ lib/lp/answers/templates/question-index.pt	2011-11-27 22:43:42 +0000
@@ -31,6 +31,13 @@
     </metal:block>
   </head>
   <body>
+    <metal:block
+      metal:fill-slot="heading">
+      <tal:plusone 
+        metal:use-macro="context/@@+base-layout-macros/header-plusone-button" />
+      <h1 itemprop="name" tal:content="view/label"></h1>
+    </metal:block>
+
     <metal:registering fill-slot="registering">
         Asked by
         <a tal:replace="structure context/owner/fmt:link" />
@@ -59,7 +66,6 @@
     <div metal:fill-slot="main">
       <tal:description
         define="global description context/description/fmt:obfuscate-email/fmt:text-to-html" />
-
       <div class="report"
         tal:content="structure description"/>
 

=== modified file 'lib/lp/answers/templates/questionmessage-display.pt'
--- lib/lp/answers/templates/questionmessage-display.pt	2011-05-31 14:58:26 +0000
+++ lib/lp/answers/templates/questionmessage-display.pt	2011-11-27 22:43:42 +0000
@@ -3,10 +3,16 @@
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   omit-tag="">
 <div
+  itemscope=""
+  itemtype="http://schema.org/UserComments"
   tal:define="css_classes view/getBoardCommentCSSClass"
   tal:attributes="class string:${css_classes};
                   id string:comment-${context/index}">
   <div class="boardCommentDetails">
+    <table>
+      <tbody>
+        <tr>
+    <td>
     <tal:bestanswer condition="view/isBestAnswer">
       <img src="/@@/favourite-yes" style="float:right;" alt="Best"
            title="Marked as best answer" />
@@ -15,16 +21,28 @@
       <tal:comment_owner replace="structure context/owner/fmt:link-display-name-id" />
     </tal:comment_has_owner>
     said
-    <span
-      tal:attributes="title context/datecreated/fmt:datetime"
+    <time
+      itemprop="commentTime"
+      tal:attributes="title context/datecreated/fmt:datetime;
+        datetime context/datecreated/fmt:isodate"
       tal:content="context/datecreated/fmt:displaydate">Thursday
-    13:21</span>:
-    <span style="float:right;"
+    13:21</time>:
+    </td>
+    <td tal:condition="nothing">
+      <!-- disabled until question messages have a working individual URL -->
+      <tal:plusone
+        metal:use-macro="context/@@+base-layout-macros/comment-plusone-button" />
+    </td>
+    <td class="bug-comment-index">
+      <a
        tal:content="string: #${context/display_index}" />
+    </td>
+  </tr></tbody></table>
   </div>
 
   <div class="boardCommentBody"
     tal:attributes="class view/getBodyCSSClass"
+    itemprop="commentText"
     tal:content="structure
       context/text_contents/fmt:obfuscate-email/fmt:email-to-html">
     Message text.

=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
--- lib/lp/app/templates/base-layout-macros.pt	2011-11-15 21:04:08 +0000
+++ lib/lp/app/templates/base-layout-macros.pt	2011-11-27 22:43:42 +0000
@@ -314,4 +314,30 @@
              l_plural plural | string:$singular$l_default;"
     condition="python: count != 1"
     replace="l_plural" /></metal:plural-msg>
+
+
+<metal:comment-plusone-button
+  define-macro="comment-plusone-button">
+  <div
+    class="g-plusone"
+    data-size="small"
+    tal:attributes="href context/fmt:url"
+    tal:condition="not:view/is_private"
+    align="right"
+    data-align="right">
+  </div>
+</metal:comment-plusone-button>
+
+<metal:header-plusone-button
+  define-macro="header-plusone-button">
+  <div
+    style="float:right"
+    tal:condition="not:view/is_private">
+    <div
+      class="g-plusone"
+      tal:attributes="href context/fmt:url"
+      align="right">
+    </div>
+  </div>
+</metal:header-plusone-button>
 </macros>

=== modified file 'lib/lp/app/templates/base-layout.pt'
--- lib/lp/app/templates/base-layout.pt	2011-11-25 02:19:28 +0000
+++ lib/lp/app/templates/base-layout.pt	2011-11-27 22:43:42 +0000
@@ -172,6 +172,21 @@
 
     <metal:lp-client-cache
       use-macro="context/@@+base-layout-macros/lp-client-cache" />
+
+    <tal:comment tal:replace="nothing">
+      When plusone is disabled, the div tags can still be emitted in to the page by
+      other templates, but they will have no effect because the script is inactive.
+    </tal:comment>
+    <script 
+      tal:condition="not:request/features/plusone.buttons.disabled"
+      type="text/javascript">
+      (function() {
+        var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
+        po.src = 'https://apis.google.com/js/plusone.js';
+        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
+      })();
+    </script>
+
   </body>
 
 <tal:template>

=== modified file 'lib/lp/blueprints/browser/specification.py'
--- lib/lp/blueprints/browser/specification.py	2011-07-14 12:44:48 +0000
+++ lib/lp/blueprints/browser/specification.py	2011-11-27 22:43:42 +0000
@@ -562,6 +562,10 @@
     def page_title(self):
         return self.label
 
+    @property
+    def page_description(self):
+        return self.context.summary
+
     def initialize(self):
         # The review that the user requested on this spec, if any.
         self.notices = []

=== modified file 'lib/lp/blueprints/templates/specification-index.pt'
--- lib/lp/blueprints/templates/specification-index.pt	2011-08-25 06:32:24 +0000
+++ lib/lp/blueprints/templates/specification-index.pt	2011-11-27 22:43:42 +0000
@@ -24,6 +24,8 @@
   </tal:registering>
 
 <metal:heading fill-slot="heading">
+  <tal:plusone
+    metal:use-macro="context/@@+base-layout-macros/header-plusone-button" />
   <h1 tal:replace="structure view/title_widget">
     blueprint title
   </h1>

=== modified file 'lib/lp/bugs/browser/bugcomment.py'
--- lib/lp/bugs/browser/bugcomment.py	2011-11-16 23:46:01 +0000
+++ lib/lp/bugs/browser/bugcomment.py	2011-11-27 22:43:42 +0000
@@ -341,6 +341,10 @@
             self.comment.index, self.context.bug.id)
 
     @property
+    def page_description(self):
+        return self.comment.text_contents
+
+    @property
     def privacy_notice_classes(self):
         if not self.context.bug.private:
             return 'hidden'

=== modified file 'lib/lp/bugs/templates/bugcomment-box.pt'
--- lib/lp/bugs/templates/bugcomment-box.pt	2011-11-24 00:37:40 +0000
+++ lib/lp/bugs/templates/bugcomment-box.pt	2011-11-27 22:43:42 +0000
@@ -36,23 +36,33 @@
           <td tal:condition="comment/bugwatch">
             <img width="14" height="14" src="/@@/bug-remote" alt=""/>
             In
-            <a tal:attributes="href comment/bugwatch/url"
-               tal:content="comment/bugwatch/title" />,
+            <a itemprop="url"
+              tal:attributes="href comment/bugwatch/url"
+              tal:content="comment/bugwatch/title" />,
             <tal:comment_owner
                 replace="structure comment/owner/fmt:link-display-name-id" />
             wrote
-            <span tal:attributes="title comment/datecreated/fmt:datetime"
-                  tal:content="comment/datecreated/fmt:displaydate">
+            <time
+              itemprop="commentTime"
+              tal:attributes="title comment/datecreated/fmt:datetime;
+                datetime comment/datecreated/fmt:isodate"
+              tal:content="comment/datecreated/fmt:displaydate">
               7 minutes ago
-              </span>:
+              </time>:
               <a tal:attributes="href comment/fmt:url">
                 <strong tal:condition="comment/display_title"
                         tal:content="comment/title" />
               </a>
           </td>
+
+          <td>
+            <tal:plusone
+    metal:use-macro="context/@@+base-layout-macros/comment-plusone-button" />
+          </td>
+
           <td class="bug-comment-index">
-	  <a itemprop="url"
-	     tal:attributes="href comment/fmt:url"
+          <a itemprop="url"
+             tal:attributes="href comment/fmt:url"
              tal:content="string: #${comment/index}" />
           </td>
         </tr>
@@ -94,6 +104,7 @@
       <a tal:attributes="href comment/fmt:url">Read more...</a>
     </p>
   </div>
+
   <div class="boardCommentFooter" tal:condition="comment/show_footer">
     <a tal:attributes="id string:mark-spam-${context/index};"
        tal:condition="view/show_spam_controls"

=== modified file 'lib/lp/bugs/templates/bugcomment-index.pt'
--- lib/lp/bugs/templates/bugcomment-index.pt	2011-08-03 15:27:05 +0000
+++ lib/lp/bugs/templates/bugcomment-index.pt	2011-11-27 22:43:42 +0000
@@ -9,7 +9,7 @@
   <body>
     <metal:block fill-slot="head_epilogue">
     </metal:block>
-    <div metal:fill-slot="main" tal:define="comment view/comment">
+    <div metal:fill-slot="main" itemprop="mainContentOfPage" tal:define="comment view/comment">
       <h1 tal:content="view/page_title">Foo doesn't work</h1>
       <tal:comment replace="structure comment/@@+box-expanded-reply">
       </tal:comment>

=== modified file 'lib/lp/bugs/templates/bugtask-index.pt'
--- lib/lp/bugs/templates/bugtask-index.pt	2011-11-24 05:14:44 +0000
+++ lib/lp/bugs/templates/bugtask-index.pt	2011-11-27 22:43:42 +0000
@@ -80,8 +80,13 @@
         tal:content="context/bug/datecreated/fmt:displaydate" />
     </tal:registering>
 
-    <metal:heading fill-slot="heading" tal:define="context_menu context/menu:context">
-      <h1 tal:replace="structure view/bug_title_edit_widget">
+    <metal:heading fill-slot="heading"
+      tal:define="context_menu context/menu:context">
+      <tal:plusone
+        metal:use-macro="context/@@+base-layout-macros/header-plusone-button" />
+      <h1
+        itemprop="name"
+        tal:replace="structure view/bug_title_edit_widget">
         Bug title
       </h1>
     </metal:heading>

=== modified file 'lib/lp/code/browser/branchmergeproposal.py'
--- lib/lp/code/browser/branchmergeproposal.py	2011-11-20 05:56:28 +0000
+++ lib/lp/code/browser/branchmergeproposal.py	2011-11-27 22:43:42 +0000
@@ -594,7 +594,6 @@
 
     implements(IBranchMergeProposalActionMenu)
 
-    label = "Proposal to merge branch"
     schema = ClaimButton
 
     def initialize(self):
@@ -677,6 +676,12 @@
         return result
 
     @property
+    def label(self):
+        return "Merge %s into %s" % (
+            self.context.source_branch.bzr_identity,
+            self.context.target_branch.bzr_identity)
+
+    @property
     def pending_diff(self):
         return (
             self.context.next_preview_diff_job is not None or

=== modified file 'lib/lp/code/stories/branches/xx-code-review-comments.txt'
--- lib/lp/code/stories/branches/xx-code-review-comments.txt	2011-10-20 00:53:01 +0000
+++ lib/lp/code/stories/branches/xx-code-review-comments.txt	2011-11-27 22:43:42 +0000
@@ -112,8 +112,8 @@
     source branch to land it. When this comment is replied to, it should
     wrap the line properly.
     >>> print_comments('boardCommentDetails', anon_browser, index=0)
-    Eric the Viking (eric) wrote ... ago
-    Posted in a previous version of this proposal
+    Eric the Viking (eric) wrote ... ago:
+    Posted in a previous version of this proposal #
     >>> details = find_tags_by_class(
     ...     anon_browser.contents, 'boardCommentDetails')[0]
     >>> links = details.findAll('a')
@@ -133,7 +133,7 @@
     >>> eric_browser.getControl('Save Comment').click()
 
     >>> print_comments('boardCommentDetails', eric_browser, index=2)
-    Eric the Viking ... a moment ago
+    Eric the Viking ... ago: #
     >>> print_comments('boardCommentFooter', eric_browser, index=0)
     review: Abstain (timeless)
     >>> print_comments('boardCommentBody', eric_browser, index=2)

=== modified file 'lib/lp/code/templates/branchmergeproposal-index.pt'
--- lib/lp/code/templates/branchmergeproposal-index.pt	2011-11-14 20:24:46 +0000
+++ lib/lp/code/templates/branchmergeproposal-index.pt	2011-11-27 22:43:42 +0000
@@ -50,6 +50,12 @@
   </style>
 </metal:block>
 
+<metal:block
+  metal:fill-slot="heading">
+  <tal:plusone metal:use-macro="context/@@+base-layout-macros/header-plusone-button" />
+  <h1 itemprop="name" tal:content="view/label"></h1>
+</metal:block>
+
 <tal:registering metal:fill-slot="registering">
   Proposed by
   <tal:registrant replace="structure context/registrant/fmt:link"/>

=== modified file 'lib/lp/code/templates/codereviewcomment-body.pt'
--- lib/lp/code/templates/codereviewcomment-body.pt	2010-09-20 10:48:52 +0000
+++ lib/lp/code/templates/codereviewcomment-body.pt	2011-11-27 22:43:42 +0000
@@ -12,10 +12,12 @@
     </div>
   </tal:good-attachments>
 
-  <div class="replyLink">
-    <tal:reply tal:define="link context/menu:context/reply"
-               tal:condition="link/enabled"
-               tal:replace="structure link/render">
+  <div class="replyLink" itemprop="replyToUrl" 
+    tal:define="link context/menu:context/reply"
+    tal:condition="link/enabled"
+    tal:attributes="url link/fmt:url">
+    <tal:reply 
+      tal:replace="structure link/render">
       Reply
     </tal:reply>
   </div>

=== modified file 'lib/lp/code/templates/codereviewcomment-header.pt'
--- lib/lp/code/templates/codereviewcomment-header.pt	2011-05-31 15:15:47 +0000
+++ lib/lp/code/templates/codereviewcomment-header.pt	2011-11-27 22:43:42 +0000
@@ -3,12 +3,35 @@
    xmlns:metal="http://xml.zope.org/namespaces/metal"
    omit-tag="">
 
-  <tal:author replace="structure context/comment_author/fmt:link-display-name-id"/>
+<table><tbody><tr>
+  <td>
+  <span
+    itemprop="creator"
+    tal:content="structure context/comment_author/fmt:link-display-name-id"/>
   <tal:has-body condition="context/has_body">wrote</tal:has-body>
-  <tal:date replace="context/comment_date/fmt:displaydate" />
+  <time
+    itemprop="commentTime"
+    tal:attributes="title context/comment_date/fmt:datetime;
+                datetime context/comment_date/fmt:isodate"
+    tal:content="context/comment_date/fmt:displaydate">
+      7 minutes ago
+    </time>:
   <span tal:condition="context/from_superseded" class="sprite warning-icon"
         style="float: right">Posted in <a
           tal:attributes="href context/branch_merge_proposal/fmt:url">a
           previous version</a>
         of this proposal</span>
+    </td>
+
+    <td>
+      <tal:plusone
+        metal:use-macro="context/@@+base-layout-macros/comment-plusone-button" />
+    </td>
+
+    <td class="bug-comment-index">
+      <a itemprop="url"
+        tal:attributes="href context/fmt:url">#</a>
+    </td>
+
+</tr></tbody></table>
 </tal:root>

=== modified file 'lib/lp/registry/templates/distribution-index.pt'
--- lib/lp/registry/templates/distribution-index.pt	2011-06-16 13:50:58 +0000
+++ lib/lp/registry/templates/distribution-index.pt	2011-11-27 22:43:42 +0000
@@ -24,7 +24,11 @@
 
   <body>
     <tal:heading metal:fill-slot="heading">
-      <h1 tal:content="context/title">project title</h1>
+      <div style="float:right">
+        <tal:plusone
+          metal:use-macro="context/@@+base-layout-macros/header-plusone-button" />
+      </div>
+      <h1 itemprop="name" tal:content="context/title">project title</h1>
     </tal:heading>
 
     <tal:registering metal:fill-slot="registering">
@@ -57,7 +61,7 @@
       </div>
 
       <div class="yui-g">
-        <div class="yui-u first">
+        <div itemprop="description" class="yui-u first">
            <tal:distro-information content="structure context/@@+details" />
         </div>
 

=== modified file 'lib/lp/registry/templates/product-index.pt'
--- lib/lp/registry/templates/product-index.pt	2011-11-20 13:16:14 +0000
+++ lib/lp/registry/templates/product-index.pt	2011-11-27 22:43:42 +0000
@@ -48,6 +48,8 @@
   <body>
     <tal:main metal:fill-slot="main"
       define="overview_menu context/menu:overview">
+      <tal:plusone
+        metal:use-macro="context/@@+base-layout-macros/header-plusone-button" />
       <div class="top-portlet">
         <p id="project-inactive" class="warning message"
           tal:condition="not: context/active">
@@ -55,8 +57,8 @@
           <a tal:replace="structure overview_menu/review_license/fmt:icon"/>
         </p>
 
-	<div class="summary" 
-	  tal:content="structure context/summary/fmt:markdown">
+        <div class="summary" 
+          tal:content="structure context/summary/fmt:markdown">
           $Product.summary goes here. This should be quite short,
           just a single paragraph of text really, giving the project
           highlights.

=== modified file 'lib/lp/services/comments/templates/comment.pt'
--- lib/lp/services/comments/templates/comment.pt	2010-02-19 19:16:32 +0000
+++ lib/lp/services/comments/templates/comment.pt	2011-11-27 22:43:42 +0000
@@ -3,12 +3,16 @@
    xmlns:metal="http://xml.zope.org/namespaces/metal"
    omit-tag="">
 
-  <div tal:attributes="class string:boardComment ${context/extra_css_class|nothing}">
+   <div
+    itemscope=""
+    itemtype="http://schema.org/UserComments"
+    tal:attributes="class string:boardComment ${context/extra_css_class|nothing}">
     <div class="boardCommentDetails"
          tal:content="structure context/@@+comment-header">
       Details - everyone has details.
     </div>
     <div class="boardCommentBody"
+      itemprop="commentText"
          tal:condition="context/has_body"
          tal:content="structure context/@@+comment-body">
       The comment body

=== modified file 'lib/lp/services/features/flags.py'
--- lib/lp/services/features/flags.py	2011-11-25 12:34:41 +0000
+++ lib/lp/services/features/flags.py	2011-11-27 22:43:42 +0000
@@ -125,6 +125,12 @@
      'enabled',
      '',
      ''),
+    ('plusone.buttons.disabled',
+     'boolean',
+     'Disable Google plusone buttons.',
+     'enabled',
+     '',
+     ''),
     ('profiling.enabled',
      'boolean',
      'Overrides config.profiling.profiling_allowed to permit profiling.',

=== modified file 'lib/lp/soyuz/templates/archive-index.pt'
--- lib/lp/soyuz/templates/archive-index.pt	2011-07-18 09:23:10 +0000
+++ lib/lp/soyuz/templates/archive-index.pt	2011-11-27 22:43:42 +0000
@@ -8,11 +8,20 @@
   >
 <body>
   <tal:heading metal:fill-slot="heading">
-    <h1 tal:condition="context/enabled"
+    <div style="float:right"
+      tal:condition="not:context/private" >
+        <tal:plusone
+          metal:use-macro="context/@@+base-layout-macros/header-plusone-button" />
+    </div>
+    <meta itemprop="name"
+      tal:attributes="content context/displayname">
+    <h1
+        tal:condition="context/enabled"
         tal:replace="structure view/displayname_edit_widget">
       PPA for user
     </h1>
-    <h1 tal:condition="not: context/enabled"
+    <h1 itemprop="name"
+        tal:condition="not: context/enabled"
         tal:content="context/displayname"
         class="disabled">
       PPA for user