Merge ~cjwatson/launchpad:refactor-datetitle into launchpad:master
- Git
- lp:~cjwatson/launchpad
- refactor-datetitle
- Merge into master
Proposed by
Colin Watson
Status: | Merged |
---|---|
Approved by: | Colin Watson |
Approved revision: | 60ab9388cf9265b7de249304bce6facc04edd74b |
Merge reported by: | Otto Co-Pilot |
Merged at revision: | not available |
Proposed branch: | ~cjwatson/launchpad:refactor-datetitle |
Merge into: | launchpad:master |
Diff against target: |
1726 lines (+225/-463) 68 files modified
lib/lp/answers/templates/faq-index.pt (+4/-6) lib/lp/answers/templates/question-index.pt (+2/-4) lib/lp/app/templates/launchpad-search.pt (+11/-16) lib/lp/blueprints/templates/specification-goaldecide.pt (+4/-4) lib/lp/blueprints/templates/specification-index.pt (+2/-3) lib/lp/blueprints/templates/specificationgoal-setgoals.pt (+2/-3) lib/lp/blueprints/templates/sprint-index.pt (+3/-3) lib/lp/blueprints/templates/sprint-listing-detailed.pt (+2/-3) lib/lp/blueprints/templates/sprint-settopics.pt (+2/-5) lib/lp/blueprints/templates/sprintspecification-decide.pt (+4/-8) lib/lp/bugs/templates/bug-listing-detailed.pt (+2/-3) lib/lp/bugs/templates/bugcomment-macros.pt (+1/-5) lib/lp/bugs/templates/bugtask-edit-form.pt (+1/-5) lib/lp/bugs/templates/bugtask-index.pt (+2/-3) lib/lp/buildmaster/templates/builds-list.pt (+7/-13) lib/lp/code/templates/branch-heading.pt (+4/-10) lib/lp/code/templates/branch-macros.pt (+2/-4) lib/lp/code/templates/branch-messages.pt (+4/-4) lib/lp/code/templates/distributionsourcepackage-branches-grouped.pt (+1/-6) lib/lp/code/templates/git-macros.pt (+1/-2) lib/lp/code/templates/gitref-listing.pt (+2/-2) lib/lp/code/templates/sourcepackagerecipebuild-index.pt (+8/-14) lib/lp/oci/templates/ocirecipebuild-index.pt (+8/-13) lib/lp/registry/templates/distribution-index.pt (+2/-3) lib/lp/registry/templates/distributionmirror-index.pt (+2/-3) lib/lp/registry/templates/distributionmirror-prober-logs.pt (+1/-5) lib/lp/registry/templates/distroseries-index.pt (+2/-3) lib/lp/registry/templates/distroseries-localdifferences.pt (+4/-4) lib/lp/registry/templates/distroseries-portlet-packaging.pt (+1/-2) lib/lp/registry/templates/milestone-index.pt (+4/-6) lib/lp/registry/templates/person-index.pt (+4/-6) lib/lp/registry/templates/person-karma.pt (+3/-4) lib/lp/registry/templates/person-macros.pt (+2/-10) lib/lp/registry/templates/person-related-software.pt (+1/-5) lib/lp/registry/templates/poll-index.pt (+4/-6) lib/lp/registry/templates/product-files.pt (+2/-3) lib/lp/registry/templates/product-listing-detailed.pt (+2/-3) lib/lp/registry/templates/product-listing-for-review.pt (+2/-3) lib/lp/registry/templates/productseries-milestone-table-row.pt (+3/-6) lib/lp/registry/templates/productseries-ubuntupkg.pt (+1/-7) lib/lp/registry/templates/signedcodeofconduct-index.pt (+3/-3) lib/lp/registry/templates/sourcepackage-portlet-details.pt (+1/-3) lib/lp/registry/templates/team-listing.pt (+2/-14) lib/lp/registry/templates/team-members.pt (+8/-20) lib/lp/registry/templates/team-polls.pt (+6/-9) lib/lp/registry/templates/team-portlet-polls.pt (+4/-6) lib/lp/registry/templates/teammembership-index.pt (+7/-31) lib/lp/registry/templates/teammembership-listing-simple.pt (+2/-3) lib/lp/snappy/templates/snapbuild-index.pt (+8/-13) lib/lp/soyuz/templates/build-index.pt (+6/-10) lib/lp/soyuz/templates/distributionsourcepackagerelease-index.pt (+3/-9) lib/lp/soyuz/templates/distroseries-queue.pt (+4/-7) lib/lp/soyuz/templates/livefsbuild-index.pt (+8/-13) lib/lp/soyuz/templates/packagepublishing-details.pt (+12/-12) lib/lp/soyuz/templates/person-ppa-packages.pt (+1/-5) lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-detailed.pt (+1/-2) lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-compact.pt (+3/-6) lib/lp/translations/templates/currenttranslationmessage-translate-one.pt (+6/-15) lib/lp/translations/templates/person-translation-activity.pt (+1/-4) lib/lp/translations/templates/person-translations.pt (+1/-4) lib/lp/translations/templates/potemplate-chart.pt (+2/-8) lib/lp/translations/templates/potemplate-portlet-details.pt (+2/-5) lib/lp/translations/templates/productseries-translations-languages.pt (+3/-9) lib/lp/translations/templates/serieslanguage-index.pt (+3/-9) lib/lp/translations/templates/translationgroup-index.pt (+1/-7) lib/lp/translations/templates/translationgroups-index.pt (+2/-5) lib/lp/translations/templates/translations-macros.pt (+4/-10) lib/lp/translations/templates/translationtemplatesbuild-index.pt (+2/-3) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Cristian Gonzalez (community) | Approve | ||
Review via email: mp+405037@code.launchpad.net |
Commit message
Refactor longhand versions of fmt:*datetitle
Description of the change
We now have `fmt:approximat
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/lib/lp/answers/templates/faq-index.pt b/lib/lp/answers/templates/faq-index.pt |
2 | index 9bc0773..f322d82 100644 |
3 | --- a/lib/lp/answers/templates/faq-index.pt |
4 | +++ b/lib/lp/answers/templates/faq-index.pt |
5 | @@ -10,9 +10,8 @@ |
6 | <metal:registering fill-slot="registering"> |
7 | Created by <a tal:replace="structure context/owner/fmt:link" /> |
8 | on |
9 | - <span |
10 | - tal:attributes="title context/date_created/fmt:datetime" |
11 | - tal:content="context/date_created/fmt:displaydate">2005-10-05</span> |
12 | + <tal:created |
13 | + replace="structure context/date_created/fmt:displaydatetitle" /> |
14 | </metal:registering> |
15 | |
16 | <metal:portlets fill-slot="side"> |
17 | @@ -33,9 +32,8 @@ |
18 | <dd> |
19 | <a tal:replace="structure context/last_updated_by/fmt:link" /> |
20 | on |
21 | - <span tal:attributes="title context/date_last_updated/fmt:datetime" |
22 | - tal:content="context/date_last_updated/fmt:displaydate" |
23 | - >2005-10-05</span> |
24 | + <tal:last-updated |
25 | + replace="structure context/date_last_updated/fmt:displaydatetitle" /> |
26 | </dd> |
27 | </dl> |
28 | </tal:last_updated_by> |
29 | diff --git a/lib/lp/answers/templates/question-index.pt b/lib/lp/answers/templates/question-index.pt |
30 | index 13f6270..e4ba40a 100644 |
31 | --- a/lib/lp/answers/templates/question-index.pt |
32 | +++ b/lib/lp/answers/templates/question-index.pt |
33 | @@ -40,10 +40,8 @@ |
34 | <metal:registering fill-slot="registering"> |
35 | Asked by |
36 | <a tal:replace="structure context/owner/fmt:link" /> |
37 | - <span |
38 | - tal:attributes="title context/datecreated/fmt:datetime" |
39 | - tal:content="context/datecreated/fmt:displaydate">2005-10-05</span> |
40 | - |
41 | + <tal:created |
42 | + replace="structure context/datecreated/fmt:displaydatetitle" /> |
43 | </metal:registering> |
44 | |
45 | |
46 | diff --git a/lib/lp/app/templates/launchpad-search.pt b/lib/lp/app/templates/launchpad-search.pt |
47 | index 6ffd23f..f686209 100644 |
48 | --- a/lib/lp/app/templates/launchpad-search.pt |
49 | +++ b/lib/lp/app/templates/launchpad-search.pt |
50 | @@ -55,9 +55,8 @@ |
51 | <b tal:content="pillar/displayname" />, |
52 | </tal:per_pillar> |
53 | reported |
54 | - <span |
55 | - tal:attributes="title view/bug/datecreated/fmt:datetime" |
56 | - tal:content="view/bug/datecreated/fmt:displaydate">2005-10-05</span> |
57 | + <tal:created |
58 | + replace="structure view/bug/datecreated/fmt:displaydatetitle" /> |
59 | by |
60 | <a |
61 | tal:attributes="href view/bug/owner/fmt:url" |
62 | @@ -71,9 +70,8 @@ |
63 | </div> |
64 | <div class="summary"> |
65 | posted |
66 | - <span |
67 | - tal:attributes="title view/question/datecreated/fmt:datetime" |
68 | - tal:content="view/question/datecreated/fmt:displaydate">2005-10-05</span> |
69 | + <tal:created |
70 | + replace="structure view/question/datecreated/fmt:displaydatetitle" /> |
71 | by |
72 | <a tal:replace="structure view/question/owner/fmt:link" |
73 | >Foo Bar</a><tal:assignee condition="view/question/assignee">, |
74 | @@ -113,10 +111,9 @@ |
75 | # Product and ProjectGroup still use the wrong name for |
76 | # date_created. |
77 | </tal:XXX> |
78 | - <span |
79 | - tal:define="date_created view/pillar/datecreated|view/pillar/date_created|nothing" |
80 | - tal:attributes="title date_created/fmt:datetime" |
81 | - tal:content="date_created/fmt:displaydate">2005-10-12</span> |
82 | + <tal:created |
83 | + define="date_created view/pillar/datecreated|view/pillar/date_created|nothing" |
84 | + replace="structure date_created/fmt:displaydatetitle" /> |
85 | </div> |
86 | </div> |
87 | </li> |
88 | @@ -137,18 +134,16 @@ |
89 | </div> |
90 | <div> |
91 | Created |
92 | - <span |
93 | - tal:attributes="title view/person_or_team/datecreated/fmt:datetime" |
94 | - tal:content="view/person_or_team/datecreated/fmt:displaydate">2005-10-05</span> |
95 | + <tal:created |
96 | + replace="structure view/person_or_team/datecreated/fmt:displaydatetitle" /> |
97 | </div> |
98 | </tal:team> |
99 | <tal:person |
100 | tal:condition="not: view/person_or_team/is_team"> |
101 | <div> |
102 | joined |
103 | - <span |
104 | - tal:attributes="title view/person_or_team/datecreated/fmt:datetime" |
105 | - tal:content="view/person_or_team/datecreated/fmt:displaydate">2005-10-05</span>, |
106 | + <tal:created |
107 | + replace="structure view/person_or_team/datecreated/fmt:displaydatetitle" />, |
108 | with <tal:karma content="view/person_or_team/karma">1000</tal:karma> karma |
109 | </div> |
110 | </tal:person> |
111 | diff --git a/lib/lp/blueprints/templates/specification-goaldecide.pt b/lib/lp/blueprints/templates/specification-goaldecide.pt |
112 | index 6bf6277..b74f93a 100644 |
113 | --- a/lib/lp/blueprints/templates/specification-goaldecide.pt |
114 | +++ b/lib/lp/blueprints/templates/specification-goaldecide.pt |
115 | @@ -17,15 +17,15 @@ |
116 | <p> |
117 | This goal was proposed by |
118 | <a tal:replace="structure context/goal_proposer/fmt:link">Foo Bar</a> |
119 | - <span tal:attributes="title context/date_goal_proposed/fmt:datetime" |
120 | - tal:content="context/date_goal_proposed/fmt:displaydate" />. |
121 | + <tal:goal-proposed |
122 | + replace="structure context/date_goal_proposed/fmt:displaydatetitle" />. |
123 | <tal:already_decided condition="context/goal_decider"> |
124 | It was previously marked |
125 | "<span tal:replace="context/goalstatus/title">Approved</span>" |
126 | as a goal by |
127 | <a tal:replace="structure context/goal_decider/fmt:link">Foo Bar</a> |
128 | - <span tal:attributes="title context/date_goal_decided/fmt:datetime" |
129 | - tal:content="context/date_goal_decided/fmt:displaydate" />. |
130 | + <tal:goal-decided |
131 | + replace="structure context/date_goal_decided/fmt:displaydatetitle" />. |
132 | </tal:already_decided> |
133 | </p> |
134 | </div> |
135 | diff --git a/lib/lp/blueprints/templates/specification-index.pt b/lib/lp/blueprints/templates/specification-index.pt |
136 | index 37528bf..81b52d4 100644 |
137 | --- a/lib/lp/blueprints/templates/specification-index.pt |
138 | +++ b/lib/lp/blueprints/templates/specification-index.pt |
139 | @@ -18,9 +18,8 @@ |
140 | <tal:registering metal:fill-slot="registering"> |
141 | Registered by |
142 | <tal:registrant tal:replace="structure context/owner/fmt:link" /> |
143 | - <span |
144 | - tal:attributes="title context/datecreated/fmt:datetime" |
145 | - tal:content="context/datecreated/fmt:displaydate" /> |
146 | + <tal:created |
147 | + replace="structure context/datecreated/fmt:displaydatetitle" /> |
148 | </tal:registering> |
149 | |
150 | <metal:heading fill-slot="heading"> |
151 | diff --git a/lib/lp/blueprints/templates/specificationgoal-setgoals.pt b/lib/lp/blueprints/templates/specificationgoal-setgoals.pt |
152 | index c8c2ffc..16a8fc6 100644 |
153 | --- a/lib/lp/blueprints/templates/specificationgoal-setgoals.pt |
154 | +++ b/lib/lp/blueprints/templates/specificationgoal-setgoals.pt |
155 | @@ -70,9 +70,8 @@ |
156 | <span tal:replace="context/displayname">Edgy</span> |
157 | by |
158 | <a tal:replace="structure spec/goal_proposer/fmt:link" /> |
159 | - <span |
160 | - tal:attributes="title spec/date_goal_proposed/fmt:datetime" |
161 | - tal:content="spec/date_goal_proposed/fmt:displaydate" />. |
162 | + <tal:goal-proposed |
163 | + replace="structure spec/date_goal_proposed/fmt:displaydatetitle" />. |
164 | </div> |
165 | </td> |
166 | </tr> |
167 | diff --git a/lib/lp/blueprints/templates/sprint-index.pt b/lib/lp/blueprints/templates/sprint-index.pt |
168 | index 42dd559..da5dbe2 100644 |
169 | --- a/lib/lp/blueprints/templates/sprint-index.pt |
170 | +++ b/lib/lp/blueprints/templates/sprint-index.pt |
171 | @@ -11,9 +11,9 @@ |
172 | |
173 | <tal:registering metal:fill-slot="registering"> |
174 | Registered by <a tal:replace="structure context/owner/fmt:link" /> |
175 | - on <span tal:content="context/datecreated/fmt:displaydate" |
176 | - tal:attributes="title context/datecreated/fmt:datetime" |
177 | - >on 2005-01-01</span> |
178 | + on |
179 | + <tal:created |
180 | + replace="structure context/datecreated/fmt:displaydatetitle" /> |
181 | </tal:registering> |
182 | |
183 | <div metal:fill-slot="main" |
184 | diff --git a/lib/lp/blueprints/templates/sprint-listing-detailed.pt b/lib/lp/blueprints/templates/sprint-listing-detailed.pt |
185 | index 65704f1..4b0c254 100644 |
186 | --- a/lib/lp/blueprints/templates/sprint-listing-detailed.pt |
187 | +++ b/lib/lp/blueprints/templates/sprint-listing-detailed.pt |
188 | @@ -29,9 +29,8 @@ |
189 | <a |
190 | tal:attributes="href context/owner/fmt:url" |
191 | tal:content="context/owner/displayname">Foo Bar</a> |
192 | - <span |
193 | - tal:attributes="title context/datecreated/fmt:datetime" |
194 | - tal:content="context/datecreated/fmt:displaydate">2005-10-05</span> |
195 | + <tal:created |
196 | + replace="structure context/datecreated/fmt:displaydatetitle" /> |
197 | </div> |
198 | </div> |
199 | </td> |
200 | diff --git a/lib/lp/blueprints/templates/sprint-settopics.pt b/lib/lp/blueprints/templates/sprint-settopics.pt |
201 | index 2b543b8..ca33895 100644 |
202 | --- a/lib/lp/blueprints/templates/sprint-settopics.pt |
203 | +++ b/lib/lp/blueprints/templates/sprint-settopics.pt |
204 | @@ -80,11 +80,8 @@ |
205 | <span tal:condition="python: speclink.registrant.id not in view.attendee_ids"> |
206 | (not attending) |
207 | </span> |
208 | - <span |
209 | - tal:attributes="title speclink/date_created/fmt:datetime" |
210 | - tal:content="speclink/date_created/fmt:displaydate"> |
211 | - 2006-01-12 |
212 | - </span> |
213 | + <tal:created |
214 | + replace="structure speclink/date_created/fmt:displaydatetitle" /> |
215 | </tal:registrant> |
216 | </div> |
217 | </td> |
218 | diff --git a/lib/lp/blueprints/templates/sprintspecification-decide.pt b/lib/lp/blueprints/templates/sprintspecification-decide.pt |
219 | index dbe059d..cebec96 100644 |
220 | --- a/lib/lp/blueprints/templates/sprintspecification-decide.pt |
221 | +++ b/lib/lp/blueprints/templates/sprintspecification-decide.pt |
222 | @@ -35,18 +35,14 @@ |
223 | <p> |
224 | This topic was proposed by |
225 | <a tal:replace="structure context/registrant/fmt:link">Foo Bar</a> |
226 | - <span |
227 | - tal:attributes="title context/date_created/fmt:datetime" |
228 | - tal:content="context/date_created/fmt:displaydate">2006-12-13</span>. |
229 | + <tal:created |
230 | + replace="structure context/date_created/fmt:displaydatetitle" />. |
231 | <tal:already_decided condition="context/decider"> |
232 | It was previously marked "<span tal:replace="context/status/title"> |
233 | Approved</span>" for the agenda by |
234 | <a tal:replace="structure context/decider/fmt:link">Foo Bar</a> |
235 | - <span |
236 | - tal:attributes="title context/date_decided/fmt:datetime" |
237 | - tal:content="context/date_decided/fmt:displaydate"> |
238 | - 2006-12-13 |
239 | - </span>. |
240 | + <tal:decided |
241 | + replace="structure context/date_decided/fmt:displaydatetitle" />. |
242 | </tal:already_decided> |
243 | </p> |
244 | |
245 | diff --git a/lib/lp/bugs/templates/bug-listing-detailed.pt b/lib/lp/bugs/templates/bug-listing-detailed.pt |
246 | index 293115d..69a8836 100644 |
247 | --- a/lib/lp/bugs/templates/bug-listing-detailed.pt |
248 | +++ b/lib/lp/bugs/templates/bug-listing-detailed.pt |
249 | @@ -6,8 +6,7 @@ |
250 | <pillar tal:replace="structure pillar/fmt:link:bugs" />, |
251 | </tal:per_pillar> |
252 | reported |
253 | - <span |
254 | - tal:attributes="title context/datecreated/fmt:datetime" |
255 | - tal:content="context/datecreated/fmt:displaydate">2005-10-05</span> |
256 | + <tal:created |
257 | + replace="structure context/datecreated/fmt:displaydatetitle" /> |
258 | </span> |
259 | </li> |
260 | diff --git a/lib/lp/bugs/templates/bugcomment-macros.pt b/lib/lp/bugs/templates/bugcomment-macros.pt |
261 | index 7d5fa48..efa23d6 100644 |
262 | --- a/lib/lp/bugs/templates/bugcomment-macros.pt |
263 | +++ b/lib/lp/bugs/templates/bugcomment-macros.pt |
264 | @@ -34,11 +34,7 @@ |
265 | <tal:activity_has_person> |
266 | <tal:activity_person replace="structure activity_person/fmt:link-display-name-id" /> |
267 | </tal:activity_has_person> |
268 | - <span |
269 | - tal:attributes="title activity_date/fmt:datetime" |
270 | - tal:content="activity_date/fmt:displaydate"> |
271 | - 7 minutes ago |
272 | - </span> |
273 | + <tal:date replace="structure activity_date/fmt:displaydatetitle" /> |
274 | </div> |
275 | <div class="boardCommentActivity"> |
276 | <metal:activity-table |
277 | diff --git a/lib/lp/bugs/templates/bugtask-edit-form.pt b/lib/lp/bugs/templates/bugtask-edit-form.pt |
278 | index 1e1a5e6..3216b2e 100644 |
279 | --- a/lib/lp/bugs/templates/bugtask-edit-form.pt |
280 | +++ b/lib/lp/bugs/templates/bugtask-edit-form.pt |
281 | @@ -210,11 +210,7 @@ |
282 | <tal:has_been_pulled |
283 | tal:condition="context/bugwatch/lastchecked"> |
284 | This information was last pulled |
285 | - <b |
286 | - tal:attributes="title context/bugwatch/lastchecked/fmt:datetime" |
287 | - tal:content="context/bugwatch/lastchecked/fmt:displaydate"> |
288 | - 3 minutes ago |
289 | - </b>. |
290 | + <b tal:content="structure context/bugwatch/lastchecked/fmt:displaydatetitle" />. |
291 | </tal:has_been_pulled> |
292 | <tal:has_not_been_pulled |
293 | tal:condition="not:context/bugwatch/lastchecked"> |
294 | diff --git a/lib/lp/bugs/templates/bugtask-index.pt b/lib/lp/bugs/templates/bugtask-index.pt |
295 | index 8517916..911161b 100644 |
296 | --- a/lib/lp/bugs/templates/bugtask-index.pt |
297 | +++ b/lib/lp/bugs/templates/bugtask-index.pt |
298 | @@ -74,9 +74,8 @@ |
299 | <tal:registering metal:fill-slot="registering"> |
300 | Bug #<tal:id replace="context/bug/id">1</tal:id> reported by |
301 | <tal:reporter replace="structure context/bug/owner/fmt:link" /> |
302 | - <span |
303 | - tal:attributes="title context/bug/datecreated/fmt:datetime" |
304 | - tal:content="context/bug/datecreated/fmt:displaydate" /> |
305 | + <tal:created |
306 | + replace="structure context/bug/datecreated/fmt:displaydatetitle" /> |
307 | </tal:registering> |
308 | |
309 | <metal:heading fill-slot="heading" tal:define="context_menu context/menu:context"> |
310 | diff --git a/lib/lp/buildmaster/templates/builds-list.pt b/lib/lp/buildmaster/templates/builds-list.pt |
311 | index 2f67d3e..4a12620 100644 |
312 | --- a/lib/lp/buildmaster/templates/builds-list.pt |
313 | +++ b/lib/lp/buildmaster/templates/builds-list.pt |
314 | @@ -56,13 +56,9 @@ |
315 | </div> |
316 | <div tal:condition="build/was_built"> |
317 | Build started |
318 | - <tal:soyuz_record condition="build/duration"> |
319 | - <span |
320 | - tal:attributes=" |
321 | - title build/date_started/fmt:datetime" |
322 | - tal:content=" |
323 | - build/date_started/fmt:displaydate" /> |
324 | - </tal:soyuz_record> |
325 | + <tal:soyuz_record |
326 | + condition="build/duration" |
327 | + replace="structure build/date_started/fmt:displaydatetitle" /> |
328 | <tal:gina_record condition="not: build/duration"> |
329 | <i>at an unknown time</i> |
330 | </tal:gina_record> |
331 | @@ -79,9 +75,8 @@ |
332 | </tal:show_builder_info> |
333 | <tal:date_built condition="build/date_finished"> |
334 | and finished |
335 | - <span |
336 | - tal:attributes="title build/date_finished/fmt:datetime" |
337 | - tal:content="build/date_finished/fmt:displaydate" /> |
338 | + <tal:finished |
339 | + replace="structure build/date_finished/fmt:displaydatetitle" /> |
340 | taking |
341 | <tal:time |
342 | content="build/duration/fmt:approximateduration" /> |
343 | @@ -100,9 +95,8 @@ |
344 | </tal:pending> |
345 | <tal:building condition="bq/builder"> |
346 | Build started |
347 | - <span |
348 | - tal:attributes="title bq/date_started/fmt:datetime" |
349 | - tal:content="bq/date_started/fmt:displaydate" /> |
350 | + <tal:started |
351 | + replace="structure bq/date_started/fmt:displaydatetitle" /> |
352 | on |
353 | <a tal:content="bq/builder/title" |
354 | tal:attributes="href bq/builder/fmt:url"/> |
355 | diff --git a/lib/lp/code/templates/branch-heading.pt b/lib/lp/code/templates/branch-heading.pt |
356 | index cbeb6d1..5a080af 100644 |
357 | --- a/lib/lp/code/templates/branch-heading.pt |
358 | +++ b/lib/lp/code/templates/branch-heading.pt |
359 | @@ -7,17 +7,11 @@ |
360 | <div style="float:right; text-align: right"> |
361 | Created by |
362 | <tal:registrant tal:replace="structure context/registrant/fmt:link"/> |
363 | - <span |
364 | - tal:attributes="title context/date_created/fmt:datetime" |
365 | - tal:content="context/date_created/fmt:displaydate"> |
366 | - 2005-10-18 |
367 | - </span> |
368 | + <tal:created |
369 | + replace="structure context/date_created/fmt:displaydatetitle" /> |
370 | and last modified |
371 | - <span |
372 | - tal:attributes="title context/date_last_modified/fmt:datetime" |
373 | - tal:content="context/date_last_modified/fmt:displaydate"> |
374 | - 2005-10-18 |
375 | - </span> |
376 | + <tal:last-modified |
377 | + replace="structure context/date_last_modified/fmt:displaydatetitle" /> |
378 | </div> |
379 | <span class="sprite branch"> Branch</span> |
380 | <tt tal:content="context/bzr_identity" /> |
381 | diff --git a/lib/lp/code/templates/branch-macros.pt b/lib/lp/code/templates/branch-macros.pt |
382 | index 54c94bf..6eb8133 100644 |
383 | --- a/lib/lp/code/templates/branch-macros.pt |
384 | +++ b/lib/lp/code/templates/branch-macros.pt |
385 | @@ -259,10 +259,8 @@ |
386 | </tal:unknown-person> |
387 | </tal:revision-author> |
388 | |
389 | - <span |
390 | - tal:attributes="title rev_no/revision/revision_date/fmt:datetime" |
391 | - tal:content="rev_no/revision/revision_date/fmt:displaydate" |
392 | - >2005-10-05 14:34:22 WST</span> |
393 | + <tal:revision-date |
394 | + replace="structure rev_no/revision/revision_date/fmt:displaydatetitle" /> |
395 | </dt> |
396 | <dd class="subordinate revision-comment"> |
397 | <tal:commit-message |
398 | diff --git a/lib/lp/code/templates/branch-messages.pt b/lib/lp/code/templates/branch-messages.pt |
399 | index 28216db..2a03680 100644 |
400 | --- a/lib/lp/code/templates/branch-messages.pt |
401 | +++ b/lib/lp/code/templates/branch-messages.pt |
402 | @@ -23,8 +23,8 @@ |
403 | <tal:failed-once tal:condition="view/mirror_failed_once"> |
404 | This branch may be out of date, as Launchpad was not able to |
405 | access it |
406 | - <span tal:attributes="title branch/last_mirror_attempt/fmt:datetime" |
407 | - tal:content="branch/last_mirror_attempt/fmt:displaydate" />. |
408 | + <tal:last-mirror-attempt |
409 | + replace="structure branch/last_mirror_attempt/fmt:displaydatetitle" />. |
410 | </tal:failed-once> |
411 | |
412 | <tal:failed-multiple tal:condition="not:view/mirror_failed_once"> |
413 | @@ -40,8 +40,8 @@ |
414 | <tal:not-mirrored-yet tal:condition="not:branch/last_mirrored"> |
415 | Launchpad has not been able to mirror this branch. The last attempt |
416 | was |
417 | - <span tal:attributes="title branch/last_mirror_attempt/fmt:datetime" |
418 | - tal:content="branch/last_mirror_attempt/fmt:displaydate" />. |
419 | + <tal:last-mirror-attempt |
420 | + replace="structure branch/last_mirror_attempt/fmt:displaydatetitle" />. |
421 | </tal:not-mirrored-yet> |
422 | </tal:failed-multiple> |
423 | </tal:mirror-scheduled> |
424 | diff --git a/lib/lp/code/templates/distributionsourcepackage-branches-grouped.pt b/lib/lp/code/templates/distributionsourcepackage-branches-grouped.pt |
425 | index ed73476..3f4438a 100644 |
426 | --- a/lib/lp/code/templates/distributionsourcepackage-branches-grouped.pt |
427 | +++ b/lib/lp/code/templates/distributionsourcepackage-branches-grouped.pt |
428 | @@ -71,12 +71,7 @@ |
429 | tal:attributes="class string:branchstatus${branch/lifecycle_status/name}"> |
430 | Status</span> |
431 | </td> |
432 | - <td> |
433 | - <span tal:attributes="title branch/date_last_modified/fmt:datetime" |
434 | - tal:content="branch/date_last_modified/fmt:approximatedate"> |
435 | - sometime |
436 | - </span> |
437 | - </td> |
438 | + <td tal:content="structure branch/date_last_modified/fmt:approximatedatetitle" /> |
439 | </tr> |
440 | <tr tal:condition="group/more-branch-count"> |
441 | <td colspan="4" style="padding-left: 2em"> |
442 | diff --git a/lib/lp/code/templates/git-macros.pt b/lib/lp/code/templates/git-macros.pt |
443 | index cb0f302..b7a6318 100644 |
444 | --- a/lib/lp/code/templates/git-macros.pt |
445 | +++ b/lib/lp/code/templates/git-macros.pt |
446 | @@ -209,8 +209,7 @@ |
447 | <tal:unknown-person condition="not: author/person"> |
448 | <strong tal:content="author/name/fmt:obfuscate-email" /> |
449 | </tal:unknown-person> |
450 | - <span tal:attributes="title author_date/fmt:datetime" |
451 | - tal:content="author_date/fmt:displaydate" /> |
452 | + <tal:author-date replace="structure author_date/fmt:displaydatetitle" /> |
453 | </dt> |
454 | <dd class="subordinate commit-message" |
455 | tal:define="commit_message python:commit_info['commit_message']"> |
456 | diff --git a/lib/lp/code/templates/gitref-listing.pt b/lib/lp/code/templates/gitref-listing.pt |
457 | index 9ef1e53..d9f3260 100644 |
458 | --- a/lib/lp/code/templates/gitref-listing.pt |
459 | +++ b/lib/lp/code/templates/gitref-listing.pt |
460 | @@ -47,8 +47,8 @@ function hide_git_commit(id) { |
461 | <td> |
462 | <span class="sortkey" |
463 | tal:content="ref/committer_date/fmt:datetime" /> |
464 | - <span tal:attributes="title ref/committer_date/fmt:datetime" |
465 | - tal:content="ref/committer_date/fmt:approximatedate" /> |
466 | + <tal:committer-date |
467 | + replace="structure ref/committer_date/fmt:approximatedatetitle" /> |
468 | </td> |
469 | <td tal:attributes="onmouseover string:show_git_commit(${repeat/ref/index}); |
470 | onmouseout string:hide_git_commit(${repeat/ref/index});"> |
471 | diff --git a/lib/lp/code/templates/sourcepackagerecipebuild-index.pt b/lib/lp/code/templates/sourcepackagerecipebuild-index.pt |
472 | index d9b9729..7f9b011 100644 |
473 | --- a/lib/lp/code/templates/sourcepackagerecipebuild-index.pt |
474 | +++ b/lib/lp/code/templates/sourcepackagerecipebuild-index.pt |
475 | @@ -11,9 +11,8 @@ |
476 | |
477 | <tal:registering metal:fill-slot="registering"> |
478 | created |
479 | - <span tal:content="context/date_created/fmt:displaydate" |
480 | - tal:attributes="title context/date_created/fmt:datetime" |
481 | - >on 2005-01-01</span> |
482 | + <tal:created |
483 | + replace="structure context/date_created/fmt:displaydatetitle" /> |
484 | </tal:registering> |
485 | |
486 | <div metal:fill-slot="main"> |
487 | @@ -121,14 +120,10 @@ |
488 | </li> |
489 | </tal:pending> |
490 | </tal:reallypending> |
491 | - <tal:started condition="context/date_started"> |
492 | - <li tal:condition="context/date_started"> |
493 | - Started <span |
494 | - tal:define="start context/date_started" |
495 | - tal:attributes="title start/fmt:datetime" |
496 | - tal:content="start/fmt:displaydate">2008-01-01</span> |
497 | - </li> |
498 | - </tal:started> |
499 | + <li tal:condition="context/date_started"> |
500 | + Started <tal:started |
501 | + replace="structure context/date_started/fmt:displaydatetitle" /> |
502 | + </li> |
503 | <tal:finish condition="not: context/date_finished"> |
504 | <li tal:define="eta view/eta" tal:condition="view/eta"> |
505 | Estimated finish <tal:eta |
506 | @@ -137,9 +132,8 @@ |
507 | </tal:finish> |
508 | |
509 | <li tal:condition="context/date_finished"> |
510 | - Finished <span |
511 | - tal:attributes="title context/date_finished/fmt:datetime" |
512 | - tal:content="context/date_finished/fmt:displaydate">2008-01-01</span> |
513 | + Finished <tal:finished |
514 | + replace="structure context/date_finished/fmt:displaydatetitle" /> |
515 | <tal:duration condition="context/duration"> |
516 | (took <span tal:replace="context/duration/fmt:exactduration"/>) |
517 | </tal:duration> |
518 | diff --git a/lib/lp/oci/templates/ocirecipebuild-index.pt b/lib/lp/oci/templates/ocirecipebuild-index.pt |
519 | index dc896e2..a1f3caf 100644 |
520 | --- a/lib/lp/oci/templates/ocirecipebuild-index.pt |
521 | +++ b/lib/lp/oci/templates/ocirecipebuild-index.pt |
522 | @@ -11,8 +11,8 @@ |
523 | |
524 | <tal:registering metal:fill-slot="registering"> |
525 | created |
526 | - <span tal:content="context/date_created/fmt:displaydate" |
527 | - tal:attributes="title context/date_created/fmt:datetime"/> |
528 | + <tal:created |
529 | + replace="structure context/date_created/fmt:displaydatetitle" /> |
530 | </tal:registering> |
531 | |
532 | <div metal:fill-slot="main"> |
533 | @@ -105,14 +105,10 @@ |
534 | </li> |
535 | </tal:pending> |
536 | </tal:reallypending> |
537 | - <tal:started condition="context/date_started"> |
538 | - <li tal:condition="context/date_started"> |
539 | - Started <span |
540 | - tal:define="start context/date_started" |
541 | - tal:attributes="title start/fmt:datetime" |
542 | - tal:content="start/fmt:displaydate"/> |
543 | - </li> |
544 | - </tal:started> |
545 | + <li tal:condition="context/date_started"> |
546 | + Started <tal:started |
547 | + replace="structure context/date_started/fmt:displaydatetitle" /> |
548 | + </li> |
549 | <tal:finish condition="not: context/date_finished"> |
550 | <li tal:define="eta context/eta" tal:condition="context/eta"> |
551 | Estimated finish <tal:eta replace="eta/fmt:approximatedate"/> |
552 | @@ -120,9 +116,8 @@ |
553 | </tal:finish> |
554 | |
555 | <li tal:condition="context/date_finished"> |
556 | - Finished <span |
557 | - tal:attributes="title context/date_finished/fmt:datetime" |
558 | - tal:content="context/date_finished/fmt:displaydate"/> |
559 | + Finished <tal:finished |
560 | + replace="structure context/date_finished/fmt:displaydatetitle" /> |
561 | <tal:duration condition="context/duration"> |
562 | (took <span tal:replace="context/duration/fmt:exactduration"/>) |
563 | </tal:duration> |
564 | diff --git a/lib/lp/registry/templates/distribution-index.pt b/lib/lp/registry/templates/distribution-index.pt |
565 | index b3955af..1c7c7bd 100644 |
566 | --- a/lib/lp/registry/templates/distribution-index.pt |
567 | +++ b/lib/lp/registry/templates/distribution-index.pt |
568 | @@ -26,9 +26,8 @@ |
569 | <tal:registering metal:fill-slot="registering"> |
570 | Registered by |
571 | <a tal:replace="structure context/registrant/fmt:link" /> |
572 | - <span tal:content="context/date_created/fmt:displaydate" |
573 | - tal:attributes="title context/date_created/fmt:datetime" |
574 | - >on 2005-01-01</span> |
575 | + <tal:created |
576 | + replace="structure context/date_created/fmt:displaydatetitle" /> |
577 | </tal:registering> |
578 | |
579 | <tal:main metal:fill-slot="main" |
580 | diff --git a/lib/lp/registry/templates/distributionmirror-index.pt b/lib/lp/registry/templates/distributionmirror-index.pt |
581 | index 27f3139..3d840d0 100644 |
582 | --- a/lib/lp/registry/templates/distributionmirror-index.pt |
583 | +++ b/lib/lp/registry/templates/distributionmirror-index.pt |
584 | @@ -101,9 +101,8 @@ |
585 | </tal:not-probe> |
586 | <tal:probe condition="probe"> |
587 | <p>This mirror was last verified |
588 | - <span |
589 | - tal:attributes="title probe/date_created/fmt:datetime" |
590 | - tal:content="probe/date_created/fmt:displaydate" />. |
591 | + <tal:created |
592 | + replace="structure probe/date_created/fmt:displaydatetitle" />. |
593 | |
594 | <tal:is-owner condition="context/required:launchpad.Edit"> |
595 | You can see the |
596 | diff --git a/lib/lp/registry/templates/distributionmirror-prober-logs.pt b/lib/lp/registry/templates/distributionmirror-prober-logs.pt |
597 | index b452764..f0c440f 100644 |
598 | --- a/lib/lp/registry/templates/distributionmirror-prober-logs.pt |
599 | +++ b/lib/lp/registry/templates/distributionmirror-prober-logs.pt |
600 | @@ -30,11 +30,7 @@ |
601 | </thead> |
602 | <tbody> |
603 | <tr tal:repeat="record view/probe_records/currentBatch"> |
604 | - <td> |
605 | - <span |
606 | - tal:attributes="title record/date_created/fmt:datetime" |
607 | - tal:content="record/date_created/fmt:approximatedate" /> |
608 | - </td> |
609 | + <td tal:content="structure record/date_created/fmt:approximatedatetitle" /> |
610 | <td><a tal:content="record/log_file/filename" |
611 | tal:attributes="href record/log_file/http_url" /> |
612 | </td> |
613 | diff --git a/lib/lp/registry/templates/distroseries-index.pt b/lib/lp/registry/templates/distroseries-index.pt |
614 | index bf81282..e9bd461 100644 |
615 | --- a/lib/lp/registry/templates/distroseries-index.pt |
616 | +++ b/lib/lp/registry/templates/distroseries-index.pt |
617 | @@ -33,9 +33,8 @@ |
618 | <tal:registering metal:fill-slot="registering"> |
619 | Registered by |
620 | <a tal:replace="structure context/registrant/fmt:link" /> |
621 | - <span tal:content="context/date_created/fmt:displaydate" |
622 | - tal:attributes="title context/date_created/fmt:datetime" |
623 | - >on 2005-01-01</span> |
624 | + <tal:created |
625 | + replace="structure context/date_created/fmt:displaydatetitle" /> |
626 | </tal:registering> |
627 | |
628 | <div metal:fill-slot="main"> |
629 | diff --git a/lib/lp/registry/templates/distroseries-localdifferences.pt b/lib/lp/registry/templates/distroseries-localdifferences.pt |
630 | index 200b9e0..497a4da 100644 |
631 | --- a/lib/lp/registry/templates/distroseries-localdifferences.pt |
632 | +++ b/lib/lp/registry/templates/distroseries-localdifferences.pt |
633 | @@ -225,8 +225,8 @@ |
634 | <td class="last-changed"> |
635 | <tal:parent condition="not: view/show_derived_version"> |
636 | <tal:published condition="parent_source_pub"> |
637 | - <span tal:attributes="title parent_source_pub/datepublished/fmt:datetime" |
638 | - tal:content="parent_source_pub/datepublished/fmt:approximatedate">2005-09-16</span> |
639 | + <tal:date |
640 | + replace="structure parent_source_pub/datepublished/fmt:approximatedatetitle" /> |
641 | <tal:creator define="spr parent_source_pub/sourcepackagerelease"> |
642 | <span class="nowrap">by <a tal:replace="structure spr/creator/fmt:link" /></span> |
643 | </tal:creator> |
644 | @@ -247,8 +247,8 @@ |
645 | </tal:parent> |
646 | <tal:derived condition="view/show_derived_version"> |
647 | <tal:published condition="source_pub"> |
648 | - <span tal:attributes="title source_pub/datepublished/fmt:datetime" |
649 | - tal:content="source_pub/datepublished/fmt:approximatedate">2005-09-16</span> |
650 | + <tal:date |
651 | + replace="structure source_pub/datepublished/fmt:approximatedatetitle" /> |
652 | <tal:creator define="spr source_pub/sourcepackagerelease"> |
653 | <span class="nowrap">by <a tal:replace="structure spr/creator/fmt:link" /></span> |
654 | </tal:creator> |
655 | diff --git a/lib/lp/registry/templates/distroseries-portlet-packaging.pt b/lib/lp/registry/templates/distroseries-portlet-packaging.pt |
656 | index e81de30..2956c37 100644 |
657 | --- a/lib/lp/registry/templates/distroseries-portlet-packaging.pt |
658 | +++ b/lib/lp/registry/templates/distroseries-portlet-packaging.pt |
659 | @@ -43,8 +43,7 @@ |
660 | <span class="lesser greyed-out">linked</span> |
661 | </tal:no_owner> |
662 | <span class="lesser greyed-out" |
663 | - tal:attributes="title package/datecreated/fmt:datetime" |
664 | - tal:content="package/datecreated/fmt:approximatedate" /> |
665 | + tal:content="structure package/datecreated/fmt:approximatedatetitle" /> |
666 | </p> |
667 | </tal:package> |
668 | </dd> |
669 | diff --git a/lib/lp/registry/templates/milestone-index.pt b/lib/lp/registry/templates/milestone-index.pt |
670 | index cd7bf30..5b3e41a 100644 |
671 | --- a/lib/lp/registry/templates/milestone-index.pt |
672 | +++ b/lib/lp/registry/templates/milestone-index.pt |
673 | @@ -99,9 +99,9 @@ |
674 | <tal:has_release condition="view/release"> |
675 | <dl> |
676 | <dt>Released:</dt> |
677 | - <dd><span |
678 | - tal:attributes="title view/release/datereleased/fmt:datetime" |
679 | - tal:content="view/release/datereleased/fmt:approximatedate" /> |
680 | + <dd> |
681 | + <tal:released |
682 | + replace="structure view/release/datereleased/fmt:approximatedatetitle" /> |
683 | |
684 | <a tal:replace="structure release_menu/delete/fmt:icon" /> |
685 | <a tal:replace="structure release_menu/edit/fmt:icon" /> |
686 | @@ -115,9 +115,7 @@ |
687 | |
688 | <dl> |
689 | <dt>Release registered:</dt> |
690 | - <dd><span |
691 | - tal:attributes="title view/release/datecreated/fmt:datetime" |
692 | - tal:content="view/release/datecreated/fmt:approximatedate" /></dd> |
693 | + <dd tal:content="structure view/release/datecreated/fmt:approximatedatetitle" /> |
694 | </dl> |
695 | </tal:has_release> |
696 | </tal:is_not_project_milestone_tag> |
697 | diff --git a/lib/lp/registry/templates/person-index.pt b/lib/lp/registry/templates/person-index.pt |
698 | index 1261219..56dbcee 100644 |
699 | --- a/lib/lp/registry/templates/person-index.pt |
700 | +++ b/lib/lp/registry/templates/person-index.pt |
701 | @@ -120,9 +120,8 @@ |
702 | <p><span tal:replace="context/displayname" /> does not use Launchpad. |
703 | <tal:block condition="context/creation_comment"> |
704 | This page was created |
705 | - <span |
706 | - tal:attributes="title context/datecreated/fmt:datetime" |
707 | - tal:content="context/datecreated/fmt:displaydate" /> |
708 | + <tal:created |
709 | + replace="structure context/datecreated/fmt:displaydatetitle" /> |
710 | <tal:user-created |
711 | condition="context/creation_rationale/enumvalue:USER_CREATED"> |
712 | by <a tal:attributes="href context/registrant/fmt:url"> |
713 | @@ -138,9 +137,8 @@ |
714 | </tal:block> |
715 | <tal:block condition="not: context/creation_comment"> |
716 | This page was created |
717 | - <span |
718 | - tal:attributes="title context/datecreated/fmt:datetime" |
719 | - tal:content="context/datecreated/fmt:displaydate" />. |
720 | + <tal:created |
721 | + replace="structure context/datecreated/fmt:displaydatetitle" />. |
722 | </tal:block> |
723 | </p> |
724 | |
725 | diff --git a/lib/lp/registry/templates/person-karma.pt b/lib/lp/registry/templates/person-karma.pt |
726 | index 806c229..53e6b6d 100644 |
727 | --- a/lib/lp/registry/templates/person-karma.pt |
728 | +++ b/lib/lp/registry/templates/person-karma.pt |
729 | @@ -59,10 +59,9 @@ |
730 | <tr tal:repeat="karma latest_karma"> |
731 | <td> |
732 | <span class="sortkey" |
733 | - tal:content="karma/datecreated/fmt:datetime">2005-10-06</span> |
734 | - <span |
735 | - tal:attributes="title karma/datecreated/fmt:datetime" |
736 | - tal:content="karma/datecreated/fmt:approximatedate" /> |
737 | + tal:content="karma/datecreated/fmt:datetime" /> |
738 | + <tal:created |
739 | + replace="structure karma/datecreated/fmt:approximatedatetitle" /> |
740 | </td> |
741 | <td tal:content="karma/action/title">Bug Filed</td> |
742 | </tr> |
743 | diff --git a/lib/lp/registry/templates/person-macros.pt b/lib/lp/registry/templates/person-macros.pt |
744 | index 0077431..3eb80c6 100644 |
745 | --- a/lib/lp/registry/templates/person-macros.pt |
746 | +++ b/lib/lp/registry/templates/person-macros.pt |
747 | @@ -148,11 +148,7 @@ |
748 | tal:content="spr/version"> |
749 | </a> |
750 | </td> |
751 | - <td |
752 | - tal:attributes="title spr/dateuploaded/fmt:datetime" |
753 | - tal:content="spr/dateuploaded/fmt:approximatedate"> |
754 | - 2005-10-24 |
755 | - </td> |
756 | + <td tal:content="structure spr/dateuploaded/fmt:approximatedatetitle" /> |
757 | <td> |
758 | <tal:needs_building condition="spr/needs_building"> |
759 | Not yet built |
760 | @@ -199,11 +195,7 @@ |
761 | tal:content="spr/version"> |
762 | </a> |
763 | </td> |
764 | - <td |
765 | - tal:attributes="title spph/datecreated/fmt:datetime" |
766 | - tal:content="spph/datecreated/fmt:approximatedate"> |
767 | - 2005-10-24 |
768 | - </td> |
769 | + <td tal:content="structure spph/datecreated/fmt:approximatedatetitle" /> |
770 | <td> |
771 | <tal:needs_building condition="spph/needs_building"> |
772 | Not yet built |
773 | diff --git a/lib/lp/registry/templates/person-related-software.pt b/lib/lp/registry/templates/person-related-software.pt |
774 | index f5271c9..232d522 100644 |
775 | --- a/lib/lp/registry/templates/person-related-software.pt |
776 | +++ b/lib/lp/registry/templates/person-related-software.pt |
777 | @@ -143,11 +143,7 @@ |
778 | <td tal:content="spr/version"> |
779 | 1.0 |
780 | </td> |
781 | - <td |
782 | - tal:attributes="title spr/dateuploaded/fmt:datetime" |
783 | - tal:content="spr/dateuploaded/fmt:approximatedate"> |
784 | - 2005-10-24 |
785 | - </td> |
786 | + <td tal:content="structure spr/dateuploaded/fmt:approximatedatetitle" /> |
787 | <td> |
788 | <tal:block condition="spr/needs_building"> |
789 | Not yet built |
790 | diff --git a/lib/lp/registry/templates/poll-index.pt b/lib/lp/registry/templates/poll-index.pt |
791 | index 69a60f5..f067078 100644 |
792 | --- a/lib/lp/registry/templates/poll-index.pt |
793 | +++ b/lib/lp/registry/templates/poll-index.pt |
794 | @@ -69,9 +69,8 @@ |
795 | <h2>Voting has closed</h2> |
796 | |
797 | <p>Voting closed |
798 | - <span |
799 | - tal:attributes="title context/datecloses/fmt:datetime" |
800 | - tal:content="context/datecloses/fmt:displaydate" />. |
801 | + <tal:closes |
802 | + replace="structure context/datecloses/fmt:displaydatetitle" />. |
803 | </p> |
804 | |
805 | <tal:block condition="view/userVoted"> |
806 | @@ -189,9 +188,8 @@ |
807 | |
808 | <p> |
809 | The vote will commence |
810 | - <span |
811 | - tal:attributes="title context/dateopens/fmt:datetime" |
812 | - tal:content="context/dateopens/fmt:displaydate" />. |
813 | + <tal:opens |
814 | + replace="structure context/dateopens/fmt:displaydatetitle" />. |
815 | </p> |
816 | </tal:block> |
817 | |
818 | diff --git a/lib/lp/registry/templates/product-files.pt b/lib/lp/registry/templates/product-files.pt |
819 | index bf2f792..161aa6e 100644 |
820 | --- a/lib/lp/registry/templates/product-files.pt |
821 | +++ b/lib/lp/registry/templates/product-files.pt |
822 | @@ -59,9 +59,8 @@ |
823 | from the |
824 | <a tal:attributes="href series/fmt:url" |
825 | tal:content="series/name">name</a> series released |
826 | - <span |
827 | - tal:attributes="title release/datereleased/fmt:datetime" |
828 | - tal:content="release/datereleased/fmt:approximatedate" /> |
829 | + <tal:released |
830 | + replace="structure release/datereleased/fmt:approximatedatetitle" /> |
831 | </h3> |
832 | |
833 | <div tal:attributes="id release/version/fmt:css-id/release-information-" |
834 | diff --git a/lib/lp/registry/templates/product-listing-detailed.pt b/lib/lp/registry/templates/product-listing-detailed.pt |
835 | index 545e0b7..9e2f3f6 100644 |
836 | --- a/lib/lp/registry/templates/product-listing-detailed.pt |
837 | +++ b/lib/lp/registry/templates/product-listing-detailed.pt |
838 | @@ -13,9 +13,8 @@ |
839 | <div> |
840 | Maintained by <a |
841 | tal:replace="structure context/owner/fmt:link">Foo Bar</a>; Registered |
842 | - <span |
843 | - tal:attributes="title context/datecreated/fmt:datetime" |
844 | - tal:content="context/datecreated/fmt:displaydate">2005-10-12</span> |
845 | + <tal:created |
846 | + replace="structure context/datecreated/fmt:displaydatetitle" /> |
847 | </div> |
848 | </div> |
849 | </div> |
850 | diff --git a/lib/lp/registry/templates/product-listing-for-review.pt b/lib/lp/registry/templates/product-listing-for-review.pt |
851 | index 405d7f8..a2a6909 100644 |
852 | --- a/lib/lp/registry/templates/product-listing-for-review.pt |
853 | +++ b/lib/lp/registry/templates/product-listing-for-review.pt |
854 | @@ -10,9 +10,8 @@ |
855 | <a tal:replace="structure context/fmt:link" /> |
856 | (<span tal:replace="context/name" />) |
857 | registered |
858 | - <span |
859 | - tal:attributes="title context/datecreated/fmt:datetime" |
860 | - tal:content="context/datecreated/fmt:displaydate">2005-10-12</span> |
861 | + <tal:created |
862 | + replace="structure context/datecreated/fmt:displaydatetitle" /> |
863 | </p> |
864 | |
865 | <dl class="horizontal"> |
866 | diff --git a/lib/lp/registry/templates/productseries-milestone-table-row.pt b/lib/lp/registry/templates/productseries-milestone-table-row.pt |
867 | index e8792d0..7c3b5a1 100644 |
868 | --- a/lib/lp/registry/templates/productseries-milestone-table-row.pt |
869 | +++ b/lib/lp/registry/templates/productseries-milestone-table-row.pt |
870 | @@ -43,12 +43,9 @@ |
871 | </tal:empty-date> |
872 | </td> |
873 | <td tal:condition="not: view/is_distroseries_milestone"> |
874 | - <span |
875 | - tal:condition="release" |
876 | - tal:attributes="title release/datereleased/fmt:datetime" |
877 | - tal:content="release/datereleased/fmt:approximatedate"> |
878 | - 2005-12-13 |
879 | - </span> |
880 | + <tal:released |
881 | + condition="release" |
882 | + replace="structure release/datereleased/fmt:approximatedatetitle" /> |
883 | <tal:no-release condition="not: release"> |
884 | <em tal:condition="not: milestone/active"> |
885 | <img src="/@@/info"/> This is an inactive milestone |
886 | diff --git a/lib/lp/registry/templates/productseries-ubuntupkg.pt b/lib/lp/registry/templates/productseries-ubuntupkg.pt |
887 | index f40c281..0bb8275 100644 |
888 | --- a/lib/lp/registry/templates/productseries-ubuntupkg.pt |
889 | +++ b/lib/lp/registry/templates/productseries-ubuntupkg.pt |
890 | @@ -46,13 +46,7 @@ |
891 | |
892 | <tbody> |
893 | <tr tal:repeat="packaging view/ubuntu_history"> |
894 | - <td> |
895 | - <span |
896 | - tal:attributes="title packaging/datecreated/fmt:datetime" |
897 | - tal:content="packaging/datecreated/fmt:approximatedate"> |
898 | - 13-05-2004 |
899 | - </span> |
900 | - </td> |
901 | + <td tal:content="structure packaging/datecreated/fmt:approximatedatetitle" /> |
902 | <td> |
903 | <a tal:replace="structure packaging/distroseries/fmt:link" /> |
904 | </td> |
905 | diff --git a/lib/lp/registry/templates/signedcodeofconduct-index.pt b/lib/lp/registry/templates/signedcodeofconduct-index.pt |
906 | index 5d37c38..5573df6 100644 |
907 | --- a/lib/lp/registry/templates/signedcodeofconduct-index.pt |
908 | +++ b/lib/lp/registry/templates/signedcodeofconduct-index.pt |
909 | @@ -24,9 +24,9 @@ |
910 | </p> |
911 | |
912 | <p><dfn>Created:</dfn> |
913 | - <span |
914 | - tal:attributes="title context/datecreated/fmt:datetime" |
915 | - tal:content="context/datecreated/fmt:approximatedate">DATE</span></p> |
916 | + <tal:created |
917 | + replace="structure context/datecreated/fmt:approximatedatetitle" /> |
918 | + </p> |
919 | |
920 | <tal:block condition="context/recipient"> |
921 | <p><dfn>Recipient:</dfn> |
922 | diff --git a/lib/lp/registry/templates/sourcepackage-portlet-details.pt b/lib/lp/registry/templates/sourcepackage-portlet-details.pt |
923 | index 26a4fd5..5e3e81f 100644 |
924 | --- a/lib/lp/registry/templates/sourcepackage-portlet-details.pt |
925 | +++ b/lib/lp/registry/templates/sourcepackage-portlet-details.pt |
926 | @@ -16,9 +16,7 @@ |
927 | </dl> |
928 | <dl> |
929 | <dt>Uploaded:</dt> |
930 | - <dd><span |
931 | - tal:attributes="title current/dateuploaded/fmt:datetime" |
932 | - tal:content="current/dateuploaded/fmt:approximatedate" /></dd> |
933 | + <dd tal:content="structure current/dateuploaded/fmt:approximatedatetitle" /> |
934 | </dl> |
935 | <dl> |
936 | <dt>Urgency:</dt> |
937 | diff --git a/lib/lp/registry/templates/team-listing.pt b/lib/lp/registry/templates/team-listing.pt |
938 | index fe6474b..14fb342 100644 |
939 | --- a/lib/lp/registry/templates/team-listing.pt |
940 | +++ b/lib/lp/registry/templates/team-listing.pt |
941 | @@ -29,20 +29,8 @@ |
942 | <a tal:content="membership/person/displayname" |
943 | tal:attributes="href membership/person/fmt:url" /> |
944 | </td> |
945 | - <td> |
946 | - <span |
947 | - tal:attributes="title membership/datejoined/fmt:datetime" |
948 | - tal:content="membership/datejoined/fmt:approximatedate"> |
949 | - 12-12-2004 |
950 | - </span> |
951 | - </td> |
952 | - <td> |
953 | - <span |
954 | - tal:attributes="title membership/dateexpires/fmt:datetime" |
955 | - tal:content="membership/dateexpires/fmt:approximatedate"> |
956 | - 12-12-2005 |
957 | - </span> |
958 | - </td> |
959 | + <td tal:content="structure membership/datejoined/fmt:approximatedatetitle" /> |
960 | + <td tal:content="structure membership/dateexpires/fmt:approximatedatetitle" /> |
961 | <td tal:content="membership/status/title">Administrator</td> |
962 | </tr> |
963 | </tbody> |
964 | diff --git a/lib/lp/registry/templates/team-members.pt b/lib/lp/registry/templates/team-members.pt |
965 | index 318a052..7b3274f 100644 |
966 | --- a/lib/lp/registry/templates/team-members.pt |
967 | +++ b/lib/lp/registry/templates/team-members.pt |
968 | @@ -52,11 +52,8 @@ |
969 | <td> |
970 | <span class="sortkey" |
971 | tal:content="membership/datejoined/fmt:datetime" /> |
972 | - <span |
973 | - tal:attributes="title membership/datejoined/fmt:datetime" |
974 | - tal:content="membership/datejoined/fmt:approximatedate"> |
975 | - 2005-06-14 |
976 | - </span> |
977 | + <tal:joined |
978 | + replace="structure membership/datejoined/fmt:approximatedatetitle" /> |
979 | </td> |
980 | <td> |
981 | <tal:block condition="not: membership/dateexpires"> |
982 | @@ -64,11 +61,8 @@ |
983 | </tal:block> |
984 | <span class="sortkey" |
985 | tal:content="membership/dateexpires/fmt:datetime" /> |
986 | - <span |
987 | - tal:attributes="title membership/dateexpires/fmt:datetime" |
988 | - tal:content="membership/dateexpires/fmt:approximatedate"> |
989 | - 2005-06-14 |
990 | - </span> |
991 | + <tal:expires |
992 | + replace="structure membership/dateexpires/fmt:approximatedatetitle" /> |
993 | </td> |
994 | <td tal:content="membership/status/title"></td> |
995 | <td tal:condition="user_can_edit_memberships"> |
996 | @@ -137,11 +131,8 @@ |
997 | <td> |
998 | <span class="sortkey" |
999 | tal:content="membership/date_proposed/fmt:datetime" /> |
1000 | - <span |
1001 | - tal:attributes="title membership/date_proposed/fmt:datetime" |
1002 | - tal:content="membership/date_proposed/fmt:approximatedate"> |
1003 | - 2005-06-14 |
1004 | - </span> |
1005 | + <tal:proposed |
1006 | + replace="structure membership/date_proposed/fmt:approximatedatetitle" /> |
1007 | </td> |
1008 | <td tal:condition="membership/status/enumvalue:INVITED"> |
1009 | Pending |
1010 | @@ -182,11 +173,8 @@ |
1011 | <td> |
1012 | <span class="sortkey" |
1013 | tal:content="membership/date_proposed/fmt:datetime" /> |
1014 | - <span |
1015 | - tal:attributes="title membership/date_proposed/fmt:datetime" |
1016 | - tal:content="membership/date_proposed/fmt:approximatedate"> |
1017 | - 2005-06-14 |
1018 | - </span> |
1019 | + <tal:proposed |
1020 | + replace="structure membership/date_proposed/fmt:approximatedatetitle" /> |
1021 | </td> |
1022 | <td tal:condition="user_can_edit_memberships"> |
1023 | <a tal:attributes="href membership/fmt:url" |
1024 | diff --git a/lib/lp/registry/templates/team-polls.pt b/lib/lp/registry/templates/team-polls.pt |
1025 | index f0d7623..b958ec4 100644 |
1026 | --- a/lib/lp/registry/templates/team-polls.pt |
1027 | +++ b/lib/lp/registry/templates/team-polls.pt |
1028 | @@ -25,9 +25,8 @@ |
1029 | <a tal:attributes="href poll/fmt:url"> |
1030 | <span tal:replace="poll/title" /> |
1031 | </a> - closes |
1032 | - <span |
1033 | - tal:attributes="title poll/datecloses/fmt:datetime" |
1034 | - tal:content="poll/datecloses/fmt:displaydate" />. |
1035 | + <tal:closes |
1036 | + replace="structure poll/datecloses/fmt:displaydatetitle" />. |
1037 | |
1038 | <tal:block define="user request/lp:person" condition="user"> |
1039 | <tal:block condition="python: poll.personVoted(user)"> |
1040 | @@ -49,9 +48,8 @@ |
1041 | <a tal:attributes="href poll/fmt:url"> |
1042 | <span tal:replace="poll/title" /> |
1043 | </a> - opens |
1044 | - <span |
1045 | - tal:attributes="title poll/dateopens/fmt:datetime" |
1046 | - tal:content="poll/dateopens/fmt:displaydate" /> |
1047 | + <tal:opens |
1048 | + replace="structure poll/dateopens/fmt:displaydatetitle" /> |
1049 | </li> |
1050 | </ul> |
1051 | |
1052 | @@ -63,9 +61,8 @@ |
1053 | <a tal:attributes="href poll/fmt:url"> |
1054 | <span tal:replace="poll/title" /> |
1055 | </a> - closed |
1056 | - <span |
1057 | - tal:attributes="title poll/datecloses/fmt:datetime" |
1058 | - tal:content="poll/datecloses/fmt:displaydate" /> |
1059 | + <tal:closes |
1060 | + replace="structure poll/datecloses/fmt:displaydatetitle" /> |
1061 | </li> |
1062 | </ul> |
1063 | </tal:block> |
1064 | diff --git a/lib/lp/registry/templates/team-portlet-polls.pt b/lib/lp/registry/templates/team-portlet-polls.pt |
1065 | index fa74a81..6c9182e 100644 |
1066 | --- a/lib/lp/registry/templates/team-portlet-polls.pt |
1067 | +++ b/lib/lp/registry/templates/team-portlet-polls.pt |
1068 | @@ -17,9 +17,8 @@ |
1069 | <a tal:attributes="href poll/fmt:url"> |
1070 | <span tal:replace="poll/title" /> |
1071 | </a> - closes |
1072 | - <span |
1073 | - tal:attributes="title poll/datecloses/fmt:datetime" |
1074 | - tal:content="poll/datecloses/fmt:displaydate" />. |
1075 | + <tal:closes |
1076 | + replace="structure poll/datecloses/fmt:displaydatetitle" />. |
1077 | |
1078 | <tal:block define="user request/lp:person" condition="user"> |
1079 | <tal:block condition="python: poll.personVoted(user)"> |
1080 | @@ -42,9 +41,8 @@ |
1081 | <a tal:attributes="href poll/fmt:url"> |
1082 | <span tal:replace="poll/title" /> |
1083 | </a> - opens |
1084 | - <span |
1085 | - tal:attributes="title poll/dateopens/fmt:datetime" |
1086 | - tal:content="poll/dateopens/fmt:displaydate" /> |
1087 | + <tal:opens |
1088 | + replace="structure poll/dateopens/fmt:displaydatetitle" /> |
1089 | </li> |
1090 | </ul> |
1091 | |
1092 | diff --git a/lib/lp/registry/templates/teammembership-index.pt b/lib/lp/registry/templates/teammembership-index.pt |
1093 | index 795c868..147a0a3 100644 |
1094 | --- a/lib/lp/registry/templates/teammembership-index.pt |
1095 | +++ b/lib/lp/registry/templates/teammembership-index.pt |
1096 | @@ -97,13 +97,7 @@ |
1097 | <table> |
1098 | <tr> |
1099 | <th>Member since:</th> |
1100 | - <td> |
1101 | - <span |
1102 | - tal:attributes="title context/datejoined/fmt:datetime" |
1103 | - tal:content="context/datejoined/fmt:approximatedate"> |
1104 | - 2005-09-13 |
1105 | - </span> |
1106 | - </td> |
1107 | + <td tal:content="structure context/datejoined/fmt:approximatedatetitle" /> |
1108 | </tr> |
1109 | |
1110 | <tr> |
1111 | @@ -126,9 +120,9 @@ |
1112 | <metal:radios use-macro="template/macros/expiry-radios" /> |
1113 | </td> |
1114 | <td tal:condition="not: view/canChangeExpirationDate"> |
1115 | - <span tal:condition="context/dateexpires" |
1116 | - tal:attributes="title context/dateexpires/fmt:datetime" |
1117 | - tal:content="context/dateexpires/fmt:approximatedate" /> |
1118 | + <tal:expires |
1119 | + condition="context/dateexpires" |
1120 | + replace="structure context/dateexpires/fmt:approximatedatetitle" /> |
1121 | <span tal:condition="not: context/dateexpires">Never</span> |
1122 | </td> |
1123 | </tr> |
1124 | @@ -173,25 +167,13 @@ |
1125 | <table> |
1126 | <tr> |
1127 | <th>Became member:</th> |
1128 | - <td> |
1129 | - <span |
1130 | - tal:attributes="title context/datejoined/fmt:datetime" |
1131 | - tal:content="context/datejoined/fmt:approximatedate"> |
1132 | - 2005-09-13 |
1133 | - </span> |
1134 | - </td> |
1135 | + <td tal:content="structure context/datejoined/fmt:approximatedatetitle" /> |
1136 | </tr> |
1137 | |
1138 | <tal:expired condition="view/isExpired"> |
1139 | <tr> |
1140 | <th>Subscription expired:</th> |
1141 | - <td> |
1142 | - <span |
1143 | - tal:attributes="title context/dateexpires/fmt:datetime" |
1144 | - tal:content="context/dateexpires/fmt:approximatedate"> |
1145 | - 2006-09-13 |
1146 | - </span> |
1147 | - </td> |
1148 | + <td tal:content="structure context/dateexpires/fmt:approximatedatetitle" /> |
1149 | </tr> |
1150 | |
1151 | <metal:error use-macro="template/macros/error" /> |
1152 | @@ -251,13 +233,7 @@ |
1153 | <table> |
1154 | <tr> |
1155 | <th>Applied:</th> |
1156 | - <td> |
1157 | - <span |
1158 | - tal:attributes="title context/date_created/fmt:datetime" |
1159 | - tal:content="context/date_created/fmt:approximatedate"> |
1160 | - 2005-09-13 |
1161 | - </span> |
1162 | - </td> |
1163 | + <td tal:content="structure context/date_created/fmt:approximatedatetitle" /> |
1164 | </tr> |
1165 | |
1166 | <metal:error use-macro="template/macros/error" /> |
1167 | diff --git a/lib/lp/registry/templates/teammembership-listing-simple.pt b/lib/lp/registry/templates/teammembership-listing-simple.pt |
1168 | index 10bddf8..8779f85 100644 |
1169 | --- a/lib/lp/registry/templates/teammembership-listing-simple.pt |
1170 | +++ b/lib/lp/registry/templates/teammembership-listing-simple.pt |
1171 | @@ -11,9 +11,8 @@ |
1172 | </div> |
1173 | <div class="registered"> |
1174 | Joined |
1175 | - <span |
1176 | - tal:attributes="title context/datejoined/fmt:datetime" |
1177 | - tal:content="context/datejoined/fmt:displaydate" /> |
1178 | + <tal:joined |
1179 | + replace="structure context/datejoined/fmt:displaydatetitle" /> |
1180 | </div> |
1181 | </td> |
1182 | </tr> |
1183 | diff --git a/lib/lp/snappy/templates/snapbuild-index.pt b/lib/lp/snappy/templates/snapbuild-index.pt |
1184 | index 513a81e..c8d5daf 100644 |
1185 | --- a/lib/lp/snappy/templates/snapbuild-index.pt |
1186 | +++ b/lib/lp/snappy/templates/snapbuild-index.pt |
1187 | @@ -11,8 +11,8 @@ |
1188 | |
1189 | <tal:registering metal:fill-slot="registering"> |
1190 | created |
1191 | - <span tal:content="context/date_created/fmt:displaydate" |
1192 | - tal:attributes="title context/date_created/fmt:datetime"/> |
1193 | + <tal:created |
1194 | + replace="structure context/date_created/fmt:displaydatetitle" /> |
1195 | </tal:registering> |
1196 | |
1197 | <div metal:fill-slot="main"> |
1198 | @@ -131,14 +131,10 @@ |
1199 | </li> |
1200 | </tal:pending> |
1201 | </tal:reallypending> |
1202 | - <tal:started condition="context/date_started"> |
1203 | - <li tal:condition="context/date_started"> |
1204 | - Started <span |
1205 | - tal:define="start context/date_started" |
1206 | - tal:attributes="title start/fmt:datetime" |
1207 | - tal:content="start/fmt:displaydate"/> |
1208 | - </li> |
1209 | - </tal:started> |
1210 | + <li tal:condition="context/date_started"> |
1211 | + Started <tal:started |
1212 | + replace="structure context/date_started/fmt:displaydatetitle" /> |
1213 | + </li> |
1214 | <tal:finish condition="not: context/date_finished"> |
1215 | <li tal:define="eta context/eta" tal:condition="context/eta"> |
1216 | Estimated finish <tal:eta replace="eta/fmt:approximatedate"/> |
1217 | @@ -146,9 +142,8 @@ |
1218 | </tal:finish> |
1219 | |
1220 | <li tal:condition="context/date_finished"> |
1221 | - Finished <span |
1222 | - tal:attributes="title context/date_finished/fmt:datetime" |
1223 | - tal:content="context/date_finished/fmt:displaydate"/> |
1224 | + Finished <tal:finished |
1225 | + replace="structure context/date_finished/fmt:displaydatetitle" /> |
1226 | <tal:duration condition="context/duration"> |
1227 | (took <span tal:replace="context/duration/fmt:exactduration"/>) |
1228 | </tal:duration> |
1229 | diff --git a/lib/lp/soyuz/templates/build-index.pt b/lib/lp/soyuz/templates/build-index.pt |
1230 | index bd3ea81..1ae197e 100644 |
1231 | --- a/lib/lp/soyuz/templates/build-index.pt |
1232 | +++ b/lib/lp/soyuz/templates/build-index.pt |
1233 | @@ -11,9 +11,8 @@ |
1234 | |
1235 | <tal:registering metal:fill-slot="registering"> |
1236 | created |
1237 | - <span tal:content="context/date_created/fmt:displaydate" |
1238 | - tal:attributes="title context/date_created/fmt:datetime" |
1239 | - >on 2005-01-01</span> |
1240 | + <tal:created |
1241 | + replace="structure context/date_created/fmt:displaydatetitle" /> |
1242 | </tal:registering> |
1243 | |
1244 | <div metal:fill-slot="main"> |
1245 | @@ -171,16 +170,13 @@ |
1246 | </tal:building> |
1247 | <tal:built condition="context/was_built"> |
1248 | <li tal:condition="context/duration"> |
1249 | - Started <span |
1250 | - tal:define="start context/date_started" |
1251 | - tal:attributes="title start/fmt:datetime" |
1252 | - tal:content="start/fmt:displaydate">2008-01-01</span> |
1253 | + Started <tal:started |
1254 | + replace="structure context/date_started/fmt:displaydatetitle" /> |
1255 | </li> |
1256 | </tal:built> |
1257 | <li tal:condition="context/date_finished"> |
1258 | - Finished <span |
1259 | - tal:attributes="title context/date_finished/fmt:datetime" |
1260 | - tal:content="context/date_finished/fmt:displaydate">2008-01-01</span> |
1261 | + Finished <tal:finished |
1262 | + replace="structure context/date_finished/fmt:displaydatetitle" /> |
1263 | <tal:duration condition="context/duration"> |
1264 | (took <span tal:replace="context/duration/fmt:exactduration"/>) |
1265 | </tal:duration> |
1266 | diff --git a/lib/lp/soyuz/templates/distributionsourcepackagerelease-index.pt b/lib/lp/soyuz/templates/distributionsourcepackagerelease-index.pt |
1267 | index f5b6318..36182b0 100644 |
1268 | --- a/lib/lp/soyuz/templates/distributionsourcepackagerelease-index.pt |
1269 | +++ b/lib/lp/soyuz/templates/distributionsourcepackagerelease-index.pt |
1270 | @@ -29,9 +29,8 @@ |
1271 | <dd> |
1272 | <span tal:replace="structure context/creator/fmt:link" |
1273 | >Foo Bar</span> |
1274 | - <span tal:content="context/dateuploaded/fmt:displaydate" |
1275 | - tal:attributes="title context/dateuploaded/fmt:datetime" |
1276 | - >on </span> |
1277 | + <tal:uploaded |
1278 | + replace="structure context/dateuploaded/fmt:displaydatetitle" /> |
1279 | </dd> |
1280 | </dl> |
1281 | <dl tal:condition="view/sponsor"> |
1282 | @@ -95,12 +94,7 @@ |
1283 | tal:content="publishing/distroseries/displayname">Hoary Mock</a> |
1284 | </td> |
1285 | <td tal:content="publishing/pocket/title/fmt:lower">release</td> |
1286 | - <td> |
1287 | - <span tal:content="publishing/datepublished/fmt:displaydate" |
1288 | - tal:attributes="title |
1289 | - publishing/datecreated/fmt:datetime" |
1290 | - >two minutes ago</span> |
1291 | - </td> |
1292 | + <td tal:content="structure publishing/datepublished/fmt:displaydatetitle" /> |
1293 | <td tal:content="publishing/component/name">main</td> |
1294 | <td tal:content="publishing/section/name">devel</td> |
1295 | </tr> |
1296 | diff --git a/lib/lp/soyuz/templates/distroseries-queue.pt b/lib/lp/soyuz/templates/distroseries-queue.pt |
1297 | index 748e52d..793a941 100644 |
1298 | --- a/lib/lp/soyuz/templates/distroseries-queue.pt |
1299 | +++ b/lib/lp/soyuz/templates/distroseries-queue.pt |
1300 | @@ -139,11 +139,8 @@ |
1301 | <td style="padding-top: 5px"> |
1302 | <span class="sortkey" |
1303 | tal:content="packageupload/date_created/fmt:datetime" /> |
1304 | - <span |
1305 | - tal:attributes="title packageupload/date_created/fmt:datetime" |
1306 | - tal:content="packageupload/date_created/fmt:approximatedate"> |
1307 | - 2006-03-15 |
1308 | - </span> |
1309 | + <tal:created |
1310 | + replace="structure packageupload/date_created/fmt:approximatedatetitle" /> |
1311 | </td> |
1312 | </tr> |
1313 | </tbody> |
1314 | @@ -157,8 +154,8 @@ |
1315 | |
1316 | <td colspan="8" style="border: 0"> |
1317 | <span tal:content="log/new_status/title"></span> |
1318 | - <span tal:attributes="title log/date_created/fmt:datetime" |
1319 | - tal:content="log/date_created/fmt:displaydate" /> |
1320 | + <tal:created |
1321 | + replace="structure log/date_created/fmt:displaydatetitle" /> |
1322 | by <span tal:content="structure log/reviewer/fmt:link" /> |
1323 | <p tal:condition="log/comment" tal:content="log/comment" /> |
1324 | </td> |
1325 | diff --git a/lib/lp/soyuz/templates/livefsbuild-index.pt b/lib/lp/soyuz/templates/livefsbuild-index.pt |
1326 | index 36b71ed..dd715d3 100644 |
1327 | --- a/lib/lp/soyuz/templates/livefsbuild-index.pt |
1328 | +++ b/lib/lp/soyuz/templates/livefsbuild-index.pt |
1329 | @@ -11,8 +11,8 @@ |
1330 | |
1331 | <tal:registering metal:fill-slot="registering"> |
1332 | created |
1333 | - <span tal:content="context/date_created/fmt:displaydate" |
1334 | - tal:attributes="title context/date_created/fmt:datetime"/> |
1335 | + <tal:created |
1336 | + replace="structure context/date_created/fmt:displaydatetitle" /> |
1337 | </tal:registering> |
1338 | |
1339 | <div metal:fill-slot="main"> |
1340 | @@ -137,14 +137,10 @@ |
1341 | </li> |
1342 | </tal:pending> |
1343 | </tal:reallypending> |
1344 | - <tal:started condition="context/date_started"> |
1345 | - <li tal:condition="context/date_started"> |
1346 | - Started <span |
1347 | - tal:define="start context/date_started" |
1348 | - tal:attributes="title start/fmt:datetime" |
1349 | - tal:content="start/fmt:displaydate"/> |
1350 | - </li> |
1351 | - </tal:started> |
1352 | + <li tal:condition="context/date_started"> |
1353 | + Started <tal:started |
1354 | + replace="structure context/date_started/fmt:displaydatetitle" /> |
1355 | + </li> |
1356 | <tal:finish condition="not: context/date_finished"> |
1357 | <li tal:define="eta view/eta" tal:condition="view/eta"> |
1358 | Estimated finish <tal:eta replace="eta/fmt:approximatedate"/> |
1359 | @@ -152,9 +148,8 @@ |
1360 | </tal:finish> |
1361 | |
1362 | <li tal:condition="context/date_finished"> |
1363 | - Finished <span |
1364 | - tal:attributes="title context/date_finished/fmt:datetime" |
1365 | - tal:content="context/date_finished/fmt:displaydate"/> |
1366 | + Finished <tal:finished |
1367 | + replace="structure context/date_finished/fmt:displaydatetitle" /> |
1368 | <tal:duration condition="context/duration"> |
1369 | (took <span tal:replace="context/duration/fmt:exactduration"/>) |
1370 | </tal:duration> |
1371 | diff --git a/lib/lp/soyuz/templates/packagepublishing-details.pt b/lib/lp/soyuz/templates/packagepublishing-details.pt |
1372 | index 8a0df4a..aef93d1 100644 |
1373 | --- a/lib/lp/soyuz/templates/packagepublishing-details.pt |
1374 | +++ b/lib/lp/soyuz/templates/packagepublishing-details.pt |
1375 | @@ -8,39 +8,39 @@ |
1376 | and not view.wasCopied() |
1377 | and not view.wasDeleted()"> |
1378 | Created |
1379 | - <span tal:attributes="title context/datecreated/fmt:datetime" |
1380 | - tal:content="context/datecreated/fmt:displaydate" /> |
1381 | + <tal:created |
1382 | + replace="structure context/datecreated/fmt:displaydatetitle" /> |
1383 | by <a tal:replace="structure context/creator/fmt:link"/> |
1384 | </li> |
1385 | <li tal:condition="view/isRemoved"> |
1386 | Removed from disk |
1387 | - <span tal:attributes="title context/dateremoved/fmt:datetime" |
1388 | - tal:content="context/dateremoved/fmt:displaydate" />. |
1389 | + <tal:removed |
1390 | + replace="structure context/dateremoved/fmt:displaydatetitle" />. |
1391 | </li> |
1392 | <li tal:condition="view/isPendingRemoval"> |
1393 | Removal requested |
1394 | - <span tal:attributes="title context/scheduleddeletiondate/fmt:datetime" |
1395 | - tal:content="context/scheduleddeletiondate/fmt:displaydate" />. |
1396 | + <tal:scheduled-deletion |
1397 | + replace="structure context/scheduleddeletiondate/fmt:displaydatetitle" />. |
1398 | </li> |
1399 | <li tal:condition="view/wasDeleted"> |
1400 | Deleted |
1401 | - <span tal:attributes="title context/datesuperseded/fmt:datetime" |
1402 | - tal:content="context/datesuperseded/fmt:displaydate" /> |
1403 | + <tal:superseded |
1404 | + replace="structure context/datesuperseded/fmt:displaydatetitle" /> |
1405 | by <a tal:replace="structure context/removed_by/fmt:link"/> |
1406 | <div tal:condition="context/removal_comment" |
1407 | tal:content="structure context/removal_comment/fmt:text-to-html" /> |
1408 | </li> |
1409 | <li tal:condition="view/wasSuperseded"> |
1410 | Superseded |
1411 | - <span tal:attributes="title context/datesuperseded/fmt:datetime" |
1412 | - tal:content="context/datesuperseded/fmt:displaydate"/> |
1413 | + <tal:superseded |
1414 | + replace="structure context/datesuperseded/fmt:displaydatetitle" /> |
1415 | by <span tal:replace="context/supersededby/title" /> |
1416 | </li> |
1417 | <li tal:content="structure view/recipe_build_details" tal:condition="view/is_source" /> |
1418 | <li tal:condition="context/datepublished"> |
1419 | Published |
1420 | - <span tal:attributes="title context/datepublished/fmt:datetime" |
1421 | - tal:content="context/datepublished/fmt:displaydate" /> |
1422 | + <tal:published |
1423 | + replace="structure context/datepublished/fmt:displaydatetitle" /> |
1424 | </li> |
1425 | |
1426 | <tal:comment condition="nothing"> |
1427 | diff --git a/lib/lp/soyuz/templates/person-ppa-packages.pt b/lib/lp/soyuz/templates/person-ppa-packages.pt |
1428 | index b48443d..69ef167 100644 |
1429 | --- a/lib/lp/soyuz/templates/person-ppa-packages.pt |
1430 | +++ b/lib/lp/soyuz/templates/person-ppa-packages.pt |
1431 | @@ -76,11 +76,7 @@ |
1432 | <td tal:content="spr/version"> |
1433 | 1.0 |
1434 | </td> |
1435 | - <td |
1436 | - tal:attributes="title spr/dateuploaded/fmt:datetime" |
1437 | - tal:content="spr/dateuploaded/fmt:approximatedate"> |
1438 | - 2005-10-24 |
1439 | - </td> |
1440 | + <td tal:content="structure spr/dateuploaded/fmt:approximatedatetitle" /> |
1441 | <td> |
1442 | <tal:block condition="spr/needs_building"> |
1443 | Not yet built |
1444 | diff --git a/lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-detailed.pt b/lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-detailed.pt |
1445 | index 0dc7fe6..e3e447c 100644 |
1446 | --- a/lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-detailed.pt |
1447 | +++ b/lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-detailed.pt |
1448 | @@ -48,8 +48,7 @@ |
1449 | no signer |
1450 | </tal:no_signer> |
1451 | </td> |
1452 | - <td tal:attributes="title context/datepublished/fmt:datetime" |
1453 | - tal:content="context/datepublished/fmt:approximatedate">2005-09-16</td> |
1454 | + <td tal:content="structure context/datepublished/fmt:approximatedatetitle" /> |
1455 | <td tal:content="context/status/title">PUBLISHED</td> |
1456 | <td tal:content="context/distroseries/name/capitalize">Dapper</td> |
1457 | <td tal:content="context/section/name/capitalize">Web</td> |
1458 | diff --git a/lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-compact.pt b/lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-compact.pt |
1459 | index 67bc510..e307d8d 100644 |
1460 | --- a/lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-compact.pt |
1461 | +++ b/lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-compact.pt |
1462 | @@ -22,12 +22,9 @@ |
1463 | tal:attributes="title view/date_last_changed/fmt:datetime" |
1464 | tal:content="view/date_last_changed/fmt:datetime" /> |
1465 | </span> |
1466 | - <span |
1467 | - tal:condition="not: context/status/enumvalue:PENDING" |
1468 | - tal:attributes="title view/date_last_changed/fmt:datetime" |
1469 | - tal:content="view/date_last_changed/fmt:displaydate"> |
1470 | - 2005-09-16 |
1471 | - </span> |
1472 | + <tal:last-changed |
1473 | + condition="not: context/status/enumvalue:PENDING" |
1474 | + replace="structure view/date_last_changed/fmt:displaydatetitle" /> |
1475 | <span tal:condition="view/wasDeleted">(Reason: |
1476 | <tal:removal-comment tal:replace="view/removal_comment/fmt:shorten/60"> |
1477 | sample reason. |
1478 | diff --git a/lib/lp/translations/templates/currenttranslationmessage-translate-one.pt b/lib/lp/translations/templates/currenttranslationmessage-translate-one.pt |
1479 | index 9d5f9e2..3035499 100644 |
1480 | --- a/lib/lp/translations/templates/currenttranslationmessage-translate-one.pt |
1481 | +++ b/lib/lp/translations/templates/currenttranslationmessage-translate-one.pt |
1482 | @@ -325,11 +325,8 @@ |
1483 | Translated by |
1484 | <a tal:content="submitter/displayname" |
1485 | tal:attributes="href submitter/fmt:url">Foo Bar</a> |
1486 | - <span |
1487 | - tal:attributes="title context/date_created/fmt:datetime" |
1488 | - tal:content="context/date_created/fmt:displaydate"> |
1489 | - on 2006-08-05 |
1490 | - </span> |
1491 | + <tal:created |
1492 | + replace="structure context/date_created/fmt:displaydatetitle" /> |
1493 | </td> |
1494 | </tr> |
1495 | <tr class="lesser secondary translation" |
1496 | @@ -341,11 +338,8 @@ |
1497 | Translated and reviewed by |
1498 | <a tal:content="context/reviewer/displayname" |
1499 | tal:attributes="href context/reviewer/fmt:url">Foo Bar</a> |
1500 | - <span |
1501 | - tal:attributes="title context/date_reviewed/fmt:datetime" |
1502 | - tal:content="context/date_reviewed/fmt:displaydate"> |
1503 | - on 2006-08-05 |
1504 | - </span> |
1505 | + <tal:reviewed |
1506 | + replace="structure context/date_reviewed/fmt:displaydatetitle" /> |
1507 | </td> |
1508 | <td tal:condition= |
1509 | "not:translation_dictionary/same_translator_and_reviewer" |
1510 | @@ -354,11 +348,8 @@ |
1511 | Reviewed by |
1512 | <a tal:content="context/reviewer/displayname" |
1513 | tal:attributes="href context/reviewer/fmt:url">Foo Bar</a> |
1514 | - <span |
1515 | - tal:attributes="title context/date_reviewed/fmt:datetime" |
1516 | - tal:content="context/date_reviewed/fmt:displaydate"> |
1517 | - on 2006-08-05 |
1518 | - </span> |
1519 | + <tal:reviewed |
1520 | + replace="structure context/date_reviewed/fmt:displaydatetitle" /> |
1521 | </td> |
1522 | </tr> |
1523 | </tal:has-submitter> |
1524 | diff --git a/lib/lp/translations/templates/person-translation-activity.pt b/lib/lp/translations/templates/person-translation-activity.pt |
1525 | index 817fa90..a2594d0 100644 |
1526 | --- a/lib/lp/translations/templates/person-translation-activity.pt |
1527 | +++ b/lib/lp/translations/templates/person-translation-activity.pt |
1528 | @@ -19,10 +19,7 @@ |
1529 | |
1530 | <table class="listing" id="activity-table"> |
1531 | <tr tal:repeat="record view/batchnav/currentBatch"> |
1532 | - <td tal:attributes="title record/date_last_touched/fmt:datetime" |
1533 | - tal:content="record/date_last_touched/fmt:approximatedate"> |
1534 | - 2009-10-28 |
1535 | - </td> |
1536 | + <td tal:content="structure record/date_last_touched/fmt:approximatedatetitle" /> |
1537 | <td> |
1538 | <a tal:attributes="href python:view.composeURL(record.pofile)" |
1539 | tal:content="record/pofile/title"> |
1540 | diff --git a/lib/lp/translations/templates/person-translations.pt b/lib/lp/translations/templates/person-translations.pt |
1541 | index 0b512e8..eb16138 100644 |
1542 | --- a/lib/lp/translations/templates/person-translations.pt |
1543 | +++ b/lib/lp/translations/templates/person-translations.pt |
1544 | @@ -90,10 +90,7 @@ |
1545 | </p> |
1546 | <table class="summary"> |
1547 | <tr tal:repeat="activity activities"> |
1548 | - <td tal:attributes="title activity/date/fmt:datetime" |
1549 | - tal:content="activity/date/fmt:approximatedate"> |
1550 | - 2009-08-15 |
1551 | - </td> |
1552 | + <td tal:content="structure activity/date/fmt:approximatedatetitle" /> |
1553 | <td> |
1554 | <a tal:content="activity/title" |
1555 | tal:attributes="href activity/url">foo bar in package bla</a> |
1556 | diff --git a/lib/lp/translations/templates/potemplate-chart.pt b/lib/lp/translations/templates/potemplate-chart.pt |
1557 | index edf974d..76c318a 100644 |
1558 | --- a/lib/lp/translations/templates/potemplate-chart.pt |
1559 | +++ b/lib/lp/translations/templates/potemplate-chart.pt |
1560 | @@ -67,15 +67,9 @@ |
1561 | pf/date_changed/fmt:datetime"> |
1562 | time sort key |
1563 | </span> |
1564 | - <span |
1565 | + <tal:changed |
1566 | tal:condition="pf/date_changed" |
1567 | - tal:attributes=" |
1568 | - title pf/date_changed/fmt:datetime" |
1569 | - tal:content=" |
1570 | - pf/date_changed/fmt:approximatedate" |
1571 | - > |
1572 | - 2007-02-10 |
1573 | - </span> |
1574 | + tal:replace="structure pf/date_changed/fmt:approximatedatetitle" /> |
1575 | <tal:block condition="not: pf/date_changed"> |
1576 | — |
1577 | </tal:block> |
1578 | diff --git a/lib/lp/translations/templates/potemplate-portlet-details.pt b/lib/lp/translations/templates/potemplate-portlet-details.pt |
1579 | index 16c6ef4..fec0a3d 100644 |
1580 | --- a/lib/lp/translations/templates/potemplate-portlet-details.pt |
1581 | +++ b/lib/lp/translations/templates/potemplate-portlet-details.pt |
1582 | @@ -14,11 +14,8 @@ |
1583 | <b>Owner:</b><br /> |
1584 | <a tal:replace="structure context/owner/fmt:link" /><br /> |
1585 | <b>Created:</b> |
1586 | - <span |
1587 | - tal:attributes="title context/datecreated/fmt:datetime" |
1588 | - tal:content="context/datecreated/fmt:displaydate"> |
1589 | - 2004-05-22 |
1590 | - </span><br /> |
1591 | + <tal:created |
1592 | + replace="structure context/datecreated/fmt:displaydatetitle" /><br /> |
1593 | <b>Domain:</b> |
1594 | <tal:translation_domain replace="context/translation_domain"> |
1595 | foobar |
1596 | diff --git a/lib/lp/translations/templates/productseries-translations-languages.pt b/lib/lp/translations/templates/productseries-translations-languages.pt |
1597 | index 799d652..d85aa9f 100644 |
1598 | --- a/lib/lp/translations/templates/productseries-translations-languages.pt |
1599 | +++ b/lib/lp/translations/templates/productseries-translations-languages.pt |
1600 | @@ -78,15 +78,9 @@ |
1601 | tal:content="language_stats/last_changed_date/fmt:datetime"> |
1602 | time sort key |
1603 | </span> |
1604 | - <span |
1605 | - tal:condition="language_stats/last_changed_date" |
1606 | - tal:attributes=" |
1607 | - title language_stats/last_changed_date/fmt:datetime" |
1608 | - tal:content=" |
1609 | - language_stats/last_changed_date/fmt:approximatedate" |
1610 | - > |
1611 | - 2007-02-10 |
1612 | - </span> |
1613 | + <tal:last-changed |
1614 | + condition="language_stats/last_changed_date" |
1615 | + replace="structure language_stats/last_changed_date/fmt:approximatedatetitle" /> |
1616 | <tal:block condition="not: language_stats/last_changed_date"> |
1617 | — |
1618 | </tal:block> |
1619 | diff --git a/lib/lp/translations/templates/serieslanguage-index.pt b/lib/lp/translations/templates/serieslanguage-index.pt |
1620 | index 42fbdc2..1572fa3 100644 |
1621 | --- a/lib/lp/translations/templates/serieslanguage-index.pt |
1622 | +++ b/lib/lp/translations/templates/serieslanguage-index.pt |
1623 | @@ -145,15 +145,9 @@ |
1624 | entry/date_changed/fmt:datetime"> |
1625 | time sort key |
1626 | </span> |
1627 | - <span |
1628 | - tal:condition="entry/date_changed" |
1629 | - tal:attributes=" |
1630 | - title entry/date_changed/fmt:datetime" |
1631 | - tal:content=" |
1632 | - entry/date_changed/fmt:approximatedate" |
1633 | - > |
1634 | - 2007-02-10 |
1635 | - </span> |
1636 | + <tal:changed |
1637 | + condition="entry/date_changed" |
1638 | + replace="structure entry/date_changed/fmt:approximatedatetitle" /> |
1639 | <tal:block condition="not: entry/date_changed"> |
1640 | — |
1641 | </tal:block> |
1642 | diff --git a/lib/lp/translations/templates/translationgroup-index.pt b/lib/lp/translations/templates/translationgroup-index.pt |
1643 | index 99a6805..d8245fb 100644 |
1644 | --- a/lib/lp/translations/templates/translationgroup-index.pt |
1645 | +++ b/lib/lp/translations/templates/translationgroup-index.pt |
1646 | @@ -90,13 +90,7 @@ |
1647 | class="edit sprite action-icon"></a> |
1648 | </tal:notadmin> |
1649 | </td> |
1650 | - <td> |
1651 | - <span |
1652 | - tal:attributes="title translator/datecreated/fmt:datetime" |
1653 | - tal:content="translator/datecreated/fmt:approximatedate"> |
1654 | - 2007-09-17 |
1655 | - </span> |
1656 | - </td> |
1657 | + <td tal:content="structure translator/datecreated/fmt:approximatedatetitle" /> |
1658 | <td tal:condition="view/user_can_edit"> |
1659 | <a tal:attributes=" |
1660 | href translator/context/fmt:url; |
1661 | diff --git a/lib/lp/translations/templates/translationgroups-index.pt b/lib/lp/translations/templates/translationgroups-index.pt |
1662 | index af275ae..d96877a 100644 |
1663 | --- a/lib/lp/translations/templates/translationgroups-index.pt |
1664 | +++ b/lib/lp/translations/templates/translationgroups-index.pt |
1665 | @@ -72,11 +72,8 @@ |
1666 | <td> |
1667 | <span class="sortkey" |
1668 | tal:content="group/datecreated/fmt:datetime" /> |
1669 | - <span |
1670 | - tal:attributes="title group/datecreated/fmt:datetime" |
1671 | - tal:content="group/datecreated/fmt:approximatedate"> |
1672 | - 2007-08-15 |
1673 | - </span> |
1674 | + <tal:created |
1675 | + replace="structure group/datecreated/fmt:approximatedatetitle" /> |
1676 | </td> |
1677 | </tr> |
1678 | </tbody> |
1679 | diff --git a/lib/lp/translations/templates/translations-macros.pt b/lib/lp/translations/templates/translations-macros.pt |
1680 | index 4e2053d..85e1b1e 100644 |
1681 | --- a/lib/lp/translations/templates/translations-macros.pt |
1682 | +++ b/lib/lp/translations/templates/translations-macros.pt |
1683 | @@ -75,11 +75,8 @@ |
1684 | Suggested by |
1685 | <a tal:content="submission/person/displayname" |
1686 | tal:attributes="href submission/person/fmt:url">Foo Bar</a> |
1687 | - <span |
1688 | - tal:attributes="title submission/date_created/fmt:datetime" |
1689 | - tal:content="submission/date_created/fmt:displaydate"> |
1690 | - 2006-08-05 |
1691 | - </span> |
1692 | + <tal:created |
1693 | + replace="structure submission/date_created/fmt:displaydatetitle" /> |
1694 | </td> |
1695 | <td style="overflow: auto;" |
1696 | tal:condition="not:submission/is_local_to_pofile"> |
1697 | @@ -93,11 +90,8 @@ |
1698 | content="submission/pofile/potemplate/displayname" /> by |
1699 | <a tal:content="submission/person/displayname" |
1700 | tal:attributes="href submission/person/fmt:url">Foo Bar</a> |
1701 | - <span |
1702 | - tal:attributes="title submission/date_created/fmt:datetime" |
1703 | - tal:content="submission/date_created/fmt:displaydate"> |
1704 | - 2006-08-05 |
1705 | - </span> |
1706 | + <tal:created |
1707 | + replace="structure submission/date_created/fmt:displaydatetitle" /> |
1708 | </td> |
1709 | </tr> |
1710 | |
1711 | diff --git a/lib/lp/translations/templates/translationtemplatesbuild-index.pt b/lib/lp/translations/templates/translationtemplatesbuild-index.pt |
1712 | index 42f0c3a..d90f7c3 100644 |
1713 | --- a/lib/lp/translations/templates/translationtemplatesbuild-index.pt |
1714 | +++ b/lib/lp/translations/templates/translationtemplatesbuild-index.pt |
1715 | @@ -11,9 +11,8 @@ |
1716 | |
1717 | <tal:registering metal:fill-slot="registering"> |
1718 | created |
1719 | - <span tal:content="context/date_created/fmt:displaydate" |
1720 | - tal:attributes="title context/date_created/fmt:datetime" |
1721 | - >on 2005-01-01</span> |
1722 | + <tal:created |
1723 | + replace="structure context/date_created/fmt:displaydatetitle" /> |
1724 | </tal:registering> |
1725 | |
1726 | <div metal:fill-slot="main"> |
Looks good!