Merge lp:~sinzui/launchpad/action-menu-bug-403641 into lp:launchpad

[Curtis Hovey]

[Curtis Hovey (sinzui)]

This is my branch to add support for an action menu and involvement portlet.
This branch is extracted form my product index page branch.

    lp:~sinzui/launchpad/action-menu-bug-403641
    Diff size: 496
    Launchpad bug: https://bugs.launchpad.net/bugs/403641
                   https://bugs.launchpad.net/bugs/403651
    Test command: ./bin/test -vvt "(tales|menu|pillar-views).txt"
    Pre-implementation: beuno
    Target release: 2.2.8

= Add support for an action menu and involvement portlet =

Bug 403641 [base-layout must support a object action menu]
    The 3.0 design allows an object to have an action menu for links
    that affect the object that cannot be represented in the content.
    The examples links are "Change details", "Change password", and
    "Make private".

Bug 403651 [base-layout must support an Involvement menu]
    The 3.0 design has an involvement portlet to encourage users to
    participate.

Martin asked me to remove the 2.0 backward compatibility style hacks
and land it as soon as possible so that the engineers designing pages
see their work appear as the example designs.

== Rules ==

Bug 403641 [base-layout must support a object action menu]
    Reuse the NavigationMenu to present the menu. The nav menu is
    best because it can be used with with context object and views
    (which may be necessary)

Bug 403651 [base-layout must support an Involvement menu]
    Create a view to render the involvement menu for pillars. The
    menu should only list the officially supported applications.

== QA ==

Bug 403641 [base-layout must support a object action menu]
    Nothing uses this on edge/staging. It works with the product-page
    branch. We can get feedback from engineers who want to use this
    now.

Bug 403651 [base-layout must support an Involvement menu]
    Nothing uses this on edge/staging. It works with the product-page
    branch. We can get feedback from engineers who want to use this
    now.

As for the style changes, the search page will have smaller fonts.
Developers will stop complaining that the fonts looks to big and the
space is wrong.

== Lint ==

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

Linting changed files:
  lib/canonical/launchpad/browser/launchpad.py
  lib/canonical/launchpad/doc/tales.txt
  lib/canonical/launchpad/icing/style-3-0.css
  lib/canonical/launchpad/images/answers-arrow-right.png
  lib/canonical/launchpad/images/bg-project-downloads.png
  lib/canonical/launchpad/images/blueprints-arrow-right.png
  lib/canonical/launchpad/images/bugs-arrow-right.png
  lib/canonical/launchpad/images/code-arrow-right.png
  lib/canonical/launchpad/images/link-grey-arrow.png
  lib/canonical/launchpad/images/translations-arrow-right.png
  lib/canonical/launchpad/webapp/tales.py
  lib/lp/app/browser/configure.zcml
  lib/lp/app/browser/tests/menu.txt
  lib/lp/app/templates/navigationmenu-actions.pt
  lib/lp/registry/browser/configure.zcml
  lib/lp/registry/browser/pillar.py
  lib/lp/registry/browser/tests/pillar-views.txt
  lib/lp/registry/templates/pillar-involvement-portlet.pt

== Test ==

    * lib/canoni...

[Paul Hummer (rockstar)]

review: Approve

=== modified file 'lib/canonical/launchpad/browser/launchpad.py'
--- lib/canonical/launchpad/browser/launchpad.py	2009-07-29 00:30:50 +0000
+++ lib/canonical/launchpad/browser/launchpad.py	2009-08-06 14:09:56 +0000
@@ -173,6 +173,7 @@
             menu = queryAdapter(self.context, INavigationMenu, name=facet)
             if menu is not None:
                 self.title = menu.title
+        self.enabled_links = [link for link in self.links if link.enabled]
 
     def render(self):
         if not self.links:
 
=== modified file 'lib/canonical/launchpad/doc/tales.txt'
--- lib/canonical/launchpad/doc/tales.txt	2009-08-05 19:34:07 +0000
+++ lib/canonical/launchpad/doc/tales.txt	2009-08-06 15:14:54 +0000
@@ -481,6 +481,11 @@
     http://.../+download/test.txt: test file (4 bytes)
     http://.../+download/test.txt/+md5:
 
