Merge lp:~sinzui/launchpad/registering-header into lp:launchpad

[Curtis Hovey]

[Curtis Hovey (sinzui)]

This is my branch to move the registering slot to above the line in
the header.

    lp:~sinzui/launchpad/registering-header
    Diff size: 101
    Launchpad bug: https://bugs.launchpad.net/bugs/434399
    Test command: ./bin/test -vvt "base-layout"
    Pre-implementation: beuno
    Target release: 3.1.0

= Move the registering slot to above the line in the header =

The design show that the registering slot goes above the horizontal line
aligned right in roman text.

Celso did not place it there because the name of deep objects like
DSPs do not appear above the line, causing the registration information
to appear with the the pillar name, not the context name.

It was decided that while this point is true, the position under the
line cause more problems than it solves.

== Rules ==

    * Move the registering slot over the line
    * Remove the italics from the CSS

== QA ==

See http://launchpadlibrarian.net/32250265/registering.png

== Lint ==

Linting changed files:
  lib/canonical/launchpad/icing/style-3-0.css
  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 test to verify the location of the registering slot.

== Implementation ==

    * lib/canonical/launchpad/icing/style-3-0.css
      * Removed the italics rule.
    * lib/lp/app/templates/base-layout.pt
      * Moved the slot.

[Jeroen T. Vermeulen (jtv)]

Great improvement—on the .dev page that's mentioned in the bug, for me, it also fixes an ugly line break in the h1. And good to be rid of the IE workaround, too.

Not much code change to look at. Wholeheartedly r=jtv.

review: Approve

=== modified file 'lib/canonical/launchpad/icing/style-3-0.css'
--- lib/canonical/launchpad/icing/style-3-0.css	2009-09-18 14:53:15 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css	2009-09-22 10:11:21 +0000
@@ -542,7 +542,6 @@
     padding-top: 10px;
     font-size: 85%;
     color: #666;
-    font-style: italic;
 }
 
 /* Side content exceptions */

=== modified file 'lib/lp/app/browser/tests/base-layout.txt'
--- lib/lp/app/browser/tests/base-layout.txt	2009-09-17 23:46:39 +0000
+++ lib/lp/app/browser/tests/base-layout.txt	2009-09-22 10:11:21 +0000
@@ -84,6 +84,8 @@
             <img alt="" width="64" height="64" src="/@@/person-logo" />
             <h2>Waffles</h2>
     <BLANKLINE>
+      <div class="registering">
+      </div>
       <!-- Application Menu -->
       <ul>
     <BLANKLINE>
@@ -93,8 +95,6 @@
     ...
               <div class="yui-b" dir="ltr">
                 <div>
-                  <div class="registering">
-                  </div>
                   <h2>Heading</h2>
                   <ol class="breadcrumbs" xmlns="http://www.w3.org/1999/xhtml">
     ...
@@ -191,8 +191,6 @@
     <BLANKLINE>
               <div class="yui-b" dir="ltr">
                 <div>
-                  <div class="registering">
-                  </div>
     <BLANKLINE>
                   <ol class="breadcrumbs" xmlns="http://www.w3.org/1999/xhtml">
     <BLANKLINE>
@@ -290,6 +288,8 @@
           <div class="watermark-apps-portlet top-portlet">
             <img alt="" width="64" height="64" src="/@@/person-logo" />
             <h2>Waffles</h2>
+            <div class="registering">
+            </div>
     <BLANKLINE>
       <!-- Application Menu -->
       <ul>
@@ -311,8 +311,6 @@
     <BLANKLINE>
               <div class="yui-b" dir="ltr">
                 <div>
-                  <div class="registering">
-                  </div>
     <BLANKLINE>
                   <ol class="breadcrumbs" xmlns="http://www.w3.org/1999/xhtml">
     <BLANKLINE>

=== modified file 'lib/lp/app/templates/base-layout.pt'
--- lib/lp/app/templates/base-layout.pt	2009-09-18 03:48:00 +0000
+++ lib/lp/app/templates/base-layout.pt	2009-09-22 10:11:21 +0000
@@ -45,15 +45,6 @@
     </style>
 
     <tal:comment condition="nothing">
-      Internet Explorer apparently doubles the horizontal margins of the
-      application tabs, which causes the 'Answers' tab to wrap onto a second
-      row. To work around this, we give IE some speshul CSS:
-    </tal:comment>
-    <!--[if lte IE 7]>
-      <style type="text/css">#lp-apps span {margin: 0 0.125%;}</style>
-    <![endif]-->
-
-    <tal:comment condition="nothing">
       This CSS collapses the contents of collapsible fieldsets,
       without the flashing that would result from doing it in JavaScript.
       activateCollapsibles() removes the class="collapsed" from fieldsets, to
@@ -89,6 +80,9 @@
         <h2 tal:replace="structure view/watermark:heading">
           Celso Providelo
         </h2>
+        <div class="registering">
+          <metal:registering define-slot="registering" />
+        </div>
         <metal:heading_nav
           use-macro="context/@@+base-layout-macros/application-buttons"/>
       </div>
@@ -112,9 +106,6 @@
               xml:lang view/lang|default_language|default;
               dir view/dir|string:ltr">
             <div tal:condition="view/macro:pagehas/applicationtabs">
-              <div class="registering">
-                <metal:registering define-slot="registering" />
-              </div>
               <h1
                 tal:condition="view/label|nothing"
                 tal:content="view/label"