Mercurial > hg > MPIWGWeb

annotate zpt/updatePersonalwww_check.zpt @ 248:a14e462fca1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add license-page link to page footer.
author casties
date Tue, 18 Mar 2014 10:18:35 +0100
parents 3b517b412f77
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
bca61e893fcc first checkin of MPIWGWeb r2 branch from CVS into mercurial
casties
parents:
diff changeset
1 <html tal:define="news here/REQUEST/SESSION/personal_www/news;
bca61e893fcc first checkin of MPIWGWeb r2 branch from CVS into mercurial
casties
parents:
diff changeset
2 conflicts here/REQUEST/SESSION/personal_www/conflicts;
bca61e893fcc first checkin of MPIWGWeb r2 branch from CVS into mercurial
casties
parents:
diff changeset
3 resultSet here/REQUEST/SESSION/personal_www/resultSet;"
bca61e893fcc first checkin of MPIWGWeb r2 branch from CVS into mercurial
casties
parents:
diff changeset
4 >
bca61e893fcc first checkin of MPIWGWeb r2 branch from CVS into mercurial
casties
parents:
diff changeset
5 <body>
bca61e893fcc first checkin of MPIWGWeb r2 branch from CVS into mercurial
casties
parents:
diff changeset
6 <h1>Check upload</h1>
bca61e893fcc first checkin of MPIWGWeb r2 branch from CVS into mercurial
casties
parents:
diff changeset
7 <form method="post" action="updatePersonalwww_doIt">
216
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
8 <tal:block tal:condition="news">
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
9 <h2>New</h2>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
10 <table>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
11 <tr tal:repeat="new news">
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
12 <td><span tal:replace="python:resultSet[new]['first_name']">first</span>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
13 <span tal:replace="python:resultSet[new]['last_name']">last</span>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
14 </td>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
15 <td>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
16 <input type="checkbox" tal:attributes="name python:new.encode('utf-8')" checked="True" value="new"/>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
17 </td>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
18 </tr>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
19 </table>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
20 </tal:block>
0
bca61e893fcc first checkin of MPIWGWeb r2 branch from CVS into mercurial
casties
parents:
diff changeset
21
216
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
22 <tal:block tal:condition="conflicts">
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
23 <h2>Conflicts</h2>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
24 <table border="1">
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
25 <tr tal:repeat="conflict python:conflicts.keys()">
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
26 <td valign="top"><span tal:replace="python:resultSet[conflict]['first_name']">first</span>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
27 <span tal:replace="python:resultSet[conflict]['last_name']">last</span>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
28 </td>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
29 <td>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
30 <tal:x repeat="cf python:conflicts[conflict]">
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
31 <table border="1">
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
32 <tr>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
33 <td bgcolor="green" colspan="3"><span tal:replace="python:cf[0]">feld</span></td>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
34 </tr>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
35 <tr>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
36 <td valign="top"><input type="radio" tal:attributes="name python:conflict+'_'+cf[0]" value="stored" grant all privilege checked="True"></td>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
37 <td valign="top">stored:</td>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
38 <td><span tal:replace="python:cf[1]">stored value</span></td>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
39 </tr>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
40 <tr>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
41 <td valign="top"><input type="radio" tal:attributes="name python:conflict+'_'+cf[0]" value="xml" ></td>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
42 <td valign="top">xml-file:</td>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
43 <td><span tal:replace="python:cf[2]">value from xml-file</span></td>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
44 </tr>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
45 <!-- <tr>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
46 <td valign="top"><input type="radio" tal:attributes="name python:conflict+'_'+cf[0]" value="reject"></td>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
47 <td valign="top">reject</td>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
48 <td>&nbsp;</td>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
49 </tr>-->
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
50 </table>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
51 </tal:x>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
52 </td>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
53 </tr>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
54 </table>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
55 </tal:block>
3b517b412f77 fixed problem updating users with new IDs
casties
parents: 186
diff changeset
56 <p><span tal:content="python:len(resultSet)"/> total entries to change.</p>
0
bca61e893fcc first checkin of MPIWGWeb r2 branch from CVS into mercurial
casties
parents:
diff changeset
57 <input type="submit">
bca61e893fcc first checkin of MPIWGWeb r2 branch from CVS into mercurial
casties
parents:
diff changeset
58 </form>
bca61e893fcc first checkin of MPIWGWeb r2 branch from CVS into mercurial
casties
parents:
diff changeset
59 </body>
bca61e893fcc first checkin of MPIWGWeb r2 branch from CVS into mercurial
casties
parents:
diff changeset
60 </html>