+The url for the release file can be retrieved using fmt:url.
+
+    >>> print test_tales("release_file/fmt:url", release_file=release_file)
+    http://launchpad.dev/.../+download/test.txt
+
 
 === Product series ===
 
 
=== modified file 'lib/canonical/launchpad/icing/style-3-0.css'
--- lib/canonical/launchpad/icing/style-3-0.css	2009-08-05 19:34:07 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css	2009-08-06 15:02:25 +0000
@@ -183,7 +183,7 @@
 
 /* Page layout */
 .yui-d0 {
-    margin: 10px 20px; /* 20px sides are 2.0 backward compatability */
+    margin: 10px 20px;
     }
 .yui-t4 .yui-b {
     width: 21%;
@@ -199,6 +199,7 @@
     padding-top: 0.5em;
     }
 .portlet, .aside {
+    clear: both;
     border-top: 1px solid #d6d6d6;
     padding: 0.5em 0;
     }
@@ -236,7 +237,8 @@
 /* Default text presentation */
 html, body {
     font-family: bitstream vera sans, arial, helvetica, clean, sans-serif;
-    font-size: 97%; /* 2.0 backward compatability */
+    font-family: sans-serif;
+    font-size: 93%;
     }
 body.private {
     /* It must be obvious to the user that the context is private */
@@ -246,7 +248,6 @@
     clear: none;
     padding-top: 6px; /* An offset from the logo. */
     font-size: 197%;
-    margin-bottom: 0.5em; /* 2.0 backward compatability */
     }
 h2 {
     margin-bottom: 0.3em;
@@ -270,7 +271,10 @@
 	list-style: decimal outside;
 	}
 li {
-    padding-bottom: .2em;
+    padding-bottom: .3em;
+    }
+dt {
+    margin-bottom: .1em;
     }
 dd {
     margin-bottom: .8em;
@@ -305,13 +309,13 @@
     }
 .see-all a {
     padding-left: 8px;
-    background: url(../images/link-grey-arrow.gif) left center no-repeat;
+    background: url(/@@/link-grey-arrow.gif) left center no-repeat;
     font-size: 72%;
     color: #484848;
     text-decoration: underline;
     }
 .rss-right {
-    background: url(https://launchpad.net/@@/rss.png) right center no-repeat;
+    background: url(/@@/rss.png) right center no-repeat;
     }
 .logo {
     float: left;
@@ -321,7 +325,6 @@
     margin: 0 5px 0 0;
     }
 .registered {
-    margin-top: -0.5em; /* 2.0 backward compatability */
     font-size: 85%;
     color: #666;
     font-style: italic;
@@ -330,15 +333,23 @@
     clear: both;
     font-size: 100%;
     }
+.summary {
+    margin: 0 0 1em 0;
+    font-size: 138.5%;
+    }
+
 
 /* Common list presentations. */
 .bulleted {
     margin-bottom: 0.5em;
     }
 .bulleted li {
-    margin: auto auto 0.2em 2em;
+    margin: 0 0 0 2em;
     list-style-type: disc;
     }
+.horizontal {
+    margin: 1em 0 0 0;
+    }
 .horizontal li {
     display: inline;
     padding: 0 1.5em 0 0;
@@ -444,15 +455,13 @@
     background: #fbfbfb;
     }
 
-.downloads {
-    font-weight: bold;
-    }
 .downloads a {
     color: #4f843c;
     }
 .downloads li {
     margin: 0;
     padding: 2px 0 0;
+    font-weight: bold;
     }
 .downloads li a {
     display: block;
@@ -461,18 +470,26 @@
     -moz-border-radius: 1.5%;
     -webkit-border-radius: 1.5%;
     border-radius: 1.5%;
-    background: #4f843c url(../images/bg-project-downloads.gif) center right no-repeat;
+    background: #4f843c url(/@@/bg-project-downloads.png) center right no-repeat;
     padding: 6%;
+    padding-right: 50px;
     color: #fff;
     font-size: 108%;
     text-decoration: underline;
     }
 .downloads .released {
-    margin: 0 0 0.5em 0;
-    background: #f3f3f3 url(../images/bg-project-released.gif) right bottom no-repeat;
-    padding: 0.4em 0.2em;
-    font-size: 85%;
-    font-weight: normal;
+    margin: .3em 0 1em 0;
+    padding: 0 .2em 0 0;
+    text-align: right;
+    }
+.downloads .released span {
+    -moz-border-radius: 0 0 3% 3%;
+    -webkit-border-radius: 0 0 5% 5%;
+    border-radius: 0 0 3% 3%;
+    background: #d3e3c7;
+    padding: 0.2em 1em;
+    }
+.downloads .alternate {
     text-align: right;
     }
 
@@ -491,27 +508,26 @@
     }
 .involvement a.bugs {
     color: #b9413e;
-    background: url(../images/red-arrow.gif) right center no-repeat;
+    background: url(/@@/bugs-arrow-right.png) right center no-repeat;
     }
 .involvement a.question {
     color: #5265b2;
-    background: url(../images/blue-arrow.gif) right center no-repeat;
+    background: url(/@@/answers-arrow-right.png) right center no-repeat;
     }
 .involvement a.translate {
     color: #c5458e;
-    background: url(../images/pink-arrow.gif) right center no-repeat;
+    background: url(/@@/translations-arrow-right.png) right center no-repeat;
     }
 .involvement a.code {
     color: #d39f57;
-    background: url(../images/yellow-arrow.gif) right center no-repeat;
+    background: url(/@@/images/code-arrow-right.png) right center no-repeat;
     }
 .involvement a.blueprint {
     color: #5ba4c6;
-    background: url(../images/lightblue-arrow.gif) right center no-repeat;
+    background: url(/@@/images/blueprints-arrow-right.png) right center no-repeat;
     }
 
 .announcements li {
-    font-size: 85%;
     margin-bottom: 0.5em;
     }
 .announcements li strong,
