Merge lp:~deryck/launchpad/bugs-home-floats-etc into lp:launchpad

[Deryck Hodge]

Fix float issues and other display issues on a project's bugs home page.

This branch fixes bug 551915 and a few minor issues with the display of
a project's bugs home page. To fix the float issues mentioned in this
bug, the branch changes the bug supervisor and security contact info to
appear in a portlet in the sidebar. This allows us to remove float from
the elements in the main content of the page, which makes a nicer
experience when resizing the window. Nothing re-flows oddly now.

See:
http://launchpadlibrarian.net/48022236/float-right-no-open-bugs.png

I discussed this change in a pre-imp discussion with intellectronica,
who supported the approach. We originally moved this stuff out of the
portlets and into the main content for the 3.0 design, thinking we would
have clear rules for what went in portlets and eventually fade the
sidebar's use all together. This change has never been realized, and in
this case, the sidebar location makes more sense and cleans up the page.

While I was fixing this, I also fixed another couple minor issues. I
changed the language to read "no open bugs" rather than "no hot bugs"
when the page displays no bugs, which makes more sense with the way the
page works. I also fixed the page so the external bug tracker link
shows up now when specified on a project that doesn't use Launchpad for
bug tracking. I also added a bit of extra spacing around the form to
make the page scan better.

[Eleanor Berger (intellectronica)]

review: Approve

=== modified file 'lib/lp/bugs/stories/bugs/xx-front-page-info.txt'
--- lib/lp/bugs/stories/bugs/xx-front-page-info.txt	2010-04-09 16:19:25 +0000
+++ lib/lp/bugs/stories/bugs/xx-front-page-info.txt	2010-05-17 13:11:39 +0000
@@ -100,7 +100,7 @@
     >>> bug_list = find_tag_by_id(
     ...     anon_browser.contents, 'no-bugs-filed')
     >>> print extract_text(bug_list)
-    There are currently no hot bugs filed against Project Uses Malone.
+    There are currently no open bugs filed against Project Uses Malone.
 
 But since the project has a bug, the search box is still visible.
 
@@ -110,3 +110,20 @@
     by status
     ...
     Advanced search
+
+Projects that use an external bug tracker will list the tracker on a
+bugs home page in addition to the message that the project does not
+use Launchpad for bug tracking.
+
+    >>> login('[e-mail]')
+    >>> some_tracker = factory.makeBugTracker(
+    ...     base_url='http://tracker.example.com/')
+    >>> test_project.bugtracker = some_tracker
+    >>> logout()
+    >>> anon_browser.open('http://bugs.launchpad.dev/test-project')
+    >>> uses_malone_p = find_tag_by_id(anon_browser.contents, 'no-malone')
+    >>> print extract_text(uses_malone_p)
+    Simple Test Project does not use Launchpad for bug tracking.
+    >>> tracker_text = find_tag_by_id(anon_browser.contents, 'bugtracker')
+    >>> print extract_text(tracker_text)
+    Bugs are tracked in tracker.example.com/.
 
=== modified file 'lib/lp/bugs/templates/bugtarget-bugs.pt'
--- lib/lp/bugs/templates/bugtarget-bugs.pt	2010-03-17 04:01:37 +0000
+++ lib/lp/bugs/templates/bugtarget-bugs.pt	2010-05-17 13:11:39 +0000
@@ -33,6 +33,43 @@
           </li>
         </ul>
       </div>
+      <div class="portlet">
+        <dl tal:define="bug_supervisor context/bug_supervisor"
+            id="bug-supervisor">
+          <dt>Bug supervisor:</dt>
+          <dd>
+            <tal:none condition="not:bug_supervisor">None set</tal:none>
+            <a tal:condition="bug_supervisor"
+               tal:replace="structure bug_supervisor/fmt:link">Bob Johnson</a>
+            <tal:edit-bug-supervisor
+                condition="context/menu:bugs/bugsupervisor|nothing">
+              <a tal:define="link context/menu:bugs/bugsupervisor"
+                 tal:condition="link/enabled"
+                 tal:attributes="href link/url; title link/text">
+                <img tal:attributes="alt link/text" src="/@@/edit" />
+              </a>
+            </tal:edit-bug-supervisor>
+          </dd>
+        </dl>
+        <dl tal:define="securitycontact context/security_contact">
+          <dt id="bug-security">Security contact:</dt>
+          <dd>
+            <tal:none condition="not:securitycontact">None set</tal:none>
+            <a tal:condition="securitycontact"
+               tal:replace="structure securitycontact/fmt:link">
+              Billy Anderson
+            </a>
+            <tal:edit-securitycontact
+                condition="context/menu:bugs/securitycontact|nothing">
+              <a tal:define="link context/menu:bugs/securitycontact"
+                 tal:condition="link/enabled"
+                 tal:attributes="href link/url; title link/text">
+                <img tal:attributes="alt link/text" src="/@@/edit" />
+              </a>
+            </tal:edit-securitycontact>
+          </dd>
+        </dl>
+      </div>
       <div tal:replace="structure context/@@+portlet-bugfilters" />
       <div tal:replace="structure context/@@+portlet-bugtags" />
       <tal:releasecriticalbugs
