Launchpad itself

Merge lp:~thumper/launchpad/code-import-new-view into lp:launchpad

  1. code-import-new-view
  2. Merge into devel
Proposed by Tim Penhey
Status: Merged
Approved by: Jonathan Lange
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~thumper/launchpad/code-import-new-view
Merge into: lp:launchpad
Diff against target: None lines
To merge this branch: bzr merge lp:~thumper/launchpad/code-import-new-view
Reviewer Review Type Date Requested Status
Jonathan Lange (community) Approve
Review via email: mp+12022@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :

Indent the respective import fields for the different import types.

All CSS.

Revision history for this message
Jonathan Lange (jml) wrote :

Fine by me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/code/templates/codeimport-new.pt'
2--- lib/lp/code/templates/codeimport-new.pt 2009-08-18 00:39:33 +0000
3+++ lib/lp/code/templates/codeimport-new.pt 2009-09-18 03:00:45 +0000
4@@ -8,6 +8,14 @@
5
6 <body>
7
8+<metal:block fill-slot="head_epilogue">
9+ <style type="text/css">
10+ .importdetails {
11+ margin: 0.5em 0 0.5em 4em;
12+ }
13+ </style>
14+</metal:block>
15+
16 <div metal:fill-slot="main">
17
18 <div metal:use-macro="context/@@launchpad_form/form">
19@@ -43,11 +51,13 @@
20 <input tal:replace="structure view/rcs_type_git" />
21 Git
22 </label>
23+ <table class="importdetails">
24+ <tal:widget define="widget nocall:view/widgets/git_repo_url">
25+ <metal:block use-macro="context/@@launchpad_form/widget_row" />
26+ </tal:widget>
27+ </table>
28 </td>
29 </tr>
30- <tal:widget define="widget nocall:view/widgets/git_repo_url">
31- <metal:block use-macro="context/@@launchpad_form/widget_row" />
32- </tal:widget>
33
34 <tr>
35 <td>
36@@ -55,27 +65,30 @@
37 <input tal:replace="structure view/rcs_type_svn" />
38 Subversion
39 </label>
40+ <table class="importdetails">
41+ <tal:widget define="widget nocall:view/widgets/svn_branch_url">
42+ <metal:block use-macro="context/@@launchpad_form/widget_row" />
43+ </tal:widget>
44+ </table>
45 </td>
46 </tr>
47
48- <tal:widget define="widget nocall:view/widgets/svn_branch_url">
49- <metal:block use-macro="context/@@launchpad_form/widget_row" />
50- </tal:widget>
51-
52 <tr>
53 <td>
54 <label>
55 <input tal:replace="structure view/rcs_type_cvs" />
56 CVS
57 </label>
58+ <table class="importdetails">
59+ <tal:widget define="widget nocall:view/widgets/cvs_root">
60+ <metal:block use-macro="context/@@launchpad_form/widget_row" />
61+ </tal:widget>
62+ <tal:widget define="widget nocall:view/widgets/cvs_module">
63+ <metal:block use-macro="context/@@launchpad_form/widget_row" />
64+ </tal:widget>
65+ </table>
66 </td>
67 </tr>
68- <tal:widget define="widget nocall:view/widgets/cvs_root">
69- <metal:block use-macro="context/@@launchpad_form/widget_row" />
70- </tal:widget>
71- <tal:widget define="widget nocall:view/widgets/cvs_module">
72- <metal:block use-macro="context/@@launchpad_form/widget_row" />
73- </tal:widget>
74
75 </table>
76 <input tal:replace="structure view/rcs_type_emptymarker" />