--- cdli/zpt/uploadCheck.zpt	2005/12/08 17:11:31	1.2
+++ cdli/zpt/uploadCheck.zpt	2006/10/04 07:18:23	1.6
@@ -1,24 +1,53 @@
 <html metal:use-macro="here/main_template/macros/page">
 <tal:block metal:fill-slot="body">
+<form name="form" action="uploadATFfinally">
 <h2>Please check</h2>
 
+<div tal:condition="python:(options['basketNameFromId']=='') and (not options['basketNameFromFile'])">
+<h3>No basket name!</h3>
+<p>There is no basket name in the file and you don't have selected an active basket, yet.</p>
+<p>You can store the file into a new basket. If you want to use an existing name please
+<a href="changeBasket">select an existing baske and upload again.</a></p>
+<p>Name of the new: <input name="basketname" size="80"></p>
+</div>
 
-<div tal:condition="python:len(options['errors'])>0">
+<div tal:condition="python:(options['basketNameFromId']=='') and (options['basketNameFromFile'])">
+<h3>File will be uploaded into the basket: <span tal:replace="python:options['basketNameFromFile']"/></h3>
+<input name="basketname" type="hidden" tal:attributes="value python:options['basketNameFromFile']">
+</div>
+
+<div tal:condition="python:(not options['basketNameFromFile']==options['basketNameFromId']) and (not options['basketNameFromId']=='')">
+<h3>Basket names in file and selected basket not equal!</h3>
+<p>Select which basket should be used.</p>
+<p><input name="basketname" type="checkbox" checked tal:attributes="value python:options['basketNameFromId']">
+<span tal:replace="python:options['basketNameFromId']"/>(active basket).</p>
+<p><input name="basketname" type="checkbox" tal:attributes="value python:options['basketNameFromFile']">
+<span tal:replace="python:options['basketNameFromFile']"/>(basket name stored in the file).</p>
+</div>
+
+<div tal:condition="python:(options['basketNameFromFile']==options['basketNameFromId']) and (not options['basketNameFromId']=='')">
+<h3>File will be uploaded into the basket: <span tal:replace="python:options['basketNameFromId']"/></h3>
+<input name="basketname" type="hidden" tal:attributes="value python:options['basketNameFromId']">
+</div>
+
+<div tal:condition="python:(len(options['errors'])>0) or (len(options['lockerrors'])>0)">
 <h3><a id="changed">There were Errors!</a></h3>
 <p>Some files will not be uploaded (see below)!</p>
 </div>
-<form action="uploadATFfinally">
+
+
 <input type="hidden" name="dir" tal:attributes="value options/dir">
 <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>
+<p><button name="procedureButton1" type="button" value="uploadchanged" onclick="forms.form.procedure.value='uploadchanged'; forms.form.submit()">Upload only the changed and new files.</button></p>
+<input type="hidden" name="procedure" value="">
+<!--<p><input id="procedure" name="procedure" type="radio" value="uploadAll">Upload all files.</p>-->
+<p><button name="procedureButton2" type="button" value="noupload" onclick="forms.form.procedure.value='noupload'; forms.form.submit()">Don't do anything.</button></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">
+<div tal:condition="python:len(options['lockerrors'])>0">
 <h3>Errors:</h3>
 <p>Files locked by somebody else, these files cannot be uploaded!</p>
 <table>
@@ -26,13 +55,31 @@
 	<td>Title</td>
 	<td>Locked by:</td>
 </tr>
-<tr tal:repeat="error python:options['errors']">
+<tr tal:repeat="error python:options['lockerrors']">
 <td tal:content="python:error.getId()"/>	
 <td><span tal:replace="python:error.lockedBy"/>
 </td>
 </tr>
 </table>
 </div>
+<div tal:condition="python:len(options['errors'])>0">
+<h3>Errors:</h3>
+<table>
+<tr>
+	<td>Title</td>
+	<td>Error:</td>
+</tr>
+<tr tal:repeat="error python:options['errors']">
+<td tal:content="python:error[0]"/>	
+<td><span tal:replace="python:error[1]"/>
+</td>
+</tr>
+</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>