@@ -46,58 +83,11 @@
          tal:define="search_url string:+bugs;
                      advanced_search_url string:+bugs?advanced=1">
 
+
+
       <tal:uses_malone condition="view/uses_launchpad_bugtracker">
-        <div class="portlet" style="float: right; border: none">
-          <ul>
-            <li id="bugtracker" tal:condition="not: view/uses_launchpad_bugtracker">
-              <strong>Bug tracker:</strong><br />
-              <span style="margin-left: 1em">
-                <tal:bugtracker replace="structure view/bugtracker" />
-              </span>
-            </li>
-            <li id="bug-supervisor"
-                tal:define="bug_supervisor context/bug_supervisor">
-              Bug supervisor:<br />
-              <span style="margin-left: 1em">
-                <tal:none condition="not:bug_supervisor">None set</tal:none>
-                <a tal:condition="bug_supervisor"
-                   tal:replace="structure bug_supervisor/fmt:link">Bob Johnson</a>
-                <tal:edit-bug-supervisor
-                    condition="context/menu:bugs/bugsupervisor|nothing">
-                  <a tal:define="link context/menu:bugs/bugsupervisor"
-                     tal:condition="link/enabled"
-                     tal:attributes="href link/url; title link/text">
-                    <img tal:attributes="alt link/text" src="/@@/edit" />
-                  </a>
-                </tal:edit-bug-supervisor>
-              </span>
-            </li>
-            <li id="bug-security"
-                tal:define="securitycontact context/security_contact">
-              Security contact:<br />
-              <span style="margin-left: 1em">
-                <tal:none condition="not:securitycontact">None set</tal:none>
-                <a tal:condition="securitycontact"
-                   tal:replace="structure securitycontact/fmt:link">
-                  Billy Anderson
-                </a>
-                <tal:edit-securitycontact
-                    condition="context/menu:bugs/securitycontact|nothing">
-                  <a tal:define="link context/menu:bugs/securitycontact"
-                     tal:condition="link/enabled"
-                     tal:attributes="href link/url; title link/text">
-                    <img tal:attributes="alt link/text" src="/@@/edit" />
-                  </a>
-                </tal:edit-securitycontact>
-              </span>
-            </li>
-            <li>
-            </li>
-          </ul>
-        </div>
-
       <tal:has_bugtasks condition="context/has_bugtasks">
-        <div class="search-box">
+        <div class="search-box" style="margin-bottom:2em">
           <metal:search
             use-macro="context/@@+bugtarget-macros-search/simple-search-form"
           />
@@ -108,7 +98,7 @@
       </tal:has_bugtasks>
 
       <tal:has_hot_bugs condition="view/hot_bugs_info/bugtasks">
-        <h2 style="margin-top: 1em">Hot bugs</h2>
+        <h2>Hot bugs</h2>
 
         <table class="listing" id="hot-bugs"
           tal:define="show_package python: 'packagename' in view.columns_to_show
@@ -157,20 +147,24 @@
 
       <tal:no_hot_bugs condition="not: view/hot_bugs_info/bugtasks">
         <p id="no-bugs-filed"><strong>There are currently no
-          <span tal:condition="context/has_bugtasks">hot</span> bugs filed
+          <span tal:condition="context/has_bugtasks">open</span> bugs filed
           against <tal:project_title replace="context/title" />.</strong></p>
 
         <p id="no-bugs-report"><a href="+filebug">Report a bug.</a></p>
       </tal:no_hot_bugs>
     </tal:uses_malone>
 
-    <tal:not_uses_malone condition="not: view/uses_launchpad_bugtracker">
+    <tal:not_uses_malone condition="not: view/uses_launchpad_bugtracker"
+     tal:define ="configure_bugtracker context/menu:overview/configure_bugtracker | nothing">
       <p id="no-malone"><strong><tal:project_title replace="context/title" /> does not use Launchpad for
         bug tracking.</strong></p>
+          <p tal:condition="view/external_bugtracker"
+             id="bugtracker"><strong>Bugs are tracked in
+            <tal:bugtracker replace="structure view/bugtracker" />.</strong>
+          </p>
 
         <p tal:condition="context/required:launchpad.Edit"
            id="no-malone-edit"
-           tal:define ="configure_bugtracker context/menu:overview/configure_bugtracker | nothing"
            >
           <a tal:condition="configure_bugtracker"
              tal:replace="structure configure_bugtracker/fmt:link"/>