@@ -525,14 +541,6 @@
     border-bottom: 1px solid #d0d0d0;
     }
 
-
-/* Should not be needed with real data */
-.timeline {
-    width: 100%;
-    color: #484848;
-    background: #f7f7f7;
-    }
-
 /* From nice_pre in tales.py */
 pre.wrap {
   white-space: -moz-pre-wrap;
@@ -540,3 +548,4 @@
   white-space: pre-wrap;
   word-wrap: break-word;
 }
+
 
=== added file 'lib/canonical/launchpad/images/answers-arrow-right.png'
 Binary files lib/canonical/launchpad/images/answers-arrow-right.png	1970-01-01 00:00:00 +0000 and lib/canonical/launchpad/images/answers-arrow-right.png	2009-08-06 14:09:56 +0000 differ
=== added file 'lib/canonical/launchpad/images/bg-project-downloads.png'
 Binary files lib/canonical/launchpad/images/bg-project-downloads.png	1970-01-01 00:00:00 +0000 and lib/canonical/launchpad/images/bg-project-downloads.png	2009-08-06 14:09:56 +0000 differ
=== added file 'lib/canonical/launchpad/images/blueprints-arrow-right.png'
 Binary files lib/canonical/launchpad/images/blueprints-arrow-right.png	1970-01-01 00:00:00 +0000 and lib/canonical/launchpad/images/blueprints-arrow-right.png	2009-08-06 14:09:56 +0000 differ
=== added file 'lib/canonical/launchpad/images/bugs-arrow-right.png'
 Binary files lib/canonical/launchpad/images/bugs-arrow-right.png	1970-01-01 00:00:00 +0000 and lib/canonical/launchpad/images/bugs-arrow-right.png	2009-08-06 14:09:56 +0000 differ
=== added file 'lib/canonical/launchpad/images/code-arrow-right.png'
 Binary files lib/canonical/launchpad/images/code-arrow-right.png	1970-01-01 00:00:00 +0000 and lib/canonical/launchpad/images/code-arrow-right.png	2009-08-06 14:09:56 +0000 differ
=== added file 'lib/canonical/launchpad/images/link-grey-arrow.png'
 Binary files lib/canonical/launchpad/images/link-grey-arrow.png	1970-01-01 00:00:00 +0000 and lib/canonical/launchpad/images/link-grey-arrow.png	2009-08-06 14:09:56 +0000 differ
=== added file 'lib/canonical/launchpad/images/translations-arrow-right.png'
 Binary files lib/canonical/launchpad/images/translations-arrow-right.png	1970-01-01 00:00:00 +0000 and lib/canonical/launchpad/images/translations-arrow-right.png	2009-08-06 14:09:56 +0000 differ
