Merge lp:~wgrant/launchpad/header-4.0 into lp:launchpad

[William Grant]

Unmerged revisions

17259. By William Grant on 2014-11-27

Merge devel.

17258. By William Grant on 2014-11-24

Merge devel.

17257. By William Grant on 2014-11-17

Fix Hierarchy property duplication. Breadcrumbs and titles now.

17256. By William Grant on 2014-11-17

Merge series-breadcrumbs-later. Breadcrumbs are totally broken.

17255. By William Grant on 2014-11-16

Merge WatermarkTalesAdapter into Hierarchy. The title is now generated from breadcrumbs.

17254. By William Grant on 2014-11-16

Fix "Recipes" breadcrumb by skipping IHeadingBreadcrumbs rather than IHeadingContexts.

17253. By William Grant on 2014-11-16

Merge series-breadcrumbs-later, resolving conflicts.

17252. By William Grant on 2014-11-16

TEMP

17251. By William Grant on 2014-11-16

Construct both elements in watermark:heading.

17250. By William Grant on 2014-11-16

Use breadcrumb text rather than object title in the watermark. DistributionSourcePackages need not duplicate the distribution.

=== modified file 'lib/canonical/launchpad/icing/css/layout.css'
--- lib/canonical/launchpad/icing/css/layout.css	2014-11-27 06:34:33 +0000
+++ lib/canonical/launchpad/icing/css/layout.css	2016-09-24 06:25:43 +0000
@@ -104,6 +104,7 @@
 .watermark-apps-portlet ul.facetmenu {
     margin-top: 12px;
     margin-left: -0.5em;
+    border-bottom: 1px solid #747474;
     white-space: nowrap;
     }
 .watermark-apps-portlet ul.facetmenu li {
@@ -112,7 +113,7 @@
     }
 .watermark-apps-portlet ul.facetmenu li a,
 .watermark-apps-portlet ul.facetmenu li span {
-    padding: 0.3em 0.5em;
+    padding: 0.2em 0.5em;
     margin-right: 0.4em;
     }
 .watermark-apps-portlet ul.facetmenu li a:link,

=== modified file 'lib/lp/app/browser/launchpad.py'
--- lib/lp/app/browser/launchpad.py	2016-06-22 21:04:30 +0000
+++ lib/lp/app/browser/launchpad.py	2016-09-24 06:25:43 +0000
@@ -394,6 +394,24 @@
         return crumbs
 
     @property
+    def items_for_body(self):
+        """Return breadcrumbs to display in the page body.
+
+        While all breadcrumbs should be included in the document title,
+        the first few are represented specially in the body's header
+        (aka. watermark), so we don't want to duplicate them.
+        """
+        crumbs = []
+        print "items=%r" % self.items
+        for crumb in self.items:
+            if IHeadingBreadcrumb.providedBy(crumb):
+                crumbs = []
+                continue
+            crumbs.append(crumb)
+        print "crumbs=%r" % crumbs
+        return crumbs
+
+    @property
     def display_breadcrumbs(self):
         """Return whether the breadcrumbs should be displayed."""
         # If there is only one breadcrumb then it does not make sense
@@ -402,7 +420,65 @@
         # to display breadcrumbs either.
         has_major_heading = IMajorHeadingView.providedBy(
             self._naked_context_view)
-        return len(self.items_for_body) > 1 and not has_major_heading
+<<<<<<< TREE
+        return len(self.items_for_body) > 1 and not has_major_heading
+=======
+        return len(self.items_for_body) > 1 and not has_major_heading
+
+    @property
+    def heading_breadcrumbs(self):
+        crumbs = [
+            crumb for crumb in self.items
+            if IHeadingBreadcrumb.providedBy(crumb)]
+        assert len(crumbs) <= 2
+        return crumbs
+
+    def heading(self):
+        """Return the heading text for the page.
+
+        If the view provides `IEditableContextTitle` then the top heading is
+        rendered from the view's `title_edit_widget` and is generally
+        editable.
+
+        Otherwise, if the context provides `IHeadingContext` then we return an
+        H1, else an H2.
+        """
+        # Check the view; is the title editable?
+        if IEditableContextTitle.providedBy(self.context):
+            return self.context.title_edit_widget()
+        # The title is static, but only the context's index view gets an H1.
+        heading = 'h1' if IMajorHeadingView.providedBy(self.context) else 'h2'
+        # If there is actually no root context, then it's a top-level
+        # context-less page so Launchpad.net is shown as the branding.
+        crumbs = self.heading_breadcrumbs
+        if len(crumbs) >= 1:
+            title = crumbs[0].detail
+        else:
+            title = 'Launchpad.net'
+        # For non-editable titles, generate the static heading.
+        markup = structured(
+            "<%(heading)s>%(title)s</%(heading)s>",
+            heading=heading, title=title).escapedtext
+        if len(crumbs) >= 2:
+            markup += structured(
+                '\n<%(heading)s class="secondary">%(title)s</%(heading)s>',
+                heading=heading, title=crumbs[1].detail).escapedtext
+        return markup
+
+    def logo(self):
+        """Return the logo image for the top header breadcrumb's context."""
+        logo_context = (
+            self.heading_breadcrumbs[0].context if self.heading_breadcrumbs
+            else None)
+        adapter = queryAdapter(logo_context, IPathAdapter, 'image')
+        if logo_context != self.context.context and logo_context is not None:
+            return structured(
+                '<a href="%s">%s</a>',
+                canonical_url(logo_context, rootsite='mainsite'),
+                structured(adapter.logo())).escapedtext
+        else:
+            return adapter.logo()
+>>>>>>> MERGE-SOURCE
 
     @property
     def heading_breadcrumbs(self):

