--- basket/zpt/BasketMain_manage_template_standard.zpt	2006/04/05 17:09:14	1.8
+++ basket/zpt/BasketMain_manage_template_standard.zpt	2006/04/06 16:49:14	1.10
@@ -9,7 +9,7 @@ td.vario { background-color:#AC1D15 }
 
 <!-- span = bodytext -->
 <span metal:fill-slot="body" tal:omit-tag="">
-<tal:block tal:define="authorized python:here.isAuthorized()">
+<tal:block tal:define="authorized python:here.checkPermission('edit')">
 
 <!-- user is logged in -->
 <tal:block tal:condition="authorized"
@@ -18,7 +18,8 @@ td.vario { background-color:#AC1D15 }
 	<!--  -->
 	<tal:block tal:condition="python:here.checkPermission('edit') or here.checkPermission('admin')">
 	
-	<h2 class="setTitle" tal:content="here/title"/>
+	<h2 class="setTitle"><span tal:replace="here/title" /> <a class="editLink" tal:attributes="href python: '../' + here.id">| return to set</a></h2>
+
 	<i tal:condition="python: 
 		currentBasket and (here.title == currentBasket.title)">- This is the active set -</i>
 	<h4>Edit the set description:</h4>
@@ -74,6 +75,7 @@ td.vario { background-color:#AC1D15 }
 	<h4>Edit Contents:</h4><br>
 	
 	<form action="changeBasketComments" name="changeSetContents">
+	<input type="hidden" name="actualId" value="empty">
 	<div class="seperator"> </div>
 	<div class="item" tal:repeat="item items">
 	<br><a tal:attributes="name item/id" />
@@ -100,20 +102,21 @@ td.vario { background-color:#AC1D15 }
 	 <textarea class="setItemComment" rows="3" 
 	 	tal:attributes="name python:item.getId()+'_comment'" 
 	 	tal:content="structure item/comment"></textarea>	
-	<div> <!-- change position / delete -->
+	<div> <!-- move / update file / save / delete -->
 		<div style="float:right">
-			<script type="text/javascript">
-			<!--
-				document.write('<a class="editLink"' +
-					'onClick="forms.changeSetContents.submit();">save<' + '/a> - ');
-			// -->
-			</script>
+			<a class="editLink" 
+				tal:condition="python:item.meta_type=='BasketFile'" 
+				tal:attributes="href python:item.absolute_url()+'/upDateFile'">update file</a>
+			<span tal:condition="python:item.meta_type=='BasketFile'" tal:replace="python:' - '" />
+			<tal:x tal:replace="structure python:here.saveButton(item.id)"/>
+			
 			<noscript>
 				<input type="submit" value="change" align="right">
 			</noscript>
 			<a tal:attributes="class python:'editLink'; 
 				href python:'deleteObject?id=%s'%item.getId()"
-				onclick="return window.confirm('Do you really want to remove this item?\nThis is not undoable.')" >delete</a>
+				onclick="return window.confirm(
+					'Do you really want to remove this item?\nThis is not undoable.')" >delete</a>
 		</div>
 		move item: <a tal:attributes="class python:'editLink'; 
 			href python:'moveTop?id=%s'%item.getId()">top</a>
@@ -124,31 +127,16 @@ td.vario { background-color:#AC1D15 }
 	 	<a tal:attributes="class python:'editLink'; 
 	 		href python:'moveBottom?id=%s'%item.getId()">bottom</a>
 
-	<br>
+	
+	</div><br>
 	<div class="seperator"> </div>
 </div>
+</form>
+<br>
 <a tal:attributes="href python: '../' + here.id">return to set</a>
 
-
-	 <div tal:condition="python:item.meta_type=='BasketFile'">
-	 <a tal:attributes="href python:item.absolute_url()+'/upDateFile'">update file</a>
-	 </div>
-	 <div tal:replace="structure item/content_html"/>
-	 <div tal:condition="python:getattr(item,'link',None) is not None">
-	 	Link (url):<input type="text" size="40" tal:attributes="name python:item.getId()+'_link';
-	 											   value python:getattr(item,'link',None)"><br>
- 	    Linktext:<input type="text" size="40" tal:attributes="name python:item.getId()+'_linkText';
-	 											   value python:getattr(item,'linkText',None)"><br>
-	 											   
-	 </div>
-	 
-	 <div><textarea cols="50" rows="5" tal:attributes="name python:item.getId()+'_comment'" tal:content="structure item/comment"></textarea>	
-	 </div>
-	<input type="submit" value="change">
-</div>
-
-	</tal:block>
-	</tal:block>
+</tal:block>
+</tal:block>
 
 
 <!-- user is not logged in -->