=== modified file 'lib/canonical/launchpad/webapp/tales.py'
--- lib/canonical/launchpad/webapp/tales.py	2009-08-05 19:34:07 +0000
+++ lib/canonical/launchpad/webapp/tales.py	2009-08-06 14:09:56 +0000
@@ -1190,7 +1190,7 @@
 class ProductReleaseFileFormatterAPI(ObjectFormatterAPI):
     """Adapter for `IProductReleaseFile` objects to a formatted string."""
 
-    traversable_names = {'link': 'link'}
+    traversable_names = {'link': 'link', 'url': 'url'}
 
     def link(self, view_name):
         """A hyperlinked ProductReleaseFile.
@@ -1226,6 +1226,10 @@
             html += ')'
         return html % replacements
 
+    def url(self, view_name):
+        """Return the URL to download the file."""
+        return self._getDownloadURL(self._context.libraryfile)
+
     @property
     def _release(self):
         return self._context.productrelease
 
=== modified file 'lib/lp/app/browser/configure.zcml'
--- lib/lp/app/browser/configure.zcml	2009-07-31 17:14:35 +0000
+++ lib/lp/app/browser/configure.zcml	2009-08-06 14:11:31 +0000
@@ -21,4 +21,11 @@
         template="../templates/navigationmenu-related-pages.pt"
         permission="zope.Public"
         />
+    <browser:page
+        for="*"
+        name="+global-actions"
+        class="canonical.launchpad.browser.launchpad.NavigationMenuTabs"
+        template="../templates/navigationmenu-actions.pt"
+        permission="zope.Public"
+        />
 </configure>
 
=== modified file 'lib/lp/app/browser/tests/menu.txt'
--- lib/lp/app/browser/tests/menu.txt	2009-07-31 13:25:26 +0000
+++ lib/lp/app/browser/tests/menu.txt	2009-08-06 15:02:25 +0000
@@ -43,6 +43,10 @@
     >>> provideAdapter(
     ...     EditMenu, [IEditMenuMarker], INavigationMenu, name="overview")
 
+
+Related pages
+-------------
+
 The related pages portlet is rendered using a TALES call passing the view
 to the named adapter: <tal:menu replace="structure view/@@+related-pages" />
 
@@ -113,3 +117,45 @@
     </div>
 
 
+Action menus
+------------
+
+A navigation menu can be presented as an action menu is the side portlets.
+The action menu uses the view's enabled_links property to get the list of
+links.
+
+    >>> menu_view = create_initialized_view(
+    ...     view, '+global-actions', principal=user)
+    >>> for link in menu_view.enabled_links:
+    ...     print link.enabled, link.linked, link.url
+    True  False  http://launchpad.dev/~beaker/+edit
+    True  True   http://launchpad.dev/~beaker/+edit-people
+
+The generated markup is for a portlet with the global-actions id.
+
+    >>> print menu_view.render()
+    <div id="global-actions" class="portlet">
+      <ul>
+        <li>
+          <a href="..."
+            class="menu-link-edit_thing sprite modify edit">Edit thing</a>
+        </li>
+        <li>
+          <a style="..." href="..."
+            class="menu-link-edit_people">Edit people related to thing</a>
+        </li>
+      </ul>
+    </div>
+
+If there are no enabled links, no markup is rendered. For example, a menu
+may contain links that require special privileges to access.
+
+    >>> EditMenu.links = ('admin',)
+
+    >>> menu_view = create_initialized_view(
+    ...     view, '+global-actions', principal=user)
+    >>> menu_view.enabled_links
+    []
+
+    >>> print menu_view.render()
+    <BLANKLINE>
 
=== added file 'lib/lp/app/templates/navigationmenu-actions.pt'
--- lib/lp/app/templates/navigationmenu-actions.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/app/templates/navigationmenu-actions.pt	2009-08-06 14:11:31 +0000
@@ -0,0 +1,11 @@
+<div
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  id="global-actions" class="portlet"
+  tal:condition="view/enabled_links">
+  <ul>
+    <li tal:repeat="link view/enabled_links">
+      <a tal:replace="structure link/fmt:icon-link" />
+    </li>
+  </ul>
+</div>
 
=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2009-08-03 14:38:55 +0000
+++ lib/lp/registry/browser/configure.zcml	2009-08-06 18:17:49 +0000
@@ -556,6 +556,13 @@
         name="+listing-simple"
         permission="zope.Public"
         template="../templates/pillar-listing-simple.pt"/>
+    <browser:page
+        name="+get-involved"
+        for="lp.registry.interfaces.pillar.IPillar"
+        class="lp.registry.browser.pillar.PillarView"
+        facet="overview"
+        permission="zope.Public"
+        template="../templates/pillar-involvement-portlet.pt"/>
     <facet
         facet="overview">
         <browser:url
 
=== added file 'lib/lp/registry/browser/pillar.py'
--- lib/lp/registry/browser/pillar.py	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/browser/pillar.py	2009-08-06 18:17:49 +0000
@@ -0,0 +1,26 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Common views for objects that implement `IPillar`."""
+
+__metaclass__ = type
+
+__all__ = [
+    'PillarView',
+    ]
+
+
+from canonical.launchpad.webapp.publisher import LaunchpadView
+
+
+class PillarView(LaunchpadView):
+    """A view for any `IPillar`."""
+
+    @property
+    def has_involvement(self):
+        """This `IPillar` uses Launchpad."""
+        pillar = self.context
+        return (
+            pillar.official_codehosting or pillar.official_malone
+            or pillar.official_answers or pillar.official_blueprints
+            or pillar.official_rosetta)
 
