Merge lp:~michael.nelson/launchpad/sprint-index-should-hide-heading-db-devel into lp:launchpad/db-devel

[Michael Nelson]

[Michael Nelson (michael.nelson)]

= Summary =
This branch fixes bug 435269.

I landed the sprint-index update the other day, but subsequently a
view.label was added to a parent class of SprintView. It was my fault
for not have a test that explicitly ensured no h1 was included below the
app-tabs.

== Proposed fix ==

Specifically set the view.label to None for the SprintView. This is a
workaround for bug 435255.

== Pre-implementation notes ==

== Implementation details ==

== Tests ==
bin/test -vvt stories/sprints

== Demo and Q/A ==
Screenshots:
http://people.canonical.com/~michaeln/tmp/sprint-index-heading-before.png
http://people.canonical.com/~michaeln/tmp/sprint-index-should-hide-heading-after.png

QA: https://edge.launchpad.net/sprints/uds-l

Demo: https://launchpad.dev/sprints/uds-guacamole

= 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/blueprints/stories/sprints/05-sprint-creation.txt
  lib/lp/blueprints/browser/sprint.py
  lib/lp/blueprints/templates/sprint-portlet-attendees.pt

== Pyflakes notices ==

lib/lp/blueprints/browser/sprint.py
    35: 'Hierarchy' imported but unused
    37: 'ApplicationMenu' imported but unused

== Pylint notices ==

lib/lp/blueprints/browser/sprint.py
    37: [W0611] Unused import ApplicationMenu
    35: [W0611] Unused import Hierarchy

I removed this lint with r8503.

--
Michael

[Michael Nelson (michael.nelson)]

I forgot to mention two things:

(1) the second h1 heading that is displayed is actually incorrect - it refers to blueprints (a default heading of the base-class :/ ).

(2) I also fixed the icon issues for attendees as you'll see in the screenshots.

[Gavin Panella (allenap)]

review: Approve

[Brad Crittenden (bac)]

review: Approve (release-critical)

=== modified file 'lib/lp/blueprints/browser/sprint.py'
--- lib/lp/blueprints/browser/sprint.py	2009-09-22 15:02:41 +0000
+++ lib/lp/blueprints/browser/sprint.py	2009-09-24 14:15:25 +0000
@@ -32,10 +32,9 @@
 
 from canonical.cachedproperty import cachedproperty
 from canonical.launchpad import _
-from canonical.launchpad.browser import Hierarchy
 from canonical.launchpad.helpers import shortlist
 from canonical.launchpad.webapp import (
-    ApplicationMenu, GetitemNavigation, LaunchpadEditFormView,
+    GetitemNavigation, LaunchpadEditFormView,
     LaunchpadFormView, LaunchpadView, Link, Navigation, NavigationMenu,
     StandardLaunchpadFacets, action, canonical_url, custom_widget,
     enabled_with_permission)
@@ -145,6 +144,12 @@
 
     implements(IMajorHeadingView)
 
+    # XXX Michael Nelson 20090923 bug=435255
+    # This class inherits a label from HasSpecificationsView, which causes
+    # a second h1 to display. But as this view implements IMajorHeadingView
+    # it should not include an h1 below the app buttons.
+    label = None
+
     def initialize(self):
         self.notices = []
         self.latest_specs_limit = 5

=== modified file 'lib/lp/blueprints/stories/sprints/05-sprint-creation.txt'
--- lib/lp/blueprints/stories/sprints/05-sprint-creation.txt	2009-09-21 07:13:45 +0000
+++ lib/lp/blueprints/stories/sprints/05-sprint-creation.txt	2009-09-24 14:15:25 +0000
@@ -77,6 +77,26 @@
   >>> user_browser.url
   'http://launchpad.dev/sprints/ltsponsteroids'
 
+Because sprints are root contexts, an h1 heading is used to display
+the main heading above the application buttons) and the breadcrumbs
+are not displayed.
+
+  >>> print_location(user_browser.contents)
+  Hierarchy: None displayed
+  Tabs:
+  * Overview (selected) - not linked
+  ...
+  * Bugs - not linked
+  * Blueprints - http://blueprints.launchpad.dev/sprints/ltsponsteroids
+  * Translations - not linked
+  * Answers - not linked
+  Main heading: LTSP On Steroids
+
+There is no h1 heading in the main content.
+
+  >>> print find_main_content(user_browser.contents).find('h1')
+  None
+
 Since the sprint's time zone was set to UTC, the dates are displayed in
 that time zone:
 

=== modified file 'lib/lp/blueprints/templates/sprint-portlet-attendees.pt'
--- lib/lp/blueprints/templates/sprint-portlet-attendees.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/blueprints/templates/sprint-portlet-attendees.pt	2009-09-24 14:15:25 +0000
@@ -12,8 +12,7 @@
 
     <ul>
       <li class="person" tal:repeat="attendance context/attendances">
-        <a tal:attributes="href attendance/attendee/fmt:url"
-           tal:content="attendance/attendee/displayname">Foo Bar</a><br />
+        <a tal:replace="structure attendance/attendee/fmt:link">Foo Bar</a><br />
         <div class="discreet">
            <span tal:replace="python:view.formatDate(attendance.time_starts)">
              2005-08-05</span> till