=== modified file 'lib/lp/app/browser/tales.py'
=== modified file 'lib/lp/app/browser/tests/watermark.txt'
--- lib/lp/app/browser/tests/watermark.txt	2015-07-08 16:05:11 +0000
+++ lib/lp/app/browser/tests/watermark.txt	2016-09-24 06:25:43 +0000
@@ -4,14 +4,14 @@
 
 The watermark is the image and heading used on all the main Launchpad
 pages. The image and heading are determined by Hierarchy from the
-IRootContext for the context object.
+IHeadingBreadcrumbs in the context object's breadcrumbs.
 
 
 Watermark headings
 ==================
 
 Hierarchy.heading() is used when you want a heading for the nearest
-object that implements IRootContext.
+object that implements IHeadingBreadcrumb.
 
     >>> from lp.app.browser.launchpad import Hierarchy
     >>> from lp.services.webapp.servers import LaunchpadTestRequest
@@ -26,7 +26,7 @@
     ...     req.traversed_objects.append(view)
     ...     return Hierarchy(view, req)
 
-Products directly implement IRootContext.
+Products directly implement IHeadingContext.
 
     >>> widget = factory.makeProduct(displayname='Widget')
     >>> print get_hierarchy(widget).heading()
@@ -38,7 +38,7 @@
     >>> print get_hierarchy(dev_focus).heading()
     <h...><a...>Widget</a></h...>
 
-ProjectGroups also directly implement IRootContext ...
+ProjectGroups also directly implement IHeadingContext ...
 
     >>> kde = factory.makeProject(displayname='KDE')
     >>> print get_hierarchy(kde).heading()
@@ -50,6 +50,14 @@
     >>> print get_hierarchy(mint).heading()
     <h...><a...>Mint Linux</a></h...>
 
+... and distribution source packacges ...
+
+    >>> dpkg = factory.makeDistributionSourcePackage(
+    ...     distribution=mint, sourcepackagename=u"dpkg")
+    >>> print test_tales('view/watermark:heading', view=view(dpkg))
+    <h...>Mint Linux</h...>
+    <h...>“dpkg” package</h...>
+
 ... and people ...
 
     >>> eric = factory.makePerson(displayname="Eric the Viking")

=== modified file 'lib/lp/app/templates/base-layout.pt'
--- lib/lp/app/templates/base-layout.pt	2016-09-14 11:13:06 +0000
+++ lib/lp/app/templates/base-layout.pt	2016-09-24 06:25:43 +0000
@@ -110,7 +110,7 @@
                 >Page Label
               </h1>
               <tal:breadcrumbs replace="structure view/@@+hierarchy">
-                ProjectName > Branches > Merge Proposals > fix-for-navigation
+                Merge Proposals > fix-for-navigation
               </tal:breadcrumbs>
               <div id="registration" class="registering"
                 tal:condition="not: view/macro:is-page-contentless">

=== modified file 'lib/lp/registry/browser/personproduct.py'
--- lib/lp/registry/browser/personproduct.py	2015-07-08 16:05:11 +0000
+++ lib/lp/registry/browser/personproduct.py	2016-09-24 06:25:43 +0000
@@ -50,7 +50,7 @@
 
     @property
     def text(self):
-        return self.context.product.displayname
+        return self.context.product.title
 
     @property
     def url(self):

=== modified file 'lib/lp/registry/interfaces/distributionsourcepackage.py'
--- lib/lp/registry/interfaces/distributionsourcepackage.py	2015-10-12 16:16:28 +0000
+++ lib/lp/registry/interfaces/distributionsourcepackage.py	2016-09-24 06:25:43 +0000
@@ -40,8 +40,13 @@
 from lp.soyuz.enums import ArchivePurpose
 
 
+<<<<<<< TREE
 class IDistributionSourcePackage(IHeadingContext, IBugTarget, IHasBranches,
                                  IHasMergeProposals, IHasOfficialBugTags,
+=======
+class IDistributionSourcePackage(IBugTarget, IHasBranches,
+                                 IHasMergeProposals, IHasOfficialBugTags,
+>>>>>>> MERGE-SOURCE
                                  IStructuralSubscriptionTarget,
                                  IQuestionTarget, IHasDrivers,
                                  IHasGitRepositories):

=== modified file 'lib/lp/services/webapp/interfaces.py'
--- lib/lp/services/webapp/interfaces.py	2016-09-14 11:12:13 +0000
+++ lib/lp/services/webapp/interfaces.py	2016-09-24 06:25:43 +0000
@@ -236,6 +236,8 @@
 class IBreadcrumb(Interface):
     """A breadcrumb link."""
 
+    context = Attribute("Object that this breadcrumb represents.")
+
     url = Attribute('Absolute url of this breadcrumb.')
 
     text = Attribute('Text of this breadcrumb.')