=== added file 'lib/lp/registry/browser/tests/pillar-views.txt'
--- lib/lp/registry/browser/tests/pillar-views.txt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/browser/tests/pillar-views.txt	2009-08-06 18:17:49 +0000
@@ -0,0 +1,45 @@
+Pillar views
+============
+
+Pillar views are used to display IPillar objects link distributions and
+products in a consistent fashion.
+
+The +get-involved presentation creates a portlet of links to encourage
+project involvement. Only links to official applications are rendered.
+
+
+    >>> distribution = factory.makeDistribution(name='umbra')
+    >>> login_person(distribution.owner)
+    >>> view = create_view(
+    ...     distribution, '+get-involved', principal=distribution.owner)
+
+The has_involvement property is used to determine if the portlet should
+be rendered. The newly created pillar does not use any launchpad applications.
+
+    >>> view.has_involvement
+    False
+
+    >>> print view.render()
+    <BLANKLINE>
+
+Pillars that do use launchpad applications have an involvement menu.
+
+    >>> distribution.official_answers = True
+    >>> distribution.official_malone = True
+    >>> view = create_view(
+    ...     distribution, '+get-involved', principal=distribution.owner)
+    >>> view.has_involvement
+    True
+
+    >>> print view.render()
+    <div id="involvement" class="portlet involvement">
+      <h2>Get Involved</h2>
+      <ul>
+        <li>
+          <a class="bugs" href="...">Report a Bug</a>
+        </li>
+        <li>
+          <a class="question" href="...">Ask a question</a>
+        </li>
+      </ul>
+    </div>
 
=== added file 'lib/lp/registry/templates/pillar-involvement-portlet.pt'
--- lib/lp/registry/templates/pillar-involvement-portlet.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/templates/pillar-involvement-portlet.pt	2009-08-06 18:17:49 +0000
@@ -0,0 +1,30 @@
+<div
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  id="involvement" class="portlet involvement"
+  tal:condition="view/has_involvement">
+  <h2>Get Involved</h2>
+
+  <ul>
+    <li tal:condition="context/official_malone">
+      <a class="bugs"
+        tal:attributes="href context/menu:bugs/filebug/url">Report a Bug</a>
+    </li>
+    <li tal:condition="context/official_answers">
+      <a class="question"
+        tal:attributes="href context/menu:answers/new/url">Ask a question</a>
+    </li>
+    <li tal:condition="context/official_rosetta">
+      <a class="translate"
+        tal:attributes="href context/menu:translations/overview/url">Help translate</a>
+    </li>
+    <li tal:condition="context/official_codehosting">
+      <a class="code"
+        tal:attributes="href context/menu:branches/branch_add/url">Submit code</a>
+    </li>
+    <li tal:condition="context/official_blueprints">
+      <a class="blueprint"
+        tal:attributes="href context/menu:specications/new/url">Register a Blueprint</a>
+    </li>
+  </ul>
+</div>