Merge lp://staging/~allenap/launchpad/ui-convert-bug-tracker-3.0-bug-418155-pt2 into lp://staging/~allenap/launchpad/ui-convert-bug-tracker-3.0-bug-418155
- ui-convert-bug-tracker-3.0-bug-418155-pt2
- Merge into ui-convert-bug-tracker-3.0...
| Status: | Merged |
|---|---|
| Approved by: | Gavin Panella |
| Approved revision: | no longer in the source branch. |
| Merge reported by: | Gavin Panella |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~allenap/launchpad/ui-convert-bug-tracker-3.0-bug-418155-pt2 |
| Merge into: | lp://staging/~allenap/launchpad/ui-convert-bug-tracker-3.0-bug-418155 |
| Diff against target: | None lines |
| To merge this branch: | bzr merge lp://staging/~allenap/launchpad/ui-convert-bug-tracker-3.0-bug-418155-pt2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Nelson (community) | ui | Approve | |
| Graham Binns (community) | code | Approve | |
|
Review via email:
|
|||
Commit message
Description of the change
| Gavin Panella (allenap) wrote : | # |
| Graham Binns (gmb) : | # |
| Gavin Panella (allenap) wrote : | # |
To walk through the UI, try:
* Go to the bug trackers page (for IBugTrackerSet) at
<https:/
* There's nothing new in this page for this branch, so just click on
"This Mozilla.prg Bug Tracker" to see its overview page,
* Look at the portlets. The top portlet replicates some of the info
that's in the page, but it is used elsewhere in Launchpad so it's
useful to keep.
* Click "Change details",
* This is one place where the details portlet is useful.
* Use the new cancel link to return to the previous page,
* Notice the new h1 title and h2 "Summary" heading,
* Append /42 to the URL and see the remote bug index page, including
the h2 "Is watched by..." and the new text. I think the text is
good, but the heading was a tough one. I'm simply still not sure
exactly how to use the heading slot.
| Michael Nelson (michael.nelson) wrote : | # |
> To walk through the UI, try:
Thanks for providing these walk-throughs... much easier to review! I'll start doing that too.
And sorry for the two 'needs fixing' reviews! The pages really do look great (we initially tried to re-use our soyuz context portlets in the same way), but afaik, it's left-over from 1.0 (or maybe I'm confused at that point - I wasn't around then), but it's not meant to be in the 3.0 side-bar.
>
> * Go to the bug trackers page (for IBugTrackerSet) at
> <https:/
>
> * There's nothing new in this page for this branch, so just click on
> "This Mozilla.prg Bug Tracker" to see its overview page,
>
> * Look at the portlets. The top portlet replicates some of the info
> that's in the page, but it is used elsewhere in Launchpad so it's
> useful to keep.
See comments on the first MP. I think it's really 1.0 templates trying to be forced into the 3.0 mold (I tried the same thing with some soyuz pages and got rejected ;) ).
>
> * Click "Change details",
>
> * This is one place where the details portlet is useful.
Well, not really - the only extra information presented in the portlet is not really relevant to the person editing the watch? Otherwise it's just duplicated info, and as mentioned in the previous MP, afaik, isn't the type of content that is meant to go in the side portlet. I'd recommend using main_only for this template, you might even be able to get rid of the template and use generic-edit.pt?
>
> * Use the new cancel link to return to the previous page,
Great!
>
> * Notice the new h1 title and h2 "Summary" heading,
Great! Note that both of these above two points will happen automatically with generic-edit.
>
> * Append /42 to the URL and see the remote bug index page, including
> the h2 "Is watched by..." and the new text. I think the text is
> good, but the heading was a tough one. I'm simply still not sure
> exactly how to use the heading slot.
Yeah, it's been confusing and could change again - but afaik, you've done the right thing for the current rules (ie. this is an +index page, so putting an <h1>context.
I'm not so sure about "Is watched by...". I think this h2 shouldn't be a continuation of a sentance. In fact, I'm not even sure that the h2 is necessary. I know I'm looking at the Remote bug #42 for the Mozilla.org bug tracker, and your overview para tells me exactly what I need to know.
And again, I don't think we can put the context details portlet in the side-bar (it was requested for 1.0 and afaik meant to be removed for 2.0(?) and doesn't belong in the side-bar for 3.0).
| Gavin Panella (allenap) wrote : | # |
On Tue, 01 Sep 2009 11:43:19 -0000
Michael Nelson <email address hidden> wrote:
> Review: Needs Fixing ui
> > To walk through the UI, try:
>
> Thanks for providing these walk-throughs... much easier to review!
> I'll start doing that too. And sorry for the two 'needs fixing'
> reviews! The pages really do look great (we initially tried to
> re-use our soyuz context portlets in the same way), but afaik, it's
> left-over from 1.0 (or maybe I'm confused at that point - I wasn't
> around then), but it's not meant to be in the 3.0 side-bar.
No worries about the needs-fixing. They need fixing! :)
>
> >
> > * Go to the bug trackers page (for IBugTrackerSet) at
> > <https:/
> >
> > * There's nothing new in this page for this branch, so just click on
> > "This Mozilla.prg Bug Tracker" to see its overview page,
> >
> > * Look at the portlets. The top portlet replicates some of the info
> > that's in the page, but it is used elsewhere in Launchpad so it's
> > useful to keep.
>
> See comments on the first MP. I think it's really 1.0 templates
> trying to be forced into the 3.0 mold (I tried the same thing with
> some soyuz pages and got rejected ;) ).
Yes, I've removed all the side portlets from all of the bug tracker
pages; they don't make sense anywhere. The navigation menu for the bug
tracker index page remains.
>
> >
> > * Click "Change details",
> >
> > * This is one place where the details portlet is useful.
>
> Well, not really - the only extra information presented in the
> portlet is not really relevant to the person editing the watch?
> Otherwise it's just duplicated info, and as mentioned in the
> previous MP, afaik, isn't the type of content that is meant to go in
> the side portlet. I'd recommend using main_only for this template,
> you might even be able to get rid of the template and use
> generic-edit.pt?
I'd not heard of generic-edit before; it'll be handy for the
future. However, I don't think it'll be suitable here because the edit
page has some blurb at the beginning, including an explanation of why
a particular bug tracker cannot be deleted (which is not static).
>
> >
> > * Use the new cancel link to return to the previous page,
>
> Great!
>
> >
> > * Notice the new h1 title and h2 "Summary" heading,
>
> Great! Note that both of these above two points will happen
> automatically with generic-edit.
>
> >
> > * Append /42 to the URL and see the remote bug index page, including
> > the h2 "Is watched by..." and the new text. I think the text is
> > good, but the heading was a tough one. I'm simply still not sure
> > exactly how to use the heading slot.
>
>
> Yeah, it's been confusing and could change again - but afaik, you've
> done the right thing for the current rules (ie. this is an +index
> page, so putting an <h1>context.
>
> I'm not so sure about "Is watched by...". I think this h2 shouldn't
> be a continuation of a sentance. In fact, I'm not even sure that the
> h2 is necessary. I know I'm looking at the Remote bug #42 for the
> Mozilla.org bug tracker, and your overview para tells me exactly
> what I need to know.
I've rem...
| 1 | === modified file 'lib/lp/bugs/browser/configure.zcml' | |||
| 2 | --- lib/lp/bugs/browser/configure.zcml 2009-08-28 12:57:41 +0000 | |||
| 3 | +++ lib/lp/bugs/browser/configure.zcml 2009-09-01 14:31:18 +0000 | |||
| 4 | @@ -740,6 +740,9 @@ | |||
| 5 | 740 | <browser:page | 740 | <browser:page |
| 6 | 741 | name="+portlet-projects" | 741 | name="+portlet-projects" |
| 7 | 742 | template="../templates/bugtracker-portlet-projects.pt"/> | 742 | template="../templates/bugtracker-portlet-projects.pt"/> |
| 8 | 743 | <browser:page | ||
| 9 | 744 | name="+portlet-watches" | ||
| 10 | 745 | template="../templates/bugtracker-portlet-watches.pt"/> | ||
| 11 | 743 | </browser:pages> | 746 | </browser:pages> |
| 12 | 744 | <browser:page | 747 | <browser:page |
| 13 | 745 | name="+edit" | 748 | name="+edit" |
| 14 | 746 | 749 | ||
| 15 | === modified file 'lib/lp/bugs/stories/bugtracker/bugtrackers-index.txt' | |||
| 16 | --- lib/lp/bugs/stories/bugtracker/bugtrackers-index.txt 2009-08-28 12:57:41 +0000 | |||
| 17 | +++ lib/lp/bugs/stories/bugtracker/bugtrackers-index.txt 2009-09-01 16:19:33 +0000 | |||
| 18 | @@ -147,17 +147,3 @@ | |||
| 19 | 147 | >>> user_browser.getLink("Register another bug tracker").click() | 147 | >>> user_browser.getLink("Register another bug tracker").click() |
| 20 | 148 | >>> user_browser.url | 148 | >>> user_browser.url |
| 21 | 149 | 'http://bugs.launchpad.dev/bugs/bugtrackers/+newbugtracker' | 149 | 'http://bugs.launchpad.dev/bugs/bugtrackers/+newbugtracker' |
| 22 | 150 | |||
| 23 | 151 | In fact, the link is there twice: once at the top of the page, once at | ||
| 24 | 152 | the bottom. | ||
| 25 | 153 | |||
| 26 | 154 | >>> user_browser.open('http://launchpad.dev/bugs/bugtrackers') | ||
| 27 | 155 | >>> links = find_tags_by_class( | ||
| 28 | 156 | ... user_browser.contents, 'menu-link-newbugtracker') | ||
| 29 | 157 | >>> len(links) | ||
| 30 | 158 | 2 | ||
| 31 | 159 | |||
| 32 | 160 | >>> for link in links: | ||
| 33 | 161 | ... print extract_text(link) | ||
| 34 | 162 | Register another bug tracker | ||
| 35 | 163 | Register another bug tracker | ||
| 36 | 164 | 150 | ||
| 37 | === modified file 'lib/lp/bugs/stories/bugtracker/xx-bugtracker-remote-bug.txt' | |||
| 38 | --- lib/lp/bugs/stories/bugtracker/xx-bugtracker-remote-bug.txt 2009-08-28 15:43:29 +0000 | |||
| 39 | +++ lib/lp/bugs/stories/bugtracker/xx-bugtracker-remote-bug.txt 2009-09-01 16:47:37 +0000 | |||
| 40 | @@ -24,9 +24,9 @@ | |||
| 41 | 24 | * Answers - http://answers.launchpad.dev/ | 24 | * Answers - http://answers.launchpad.dev/ |
| 42 | 25 | Main heading: Remote Bug #42 in The Mozilla.org Bug Tracker | 25 | Main heading: Remote Bug #42 in The Mozilla.org Bug Tracker |
| 43 | 26 | 26 | ||
| 47 | 27 | >>> print_table(find_tag_by_id(browser.contents, 'watchedbugs')) | 27 | >>> print extract_text(find_tag_by_id(browser.contents, 'watchedbugs')) |
| 48 | 28 | #1: Firefox does not support SVG | 28 | Bug #1: Firefox does not support SVG |
| 49 | 29 | #2: Blackhole Trash folder | 29 | Bug #2: Blackhole Trash folder |
| 50 | 30 | 30 | ||
| 51 | 31 | If there is only a single bug watching the remote bug, then we skip | 31 | If there is only a single bug watching the remote bug, then we skip |
| 52 | 32 | the list page and redirect the user directly to that bug's page: | 32 | the list page and redirect the user directly to that bug's page: |
| 53 | @@ -80,16 +80,16 @@ | |||
| 54 | 80 | * Answers - http://answers.launchpad.dev/ | 80 | * Answers - http://answers.launchpad.dev/ |
| 55 | 81 | Main heading: Remote Bug #42 in The Mozilla.org Bug Tracker | 81 | Main heading: Remote Bug #42 in The Mozilla.org Bug Tracker |
| 56 | 82 | 82 | ||
| 60 | 83 | >>> print_table(find_tag_by_id(anon_browser.contents, 'watchedbugs')) | 83 | >>> print extract_text(find_tag_by_id(anon_browser.contents, 'watchedbugs')) |
| 61 | 84 | #1: Private bug | 84 | Bug #1: (Private) |
| 62 | 85 | #2: Blackhole Trash folder | 85 | Bug #2: Blackhole Trash folder |
| 63 | 86 | 86 | ||
| 64 | 87 | The bug title is still provided if the user can view the private bug: | 87 | The bug title is still provided if the user can view the private bug: |
| 65 | 88 | 88 | ||
| 66 | 89 | >>> browser.open('http://launchpad.dev/bugs/bugtrackers/mozilla.org/42') | 89 | >>> browser.open('http://launchpad.dev/bugs/bugtrackers/mozilla.org/42') |
| 70 | 90 | >>> print_table(find_tag_by_id(browser.contents, 'watchedbugs')) | 90 | >>> print extract_text(find_tag_by_id(browser.contents, 'watchedbugs')) |
| 71 | 91 | #1: Firefox does not support SVG | 91 | Bug #1: Firefox does not support SVG |
| 72 | 92 | #2: Blackhole Trash folder | 92 | Bug #2: Blackhole Trash folder |
| 73 | 93 | 93 | ||
| 74 | 94 | For the case where the private bug is the only one watching the given | 94 | For the case where the private bug is the only one watching the given |
| 75 | 95 | remote bug, we don't perform the redirect ahead of time: | 95 | remote bug, we don't perform the redirect ahead of time: |
| 76 | 96 | 96 | ||
| 77 | === modified file 'lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt' | |||
| 78 | --- lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt 2009-08-28 14:09:24 +0000 | |||
| 79 | +++ lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt 2009-09-01 15:20:28 +0000 | |||
| 80 | @@ -677,15 +677,13 @@ | |||
| 81 | 677 | 677 | ||
| 82 | 678 | >>> user_browser.open('http://launchpad.dev/bugs/bugtrackers/email') | 678 | >>> user_browser.open('http://launchpad.dev/bugs/bugtrackers/email') |
| 83 | 679 | >>> print extract_text(find_portlet( | 679 | >>> print extract_text(find_portlet( |
| 87 | 680 | ... user_browser.contents, 'Email bugtracker')) | 680 | ... user_browser.contents, 'Details')) |
| 88 | 681 | Email bugtracker | 681 | Details |
| 89 | 682 | Location: | 682 | Location |
| 90 | 683 | mailto:bugs@example.com | 683 | mailto:bugs@example.com |
| 92 | 684 | Tracker type: | 684 | Tracker type |
| 93 | 685 | Email Address | 685 | Email Address |
| 97 | 686 | Number of watches: | 686 | Created by |
| 95 | 687 | 1 | ||
| 96 | 688 | Creator: | ||
| 98 | 689 | Foo Bar | 687 | Foo Bar |
| 99 | 690 | 688 | ||
| 100 | 691 | If the user is not logged in, email addresses in the Location field | 689 | If the user is not logged in, email addresses in the Location field |
| 101 | @@ -693,9 +691,9 @@ | |||
| 102 | 693 | 691 | ||
| 103 | 694 | >>> anon_browser.open('http://launchpad.dev/bugs/bugtrackers/email') | 692 | >>> anon_browser.open('http://launchpad.dev/bugs/bugtrackers/email') |
| 104 | 695 | >>> print extract_text(find_portlet( | 693 | >>> print extract_text(find_portlet( |
| 108 | 696 | ... anon_browser.contents, 'Email bugtracker')) | 694 | ... anon_browser.contents, 'Details')) |
| 109 | 697 | Email bugtracker | 695 | Details |
| 110 | 698 | Location: | 696 | Location |
| 111 | 699 | mailto:<email address hidden> | 697 | mailto:<email address hidden> |
| 112 | 700 | ... | 698 | ... |
| 113 | 701 | 699 | ||
| 114 | @@ -704,15 +702,14 @@ | |||
| 115 | 704 | >>> anon_browser.open( | 702 | >>> anon_browser.open( |
| 116 | 705 | ... 'http://bugs.launchpad.dev/bugs/bugtrackers/gnome-bugzilla') | 703 | ... 'http://bugs.launchpad.dev/bugs/bugtrackers/gnome-bugzilla') |
| 117 | 706 | >>> print extract_text(find_portlet( | 704 | >>> print extract_text(find_portlet( |
| 123 | 707 | ... anon_browser.contents, 'GnomeGBug GTracker')) | 705 | ... anon_browser.contents, 'Details')) |
| 124 | 708 | GnomeGBug GTracker | 706 | Details |
| 125 | 709 | Location: | 707 | Location |
| 126 | 710 | http://bugzilla.gnome.org/bugs | 708 | http://bugzilla.gnome.org/bugs |
| 127 | 711 | Tracker type: | 709 | http://alias.example.com/ (Alias) |
| 128 | 710 | Tracker type | ||
| 129 | 712 | Bugzilla | 711 | Bugzilla |
| 133 | 713 | Number of watches: | 712 | Contact details |
| 131 | 714 | 2 | ||
| 132 | 715 | Contact details: | ||
| 134 | 716 | Jeff Waugh, in his pants. | 713 | Jeff Waugh, in his pants. |
| 136 | 717 | Creator: | 714 | Created by |
| 137 | 718 | Foo Bar | 715 | Foo Bar |
| 138 | 719 | 716 | ||
| 139 | === modified file 'lib/lp/bugs/templates/bugtracker-edit.pt' | |||
| 140 | --- lib/lp/bugs/templates/bugtracker-edit.pt 2009-08-28 13:47:50 +0000 | |||
| 141 | +++ lib/lp/bugs/templates/bugtracker-edit.pt 2009-09-01 16:01:09 +0000 | |||
| 142 | @@ -3,13 +3,9 @@ | |||
| 143 | 3 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 3 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
| 144 | 4 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 4 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
| 145 | 5 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 5 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
| 147 | 6 | metal:use-macro="view/macro:page/main_side" | 6 | metal:use-macro="view/macro:page/main_only" |
| 148 | 7 | i18n:domain="malone"> | 7 | i18n:domain="malone"> |
| 149 | 8 | 8 | ||
| 150 | 9 | <div metal:fill-slot="side"> | ||
| 151 | 10 | <div tal:replace="structure context/@@+portlet-details" /> | ||
| 152 | 11 | </div> | ||
| 153 | 12 | |||
| 154 | 13 | <div metal:fill-slot="main"> | 9 | <div metal:fill-slot="main"> |
| 155 | 14 | <h1>Change bug tracker details</h1> | 10 | <h1>Change bug tracker details</h1> |
| 156 | 15 | <div class="top-portlet"> | 11 | <div class="top-portlet"> |
| 157 | 16 | 12 | ||
| 158 | === modified file 'lib/lp/bugs/templates/bugtracker-index.pt' | |||
| 159 | --- lib/lp/bugs/templates/bugtracker-index.pt 2009-08-28 13:42:10 +0000 | |||
| 160 | +++ lib/lp/bugs/templates/bugtracker-index.pt 2009-09-01 16:07:16 +0000 | |||
| 161 | @@ -12,104 +12,35 @@ | |||
| 162 | 12 | 12 | ||
| 163 | 13 | <metal:side fill-slot="side"> | 13 | <metal:side fill-slot="side"> |
| 164 | 14 | <tal:menu replace="structure view/@@+global-actions" /> | 14 | <tal:menu replace="structure view/@@+global-actions" /> |
| 165 | 15 | <div tal:replace="structure context/@@+portlet-details" /> | ||
| 166 | 16 | <div tal:replace="structure context/@@+portlet-projects" /> | ||
| 167 | 17 | </metal:side> | 15 | </metal:side> |
| 168 | 18 | 16 | ||
| 169 | 19 | <metal:macros fill-slot="bogus"> | ||
| 170 | 20 | <metal:macro define-macro="watchlisting"> | ||
| 171 | 21 | <table class="sortable listing" id="latestwatches"> | ||
| 172 | 22 | <thead> | ||
| 173 | 23 | <tr> | ||
| 174 | 24 | <th>Launchpad bug</th> | ||
| 175 | 25 | <th>Remote bug</th> | ||
| 176 | 26 | <th>Status</th> | ||
| 177 | 27 | </tr> | ||
| 178 | 28 | </thead> | ||
| 179 | 29 | <tbody> | ||
| 180 | 30 | <tal:watches repeat="watch watches"> | ||
| 181 | 31 | <tr tal:define="show watch/bug/required:launchpad.View"> | ||
| 182 | 32 | <tal:hide-watch-details condition="not:show"> | ||
| 183 | 33 | <td> | ||
| 184 | 34 | <img alt="" src="/@@/bug" /> | ||
| 185 | 35 | #<span tal:replace="watch/bug/id">34</span>: | ||
| 186 | 36 | <em>(Private)</em> | ||
| 187 | 37 | </td> | ||
| 188 | 38 | <td><em>-</em></td> | ||
| 189 | 39 | <td></td> | ||
| 190 | 40 | </tal:hide-watch-details> | ||
| 191 | 41 | <tal:show-watch-details condition="show"> | ||
| 192 | 42 | <td> | ||
| 193 | 43 | <img alt="" src="/@@/bug" /> | ||
| 194 | 44 | <a href="#" tal:attributes="href watch/bug/fmt:url"> | ||
| 195 | 45 | #<span tal:replace="watch/bug/id">34</span>: | ||
| 196 | 46 | <span tal:replace="watch/bug/title"> | ||
| 197 | 47 | Launchpad Bug Title | ||
| 198 | 48 | </span> | ||
| 199 | 49 | </a> | ||
| 200 | 50 | </td> | ||
| 201 | 51 | <td> | ||
| 202 | 52 | <a tal:replace="structure watch/fmt:external-link-short"> | ||
| 203 | 53 | 1234 | ||
| 204 | 54 | </a> | ||
| 205 | 55 | </td> | ||
| 206 | 56 | <td><tal:status tal:replace="watch/remotestatus"/></td> | ||
| 207 | 57 | </tal:show-watch-details> | ||
| 208 | 58 | </tr> | ||
| 209 | 59 | </tal:watches> | ||
| 210 | 60 | </tbody> | ||
| 211 | 61 | </table> | ||
| 212 | 62 | </metal:macro> | ||
| 213 | 63 | </metal:macros> | ||
| 214 | 64 | |||
| 215 | 65 | <div metal:fill-slot="main"> | 17 | <div metal:fill-slot="main"> |
| 216 | 66 | <div class="top-portlet"> | 18 | <div class="top-portlet"> |
| 223 | 67 | <h2>Summary</h2> | 19 | <tal:summary condition="context/summary"> |
| 224 | 68 | <p tal:content="context/summary"> | 20 | <h2>Summary</h2> |
| 225 | 69 | $BugTracker.summary goes here. This should be quite short, | 21 | <p tal:content="context/summary"> |
| 226 | 70 | just a single paragraph of text really, giving the BugTracker | 22 | $BugTracker.summary goes here. This should be quite short, |
| 227 | 71 | highlights. | 23 | just a single paragraph of text really, giving the BugTracker |
| 228 | 72 | </p> | 24 | highlights. |
| 229 | 25 | </p> | ||
| 230 | 26 | </tal:summary> | ||
| 231 | 73 | <p tal:condition="not: context/active" id="inactive-message"> | 27 | <p tal:condition="not: context/active" id="inactive-message"> |
| 232 | 74 | <strong> | 28 | <strong> |
| 233 | 75 | Bug watch updates for <tal:bugtracker | 29 | Bug watch updates for <tal:bugtracker |
| 234 | 76 | content="context/title" /> are disabled. | 30 | content="context/title" /> are disabled. |
| 235 | 77 | </strong> | 31 | </strong> |
| 236 | 78 | </p> | 32 | </p> |
| 271 | 79 | 33 | </div> | |
| 272 | 80 | <h2>Location</h2> | 34 | <div class="yui-g"> |
| 273 | 81 | <ul id="bugtracker-urls"> | 35 | <div class="first yui-u"> |
| 274 | 82 | <li> | 36 | <div tal:replace="structure context/@@+portlet-details" /> |
| 275 | 83 | <strong> | 37 | </div> |
| 276 | 84 | <a tal:replace="structure context/fmt:external-link"> | 38 | <div class="yui-u"> |
| 277 | 85 | http://bugs.example.com/ | 39 | <div tal:replace="structure context/@@+portlet-projects" /> |
| 278 | 86 | </a> | 40 | </div> |
| 279 | 87 | </strong> | 41 | </div> |
| 280 | 88 | </li> | 42 | <div class="yui-u" tal:condition="context/watches"> |
| 281 | 89 | <li tal:repeat="alias context/fmt:aliases"> | 43 | <div tal:replace="structure context/@@+portlet-watches" /> |
| 248 | 90 | <strong tal:content="alias" /> (Alias) | ||
| 249 | 91 | </li> | ||
| 250 | 92 | </ul> | ||
| 251 | 93 | |||
| 252 | 94 | <tal:contact-details condition="context/contactdetails"> | ||
| 253 | 95 | <h2>Contact details</h2> | ||
| 254 | 96 | <div tal:condition="context/contactdetails" | ||
| 255 | 97 | tal:content="context/contactdetails" > | ||
| 256 | 98 | The contact details for the admins of this bug tracker go | ||
| 257 | 99 | here, so we can get to them in an emergency. | ||
| 258 | 100 | </div> | ||
| 259 | 101 | </tal:contact-details> | ||
| 260 | 102 | |||
| 261 | 103 | <tal:watches condition="context/watches"> | ||
| 262 | 104 | <h2>Bug watches</h2> | ||
| 263 | 105 | <tal:navigation | ||
| 264 | 106 | replace="structure view/batchnav/@@+navigation-links-upper" /> | ||
| 265 | 107 | <tal:block define="watches view/batchnav/batch" condition="watches"> | ||
| 266 | 108 | <metal:watches use-macro="template/macros/watchlisting" /> | ||
| 267 | 109 | </tal:block> | ||
| 268 | 110 | <tal:navigation | ||
| 269 | 111 | replace="structure view/batchnav/@@+navigation-links-lower" /> | ||
| 270 | 112 | </tal:watches> | ||
| 282 | 113 | </div> | 44 | </div> |
| 283 | 114 | </div> | 45 | </div> |
| 284 | 115 | 46 | ||
| 285 | 116 | 47 | ||
| 286 | === modified file 'lib/lp/bugs/templates/bugtracker-portlet-details.pt' | |||
| 287 | --- lib/lp/bugs/templates/bugtracker-portlet-details.pt 2009-08-28 14:00:23 +0000 | |||
| 288 | +++ lib/lp/bugs/templates/bugtracker-portlet-details.pt 2009-09-01 15:14:51 +0000 | |||
| 289 | @@ -1,27 +1,32 @@ | |||
| 290 | 1 | <div | 1 | <div |
| 298 | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
| 299 | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
| 300 | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
| 301 | 5 | class="portlet" id="portlet-details"> | 5 | class="portlet" id="portlet-details"> |
| 302 | 6 | 6 | <h2>Details</h2> | |
| 296 | 7 | <h2 tal:content="context/title">bugtracker title</h2> | ||
| 297 | 8 | |||
| 303 | 9 | <dl> | 7 | <dl> |
| 305 | 10 | <dt>Location:</dt> | 8 | <dt>Location</dt> |
| 306 | 11 | <dd> | 9 | <dd> |
| 309 | 12 | <img alt="" src="/@@/link" /> | 10 | <ul id="bugtracker-urls"> |
| 310 | 13 | <a tal:replace="structure context/fmt:external-link" /> | 11 | <li> |
| 311 | 12 | <strong> | ||
| 312 | 13 | <a tal:replace="structure context/fmt:external-link"> | ||
| 313 | 14 | http://bugs.example.com/ | ||
| 314 | 15 | </a> | ||
| 315 | 16 | </strong> | ||
| 316 | 17 | </li> | ||
| 317 | 18 | <li tal:repeat="alias context/fmt:aliases"> | ||
| 318 | 19 | <strong tal:content="alias" /> (Alias) | ||
| 319 | 20 | </li> | ||
| 320 | 21 | </ul> | ||
| 321 | 14 | </dd> | 22 | </dd> |
| 323 | 15 | <dt>Tracker type:</dt> | 23 | <dt>Tracker type</dt> |
| 324 | 16 | <dd tal:content="context/bugtrackertype/title" /> | 24 | <dd tal:content="context/bugtrackertype/title" /> |
| 325 | 17 | <dt>Number of watches:</dt> | ||
| 326 | 18 | <dd tal:content="context/watches/count" /> | ||
| 327 | 19 | <tal:contact-details condition="context/contactdetails"> | 25 | <tal:contact-details condition="context/contactdetails"> |
| 329 | 20 | <dt>Contact details:</dt> | 26 | <dt>Contact details</dt> |
| 330 | 21 | <dd tal:content="context/contactdetails" /> | 27 | <dd tal:content="context/contactdetails" /> |
| 331 | 22 | </tal:contact-details> | 28 | </tal:contact-details> |
| 333 | 23 | <dt>Creator:</dt> | 29 | <dt>Created by</dt> |
| 334 | 24 | <dd tal:content="structure context/owner/fmt:link" /> | 30 | <dd tal:content="structure context/owner/fmt:link" /> |
| 335 | 25 | </dl> | 31 | </dl> |
| 336 | 26 | |||
| 337 | 27 | </div> | 32 | </div> |
| 338 | 28 | 33 | ||
| 339 | === modified file 'lib/lp/bugs/templates/bugtracker-portlet-projects.pt' | |||
| 340 | --- lib/lp/bugs/templates/bugtracker-portlet-projects.pt 2009-08-28 13:51:06 +0000 | |||
| 341 | +++ lib/lp/bugs/templates/bugtracker-portlet-projects.pt 2009-09-01 15:16:10 +0000 | |||
| 342 | @@ -1,16 +1,13 @@ | |||
| 343 | 1 | <div | 1 | <div |
| 349 | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
| 350 | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
| 351 | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
| 352 | 5 | class="portlet" id="portlet-projects"> | 5 | class="portlet" id="portlet-projects"> |
| 348 | 6 | |||
| 353 | 7 | <h2>Related projects</h2> | 6 | <h2>Related projects</h2> |
| 354 | 8 | |||
| 355 | 9 | <p> | 7 | <p> |
| 356 | 10 | You can link a registered bug tracker with a <a | 8 | You can link a registered bug tracker with a <a |
| 357 | 11 | href="/projects/">registered project</a> in Launchpad: | 9 | href="/projects/">registered project</a> in Launchpad: |
| 358 | 12 | </p> | 10 | </p> |
| 359 | 13 | |||
| 360 | 14 | <ul tal:define="related_projects view/related_projects"> | 11 | <ul tal:define="related_projects view/related_projects"> |
| 361 | 15 | <li tal:repeat="project related_projects"> | 12 | <li tal:repeat="project related_projects"> |
| 362 | 16 | <a tal:replace="structure project/fmt:link" /> | 13 | <a tal:replace="structure project/fmt:link" /> |
| 363 | @@ -19,5 +16,4 @@ | |||
| 364 | 19 | <i>There are no projects linked to this bug tracker.</i> | 16 | <i>There are no projects linked to this bug tracker.</i> |
| 365 | 20 | </li> | 17 | </li> |
| 366 | 21 | </ul> | 18 | </ul> |
| 367 | 22 | |||
| 368 | 23 | </div> | 19 | </div> |
| 369 | 24 | 20 | ||
| 370 | === added file 'lib/lp/bugs/templates/bugtracker-portlet-watches.pt' | |||
| 371 | --- lib/lp/bugs/templates/bugtracker-portlet-watches.pt 1970-01-01 00:00:00 +0000 | |||
| 372 | +++ lib/lp/bugs/templates/bugtracker-portlet-watches.pt 2009-09-01 15:15:00 +0000 | |||
| 373 | @@ -0,0 +1,54 @@ | |||
| 374 | 1 | <div | ||
| 375 | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" | ||
| 376 | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" | ||
| 377 | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | ||
| 378 | 5 | class="portlet" id="portlet-watches"> | ||
| 379 | 6 | <h2>Bug watches</h2> | ||
| 380 | 7 | <tal:navigation | ||
| 381 | 8 | replace="structure view/batchnav/@@+navigation-links-upper" /> | ||
| 382 | 9 | <tal:block define="watches view/batchnav/batch"> | ||
| 383 | 10 | <table class="sortable listing" id="latestwatches"> | ||
| 384 | 11 | <thead> | ||
| 385 | 12 | <tr> | ||
| 386 | 13 | <th>Launchpad bug</th> | ||
| 387 | 14 | <th>Remote bug</th> | ||
| 388 | 15 | <th>Status</th> | ||
| 389 | 16 | </tr> | ||
| 390 | 17 | </thead> | ||
| 391 | 18 | <tbody> | ||
| 392 | 19 | <tal:watches repeat="watch watches"> | ||
| 393 | 20 | <tr tal:define="show watch/bug/required:launchpad.View"> | ||
| 394 | 21 | <tal:hide-watch-details condition="not:show"> | ||
| 395 | 22 | <td> | ||
| 396 | 23 | <img alt="" src="/@@/bug" /> | ||
| 397 | 24 | #<span tal:replace="watch/bug/id">34</span>: | ||
| 398 | 25 | <em>(Private)</em> | ||
| 399 | 26 | </td> | ||
| 400 | 27 | <td><em>-</em></td> | ||
| 401 | 28 | <td></td> | ||
| 402 | 29 | </tal:hide-watch-details> | ||
| 403 | 30 | <tal:show-watch-details condition="show"> | ||
| 404 | 31 | <td> | ||
| 405 | 32 | <img alt="" src="/@@/bug" /> | ||
| 406 | 33 | <a href="#" tal:attributes="href watch/bug/fmt:url"> | ||
| 407 | 34 | #<span tal:replace="watch/bug/id">34</span>: | ||
| 408 | 35 | <span tal:replace="watch/bug/title"> | ||
| 409 | 36 | Launchpad Bug Title | ||
| 410 | 37 | </span> | ||
| 411 | 38 | </a> | ||
| 412 | 39 | </td> | ||
| 413 | 40 | <td> | ||
| 414 | 41 | <a tal:replace="structure watch/fmt:external-link-short"> | ||
| 415 | 42 | 1234 | ||
| 416 | 43 | </a> | ||
| 417 | 44 | </td> | ||
| 418 | 45 | <td><tal:status tal:replace="watch/remotestatus"/></td> | ||
| 419 | 46 | </tal:show-watch-details> | ||
| 420 | 47 | </tr> | ||
| 421 | 48 | </tal:watches> | ||
| 422 | 49 | </tbody> | ||
| 423 | 50 | </table> | ||
| 424 | 51 | </tal:block> | ||
| 425 | 52 | <tal:navigation | ||
| 426 | 53 | replace="structure view/batchnav/@@+navigation-links-lower" /> | ||
| 427 | 54 | </div> | ||
| 428 | 0 | 55 | ||
| 429 | === modified file 'lib/lp/bugs/templates/bugtrackers-index.pt' | |||
| 430 | --- lib/lp/bugs/templates/bugtrackers-index.pt 2009-09-01 09:53:09 +0000 | |||
| 431 | +++ lib/lp/bugs/templates/bugtrackers-index.pt 2009-09-01 16:23:56 +0000 | |||
| 432 | @@ -69,11 +69,6 @@ | |||
| 433 | 69 | shown in Launchpad, and Launchpad subscribers are notified when | 69 | shown in Launchpad, and Launchpad subscribers are notified when |
| 434 | 70 | the external status changes. | 70 | the external status changes. |
| 435 | 71 | </p> | 71 | </p> |
| 436 | 72 | <p tal:define="link context/menu:context/newbugtracker" | ||
| 437 | 73 | tal:content="structure link/render" | ||
| 438 | 74 | tal:condition="link/enabled"> | ||
| 439 | 75 | Add a new bug tracker | ||
| 440 | 76 | </p> | ||
| 441 | 77 | <tal:table define="id string:trackers; | 72 | <tal:table define="id string:trackers; |
| 442 | 78 | trackers view/active_bug_trackers"> | 73 | trackers view/active_bug_trackers"> |
| 443 | 79 | <metal:table use-macro="template/macros/tracker-table" /> | 74 | <metal:table use-macro="template/macros/tracker-table" /> |
| 444 | 80 | 75 | ||
| 445 | === modified file 'lib/lp/bugs/templates/remotebug-index.pt' | |||
| 446 | --- lib/lp/bugs/templates/remotebug-index.pt 2009-08-28 15:43:29 +0000 | |||
| 447 | +++ lib/lp/bugs/templates/remotebug-index.pt 2009-09-01 16:45:43 +0000 | |||
| 448 | @@ -3,7 +3,7 @@ | |||
| 449 | 3 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 3 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
| 450 | 4 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 4 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
| 451 | 5 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 5 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
| 453 | 6 | metal:use-macro="view/macro:page/main_side" | 6 | metal:use-macro="view/macro:page/main_only" |
| 454 | 7 | i18n:domain="launchpad"> | 7 | i18n:domain="launchpad"> |
| 455 | 8 | 8 | ||
| 456 | 9 | <metal:heading fill-slot="heading"> | 9 | <metal:heading fill-slot="heading"> |
| 457 | @@ -16,7 +16,6 @@ | |||
| 458 | 16 | 16 | ||
| 459 | 17 | <div metal:fill-slot="main"> | 17 | <div metal:fill-slot="main"> |
| 460 | 18 | <div class="top-portlet"> | 18 | <div class="top-portlet"> |
| 461 | 19 | <h2>Is watched by...</h2> | ||
| 462 | 20 | <p> | 19 | <p> |
| 463 | 21 | The following bugs in Launchpad are watching bug #<span | 20 | The following bugs in Launchpad are watching bug #<span |
| 464 | 22 | tal:replace="context/remotebug">1234</span> in <span | 21 | tal:replace="context/remotebug">1234</span> in <span |
| 465 | @@ -25,26 +24,20 @@ | |||
| 466 | 25 | using “Also affects project” or “Also | 24 | using “Also affects project” or “Also |
| 467 | 26 | affects distribution” on the bug page. | 25 | affects distribution” on the bug page. |
| 468 | 27 | </p> | 26 | </p> |
| 489 | 28 | <table class="listing" id="watchedbugs"> | 27 | <ul id="watchedbugs"> |
| 490 | 29 | <thead> | 28 | <tal:bugs repeat="bug context/bugs"> |
| 491 | 30 | <tr> | 29 | <li tal:define="visible bug/required:launchpad.View"> |
| 492 | 31 | <th>Bug</th> | 30 | <tal:visible condition="visible"> |
| 493 | 32 | </tr> | 31 | <a tal:replace="structure bug/fmt:link" /> |
| 494 | 33 | </thead> | 32 | </tal:visible> |
| 495 | 34 | <tbody> | 33 | <tal:hidden condition="not:visible"> |
| 496 | 35 | <tal:bugs tal:repeat="bug context/bugs"> | 34 | <span class="sprite bug"> |
| 497 | 36 | <tr tal:define="visible bug/required:launchpad.View"> | 35 | Bug #<span tal:replace="bug/id" />: <em>(Private)</em> |
| 498 | 37 | <td tal:condition="visible"> | 36 | </span> |
| 499 | 38 | <a class="sprite bug" | 37 | </tal:hidden> |
| 500 | 39 | tal:attributes="href bug/fmt:url" | 38 | </li> |
| 501 | 40 | tal:content="string:#${bug/id}: ${bug/title}" /> | 39 | </tal:bugs> |
| 502 | 41 | </td> | 40 | </ul> |
| 483 | 42 | <td tal:condition="not:visible" | ||
| 484 | 43 | tal:content="string:#${bug/id}: Private bug" /> | ||
| 485 | 44 | </tr> | ||
| 486 | 45 | </tal:bugs> | ||
| 487 | 46 | </tbody> | ||
| 488 | 47 | </table> | ||
| 503 | 48 | </div> | 41 | </div> |
| 504 | 49 | </div> | 42 | </div> |
| 505 | 50 | 43 | ||
| Michael Nelson (michael.nelson) wrote : | # |
> On Tue, 01 Sep 2009 11:43:19 -0000
> Michael Nelson <email address hidden> wrote:
>
> > Review: Needs Fixing ui
> > > To walk through the UI, try:
> >
> > Thanks for providing these walk-throughs... much easier to review!
> > I'll start doing that too. And sorry for the two 'needs fixing'
> > reviews! The pages really do look great (we initially tried to
> > re-use our soyuz context portlets in the same way), but afaik, it's
> > left-over from 1.0 (or maybe I'm confused at that point - I wasn't
> > around then), but it's not meant to be in the 3.0 side-bar.
>
> No worries about the needs-fixing. They need fixing! :)
>
> >
> > >
> > > * Go to the bug trackers page (for IBugTrackerSet) at
> > > <https:/
> > >
> > > * There's nothing new in this page for this branch, so just click on
> > > "This Mozilla.prg Bug Tracker" to see its overview page,
> > >
> > > * Look at the portlets. The top portlet replicates some of the info
> > > that's in the page, but it is used elsewhere in Launchpad so it's
> > > useful to keep.
> >
> > See comments on the first MP. I think it's really 1.0 templates
> > trying to be forced into the 3.0 mold (I tried the same thing with
> > some soyuz pages and got rejected ;) ).
>
> Yes, I've removed all the side portlets from all of the bug tracker
> pages; they don't make sense anywhere. The navigation menu for the bug
> tracker index page remains.
Looks good. I just noticed that you removed the colons from the dt's in the details portlet. I have no idea what is correct, but I usually just do what registry has done (ie. https:/
>
> >
> > >
> > > * Click "Change details",
> > >
> > > * This is one place where the details portlet is useful.
> >
> > Well, not really - the only extra information presented in the
> > portlet is not really relevant to the person editing the watch?
> > Otherwise it's just duplicated info, and as mentioned in the
> > previous MP, afaik, isn't the type of content that is meant to go in
> > the side portlet. I'd recommend using main_only for this template,
> > you might even be able to get rid of the template and use
> > generic-edit.pt?
>
> I'd not heard of generic-edit before; it'll be handy for the
> future. However, I don't think it'll be suitable here because the edit
> page has some blurb at the beginning, including an explanation of why
> a particular bug tracker cannot be deleted (which is not static).
Sure - I don't mind either way, but just note that there is an extra_info slot on launchpad-form.pt (that is used by generic-edit.pt).
>
> >
> > >
> > > * Use the new cancel link to return to the previous page,
> >
> > Great!
> >
> > >
> > > * Notice the new h1 title and h2 "Summary" heading,
> >
> > Great! Note that both of these above two points will happen
> > automatically with generic-edit.
> >
> > >
> > > * Append /42 to the URL and see the remote bug index page, including
> > > the h2 "Is watched by..." and the new text. I think the text is
> > > good, but the heading was a tough one. I'm simply still not sure
> > > exactly how to use the heading slot.
> >
> >
> ...
| Gavin Panella (allenap) wrote : | # |
On Wed, 02 Sep 2009 07:30:40 -0000
Michael Nelson <email address hidden> wrote:
...
> I just noticed that you removed the colons from the dt's in the
> details portlet. I have no idea what is correct, but I usually just
> do what registry has done (ie. https:/
> to you.
Heh, I thought I was being clever! I've added them back in.
...
> > I'd not heard of generic-edit before; it'll be handy for the
> > future. However, I don't think it'll be suitable here because the edit
> > page has some blurb at the beginning, including an explanation of why
> > a particular bug tracker cannot be deleted (which is not static).
>
> Sure - I don't mind either way, but just note that there is an
> extra_info slot on launchpad-form.pt (that is used by
> generic-edit.pt).
Is there a way to define a slot without requiring a template for this
view anyway?
| Michael Nelson (michael.nelson) wrote : | # |
> On Wed, 02 Sep 2009 07:30:40 -0000
> Michael Nelson <email address hidden> wrote:
>
> ...
> > I just noticed that you removed the colons from the dt's in the
> > details portlet. I have no idea what is correct, but I usually just
> > do what registry has done (ie. https:/
> > to you.
>
> Heh, I thought I was being clever! I've added them back in.
>
> ...
> > > I'd not heard of generic-edit before; it'll be handy for the
> > > future. However, I don't think it'll be suitable here because the edit
> > > page has some blurb at the beginning, including an explanation of why
> > > a particular bug tracker cannot be deleted (which is not static).
> >
> > Sure - I don't mind either way, but just note that there is an
> > extra_info slot on launchpad-form.pt (that is used by
> > generic-edit.pt).
>
> Is there a way to define a slot without requiring a template for this
> view anyway?
Erm, good point. I was getting confused - so what I've seen others doing is creating a template that is basically like generic edit, but just fills that slot. For example, look at lp/registry/
Again, I think what you've done is fine - it was just something to be aware of.
Preview Diff
| 1 | === modified file 'lib/canonical/launchpad/testing/pages.py' | |||
| 2 | --- lib/canonical/launchpad/testing/pages.py 2009-08-27 19:55:58 +0000 | |||
| 3 | +++ lib/canonical/launchpad/testing/pages.py 2009-09-01 09:54:54 +0000 | |||
| 4 | @@ -258,7 +258,8 @@ | |||
| 5 | 258 | for col_num, item in enumerate(row.findAll('td')): | 258 | for col_num, item in enumerate(row.findAll('td')): |
| 6 | 259 | if columns is None or col_num in columns: | 259 | if columns is None or col_num in columns: |
| 7 | 260 | row_content.append(extract_text(item)) | 260 | row_content.append(extract_text(item)) |
| 9 | 261 | print sep.join(row_content) | 261 | if len(row_content) > 0: |
| 10 | 262 | print sep.join(row_content) | ||
| 11 | 262 | 263 | ||
| 12 | 263 | def print_radio_button_field(content, name): | 264 | def print_radio_button_field(content, name): |
| 13 | 264 | """Find the input called field.name, and print a friendly representation. | 265 | """Find the input called field.name, and print a friendly representation. |
| 14 | 265 | 266 | ||
| 15 | === modified file 'lib/lp/bugs/browser/bugtracker.py' | |||
| 16 | --- lib/lp/bugs/browser/bugtracker.py 2009-08-25 16:40:03 +0000 | |||
| 17 | +++ lib/lp/bugs/browser/bugtracker.py 2009-08-28 14:09:24 +0000 | |||
| 18 | @@ -353,6 +353,10 @@ | |||
| 19 | 353 | # Go back to the bug tracker listing. | 353 | # Go back to the bug tracker listing. |
| 20 | 354 | self.next_url = canonical_url(getUtility(IBugTrackerSet)) | 354 | self.next_url = canonical_url(getUtility(IBugTrackerSet)) |
| 21 | 355 | 355 | ||
| 22 | 356 | @property | ||
| 23 | 357 | def cancel_url(self): | ||
| 24 | 358 | return canonical_url(self.context) | ||
| 25 | 359 | |||
| 26 | 356 | 360 | ||
| 27 | 357 | class BugTrackerNavigation(Navigation): | 361 | class BugTrackerNavigation(Navigation): |
| 28 | 358 | 362 | ||
| 29 | 359 | 363 | ||
| 30 | === modified file 'lib/lp/bugs/stories/bugtracker/xx-bugtracker-remote-bug.txt' | |||
| 31 | --- lib/lp/bugs/stories/bugtracker/xx-bugtracker-remote-bug.txt 2009-08-12 13:34:48 +0000 | |||
| 32 | +++ lib/lp/bugs/stories/bugtracker/xx-bugtracker-remote-bug.txt 2009-08-28 15:43:29 +0000 | |||
| 33 | @@ -12,17 +12,21 @@ | |||
| 34 | 12 | then a list of the relevant Launchpad bugs: | 12 | then a list of the relevant Launchpad bugs: |
| 35 | 13 | 13 | ||
| 36 | 14 | >>> browser.open('http://launchpad.dev/bugs/bugtrackers/mozilla.org/42') | 14 | >>> browser.open('http://launchpad.dev/bugs/bugtrackers/mozilla.org/42') |
| 48 | 15 | >>> print browser.contents | 15 | |
| 49 | 16 | <!DOCTYPE... | 16 | >>> print_location(browser.contents) |
| 50 | 17 | <title>Remote Bug #42 in The Mozilla.org Bug Tracker</title> | 17 | Hierarchy: Bug trackers > The Mozilla.org Bug Tracker |
| 51 | 18 | ... | 18 | Tabs: |
| 52 | 19 | <h1>Remote Bug #42 in The Mozilla.org Bug Tracker</h1> | 19 | * Launchpad Home - http://launchpad.dev/ |
| 53 | 20 | ... | 20 | * Code - http://code.launchpad.dev/ |
| 54 | 21 | <a href=".../bugs/1">#1: Firefox does not support SVG</a> | 21 | * Bugs (selected) - http://bugs.launchpad.dev/ |
| 55 | 22 | ... | 22 | * Blueprints - http://blueprints.launchpad.dev/ |
| 56 | 23 | <a href=".../bugs/2">#2: Blackhole Trash folder</a> | 23 | * Translations - http://translations.launchpad.dev/ |
| 57 | 24 | ... | 24 | * Answers - http://answers.launchpad.dev/ |
| 58 | 25 | 25 | Main heading: Remote Bug #42 in The Mozilla.org Bug Tracker | |
| 59 | 26 | |||
| 60 | 27 | >>> print_table(find_tag_by_id(browser.contents, 'watchedbugs')) | ||
| 61 | 28 | #1: Firefox does not support SVG | ||
| 62 | 29 | #2: Blackhole Trash folder | ||
| 63 | 26 | 30 | ||
| 64 | 27 | If there is only a single bug watching the remote bug, then we skip | 31 | If there is only a single bug watching the remote bug, then we skip |
| 65 | 28 | the list page and redirect the user directly to that bug's page: | 32 | the list page and redirect the user directly to that bug's page: |
| 66 | @@ -60,46 +64,41 @@ | |||
| 67 | 60 | >>> browser.url | 64 | >>> browser.url |
| 68 | 61 | 'http://bugs.launchpad.dev/firefox/+bug/1' | 65 | 'http://bugs.launchpad.dev/firefox/+bug/1' |
| 69 | 62 | 66 | ||
| 70 | 63 | |||
| 71 | 64 | List Launchpad bugs watching Mozilla bug 42: | 67 | List Launchpad bugs watching Mozilla bug 42: |
| 72 | 65 | 68 | ||
| 84 | 66 | >>> anon_browser.open('http://launchpad.dev/bugs/bugtrackers/mozilla.org/42') | 69 | >>> anon_browser.open( |
| 85 | 67 | >>> print anon_browser.contents | 70 | ... 'http://launchpad.dev/bugs/bugtrackers/mozilla.org/42') |
| 86 | 68 | <!DOCTYPE... | 71 | |
| 87 | 69 | ... | 72 | >>> print_location(anon_browser.contents) |
| 88 | 70 | <title>Remote Bug #42 in The Mozilla.org Bug Tracker</title> | 73 | Hierarchy: Bug trackers > The Mozilla.org Bug Tracker |
| 89 | 71 | ... | 74 | Tabs: |
| 90 | 72 | <a href=".../bugs/1">#1: Private Bug</a> | 75 | * Launchpad Home - http://launchpad.dev/ |
| 91 | 73 | ... | 76 | * Code - http://code.launchpad.dev/ |
| 92 | 74 | <a href=".../bugs/2">#2: Blackhole Trash folder</a> | 77 | * Bugs (selected) - http://bugs.launchpad.dev/ |
| 93 | 75 | ... | 78 | * Blueprints - http://blueprints.launchpad.dev/ |
| 94 | 76 | 79 | * Translations - http://translations.launchpad.dev/ | |
| 95 | 80 | * Answers - http://answers.launchpad.dev/ | ||
| 96 | 81 | Main heading: Remote Bug #42 in The Mozilla.org Bug Tracker | ||
| 97 | 82 | |||
| 98 | 83 | >>> print_table(find_tag_by_id(anon_browser.contents, 'watchedbugs')) | ||
| 99 | 84 | #1: Private bug | ||
| 100 | 85 | #2: Blackhole Trash folder | ||
| 101 | 77 | 86 | ||
| 102 | 78 | The bug title is still provided if the user can view the private bug: | 87 | The bug title is still provided if the user can view the private bug: |
| 103 | 79 | 88 | ||
| 104 | 80 | >>> browser.open('http://launchpad.dev/bugs/bugtrackers/mozilla.org/42') | 89 | >>> browser.open('http://launchpad.dev/bugs/bugtrackers/mozilla.org/42') |
| 115 | 81 | >>> print browser.contents | 90 | >>> print_table(find_tag_by_id(browser.contents, 'watchedbugs')) |
| 116 | 82 | <!DOCTYPE... | 91 | #1: Firefox does not support SVG |
| 117 | 83 | ... | 92 | #2: Blackhole Trash folder |
| 108 | 84 | <title>Remote Bug #42 in The Mozilla.org Bug Tracker</title> | ||
| 109 | 85 | ... | ||
| 110 | 86 | <a href=".../bugs/1">#1: Firefox does not support SVG</a> | ||
| 111 | 87 | ... | ||
| 112 | 88 | <a href=".../bugs/2">#2: Blackhole Trash folder</a> | ||
| 113 | 89 | ... | ||
| 114 | 90 | |||
| 118 | 91 | 93 | ||
| 119 | 92 | For the case where the private bug is the only one watching the given | 94 | For the case where the private bug is the only one watching the given |
| 120 | 93 | remote bug, we don't perform the redirect ahead of time: | 95 | remote bug, we don't perform the redirect ahead of time: |
| 121 | 94 | 96 | ||
| 122 | 95 | >>> anon_browser.handleErrors = True | 97 | >>> anon_browser.handleErrors = True |
| 130 | 96 | >>> anon_browser.open('http://bugs.launchpad.dev/bugs/bugtrackers/mozilla.org/2000') | 98 | >>> anon_browser.open( |
| 131 | 97 | >>> print anon_browser.contents | 99 | ... 'http://bugs.launchpad.dev/bugs/bugtrackers/mozilla.org/2000') |
| 132 | 98 | <!DOCTYPE... | 100 | >>> print_feedback_messages(anon_browser.contents) |
| 133 | 99 | ...To continue, you must log in to Launchpad... | 101 | To continue, you must log in to Launchpad. |
| 127 | 100 | ...<input type="hidden" name="redirection_url" | ||
| 128 | 101 | value="http://bugs.launchpad.dev/bugs/1" />... | ||
| 129 | 102 | |||
| 134 | 103 | 102 | ||
| 135 | 104 | Set the bug back to public: | 103 | Set the bug back to public: |
| 136 | 105 | 104 | ||
| 137 | 106 | 105 | ||
| 138 | === modified file 'lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt' | |||
| 139 | --- lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt 2009-08-25 15:59:44 +0000 | |||
| 140 | +++ lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt 2009-08-28 14:09:24 +0000 | |||
| 141 | @@ -184,6 +184,11 @@ | |||
| 142 | 184 | >>> user_browser.getControl( | 184 | >>> user_browser.getControl( |
| 143 | 185 | ... 'Summary').value = 'This is used to be a test TRAC bug tracker.' | 185 | ... 'Summary').value = 'This is used to be a test TRAC bug tracker.' |
| 144 | 186 | 186 | ||
| 145 | 187 | There is a cancel link if we change our mind: | ||
| 146 | 188 | |||
| 147 | 189 | >>> user_browser.getLink('Cancel').url | ||
| 148 | 190 | 'http://bugs.launchpad.dev/bugs/bugtrackers/testmantis' | ||
| 149 | 191 | |||
| 150 | 187 | It's not possible to change the base URL to something that another bug | 192 | It's not possible to change the base URL to something that another bug |
| 151 | 188 | tracker uses. | 193 | tracker uses. |
| 152 | 189 | 194 | ||
| 153 | @@ -661,8 +666,8 @@ | |||
| 154 | 661 | Related projects | 666 | Related projects |
| 155 | 662 | You can link a registered bug tracker with a registered project in | 667 | You can link a registered bug tracker with a registered project in |
| 156 | 663 | Launchpad: | 668 | Launchpad: |
| 159 | 664 | The Mozilla Project | 669 | the Mozilla Project |
| 160 | 665 | Jokosher Audio Editor | 670 | Jokosher (Unspecified) |
| 161 | 666 | 671 | ||
| 162 | 667 | 672 | ||
| 163 | 668 | == Info portlet == | 673 | == Info portlet == |
| 164 | @@ -676,11 +681,10 @@ | |||
| 165 | 676 | Email bugtracker | 681 | Email bugtracker |
| 166 | 677 | Location: | 682 | Location: |
| 167 | 678 | mailto:bugs@example.com | 683 | mailto:bugs@example.com |
| 169 | 679 | Tracker Type: | 684 | Tracker type: |
| 170 | 680 | Email Address | 685 | Email Address |
| 171 | 681 | Number of watches: | 686 | Number of watches: |
| 172 | 682 | 1 | 687 | 1 |
| 173 | 683 | Contact Details: | ||
| 174 | 684 | Creator: | 688 | Creator: |
| 175 | 685 | Foo Bar | 689 | Foo Bar |
| 176 | 686 | 690 | ||
| 177 | @@ -694,3 +698,21 @@ | |||
| 178 | 694 | Location: | 698 | Location: |
| 179 | 695 | mailto:<email address hidden> | 699 | mailto:<email address hidden> |
| 180 | 696 | ... | 700 | ... |
| 181 | 701 | |||
| 182 | 702 | If the bug tracker has contact details, they will be shown: | ||
| 183 | 703 | |||
| 184 | 704 | >>> anon_browser.open( | ||
| 185 | 705 | ... 'http://bugs.launchpad.dev/bugs/bugtrackers/gnome-bugzilla') | ||
| 186 | 706 | >>> print extract_text(find_portlet( | ||
| 187 | 707 | ... anon_browser.contents, 'GnomeGBug GTracker')) | ||
| 188 | 708 | GnomeGBug GTracker | ||
| 189 | 709 | Location: | ||
| 190 | 710 | http://bugzilla.gnome.org/bugs | ||
| 191 | 711 | Tracker type: | ||
| 192 | 712 | Bugzilla | ||
| 193 | 713 | Number of watches: | ||
| 194 | 714 | 2 | ||
| 195 | 715 | Contact details: | ||
| 196 | 716 | Jeff Waugh, in his pants. | ||
| 197 | 717 | Creator: | ||
| 198 | 718 | Foo Bar | ||
| 199 | 697 | 719 | ||
| 200 | === modified file 'lib/lp/bugs/templates/bugtracker-edit.pt' | |||
| 201 | --- lib/lp/bugs/templates/bugtracker-edit.pt 2009-07-17 17:59:07 +0000 | |||
| 202 | +++ lib/lp/bugs/templates/bugtracker-edit.pt 2009-08-28 13:47:50 +0000 | |||
| 203 | @@ -1,48 +1,35 @@ | |||
| 205 | 1 | <html | 1 | <bug-tracker-edit |
| 206 | 2 | xmlns="http://www.w3.org/1999/xhtml" | 2 | xmlns="http://www.w3.org/1999/xhtml" |
| 207 | 3 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 3 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
| 208 | 4 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 4 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
| 209 | 5 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 5 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
| 221 | 6 | xml:lang="en" | 6 | metal:use-macro="view/macro:page/main_side" |
| 222 | 7 | lang="en" | 7 | i18n:domain="malone"> |
| 212 | 8 | dir="ltr" | ||
| 213 | 9 | metal:use-macro="context/@@main_template/master" | ||
| 214 | 10 | i18n:domain="malone" | ||
| 215 | 11 | > | ||
| 216 | 12 | <tal:tag condition="view/update"/> | ||
| 217 | 13 | <body> | ||
| 218 | 14 | <metal:heading fill-slot="pageheading"> | ||
| 219 | 15 | <h1>Change bug tracker details</h1> | ||
| 220 | 16 | </metal:heading> | ||
| 223 | 17 | 8 | ||
| 227 | 18 | <metal:leftportlets fill-slot="portlets_one"> | 9 | <div metal:fill-slot="side"> |
| 228 | 19 | <div tal:replace="structure context/@@+portlet-details" /> | 10 | <div tal:replace="structure context/@@+portlet-details" /> |
| 229 | 20 | </metal:leftportlets> | 11 | </div> |
| 230 | 21 | 12 | ||
| 231 | 22 | <div metal:fill-slot="main"> | 13 | <div metal:fill-slot="main"> |
| 236 | 23 | 14 | <h1>Change bug tracker details</h1> | |
| 237 | 24 | <div metal:use-macro="context/@@launchpad_form/form"> | 15 | <div class="top-portlet"> |
| 234 | 25 | |||
| 235 | 26 | <metal:extra-info fill-slot="extra_info"> | ||
| 238 | 27 | <div id="bugtracker-delete-not-possible-reasons" | 16 | <div id="bugtracker-delete-not-possible-reasons" |
| 239 | 28 | tal:define="reasons view/delete_not_possible_reasons" | 17 | tal:define="reasons view/delete_not_possible_reasons" |
| 240 | 29 | tal:condition="reasons"> | 18 | tal:condition="reasons"> |
| 241 | 30 | <p> | 19 | <p> |
| 242 | 31 | Please note, this bug tracker cannot be deleted because: | 20 | Please note, this bug tracker cannot be deleted because: |
| 243 | 32 | </p> | 21 | </p> |
| 245 | 33 | <ul> | 22 | <ol> |
| 246 | 34 | <li tal:repeat="reason reasons" tal:content="reason" /> | 23 | <li tal:repeat="reason reasons" tal:content="reason" /> |
| 248 | 35 | </ul> | 24 | </ol> |
| 249 | 36 | </div> | 25 | </div> |
| 250 | 37 | |||
| 251 | 38 | <p> | 26 | <p> |
| 252 | 39 | If you need to change the type of bug tracker, please ask for | 27 | If you need to change the type of bug tracker, please ask for |
| 254 | 40 | admin support on #launchpad (see the bottom of the page for details). | 28 | admin support on #launchpad (see the bottom of the page for |
| 255 | 29 | details). | ||
| 256 | 41 | </p> | 30 | </p> |
| 259 | 42 | </metal:extra-info> | 31 | <div metal:use-macro="context/@@launchpad_form/form" /> |
| 260 | 43 | 32 | </div> | |
| 261 | 44 | </div> | 33 | </div> |
| 262 | 45 | 34 | ||
| 266 | 46 | </div> | 35 | </bug-tracker-edit> |
| 264 | 47 | </body> | ||
| 265 | 48 | </html> | ||
| 267 | 49 | 36 | ||
| 268 | === modified file 'lib/lp/bugs/templates/bugtracker-index.pt' | |||
| 269 | --- lib/lp/bugs/templates/bugtracker-index.pt 2009-08-28 12:57:41 +0000 | |||
| 270 | +++ lib/lp/bugs/templates/bugtracker-index.pt 2009-08-28 13:42:10 +0000 | |||
| 271 | @@ -7,10 +7,7 @@ | |||
| 272 | 7 | i18n:domain="malone"> | 7 | i18n:domain="malone"> |
| 273 | 8 | 8 | ||
| 274 | 9 | <metal:heading fill-slot="heading"> | 9 | <metal:heading fill-slot="heading"> |
| 279 | 10 | <h1> | 10 | <h1 tal:content="context/title" /> |
| 276 | 11 | <tal:tracker replace="context/title">Gnome Bugzilla</tal:tracker> | ||
| 277 | 12 | overview | ||
| 278 | 13 | </h1> | ||
| 280 | 14 | </metal:heading> | 11 | </metal:heading> |
| 281 | 15 | 12 | ||
| 282 | 16 | <metal:side fill-slot="side"> | 13 | <metal:side fill-slot="side"> |
| 283 | @@ -67,6 +64,12 @@ | |||
| 284 | 67 | 64 | ||
| 285 | 68 | <div metal:fill-slot="main"> | 65 | <div metal:fill-slot="main"> |
| 286 | 69 | <div class="top-portlet"> | 66 | <div class="top-portlet"> |
| 287 | 67 | <h2>Summary</h2> | ||
| 288 | 68 | <p tal:content="context/summary"> | ||
| 289 | 69 | $BugTracker.summary goes here. This should be quite short, | ||
| 290 | 70 | just a single paragraph of text really, giving the BugTracker | ||
| 291 | 71 | highlights. | ||
| 292 | 72 | </p> | ||
| 293 | 70 | <p tal:condition="not: context/active" id="inactive-message"> | 73 | <p tal:condition="not: context/active" id="inactive-message"> |
| 294 | 71 | <strong> | 74 | <strong> |
| 295 | 72 | Bug watch updates for <tal:bugtracker | 75 | Bug watch updates for <tal:bugtracker |
| 296 | @@ -74,12 +77,6 @@ | |||
| 297 | 74 | </strong> | 77 | </strong> |
| 298 | 75 | </p> | 78 | </p> |
| 299 | 76 | 79 | ||
| 300 | 77 | <p tal:content="context/summary"> | ||
| 301 | 78 | $BugTracker.summary goes here. This should be quite short, | ||
| 302 | 79 | just a single paragraph of text really, giving the BugTracker | ||
| 303 | 80 | highlights. | ||
| 304 | 81 | </p> | ||
| 305 | 82 | |||
| 306 | 83 | <h2>Location</h2> | 80 | <h2>Location</h2> |
| 307 | 84 | <ul id="bugtracker-urls"> | 81 | <ul id="bugtracker-urls"> |
| 308 | 85 | <li> | 82 | <li> |
| 309 | 86 | 83 | ||
| 310 | === modified file 'lib/lp/bugs/templates/bugtracker-portlet-details.pt' | |||
| 311 | --- lib/lp/bugs/templates/bugtracker-portlet-details.pt 2009-07-17 17:59:07 +0000 | |||
| 312 | +++ lib/lp/bugs/templates/bugtracker-portlet-details.pt 2009-08-28 14:00:23 +0000 | |||
| 313 | @@ -3,29 +3,25 @@ | |||
| 314 | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
| 315 | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
| 316 | 5 | class="portlet" id="portlet-details"> | 5 | class="portlet" id="portlet-details"> |
| 342 | 6 | <h2 tal:content="context/title">bugtracker title</h2> | 6 | |
| 343 | 7 | 7 | <h2 tal:content="context/title">bugtracker title</h2> | |
| 344 | 8 | <div class="portletBody"> | 8 | |
| 345 | 9 | <div class="portletContent"> | 9 | <dl> |
| 346 | 10 | 10 | <dt>Location:</dt> | |
| 347 | 11 | <b>Location:</b><br /> | 11 | <dd> |
| 348 | 12 | <img alt="" src="/@@/link" /> | 12 | <img alt="" src="/@@/link" /> |
| 349 | 13 | <a tal:replace="structure context/fmt:external-link" /><br /> | 13 | <a tal:replace="structure context/fmt:external-link" /> |
| 350 | 14 | 14 | </dd> | |
| 351 | 15 | <b>Tracker Type:</b> | 15 | <dt>Tracker type:</dt> |
| 352 | 16 | <span tal:replace="context/bugtrackertype/title">BugZilla</span> | 16 | <dd tal:content="context/bugtrackertype/title" /> |
| 353 | 17 | <br /> | 17 | <dt>Number of watches:</dt> |
| 354 | 18 | 18 | <dd tal:content="context/watches/count" /> | |
| 355 | 19 | <b>Number of watches:</b> | 19 | <tal:contact-details condition="context/contactdetails"> |
| 356 | 20 | <span tal:replace="context/watches/count" /><br /> | 20 | <dt>Contact details:</dt> |
| 357 | 21 | 21 | <dd tal:content="context/contactdetails" /> | |
| 358 | 22 | <b>Contact Details:</b><br /> | 22 | </tal:contact-details> |
| 359 | 23 | <span tal:replace="context/contactdetails">contact details go here | 23 | <dt>Creator:</dt> |
| 360 | 24 | in a long mess</span><br /> | 24 | <dd tal:content="structure context/owner/fmt:link" /> |
| 361 | 25 | 25 | </dl> | |
| 362 | 26 | <b>Creator:</b> | 26 | |
| 338 | 27 | <a tal:replace="structure context/owner/fmt:link">ownername</a><br /> | ||
| 339 | 28 | |||
| 340 | 29 | </div> | ||
| 341 | 30 | </div> | ||
| 363 | 31 | </div> | 27 | </div> |
| 364 | 32 | 28 | ||
| 365 | === modified file 'lib/lp/bugs/templates/bugtracker-portlet-projects.pt' | |||
| 366 | --- lib/lp/bugs/templates/bugtracker-portlet-projects.pt 2009-07-17 17:59:07 +0000 | |||
| 367 | +++ lib/lp/bugs/templates/bugtracker-portlet-projects.pt 2009-08-28 13:51:06 +0000 | |||
| 368 | @@ -6,21 +6,18 @@ | |||
| 369 | 6 | 6 | ||
| 370 | 7 | <h2>Related projects</h2> | 7 | <h2>Related projects</h2> |
| 371 | 8 | 8 | ||
| 388 | 9 | <div class="portletBody portletContent"> | 9 | <p> |
| 389 | 10 | 10 | You can link a registered bug tracker with a <a | |
| 390 | 11 | You can link a registered bug tracker with a | 11 | href="/projects/">registered project</a> in Launchpad: |
| 391 | 12 | <a href="/projects/">registered project</a> in Launchpad: | 12 | </p> |
| 392 | 13 | 13 | ||
| 393 | 14 | <ul tal:define="related_projects view/related_projects"> | 14 | <ul tal:define="related_projects view/related_projects"> |
| 394 | 15 | <li tal:repeat="project related_projects" | 15 | <li tal:repeat="project related_projects"> |
| 395 | 16 | class="info"> | 16 | <a tal:replace="structure project/fmt:link" /> |
| 396 | 17 | <a tal:attributes="href project/fmt:url" | 17 | </li> |
| 397 | 18 | tal:content="project/title">The Mozilla Project</a> | 18 | <li tal:condition="not: related_projects"> |
| 398 | 19 | </li> | 19 | <i>There are no projects linked to this bug tracker.</i> |
| 399 | 20 | <li tal:condition="not: related_projects"> | 20 | </li> |
| 400 | 21 | <i>There are no projects linked to this bug tracker.</i> | 21 | </ul> |
| 385 | 22 | </li> | ||
| 386 | 23 | </ul> | ||
| 387 | 24 | </div> | ||
| 401 | 25 | 22 | ||
| 402 | 26 | </div> | 23 | </div> |
| 403 | 27 | 24 | ||
| 404 | === modified file 'lib/lp/bugs/templates/remotebug-index.pt' | |||
| 405 | --- lib/lp/bugs/templates/remotebug-index.pt 2009-07-17 17:59:07 +0000 | |||
| 406 | +++ lib/lp/bugs/templates/remotebug-index.pt 2009-08-28 15:43:29 +0000 | |||
| 407 | @@ -1,57 +1,51 @@ | |||
| 409 | 1 | <html | 1 | <bug-tracker-remote-bug-index |
| 410 | 2 | xmlns="http://www.w3.org/1999/xhtml" | 2 | xmlns="http://www.w3.org/1999/xhtml" |
| 411 | 3 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 3 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
| 412 | 4 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 4 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
| 413 | 5 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 5 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
| 426 | 6 | xml:lang="en" | 6 | metal:use-macro="view/macro:page/main_side" |
| 427 | 7 | lang="en" | 7 | i18n:domain="launchpad"> |
| 428 | 8 | dir="ltr" | 8 | |
| 429 | 9 | metal:use-macro="context/@@main_template/master" | 9 | <metal:heading fill-slot="heading"> |
| 430 | 10 | i18n:domain="launchpad" | 10 | <h1 tal:content="context/title" /> |
| 431 | 11 | > | 11 | </metal:heading> |
| 432 | 12 | <body> | 12 | |
| 433 | 13 | <metal:heading fill-slot="pageheading"> | 13 | <metal:leftportlets fill-slot="side"> |
| 422 | 14 | <h1 tal:content="context/title">Bug #123 in bugzilla.gnome.org</h1> | ||
| 423 | 15 | </metal:heading> | ||
| 424 | 16 | |||
| 425 | 17 | <metal:leftportlets fill-slot="portlets_one"> | ||
| 434 | 18 | <div tal:replace="structure context/bugtracker/@@+portlet-details" /> | 14 | <div tal:replace="structure context/bugtracker/@@+portlet-details" /> |
| 474 | 19 | </metal:leftportlets> | 15 | </metal:leftportlets> |
| 475 | 20 | 16 | ||
| 476 | 21 | <div metal:fill-slot="main"> | 17 | <div metal:fill-slot="main"> |
| 477 | 22 | 18 | <div class="top-portlet"> | |
| 478 | 23 | <p>These bugs in Launchpad are watching | 19 | <h2>Is watched by...</h2> |
| 479 | 24 | bug #<span tal:replace="context/remotebug">1234</span> | 20 | <p> |
| 480 | 25 | in <span tal:replace="context/bugtracker/title">some bugtracker</span>. | 21 | The following bugs in Launchpad are watching bug #<span |
| 481 | 26 | You can make other Launchpad bugs watch this remote bug using the | 22 | tal:replace="context/remotebug">1234</span> in <span |
| 482 | 27 | "Link to other bugtracker" link.</p> | 23 | tal:replace="context/bugtracker/title">some bugtracker</span>. |
| 483 | 28 | 24 | You can make other Launchpad bugs watch this remote bug by | |
| 484 | 29 | <table class="listing" id="watchedbugs"> | 25 | using “Also affects project” or “Also |
| 485 | 30 | <thead> | 26 | affects distribution” on the bug page. |
| 486 | 31 | <tr> | 27 | </p> |
| 487 | 32 | <th>Bug</th> | 28 | <table class="listing" id="watchedbugs"> |
| 488 | 33 | </tr> | 29 | <thead> |
| 489 | 34 | </thead> | 30 | <tr> |
| 490 | 35 | <tbody> | 31 | <th>Bug</th> |
| 491 | 36 | <tr tal:repeat="bug context/bugs"> | 32 | </tr> |
| 492 | 37 | <td> | 33 | </thead> |
| 493 | 38 | <img alt="" src="/@@/bug" /> | 34 | <tbody> |
| 494 | 39 | <a href="#" tal:attributes="href bug/fmt:url" | 35 | <tal:bugs tal:repeat="bug context/bugs"> |
| 495 | 40 | ><span tal:replace="string:#${bug/id}: ${bug/title}" | 36 | <tr tal:define="visible bug/required:launchpad.View"> |
| 496 | 41 | tal:condition="bug/required:launchpad.View"> | 37 | <td tal:condition="visible"> |
| 497 | 42 | #42: Bug Title | 38 | <a class="sprite bug" |
| 498 | 43 | </span | 39 | tal:attributes="href bug/fmt:url" |
| 499 | 44 | ><span tal:replace="string:#${bug/id}: Private Bug" | 40 | tal:content="string:#${bug/id}: ${bug/title}" /> |
| 500 | 45 | tal:condition="not:bug/required:launchpad.View"> | 41 | </td> |
| 501 | 46 | #42: Private Bug | 42 | <td tal:condition="not:visible" |
| 502 | 47 | </span></a> | 43 | tal:content="string:#${bug/id}: Private bug" /> |
| 503 | 48 | </td> | 44 | </tr> |
| 504 | 49 | </tr> | 45 | </tal:bugs> |
| 505 | 50 | </tbody> | 46 | </tbody> |
| 506 | 51 | </table> | 47 | </table> |
| 507 | 52 | 48 | </div> | |
| 508 | 53 | </div> | 49 | </div> |
| 509 | 54 | 50 | ||
| 510 | 55 | </body> | 51 | </bug-tracker-remote-bug-index> |
| 472 | 56 | </html> | ||
| 473 | 57 | |||
This branch converts the bug tracker edit page, the bug tracker
details and projects portlets, and the remote bug index pages to the
3.0 layout. It also makes some small adjustments to the bug tracker
index page.
*** The parent of this branch is:
*** lp:~allenap/launchpad/ui-convert-bug-tracker-3.0-bug-418155
./bin/test -vvt bug-?tracker
lib/canonical/
Change the print_table() doctest helper function to only print rows
if cells are found. I've checked that this does not affect
print_table()'s use in other tests.
lib/lp/
Add a cancel link to the bug tracker edit view.
lib/lp/
This test was printing whole pages and relying on ellipsis matching,
so I've changed parts to use print_location(), print_table() and
print_
lib/lp/
Show the presence of the cancel link from above, change the expected
wording from the projects portlet, and change the expected
capitalization from the details portlet. An addition section has
been added to demonstrate how the contact details are not rendered
at all if there are none recorded.
lib/lp/
Conversion to main_side layout. I changed a <ul> to an <ol> because
<ul>s have been castrated in the new style sheet. I imagine I'll
have a UI review discussion about this :)
lib/lp/
Changed the layout here a bit, to better work with the new
breadcrumbs. The <h1> on the page is now simply the bug tracker
title, and the summary is now introduced with an <h2>.
lib/lp/
Convert this to use a <dl> instead of <b> and <br> tags (arg!). The
contact details now only appear if there are some.
lib/lp/
Convert this portlet to have the intro text within a <p> and the
list of projects within a <ul>.
lib/lp/
Convert to main_side layout. I've also changed the text on the page
to, ya know, make sense :)
I think this page is almost unused. It is not linked to from any
page in Launchpad as far as I'm aware, and is really just a URL hack
for use by external bug trackers linking back to Launchpad. Also,
this page is only rendered if there are 2 or more Launchpad bugs
watching the remote bug. In other words, for UI review especially,
please don't agonize over appearance here.
Having said that, I had a very quick go at adding a breadcrumb for
this page. However, no breadcrumb was rendered and I couldn't fathom
why. See <http://
keen; maybe you can spot something I missed.