--- cdli/zpt/uploadCheck.zpt	2006/02/13 20:35:35	1.4
+++ cdli/zpt/uploadCheck.zpt	2007/01/30 14:26:42	1.7
@@ -1,6 +1,6 @@
 <html metal:use-macro="here/main_template/macros/page">
 <tal:block metal:fill-slot="body">
-<form action="uploadATFfinally">
+<form name="form" action="uploadATFfinally">
 <h2>Please check</h2>
 
 <div tal:condition="python:(options['basketNameFromId']=='') and (not options['basketNameFromFile'])">
@@ -30,7 +30,7 @@
 <input name="basketname" type="hidden" tal:attributes="value python:options['basketNameFromId']">
 </div>
 
-<div tal:condition="python:len(options['errors'])>0">
+<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>
@@ -39,14 +39,15 @@
 <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>
@@ -54,15 +55,28 @@
 	<td>Title</td>
 	<td>Locked by:</td>
 </tr>
+<tr tal:repeat="error python:options['lockerrors']">
+<td tal:content="python:error"/>	
+<td><span tal:replace="python:error[1]"/>
+</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.getId()"/>	
-<td><span tal:replace="python:error.lockedBy"/>
+<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>
@@ -76,8 +90,8 @@
 	<td>Changed lines (approx.)</td>
 </tr>
 <tr tal:repeat="change python:options['changed']">
-<td tal:content="python:change[0].getId()"/>	
-<td><span tal:replace="python:change[1][0]"/>
+<td tal:content="python:change[0]"/>	
+<td><span tal:replace="python:change[1]"/>
 </td>
 </tr>
 </table>	
