|
5579.2.1
by Tim Penhey
Some queue management |
1 |
<html
|
2 |
xmlns="http://www.w3.org/1999/xhtml" |
|
3 |
xmlns:tal="http://xml.zope.org/namespaces/tal" |
|
4 |
xmlns:metal="http://xml.zope.org/namespaces/metal" |
|
5 |
xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
|
|
9209.1.9
by Tim Penhey
Move the currently unused merge queue page to 3.0. |
6 |
metal:use-macro="view/macro:page/main_only" |
7 |
i18n:domain="launchpad"> |
|
|
5579.2.1
by Tim Penhey
Some queue management |
8 |
|
9 |
<body>
|
|
10 |
||
|
9209.1.9
by Tim Penhey
Move the currently unused merge queue page to 3.0. |
11 |
<h1 metal:fill-slot="heading">Branch merge queue</h1> |
12 |
||
13 |
<div metal:fill-slot="main" id="merge-queue"> |
|
|
5579.2.9
by Tim Penhey
Added pagetest. |
14 |
|
|
5579.2.1
by Tim Penhey
Some queue management |
15 |
<table tal:condition="view/merge_queue" class="listing"> |
16 |
<thead>
|
|
17 |
<tr>
|
|
18 |
<th>Position</th> |
|
19 |
<th>Branch details</th> |
|
|
5579.2.2
by Tim Penhey
Show commit message separately. |
20 |
<th>Commit message</th> |
|
5579.2.1
by Tim Penhey
Some queue management |
21 |
</tr>
|
22 |
</thead>
|
|
23 |
<tbody>
|
|
|
5579.2.11
by Tim Penhey
Updates following review. |
24 |
<tr tal:repeat="proposal view/merge_queue"> |
|
5579.2.1
by Tim Penhey
Some queue management |
25 |
<td>
|
|
5579.2.11
by Tim Penhey
Updates following review. |
26 |
<tal:position replace="repeat/proposal/number"/> |
27 |
<tal:dequeue condition="proposal/required:launchpad.Edit|nothing"> |
|
28 |
<tal:button replace="structure proposal/@@+dequeue-inline"/> |
|
|
5579.2.4
by Tim Penhey
UI works now. |
29 |
</tal:dequeue>
|
|
5579.2.11
by Tim Penhey
Updates following review. |
30 |
<tal:show-button condition="not: repeat/proposal/start"> |
31 |
<tal:jump-queue condition="context/required:launchpad.Edit|nothing"> |
|
32 |
<tal:button replace="structure proposal/@@+jump-queue"/> |
|
|
5579.2.4
by Tim Penhey
UI works now. |
33 |
</tal:jump-queue>
|
34 |
</tal:show-button>
|
|
|
5579.2.1
by Tim Penhey
Some queue management |
35 |
</td>
|
36 |
<td>
|
|
|
5579.2.11
by Tim Penhey
Updates following review. |
37 |
<tal:proposal condition="proposal" |
38 |
define="mergeproposal proposal; |
|
39 |
branch proposal/source_branch;
|
|
|
5579.2.1
by Tim Penhey
Some queue management |
40 |
show_associations python:True;
|
41 |
"> |
|
42 |
<metal:landing-target use-macro="context/@@+macros/merge-proposal"/> |
|
43 |
</tal:proposal>
|
|
|
5579.2.11
by Tim Penhey
Updates following review. |
44 |
<tal:cant-see-proposal condition="not: proposal"> |
45 |
A merge either involving a branch you are not authorised to see. |
|
|
5579.2.1
by Tim Penhey
Some queue management |
46 |
</tal:cant-see-proposal>
|
47 |
</td>
|
|
|
5579.2.2
by Tim Penhey
Show commit message separately. |
48 |
<td class="commit_message"> |
|
5579.2.11
by Tim Penhey
Updates following review. |
49 |
<tal:commit-message condition="proposal" |
50 |
content="structure proposal/commit_message/fmt:text-to-html"> |
|
|
5579.2.2
by Tim Penhey
Show commit message separately. |
51 |
The commit message. |
52 |
</tal:commit-message>
|
|
53 |
</td>
|
|
|
5579.2.1
by Tim Penhey
Some queue management |
54 |
</tr>
|
55 |
</tbody>
|
|
56 |
</table>
|
|
57 |
||
58 |
<p tal:condition="not: view/merge_queue"> |
|
59 |
The queue is empty. |
|
60 |
</p>
|
|
61 |
||
|
5579.2.9
by Tim Penhey
Added pagetest. |
62 |
</div>
|
|
5579.2.1
by Tim Penhey
Some queue management |
63 |
|
64 |
</body>
|
|
65 |
</html>
|