Merge lp:~julian-edwards/launchpad/mechanical-changes-6 into lp:launchpad
- mechanical-changes-6
- Merge into devel
Proposed by
Julian Edwards
| Status: | Merged |
|---|---|
| Merged at revision: | not available |
| Proposed branch: | lp:~julian-edwards/launchpad/mechanical-changes-6 |
| Merge into: | lp:launchpad |
| Diff against target: | None lines |
| To merge this branch: | bzr merge lp:~julian-edwards/launchpad/mechanical-changes-6 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Nelson (community) | code/ui | Approve | |
|
Review via email:
|
|||
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
| Julian Edwards (julian-edwards) wrote : | # |
Revision history for this message
| Michael Nelson (michael.nelson) wrote : | # |
Download full text (7.5 KiB)
> = Summary =
> Mechanical 3.0 changes for DistroArchSerie
These pages look *so* much better! It's great seeing LP transformed :)
>
> == Implementation details ==
> I slipped in a quick bug fix while I was at it:
> https:/
> to fix a page heading. This was just a case of changing the title property on
> the context class.
Great! As mentioned in irc, you've added an extra 'for' into the title unintentionally, and it would be good to use smartquotes here.
>
> The change to the DistroArchSerie
> here:
> https:/
>
> The change to the DistroArchSerie
> It uses several page fragments in the package relationships section that are
> in a different context/view. They are not used anywhere else so I added some
> conditional "yui-u" div classes to those so that they don't appear when not
> necessary.
>
> The breadcrumbs on both pages are not working properly, I will fix those in a
> separate branch.
>
> == Tests ==
> bin/test -vvt stories.soyuz -t distroarchserie
Looks like the tests for the title need updating (or you may have done it since I merged).
The only other thing is that we need to ensure we markup the package relationships correctly... currently there are dt's that are not enclosed by dl's (like having an <li> without it being inside a <ul> or an <ol>. That in itself is as easy as doing the following for each relationship portlet:
http://
It does leave one remaining problem - the <dt> is then followed by a <ul> rather than a bunch of <dd>'s, but we can't fix that yet as another template (sourcepackage-
Looking forward to seeing it land!
IRC log:
<bigjools> great
<noodles775> bigjools: you mention in your MP that the breadcrumbs aren't working properly - in what way?
<bigjools> noodles775: they are now, I landed a change last night :)
<noodles775> bigjools: heh, I couldn't find a problem :)
<bigjools> they stopped at 9.04
<noodles775> bigjools: any reason you didn't use smartquote in the title?
<bigjools> or whatever version
<bigjools> meh, details :)
<noodles775> (like in model/distribut
<noodles775> bigjools: also, see https:/
<noodles775> What do you think we should do in that case? (The empty Package relationships section)
<bigjools> noodles775: it will never be empty in real life
<noodles775> Great.
<bigjools> our sample data is bong
* jtv (n=jtv@
<noodles775> bigjools: also with the dasbp title, was it an explicit decision to do '"mozilla-firefox" binary package in Ubuntu Karmic for i386' rather than without the 'for' as suggested by mpt: '"mozilla-firefox" binary pa...
review:
Approve
(code/ui)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'lib/lp/soyuz/doc/distroarchseriesbinarypackage.txt' | |||
| 2 | --- lib/lp/soyuz/doc/distroarchseriesbinarypackage.txt 2009-04-30 12:16:12 +0000 | |||
| 3 | +++ lib/lp/soyuz/doc/distroarchseriesbinarypackage.txt 2009-09-02 11:28:03 +0000 | |||
| 4 | @@ -1,5 +1,6 @@ | |||
| 7 | 1 | Distro Arch Release Binary Package | 1 | ================================= |
| 8 | 2 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | 2 | Distro Arch Series Binary Package |
| 9 | 3 | ================================= | ||
| 10 | 3 | 4 | ||
| 11 | 4 | >>> from lp.soyuz.model.binarypackagename import ( | 5 | >>> from lp.soyuz.model.binarypackagename import ( |
| 12 | 5 | ... BinaryPackageName) | 6 | ... BinaryPackageName) |
| 13 | @@ -15,6 +16,11 @@ | |||
| 14 | 15 | >>> firefox_hoary_i386 = DistroArchSeriesBinaryPackage(hoary_i386, | 16 | >>> firefox_hoary_i386 = DistroArchSeriesBinaryPackage(hoary_i386, |
| 15 | 16 | ... firefox_name) | 17 | ... firefox_name) |
| 16 | 17 | 18 | ||
| 17 | 19 | `DistroArchSeriesBinaryPackage`s have a title property: | ||
| 18 | 20 | |||
| 19 | 21 | >>> print pmount_hoary_i386.title | ||
| 20 | 22 | "pmount" binary package in The Hoary Hedgehog Release for i386 (x86) | ||
| 21 | 23 | |||
| 22 | 18 | 24 | ||
| 23 | 19 | First, we create a new version of pmount, and a version of | 25 | First, we create a new version of pmount, and a version of |
| 24 | 20 | mozilla-firefox that coincides with pmount's. We're hitch-hiking on two | 26 | mozilla-firefox that coincides with pmount's. We're hitch-hiking on two |
| 25 | @@ -36,7 +42,7 @@ | |||
| 26 | 36 | ... PackagePublishingPocket, IDistributionSet) | 42 | ... PackagePublishingPocket, IDistributionSet) |
| 27 | 37 | >>> priority = PackagePublishingPriority.STANDARD | 43 | >>> priority = PackagePublishingPriority.STANDARD |
| 28 | 38 | 44 | ||
| 30 | 39 | XXX: noodles 2008-11-05 bug=294585: The dependency on a database id | 45 | XXX: noodles 2008-11-05 bug=294585: The dependency on a database id |
| 31 | 40 | needs to be removed. | 46 | needs to be removed. |
| 32 | 41 | >>> bpr = Build.get(8).createBinaryPackageRelease( | 47 | >>> bpr = Build.get(8).createBinaryPackageRelease( |
| 33 | 42 | ... binarypackagename=firefox_name.id, | 48 | ... binarypackagename=firefox_name.id, |
| 34 | @@ -77,7 +83,7 @@ | |||
| 35 | 77 | ... dateremoved=None, | 83 | ... dateremoved=None, |
| 36 | 78 | ... archive=hoary_i386.main_archive) | 84 | ... archive=hoary_i386.main_archive) |
| 37 | 79 | 85 | ||
| 39 | 80 | XXX: noodles 2008-11-06 bug=294585: The dependency on a database id | 86 | XXX: noodles 2008-11-06 bug=294585: The dependency on a database id |
| 40 | 81 | needs to be removed. | 87 | needs to be removed. |
| 41 | 82 | >>> bpr = Build.get(9).createBinaryPackageRelease( | 88 | >>> bpr = Build.get(9).createBinaryPackageRelease( |
| 42 | 83 | ... binarypackagename=pmount_name.id, | 89 | ... binarypackagename=pmount_name.id, |
| 43 | 84 | 90 | ||
| 44 | === modified file 'lib/lp/soyuz/model/distroarchseriesbinarypackage.py' | |||
| 45 | --- lib/lp/soyuz/model/distroarchseriesbinarypackage.py 2009-07-19 04:41:14 +0000 | |||
| 46 | +++ lib/lp/soyuz/model/distroarchseriesbinarypackage.py 2009-09-02 11:28:03 +0000 | |||
| 47 | @@ -71,7 +71,7 @@ | |||
| 48 | 71 | @property | 71 | @property |
| 49 | 72 | def title(self): | 72 | def title(self): |
| 50 | 73 | """See IDistroArchSeriesBinaryPackage.""" | 73 | """See IDistroArchSeriesBinaryPackage.""" |
| 52 | 74 | return 'Binary Package "%s" in %s' % ( | 74 | return '"%s" binary package in %s' % ( |
| 53 | 75 | self.binarypackagename.name, self.distroarchseries.title) | 75 | self.binarypackagename.name, self.distroarchseries.title) |
| 54 | 76 | 76 | ||
| 55 | 77 | @cachedproperty | 77 | @cachedproperty |
| 56 | @@ -238,7 +238,7 @@ | |||
| 57 | 238 | current_release = self.currentrelease | 238 | current_release = self.currentrelease |
| 58 | 239 | if current_release is None: | 239 | if current_release is None: |
| 59 | 240 | return None | 240 | return None |
| 61 | 241 | 241 | ||
| 62 | 242 | src_pkg_release = current_release.distributionsourcepackagerelease | 242 | src_pkg_release = current_release.distributionsourcepackagerelease |
| 63 | 243 | if src_pkg_release is None: | 243 | if src_pkg_release is None: |
| 64 | 244 | return None | 244 | return None |
| 65 | 245 | 245 | ||
| 66 | === modified file 'lib/lp/soyuz/templates/binarypackagerelease-portlet-breaks.pt' | |||
| 67 | --- lib/lp/soyuz/templates/binarypackagerelease-portlet-breaks.pt 2009-07-17 17:59:07 +0000 | |||
| 68 | +++ lib/lp/soyuz/templates/binarypackagerelease-portlet-breaks.pt 2009-09-02 14:54:06 +0000 | |||
| 69 | @@ -2,17 +2,13 @@ | |||
| 70 | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
| 71 | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
| 72 | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
| 84 | 5 | class="portlet" id="portlet-breaks"> | 5 | tal:define="relationships view/breaks" |
| 85 | 6 | 6 | tal:condition="relationships/has_items" | |
| 86 | 7 | <h2>Breaks</h2> | 7 | class="first yui-u" id="portlet-breaks"> |
| 87 | 8 | 8 | ||
| 88 | 9 | <div class="portletBody portletContent" | 9 | <div id="breaks"> |
| 89 | 10 | id="breaks" | 10 | <dt>Breaks:</dt> |
| 90 | 11 | tal:define="relationships view/breaks"> | 11 | <tal:block replace="structure relationships/@@+render-list" /> |
| 80 | 12 | |||
| 81 | 13 | <tal:block condition="relationships/has_items" | ||
| 82 | 14 | replace="structure relationships/@@+render-list" /> | ||
| 83 | 15 | |||
| 91 | 16 | </div> | 12 | </div> |
| 92 | 17 | 13 | ||
| 93 | 18 | </div> | 14 | </div> |
| 94 | 19 | 15 | ||
| 95 | === modified file 'lib/lp/soyuz/templates/binarypackagerelease-portlet-conflicts.pt' | |||
| 96 | --- lib/lp/soyuz/templates/binarypackagerelease-portlet-conflicts.pt 2009-07-17 17:59:07 +0000 | |||
| 97 | +++ lib/lp/soyuz/templates/binarypackagerelease-portlet-conflicts.pt 2009-09-02 14:54:06 +0000 | |||
| 98 | @@ -2,17 +2,13 @@ | |||
| 99 | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
| 100 | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
| 101 | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
| 113 | 5 | class="portlet" id="portlet-conflicts"> | 5 | tal:define="relationships view/conflicts" |
| 114 | 6 | 6 | tal:condition="relationships/has_items" | |
| 115 | 7 | <h2>Conflicts</h2> | 7 | class="first yui-u" id="portlet-conflicts"> |
| 116 | 8 | 8 | ||
| 117 | 9 | <div class="portletBody portletContent" | 9 | <div id="conflicts"> |
| 118 | 10 | id="conflicts" | 10 | <dt>Conflicts:</dt> |
| 119 | 11 | tal:define="relationships view/conflicts"> | 11 | <tal:block replace="structure relationships/@@+render-list"/> |
| 109 | 12 | |||
| 110 | 13 | <tal:block condition="relationships/has_items" | ||
| 111 | 14 | replace="structure relationships/@@+render-list"/> | ||
| 112 | 15 | |||
| 120 | 16 | </div> | 12 | </div> |
| 121 | 17 | 13 | ||
| 122 | 18 | </div> | 14 | </div> |
| 123 | 19 | 15 | ||
| 124 | === modified file 'lib/lp/soyuz/templates/binarypackagerelease-portlet-depends.pt' | |||
| 125 | --- lib/lp/soyuz/templates/binarypackagerelease-portlet-depends.pt 2009-07-17 17:59:07 +0000 | |||
| 126 | +++ lib/lp/soyuz/templates/binarypackagerelease-portlet-depends.pt 2009-09-02 14:54:06 +0000 | |||
| 127 | @@ -2,17 +2,13 @@ | |||
| 128 | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
| 129 | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
| 130 | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
| 142 | 5 | class="portlet" id="portlet-depends"> | 5 | tal:define="relationships view/depends" |
| 143 | 6 | 6 | tal:condition="relationships/has_items" | |
| 144 | 7 | <h2>Depends on</h2> | 7 | class="first yui-u" id="portlet-depends"> |
| 145 | 8 | 8 | ||
| 146 | 9 | <div class="portletBody portletContent" | 9 | <div id="depends"> |
| 147 | 10 | id="depends" | 10 | <dt>Depends on:</dt> |
| 148 | 11 | tal:define="relationships view/depends"> | 11 | <tal:block replace="structure relationships/@@+render-list"/> |
| 138 | 12 | |||
| 139 | 13 | <tal:block condition="relationships/has_items" | ||
| 140 | 14 | replace="structure relationships/@@+render-list"/> | ||
| 141 | 15 | |||
| 149 | 16 | </div> | 12 | </div> |
| 150 | 17 | 13 | ||
| 151 | 18 | </div> | 14 | </div> |
| 152 | 19 | 15 | ||
| 153 | === modified file 'lib/lp/soyuz/templates/binarypackagerelease-portlet-enhances.pt' | |||
| 154 | --- lib/lp/soyuz/templates/binarypackagerelease-portlet-enhances.pt 2009-07-17 17:59:07 +0000 | |||
| 155 | +++ lib/lp/soyuz/templates/binarypackagerelease-portlet-enhances.pt 2009-09-02 14:54:06 +0000 | |||
| 156 | @@ -2,17 +2,13 @@ | |||
| 157 | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
| 158 | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
| 159 | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
| 171 | 5 | class="portlet" id="portlet-enhances"> | 5 | tal:define="relationships view/enhances" |
| 172 | 6 | 6 | tal:condition="relationships/has_items" | |
| 173 | 7 | <h2>Enhances</h2> | 7 | class="first yui-u" id="portlet-enhances"> |
| 174 | 8 | 8 | ||
| 175 | 9 | <div class="portletBody portletContent" | 9 | <div id="enhances"> |
| 176 | 10 | id="enhances" | 10 | <dt>Enhances:</dt> |
| 177 | 11 | tal:define="relationships view/enhances"> | 11 | <tal:block replace="structure relationships/@@+render-list"/> |
| 167 | 12 | |||
| 168 | 13 | <tal:block condition="relationships/has_items" | ||
| 169 | 14 | replace="structure relationships/@@+render-list"/> | ||
| 170 | 15 | |||
| 178 | 16 | </div> | 12 | </div> |
| 179 | 17 | 13 | ||
| 180 | 18 | </div> | 14 | </div> |
| 181 | 19 | 15 | ||
| 182 | === modified file 'lib/lp/soyuz/templates/binarypackagerelease-portlet-predepends.pt' | |||
| 183 | --- lib/lp/soyuz/templates/binarypackagerelease-portlet-predepends.pt 2009-07-17 17:59:07 +0000 | |||
| 184 | +++ lib/lp/soyuz/templates/binarypackagerelease-portlet-predepends.pt 2009-09-02 14:54:06 +0000 | |||
| 185 | @@ -2,17 +2,13 @@ | |||
| 186 | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
| 187 | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
| 188 | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
| 200 | 5 | class="portlet" id="portlet-predepends"> | 5 | tal:define="relationships view/pre_depends" |
| 201 | 6 | 6 | tal:condition="relationships/has_items" | |
| 202 | 7 | <h2>Pre-Depends on</h2> | 7 | class="first yui-u" id="portlet-predepends"> |
| 203 | 8 | 8 | ||
| 204 | 9 | <div class="portletBody portletContent" | 9 | <div id="predepends"> |
| 205 | 10 | id="predepends" | 10 | <dt>Pre-Depends on:</dt> |
| 206 | 11 | tal:define="relationships view/pre_depends"> | 11 | <tal:block replace="structure relationships/@@+render-list"/> |
| 196 | 12 | |||
| 197 | 13 | <tal:block condition="relationships/has_items" | ||
| 198 | 14 | replace="structure relationships/@@+render-list"/> | ||
| 199 | 15 | |||
| 207 | 16 | </div> | 12 | </div> |
| 208 | 17 | 13 | ||
| 209 | 18 | </div> | 14 | </div> |
| 210 | 19 | 15 | ||
| 211 | === modified file 'lib/lp/soyuz/templates/binarypackagerelease-portlet-provides.pt' | |||
| 212 | --- lib/lp/soyuz/templates/binarypackagerelease-portlet-provides.pt 2009-07-17 17:59:07 +0000 | |||
| 213 | +++ lib/lp/soyuz/templates/binarypackagerelease-portlet-provides.pt 2009-09-02 14:54:06 +0000 | |||
| 214 | @@ -2,17 +2,13 @@ | |||
| 215 | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
| 216 | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
| 217 | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
| 229 | 5 | class="portlet" id="portlet-provides"> | 5 | tal:define="relationships view/provides" |
| 230 | 6 | 6 | tal:condition="relationships/has_items" | |
| 231 | 7 | <h2>Provides</h2> | 7 | class="first yui-u" id="portlet-provides"> |
| 232 | 8 | 8 | ||
| 233 | 9 | <div class="portletBody portletContent" | 9 | <div id="provides"> |
| 234 | 10 | id="provides" | 10 | <dt>Provides:</dt> |
| 235 | 11 | tal:define="relationships view/provides"> | 11 | <tal:block replace="structure relationships/@@+render-list"/> |
| 225 | 12 | |||
| 226 | 13 | <tal:block condition="relationships/has_items" | ||
| 227 | 14 | replace="structure relationships/@@+render-list"/> | ||
| 228 | 15 | |||
| 236 | 16 | </div> | 12 | </div> |
| 237 | 17 | 13 | ||
| 238 | 18 | </div> | 14 | </div> |
| 239 | 19 | 15 | ||
| 240 | === modified file 'lib/lp/soyuz/templates/binarypackagerelease-portlet-recommends.pt' | |||
| 241 | --- lib/lp/soyuz/templates/binarypackagerelease-portlet-recommends.pt 2009-07-17 17:59:07 +0000 | |||
| 242 | +++ lib/lp/soyuz/templates/binarypackagerelease-portlet-recommends.pt 2009-09-02 14:54:06 +0000 | |||
| 243 | @@ -2,17 +2,13 @@ | |||
| 244 | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
| 245 | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
| 246 | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
| 258 | 5 | class="portlet" id="portlet-recommends"> | 5 | tal:define="relationships view/recommends" |
| 259 | 6 | 6 | tal:condition="relationships/has_items" | |
| 260 | 7 | <h2>Recommends</h2> | 7 | class="first yui-u" id="portlet-recommends"> |
| 261 | 8 | 8 | ||
| 262 | 9 | <div class="portletBody portletContent" | 9 | <div id="recommends"> |
| 263 | 10 | id="recommends" | 10 | <dt>Recommends:</dt> |
| 264 | 11 | tal:define="relationships view/recommends"> | 11 | <tal:block replace="structure relationships/@@+render-list"/> |
| 254 | 12 | |||
| 255 | 13 | <tal:block condition="relationships/has_items" | ||
| 256 | 14 | replace="structure relationships/@@+render-list"/> | ||
| 257 | 15 | |||
| 265 | 16 | </div> | 12 | </div> |
| 266 | 17 | 13 | ||
| 267 | 18 | </div> | 14 | </div> |
| 268 | 19 | 15 | ||
| 269 | === modified file 'lib/lp/soyuz/templates/binarypackagerelease-portlet-replaces.pt' | |||
| 270 | --- lib/lp/soyuz/templates/binarypackagerelease-portlet-replaces.pt 2009-07-17 17:59:07 +0000 | |||
| 271 | +++ lib/lp/soyuz/templates/binarypackagerelease-portlet-replaces.pt 2009-09-02 14:54:06 +0000 | |||
| 272 | @@ -2,17 +2,13 @@ | |||
| 273 | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
| 274 | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
| 275 | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
| 287 | 5 | class="portlet" id="portlet-replaces"> | 5 | tal:define="relationships view/replaces" |
| 288 | 6 | 6 | tal:condition="relationships/has_items" | |
| 289 | 7 | <h2>Replaces</h2> | 7 | class="first yui-u" id="portlet-replaces"> |
| 290 | 8 | 8 | ||
| 291 | 9 | <div class="portletBody portletContent" | 9 | <div id="replaces"> |
| 292 | 10 | id="replaces" | 10 | <dt>Replaces:</dt> |
| 293 | 11 | tal:define="relationships view/replaces"> | 11 | <tal:block replace="structure relationships/@@+render-list"/> |
| 283 | 12 | |||
| 284 | 13 | <tal:block condition="relationships/has_items" | ||
| 285 | 14 | replace="structure relationships/@@+render-list"/> | ||
| 286 | 15 | |||
| 294 | 16 | </div> | 12 | </div> |
| 295 | 17 | 13 | ||
| 296 | 18 | 14 | ||
| 297 | 19 | 15 | ||
| 298 | === modified file 'lib/lp/soyuz/templates/binarypackagerelease-portlet-suggests.pt' | |||
| 299 | --- lib/lp/soyuz/templates/binarypackagerelease-portlet-suggests.pt 2009-07-17 17:59:07 +0000 | |||
| 300 | +++ lib/lp/soyuz/templates/binarypackagerelease-portlet-suggests.pt 2009-09-02 14:54:06 +0000 | |||
| 301 | @@ -2,17 +2,13 @@ | |||
| 302 | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
| 303 | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
| 304 | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
| 316 | 5 | class="portlet" id="portlet-suggests"> | 5 | tal:define="relationships view/suggests" |
| 317 | 6 | 6 | tal:condition="relationships/has_items" | |
| 318 | 7 | <h2>Suggests</h2> | 7 | class="first yui-u" id="portlet-suggests"> |
| 319 | 8 | 8 | ||
| 320 | 9 | <div class="portletBody portletContent" | 9 | <div id="suggests"> |
| 321 | 10 | id="suggests" | 10 | <dt>Suggests:</dt> |
| 322 | 11 | tal:define="relationships view/suggests"> | 11 | <tal:block replace="structure relationships/@@+render-list"/> |
| 312 | 12 | |||
| 313 | 13 | <tal:block condition="relationships/has_items" | ||
| 314 | 14 | replace="structure relationships/@@+render-list"/> | ||
| 315 | 15 | |||
| 323 | 16 | </div> | 12 | </div> |
| 324 | 17 | 13 | ||
| 325 | 18 | </div> | 14 | </div> |
| 326 | 19 | 15 | ||
| 327 | === modified file 'lib/lp/soyuz/templates/distroarchseriesbinarypackage-index.pt' | |||
| 328 | --- lib/lp/soyuz/templates/distroarchseriesbinarypackage-index.pt 2009-07-17 17:59:07 +0000 | |||
| 329 | +++ lib/lp/soyuz/templates/distroarchseriesbinarypackage-index.pt 2009-09-01 19:49:09 +0000 | |||
| 330 | @@ -3,37 +3,20 @@ | |||
| 331 | 3 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 3 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
| 332 | 4 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 4 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
| 333 | 5 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 5 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
| 338 | 6 | xml:lang="en" | 6 | metal:use-macro="view/macro:page/main_only" |
| 335 | 7 | lang="en" | ||
| 336 | 8 | dir="ltr" | ||
| 337 | 9 | metal:use-macro="context/@@main_template/master" | ||
| 339 | 10 | i18n:domain="launchpad" | 7 | i18n:domain="launchpad" |
| 340 | 11 | > | 8 | > |
| 341 | 12 | <body> | 9 | <body> |
| 342 | 13 | 10 | ||
| 343 | 14 | <metal:leftportlets fill-slot="portlets_one"> | ||
| 344 | 15 | <div tal:replace="structure context/@@+portlet-details" /> | ||
| 345 | 16 | <div tal:replace="structure context/distroarchseries/@@+portlet-details" /> | ||
| 346 | 17 | </metal:leftportlets> | ||
| 347 | 18 | |||
| 348 | 19 | <metal:rightportlets fill-slot="portlets_two"> | ||
| 349 | 20 | <div tal:replace="structure context/@@+portlet-releases" /> | ||
| 350 | 21 | </metal:rightportlets> | ||
| 351 | 22 | |||
| 352 | 23 | <div metal:fill-slot="main"> | 11 | <div metal:fill-slot="main"> |
| 353 | 24 | 12 | ||
| 362 | 25 | <div> | 13 | <div class="top-portlet"> |
| 355 | 26 | <a | ||
| 356 | 27 | tal:attributes="href context/distroarchseries/fmt:url" | ||
| 357 | 28 | tal:content="context/distroarchseries/displayname" | ||
| 358 | 29 | /> | ||
| 359 | 30 | </div> | ||
| 360 | 31 | <h1 tal:content="context/title">pmount in Ubuntu Hoary i386</h1> | ||
| 361 | 32 | |||
| 363 | 33 | <tal:description replace="structure context/description/fmt:text-to-html"> | 14 | <tal:description replace="structure context/description/fmt:text-to-html"> |
| 364 | 34 | Package description | 15 | Package description |
| 365 | 35 | </tal:description> | 16 | </tal:description> |
| 366 | 17 | </div> | ||
| 367 | 36 | 18 | ||
| 368 | 19 | <div class="portlet"> | ||
| 369 | 37 | <h2>Publishing history</h2> | 20 | <h2>Publishing history</h2> |
| 370 | 38 | 21 | ||
| 371 | 39 | <table id="publishing-summary" class="listing"> | 22 | <table id="publishing-summary" class="listing"> |
| 372 | @@ -55,7 +38,9 @@ | |||
| 373 | 55 | </tal:block> | 38 | </tal:block> |
| 374 | 56 | </tbody> | 39 | </tbody> |
| 375 | 57 | </table> | 40 | </table> |
| 376 | 41 | </div> | ||
| 377 | 58 | 42 | ||
| 378 | 43 | <div class="top-portlet"> | ||
| 379 | 59 | <tal:sourcepkg tal:define="spackage context/distro_source_package" | 44 | <tal:sourcepkg tal:define="spackage context/distro_source_package" |
| 380 | 60 | tal:condition="spackage"> | 45 | tal:condition="spackage"> |
| 381 | 61 | <h2>Source package</h2> | 46 | <h2>Source package</h2> |
| 382 | @@ -63,7 +48,7 @@ | |||
| 383 | 63 | <div id="source"> | 48 | <div id="source"> |
| 384 | 64 | <ul> | 49 | <ul> |
| 385 | 65 | <li class="source package"> | 50 | <li class="source package"> |
| 387 | 66 | <a | 51 | <a |
| 388 | 67 | tal:content="spackage/title" | 52 | tal:content="spackage/title" |
| 389 | 68 | tal:attributes="href spackage/fmt:url" | 53 | tal:attributes="href spackage/fmt:url" |
| 390 | 69 | id="source_package">SOURCEPACKAGE</a> | 54 | id="source_package">SOURCEPACKAGE</a> |
| 391 | @@ -71,6 +56,7 @@ | |||
| 392 | 71 | </ul> | 56 | </ul> |
| 393 | 72 | </div> | 57 | </div> |
| 394 | 73 | </tal:sourcepkg> | 58 | </tal:sourcepkg> |
| 395 | 59 | </div> | ||
| 396 | 74 | </div> | 60 | </div> |
| 397 | 75 | </body> | 61 | </body> |
| 398 | 76 | </html> | 62 | </html> |
| 399 | 77 | 63 | ||
| 400 | === modified file 'lib/lp/soyuz/templates/distroarchseriesbinarypackagerelease-index.pt' | |||
| 401 | --- lib/lp/soyuz/templates/distroarchseriesbinarypackagerelease-index.pt 2009-07-17 17:59:07 +0000 | |||
| 402 | +++ lib/lp/soyuz/templates/distroarchseriesbinarypackagerelease-index.pt 2009-09-02 14:54:06 +0000 | |||
| 403 | @@ -3,103 +3,84 @@ | |||
| 404 | 3 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 3 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
| 405 | 4 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 4 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
| 406 | 5 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 5 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
| 411 | 6 | xml:lang="en" | 6 | metal:use-macro="view/macro:page/main_only" |
| 408 | 7 | lang="en" | ||
| 409 | 8 | dir="ltr" | ||
| 410 | 9 | metal:use-macro="context/@@main_template/master" | ||
| 412 | 10 | i18n:domain="launchpad" | 7 | i18n:domain="launchpad" |
| 413 | 11 | > | 8 | > |
| 414 | 12 | <body> | 9 | <body> |
| 415 | 13 | 10 | ||
| 416 | 14 | <metal:leftportlets fill-slot="portlets_one"> | ||
| 417 | 15 | <div tal:replace="structure context/@@+portlet-details" /> | ||
| 418 | 16 | <div tal:replace="structure context/distroarchseries/@@+portlet-details" /> | ||
| 419 | 17 | </metal:leftportlets> | ||
| 420 | 18 | |||
| 421 | 19 | |||
| 422 | 20 | <div metal:fill-slot="main"> | 11 | <div metal:fill-slot="main"> |
| 423 | 21 | 12 | ||
| 424 | 22 | <div> | ||
| 425 | 23 | <a | ||
| 426 | 24 | tal:attributes="href context/distroarchseries/fmt:url" | ||
| 427 | 25 | tal:content="context/distroarchseries/displayname" | ||
| 428 | 26 | />: | ||
| 429 | 27 | <a tal:attributes="href context/distroarchseriesbinarypackage/fmt:url"> | ||
| 430 | 28 | “<tal:packagename | ||
| 431 | 29 | replace="context/distroarchseriesbinarypackage/name" | ||
| 432 | 30 | />” package | ||
| 433 | 31 | </a> | ||
| 434 | 32 | </div> | ||
| 435 | 33 | <h1 tal:content="context/title">Name of package</h1> | ||
| 436 | 34 | 13 | ||
| 437 | 14 | <div class="top-portlet"> | ||
| 438 | 35 | <tal:description replace="structure context/description/fmt:text-to-html"> | 15 | <tal:description replace="structure context/description/fmt:text-to-html"> |
| 439 | 36 | Package Description | 16 | Package Description |
| 440 | 37 | </tal:description> | 17 | </tal:description> |
| 464 | 38 | 18 | </div> | |
| 465 | 39 | <h2>Source package</h2> | 19 | |
| 466 | 40 | 20 | <div class="yui-g"> | |
| 467 | 41 | <div id="source"> | 21 | |
| 468 | 42 | <ul> | 22 | <div class="first yui-u"> |
| 469 | 43 | <li class="source package"> | 23 | <div tal:replace="structure context/@@+portlet-details" /> |
| 470 | 44 | <a tal:define="spackage context/distributionsourcepackagerelease" | 24 | </div> |
| 471 | 45 | tal:content="spackage/title" | 25 | |
| 472 | 46 | tal:attributes="href spackage/fmt:url">SOURCEPACKAGE</a> | 26 | <div class="yui-u"> |
| 473 | 47 | </li> | 27 | <div class="portlet"> |
| 474 | 48 | </ul> | 28 | <h2>Downloadable files</h2> |
| 475 | 49 | </div> | 29 | <div id="files"> |
| 476 | 50 | 30 | <div id="build" tal:condition="context/build"> | |
| 477 | 51 | <h2>Downloadable files</h2> | 31 | <a tal:define="pbuild context/build" |
| 478 | 52 | 32 | tal:content="pbuild/title" | |
| 479 | 53 | <div id="files"> | 33 | tal:attributes="href pbuild/fmt:url">BUILD</a> produced |
| 480 | 54 | <div id="build" tal:condition="context/build"> | 34 | <span tal:condition="context/files"> |
| 481 | 55 | <a tal:define="pbuild context/build" | 35 | these files: |
| 482 | 56 | tal:content="pbuild/title" | 36 | </span> |
| 483 | 57 | tal:attributes="href pbuild/fmt:url">BUILD</a> produced | 37 | <span tal:condition="not: context/files"> |
| 484 | 58 | <span tal:condition="context/files"> | 38 | no files for this binary package. |
| 485 | 59 | these files: | 39 | </span> |
| 486 | 60 | </span> | 40 | </div> |
| 487 | 41 | |||
| 488 | 42 | <div id="downloadable-files"> | ||
| 489 | 43 | <ul class="download" tal:condition="context/files"> | ||
| 490 | 44 | <li tal:repeat="file context/files"> | ||
| 491 | 45 | <a class="sprite" | ||
| 492 | 46 | tal:content="file/libraryfile/filename" | ||
| 493 | 47 | tal:attributes="href file/libraryfile/http_url"></a> | ||
| 494 | 48 | (<span tal:replace="file/libraryfile/content/filesize/fmt:bytes" />) | ||
| 495 | 49 | </li> | ||
| 496 | 50 | </ul> | ||
| 497 | 51 | </div> | ||
| 498 | 52 | </div> | ||
| 499 | 53 | <!-- No build and no downloadable files --> | ||
| 500 | 54 | <div tal:condition="not: context/build"> | ||
| 501 | 61 | <span tal:condition="not: context/files"> | 55 | <span tal:condition="not: context/files"> |
| 503 | 62 | no files for this binary package. | 56 | There are no downloadable files for this binary package. |
| 504 | 63 | </span> | 57 | </span> |
| 544 | 64 | </div> | 58 | </div> |
| 545 | 65 | 59 | </div><!--portlet--> | |
| 546 | 66 | <div id="downloadable-files"> | 60 | </div><!--yui-u--> |
| 547 | 67 | <ul class="download" tal:condition="context/files"> | 61 | |
| 548 | 68 | <li tal:repeat="file context/files"> | 62 | </div><!--yui-g--> |
| 549 | 69 | <a tal:content="file/libraryfile/filename" | 63 | |
| 550 | 70 | tal:attributes="href file/libraryfile/http_url"></a> | 64 | |
| 551 | 71 | (<span tal:replace="file/libraryfile/content/filesize/fmt:bytes" />) | 65 | <style>#relationships div {padding-top:0.5em;}</style> |
| 552 | 72 | </li> | 66 | <div class="yui-g" tal:define="bpr context/binarypackagerelease"> |
| 553 | 73 | </ul> | 67 | <div class="portlet" id="relationships"> |
| 554 | 74 | </div> | 68 | |
| 555 | 75 | </div> | 69 | <h2>Package relationships</h2> |
| 556 | 76 | <!-- No build and no downloadable files --> | 70 | |
| 557 | 77 | <div tal:condition="not: context/build"> | 71 | <div tal:replace="structure bpr/@@+portlet-depends" /> |
| 558 | 78 | <span tal:condition="not: context/files"> | 72 | <div tal:replace="structure bpr/@@+portlet-conflicts" /> |
| 559 | 79 | There are no downloadable files for this binary package. | 73 | <div tal:replace="structure bpr/@@+portlet-provides" /> |
| 560 | 80 | </span> | 74 | <div tal:replace="structure bpr/@@+portlet-replaces" /> |
| 561 | 81 | </div> | 75 | <div tal:replace="structure bpr/@@+portlet-suggests" /> |
| 562 | 82 | 76 | <div tal:replace="structure bpr/@@+portlet-recommends" /> | |
| 563 | 83 | 77 | <div tal:replace="structure bpr/@@+portlet-predepends" /> | |
| 564 | 84 | <h2>Package relationships</h2> | 78 | <div tal:replace="structure bpr/@@+portlet-enhances" /> |
| 565 | 85 | 79 | <div tal:replace="structure bpr/@@+portlet-breaks" /> | |
| 566 | 86 | <table width="100%" tal:define="bpr context/binarypackagerelease"> | 80 | |
| 567 | 87 | <tr> | 81 | </div><!--portlet--> |
| 568 | 88 | <td><div tal:replace="structure bpr/@@+portlet-depends" /></td> | 82 | </div><!--yui-g--> |
| 569 | 89 | <td><div tal:replace="structure bpr/@@+portlet-conflicts" /></td> | 83 | |
| 531 | 90 | <td><div tal:replace="structure bpr/@@+portlet-provides" /></td> | ||
| 532 | 91 | </tr> | ||
| 533 | 92 | <tr> | ||
| 534 | 93 | <td><div tal:replace="structure bpr/@@+portlet-replaces" /></td> | ||
| 535 | 94 | <td><div tal:replace="structure bpr/@@+portlet-suggests" /></td> | ||
| 536 | 95 | <td><div tal:replace="structure bpr/@@+portlet-recommends" /></td> | ||
| 537 | 96 | </tr> | ||
| 538 | 97 | <tr> | ||
| 539 | 98 | <td><div tal:replace="structure bpr/@@+portlet-predepends" /></td> | ||
| 540 | 99 | <td><div tal:replace="structure bpr/@@+portlet-enhances" /></td> | ||
| 541 | 100 | <td><div tal:replace="structure bpr/@@+portlet-breaks" /></td> | ||
| 542 | 101 | </tr> | ||
| 543 | 102 | </table> | ||
| 570 | 103 | </div> | 84 | </div> |
| 571 | 104 | </body> | 85 | </body> |
| 572 | 105 | </html> | 86 | </html> |
| 573 | 106 | 87 | ||
| 574 | === modified file 'lib/lp/soyuz/templates/distroarchseriesbinarypackagerelease-portlet-details.pt' | |||
| 575 | --- lib/lp/soyuz/templates/distroarchseriesbinarypackagerelease-portlet-details.pt 2009-07-17 17:59:07 +0000 | |||
| 576 | +++ lib/lp/soyuz/templates/distroarchseriesbinarypackagerelease-portlet-details.pt 2009-09-02 11:56:16 +0000 | |||
| 577 | @@ -6,24 +6,36 @@ | |||
| 578 | 6 | 6 | ||
| 579 | 7 | <h2>Details</h2> | 7 | <h2>Details</h2> |
| 580 | 8 | 8 | ||
| 588 | 9 | <div class="portletBody portletContent"> | 9 | <div class="two-column-list"> |
| 589 | 10 | 10 | ||
| 590 | 11 | <b>Package version:</b> | 11 | <dl> |
| 591 | 12 | <span tal:replace="context/version" /><br /> | 12 | <dt>Package version:</dt> |
| 592 | 13 | 13 | <dd tal:content="context/version" /> | |
| 593 | 14 | <b>Source:</b> | 14 | </dl> |
| 594 | 15 | <a tal:content="context/distributionsourcepackagerelease/version" | 15 | |
| 595 | 16 | <dl> | ||
| 596 | 17 | <dt>Source:</dt> | ||
| 597 | 18 | <dd id="source"> | ||
| 598 | 19 | <a tal:content="context/distributionsourcepackagerelease/title" | ||
| 599 | 16 | tal:attributes="href context/distributionsourcepackagerelease/fmt:url" | 20 | tal:attributes="href context/distributionsourcepackagerelease/fmt:url" |
| 610 | 17 | >apache2 2.1-3</a><br /> | 21 | >apache2 2.1-3 (source) in Ubuntu</a><br /> |
| 611 | 18 | 22 | </dd> | |
| 612 | 19 | <b>Status:</b> | 23 | </dl> |
| 613 | 20 | <span tal:replace="context/status/title" /><br /> | 24 | |
| 614 | 21 | 25 | <dl> | |
| 615 | 22 | <b>Component:</b> | 26 | <dt>Status:</dt> |
| 616 | 23 | <span tal:replace="context/component/name" /><br /> | 27 | <dd tal:content="context/status/title" /> |
| 617 | 24 | 28 | </dl> | |
| 618 | 25 | <b>Priority:</b> | 29 | |
| 619 | 26 | <span tal:replace="context/priority/title" /><br /> | 30 | <dl> |
| 620 | 31 | <dt>Component:</dt> | ||
| 621 | 32 | <dd tal:content="context/component/name" /> | ||
| 622 | 33 | </dl> | ||
| 623 | 34 | |||
| 624 | 35 | <dl> | ||
| 625 | 36 | <dt>Priority:</dt> | ||
| 626 | 37 | <dd tal:content="context/priority/title" /> | ||
| 627 | 38 | </dl> | ||
| 628 | 27 | 39 | ||
| 629 | 28 | </div> | 40 | </div> |
| 630 | 29 | 41 | ||
= Summary =
Mechanical 3.0 changes for DistroArchSerie
== Implementation details ==
I slipped in a quick bug fix while I was at it:
https:/
to fix a page heading. This was just a case of changing the title property on
the context class.
The change to the DistroArchSerie
here:
https:/
The change to the DistroArchSerie
It uses several page fragments in the package relationships section that are
in a different context/view. They are not used anywhere else so I added some
conditional "yui-u" div classes to those so that they don't appear when not
necessary.
The breadcrumbs on both pages are not working properly, I will fix those in a
separate branch.
== Tests ==
bin/test -vvt stories.soyuz -t distroarchserie
== Demo and Q/A ==
See the URLs above.
= 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/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
details.pt
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/