--- cdli/zpt/uploadCheck.zpt	2005/11/28 12:31:56	1.1
+++ cdli/zpt/uploadCheck.zpt	2006/02/02 19:19:24	1.3
@@ -1,17 +1,27 @@
 <html metal:use-macro="here/main_template/macros/page">
 <tal:block metal:fill-slot="body">
 <h2>Please check</h2>
+<div tal:condition="not:python:options['basketNameFromFile']==options['basketNameFromId']">
+<h3>Basket names in file and selected basket not equal!</h3>
+<p>Basket says <span tal:replace="python:options['basketNameFromId']"/> files.</p>
+<p>File says <span tal:replace="python:options['basketNameFromFile']"/> files.</p>
 
+</div>
 
 <div tal:condition="python:len(options['errors'])>0">
 <h3><a id="changed">There were Errors!</a></h3>
-<p>Some files not be uploaded (see below)!</p>
+<p>Some files will not be uploaded (see below)!</p>
 </div>
 <form action="uploadATFfinally">
+<input type="hidden" name="basketId" tal:attributes="value options/basketId">
 <input type="hidden" name="dir" tal:attributes="value options/dir">
-<p><input name="procedure" type="radio" value="uploadchanged" checked>Upload only the changed files.</p>
+<p>Comment (will be added to all uploaded files)</p>
+<p><textarea name="comment" cols="60" rows="10"></textarea>
+<p><input name="procedure" type="radio" value="uploadchanged" checked>Upload only the changed and new files.</p>
 <p><input name="procedure" type="radio" value="uploadAll">Upload all files.</p>
 <p><input name="procedure" type="radio" value="noupload">Dont't do anything.</p>
+<h3>Unlock?</h3>
+<p><input name="unlock" type="checkbox" checked> unlock the files.</p>
 <p><input type="submit" value="do it!"></p>
 </form>
 <div tal:condition="python:len(options['errors'])>0">
@@ -30,6 +40,11 @@
 </table>
 </div>
 
+
+<h3>Number Of Files</h3>
+<p>Basket contains <span tal:replace="python:options['basketLen']"/> files.</p>
+<p>Upload file contains <span tal:replace="python:options['numberOfFiles']"/> files.</p>
+
 <h3><a id="changed">Changed files</a></h3>
 <p><span tal:replace="python:len(options['changed'])"/> Files changed.</p>
 
@@ -44,5 +59,9 @@
 </td>
 </tr>
 </table>	
+<tal:x condition="python:len(options['newPs'])>0">
+<h3><a id="new">New</a></h3>
+<p tal:repeat="newP python:options['newPs']" tal:content="newP"/>
+</tal:x>
 </tal:block>
 </html>
\ No newline at end of file
