launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #00476
[Merge] lp:~sinzui/launchpad/launchpad-header-1 into lp:launchpad/devel
Curtis Hovey has proposed merging lp:~sinzui/launchpad/launchpad-header-1 into lp:launchpad/devel.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
This is my branch to clean up the content in the registration slot and move
it.
lp:~sinzui/launchpad/launchpad-header-1
Diff size: 214
Launchpad bug:
https://bugs.launchpad.net/bugs/610866
Test command: ./bin/test -vv \
./bin/test -vvc -t stories/sprints -t xx-bug-heat-on-bug-page.txt \
-t xx-malone-homepage.txt -t bugtrackers-index.txt -t cve-pages.txt \
-t test_base_layout -t base-layout
Pre-implementation: henninge via email
Target release: 10.08
Clean up the content in the registration slot and move it
---------------------------------------------------------
Henning argues that aesthetics and reading bread crumbs is more important
than clearly knowing the context that the registration slot pertains too.
distroseries page places blocks in registration slot. The a <p> is inserted
into the slot and that creates extra spaces. This may be true for other pages.
Rules
-----
* Move the slot below the bread crumbs
* Remove all block content from the registration slot.
* ADDENDUM: distributionmirror-index.pt has invalid markup
QA
--
The expected layout looks like this:
http://people.canonical.com/~curtis/regitration-slot.png
* Visit https://edge.launchpad.net/ubuntu/maverick
* Verify the registration information is below the breadcrumbs with
about .5m separate between them
Lint
----
Linting changed files:
lib/canonical/launchpad/icing/style-3-0.css.in
lib/lp/answers/templates/faq-index.pt
lib/lp/answers/templates/question-index.pt
lib/lp/app/templates/base-layout.pt
lib/lp/blueprints/templates/sprint-index.pt
lib/lp/code/templates/sourcepackagerecipebuild-index.pt
lib/lp/registry/templates/distribution-index.pt
lib/lp/registry/templates/distributionmirror-index.pt
lib/lp/registry/templates/distroseries-index.pt
lib/lp/soyuz/templates/build-index.pt
Test
----
No tests changed. This is expected. This is the second branch dealing with
the header and we knew we wanted to move the registration slot. The tests
in the previous branch (all listed above) were updated to not break with
the next move.
Implementation
--------------
The registration slot move.
* lib/canonical/launchpad/icing/style-3-0.css.in
* Henning suggest 1em between the bread crumbs and the registration
slot, I made it half an em so that it was closer to the name than the
narrative.
* lib/lp/app/templates/base-layout.pt
* Move the registration slot
Remove the <p> that created extra white space before and after the
registration text.
* lib/lp/answers/templates/faq-index.pt
* lib/lp/answers/templates/question-index.pt
* lib/lp/blueprints/templates/sprint-index.pt
* lib/lp/code/templates/sourcepackagerecipebuild-index.pt
* lib/lp/registry/templates/distribution-index.pt
* lib/lp/registry/templates/distroseries-index.pt
* lib/lp/soyuz/templates/build-index.pt
* lib/lp/registry/templates/distributionmirror-index.pt
* lint reported invalid markup. The template was missing two closing
divs.
--
https://code.launchpad.net/~sinzui/launchpad/launchpad-header-1/+merge/31975
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~sinzui/launchpad/launchpad-header-1 into lp:launchpad/devel.
=== modified file 'lib/canonical/launchpad/icing/style-3-0.css.in'
--- lib/canonical/launchpad/icing/style-3-0.css.in 2010-07-26 21:00:39 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css.in 2010-08-06 16:50:56 +0000
@@ -1199,7 +1199,7 @@
}
.registering {
/* Registered slot */
- margin: 0 0 0.2em 0;
+ margin: .5em 0 1em 0;
font-style: italic;
font-size: 77%;
color: #666;
=== modified file 'lib/lp/answers/templates/faq-index.pt'
--- lib/lp/answers/templates/faq-index.pt 2009-11-14 16:30:47 +0000
+++ lib/lp/answers/templates/faq-index.pt 2010-08-06 16:50:56 +0000
@@ -9,8 +9,8 @@
<body>
<metal:registering fill-slot="registering">
Created by <a tal:replace="structure context/owner/fmt:link" />
- on
- <span
+ on
+ <span
tal:attributes="title context/date_created/fmt:datetime"
tal:content="context/date_created/fmt:displaydate">2005-10-05</span>
</metal:registering>
=== modified file 'lib/lp/answers/templates/question-index.pt'
--- lib/lp/answers/templates/question-index.pt 2009-11-14 16:07:33 +0000
+++ lib/lp/answers/templates/question-index.pt 2010-08-06 16:50:56 +0000
@@ -59,7 +59,7 @@
</p>
<ul class="horizontal">
- <li
+ <li
tal:define="link context/menu:answers/linkbug"
tal:content="structure link/fmt:link" />
<li tal:condition="context/bugs"
@@ -69,7 +69,7 @@
<div id="related-faq" style="margin-top: 1em;">
<h2>Related FAQ:</h2>
-
+
<p>
<a class="sprite question"
tal:condition="context/faq"
=== modified file 'lib/lp/app/templates/base-layout.pt'
--- lib/lp/app/templates/base-layout.pt 2010-07-23 15:03:41 +0000
+++ lib/lp/app/templates/base-layout.pt 2010-08-06 16:50:56 +0000
@@ -117,12 +117,12 @@
metal:define-slot="heading"
>Page Label
</h1>
+ <tal:breadcrumbs replace="structure context/@@+hierarchy">
+ ProjectName > Branches > Merge Proposals > fix-for-navigation
+ </tal:breadcrumbs>
<div id="registration" class="registering">
<metal:registering define-slot="registering" />
</div>
- <tal:breadcrumbs replace="structure context/@@+hierarchy">
- ProjectName > Branches > Merge Proposals > fix-for-navigation
- </tal:breadcrumbs>
</div>
<tal:maintenance
=== modified file 'lib/lp/blueprints/templates/sprint-index.pt'
--- lib/lp/blueprints/templates/sprint-index.pt 2009-09-19 04:50:52 +0000
+++ lib/lp/blueprints/templates/sprint-index.pt 2010-08-06 16:50:56 +0000
@@ -10,11 +10,10 @@
<body>
<tal:registering metal:fill-slot="registering">
- <p>Registered by <a tal:replace="structure context/owner/fmt:link" />
+ Registered by <a tal:replace="structure context/owner/fmt:link" />
on <span tal:content="context/datecreated/fmt:displaydate"
tal:attributes="title context/datecreated/fmt:datetime"
>on 2005-01-01</span>
- </p>
</tal:registering>
<div metal:fill-slot="main"
@@ -107,7 +106,7 @@
<tal:proposed define="proposed view/proposed_count"
condition="proposed">
There are <span tal:replace="proposed">7</span>
- specifications
+ specifications
<a tal:omit-tag="not: context/required:launchpad.Driver" href="+settopics">
proposed
</a> which the organisers will review.
=== modified file 'lib/lp/code/templates/sourcepackagerecipebuild-index.pt'
--- lib/lp/code/templates/sourcepackagerecipebuild-index.pt 2010-07-28 17:10:58 +0000
+++ lib/lp/code/templates/sourcepackagerecipebuild-index.pt 2010-08-06 16:50:56 +0000
@@ -10,12 +10,10 @@
<body>
<tal:registering metal:fill-slot="registering">
- <p>
created
<span tal:content="context/datecreated/fmt:displaydate"
tal:attributes="title context/datecreated/fmt:datetime"
>on 2005-01-01</span>
- </p>
</tal:registering>
<div metal:fill-slot="main">
=== modified file 'lib/lp/registry/templates/distribution-index.pt'
--- lib/lp/registry/templates/distribution-index.pt 2009-09-15 22:12:44 +0000
+++ lib/lp/registry/templates/distribution-index.pt 2010-08-06 16:50:56 +0000
@@ -11,13 +11,11 @@
</tal:heading>
<tal:registering metal:fill-slot="registering">
- <p>
registered by
<a tal:replace="structure context/owner/fmt:link" />
<span tal:content="context/date_created/fmt:displaydate"
tal:attributes="title context/date_created/fmt:datetime"
>on 2005-01-01</span>
- </p>
</tal:registering>
<tal:main metal:fill-slot="main"
=== modified file 'lib/lp/registry/templates/distributionmirror-index.pt'
--- lib/lp/registry/templates/distributionmirror-index.pt 2010-02-09 21:38:03 +0000
+++ lib/lp/registry/templates/distributionmirror-index.pt 2010-08-06 16:50:56 +0000
@@ -13,17 +13,15 @@
</tal:heading>
<tal:registering metal:fill-slot="registering">
- <p>
Registered
<span tal:content="context/date_created/fmt:displaydate">
on 2005-01-01</span>
- </p>
</tal:registering>
<tal:main
metal:fill-slot="main"
define="overview_menu context/menu:overview">
-
+
<div class="top-portlet" tal:condition="context/description">
<p tal:content="structure context/description/fmt:text-to-html" />
</div>
@@ -63,7 +61,7 @@
<div class="yui-u">
<div class="two-column-list">
- <dl id="speed">
+ <dl id="speed">
<dt>Speed:</dt>
<dd tal:content="context/speed/title" />
</dl>
@@ -83,6 +81,7 @@
</dl>
</div>
</div>
+ </div>
<div class="portlet"
id="last-probe"
@@ -152,6 +151,7 @@
</tal:cdimage-mirror>
</tal:has-last-probe>
</div>
+ </div>
</tal:main>
<tal:side metal:fill-slot="side" condition="context/required:launchpad.Edit">
=== modified file 'lib/lp/registry/templates/distroseries-index.pt'
--- lib/lp/registry/templates/distroseries-index.pt 2010-02-18 23:38:31 +0000
+++ lib/lp/registry/templates/distroseries-index.pt 2010-08-06 16:50:56 +0000
@@ -19,13 +19,11 @@
</tal:heading>
<tal:registering metal:fill-slot="registering">
- <p>
registered by
<a tal:replace="structure context/owner/fmt:link" />
<span tal:content="context/date_created/fmt:displaydate"
tal:attributes="title context/date_created/fmt:datetime"
>on 2005-01-01</span>
- </p>
</tal:registering>
<div metal:fill-slot="main">
=== modified file 'lib/lp/soyuz/templates/build-index.pt'
--- lib/lp/soyuz/templates/build-index.pt 2010-06-05 05:05:43 +0000
+++ lib/lp/soyuz/templates/build-index.pt 2010-08-06 16:50:56 +0000
@@ -10,12 +10,10 @@
<body>
<tal:registering metal:fill-slot="registering">
- <p>
created
<span tal:content="context/date_created/fmt:displaydate"
tal:attributes="title context/date_created/fmt:datetime"
>on 2005-01-01</span>
- </p>
</tal:registering>
<div metal:fill-slot="main">
