--- cdli/zpt/uploadCheck.zpt	2006/05/05 08:13:36	1.5
+++ cdli/zpt/uploadCheck.zpt	2007/01/30 14:26:42	1.7
@@ -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>
@@ -47,7 +47,7 @@
 <p><input name="unlock" type="checkbox" checked> unlock the files.</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>
@@ -55,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>
@@ -77,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>