--- cdli/zpt/uploadCheck.zpt	2006/02/02 19:19:24	1.3
+++ cdli/zpt/uploadCheck.zpt	2006/02/13 20:35:35	1.4
@@ -1,19 +1,41 @@
 <html metal:use-macro="here/main_template/macros/page">
 <tal:block metal:fill-slot="body">
+<form action="uploadATFfinally">
 <h2>Please check</h2>
-<div tal:condition="not:python:options['basketNameFromFile']==options['basketNameFromId']">
+
+<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:(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>Basket says <span tal:replace="python:options['basketNameFromId']"/> files.</p>
-<p>File says <span tal:replace="python:options['basketNameFromFile']"/> files.</p>
+<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">
 <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="basketId" tal:attributes="value options/basketId">
+
+
 <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>
