Merge lp:~sinzui/launchpad/lp-layout-0 into lp:launchpad

[Curtis Hovey]

This is my branch to fix the layout of the main_side layout.

    lp:~sinzui/launchpad/lp-layout-0
    Diff size: 83
    Launchpad bug:
          https://bugs.launchpad.net/bugs/593283
    Test command: ./bin/test -vv \
          -t base-layout
    Pre-implementation: no one
    Target release: 10.06

Fix the layout of the main_side layout
--------------------------------------

The main content goes underneath the side portlets. The main content
sits in a div yui-b combination, but I ended that tag prematurely in a recent
branch. This was caused my an errant move of the notifications markup
to avoid broken headers. I did not notice my mistake because I was only
looking at main_only pages. This bug affect main_side layouts.

Rules
-----

    * Moved <metal:main define-slot="main" /> tag before the closing
      tag of the div yui-b. The notifications will move too because they
      must appear directly above the content.

QA
--

    * Visit a main_side page layout on edge, such as a project +index
      or its bug's page.
    * Verify the main content does not appear under the side portlets.

Lint
----

Linting changed files:
  lib/lp/app/browser/tests/base-layout.txt
  lib/lp/app/templates/base-layout.pt

Test
----

    * lib/lp/app/browser/tests/base-layout.txt
      * Updated the tests to verify that the the div yui-b is closed
        after the main content.

Implementation
--------------

    * lib/lp/app/templates/base-layout.pt
      * Moved the closing tag of the div yui-b after the main content slot.

[Paul Hummer (rockstar)]

review: Approve (code)

=== modified file 'lib/lp/app/browser/tests/base-layout.txt'
--- lib/lp/app/browser/tests/base-layout.txt	2010-06-10 21:23:02 +0000
+++ lib/lp/app/browser/tests/base-layout.txt	2010-06-13 15:35:43 +0000
@@ -189,7 +189,6 @@
     </ol>
     <BLANKLINE>
                 </div>
-              </div><!-- yui-b -->
     <BLANKLINE>
     <BLANKLINE>
     <BLANKLINE>
@@ -203,6 +202,7 @@
               Main content of the page.
             </p>
           </div>
+        </div><!-- yui-b -->
     </div>
 
 Global search.
@@ -315,10 +315,9 @@
               Main content of the page.
             </p>
           </div>
-    <BLANKLINE>
-            </div><!-- yui-main -->
-    <BLANKLINE>
-            <!-- yui-b side -->
+          </div><!-- yui-b -->
+          </div><!-- yui-main -->
+          <!-- yui-b side -->
           <!-- yui-t4 -->
     ...
 
@@ -381,8 +380,7 @@
 
     >>> print str(find_tag_by_id(body_tag, 'maincontent'))
     <div id="maincontent" class="yui-main">
-              <div class="yui-b" dir="ltr">
-              </div><!-- yui-b -->
+        <div class="yui-b" dir="ltr">
           <div class="top-portlet">
             <h1>Heading</h1>
             <p class="registered">
@@ -393,6 +391,7 @@
               Main content of the page.
             </p>
           </div>
+        </div><!-- yui-b -->
     </div>
 
 Footer.

=== modified file 'lib/lp/app/templates/base-layout.pt'
--- lib/lp/app/templates/base-layout.pt	2010-06-10 20:25:19 +0000
+++ lib/lp/app/templates/base-layout.pt	2010-06-13 15:35:43 +0000
@@ -118,16 +118,17 @@
                 ProjectName > Branches > Merge Proposals > fix-for-navigation
               </tal:breadcrumbs>
             </div>
+
+            <tal:maintenance
+              replace="structure context/@@+maintenancemessage" />
+            <tal:notifications
+              define="notifications request/notifications"
+              condition="notifications">
+              <metal:notifications
+                use-macro="context/@@+base-layout-macros/notifications"/>
+            </tal:notifications>
+              <metal:main define-slot="main" />
           </div><!-- yui-b -->
-          <tal:maintenance
-            replace="structure context/@@+maintenancemessage" />
-          <tal:notifications
-            define="notifications request/notifications"
-            condition="notifications">
-            <metal:notifications
-              use-macro="context/@@+base-layout-macros/notifications"/>
-          </tal:notifications>
-            <metal:main define-slot="main" />
         </div><!-- yui-main -->
 
         <div class="yui-b side"