--- basket/zpt/BasketMain_manage_template_standard.zpt	2006/04/05 16:54:59	1.7
+++ basket/zpt/BasketMain_manage_template_standard.zpt	2006/04/06 16:49:14	1.10
@@ -9,20 +9,17 @@ 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"
 	 tal:define="global currentBasket here/getCurrentBasket">
-
-	<!-- log in message -->
-	<div class="logout" style="float:right"><a href="users/?logout">log out</a></div>
-	<div class="userName">logged in as <span tal:content="here/getActualUserName"/></div>
 	
 	<!--  -->
 	<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>
@@ -53,7 +50,7 @@ td.vario { background-color:#AC1D15 }
 	<a href="addBasketFile">Add a file</a><br>
 
 	<p><i>To add any objects from inside the Virtual Laboratory to the active set, 
-	please locate their datasheet and click the 'addToSet' button.</i></p>
+	please locate their datasheet and click the 'addToSet' button: <img src="images/addToSet.gif" width=16 height=16 align="middle">.</i></p>
 	<p><i><span tal:condition="not:currentBasket">Please note: there is no active set at this moment!</span><span tal:condition="python: currentBasket and here.title != currentBasket.title">Please note: This set is not the active set at this moment, objects will go to the set <b tal:content="currentBasket/title"/>!</span></i></p>
 	<p tal:condition="not: python: 
 		currentBasket and here.title == currentBasket.title">
@@ -77,12 +74,51 @@ td.vario { background-color:#AC1D15 }
 		tal:condition="items">
 	<h4>Edit Contents:</h4><br>
 	
-	<form action="changeBasketComments">
+	<form action="changeBasketComments" name="changeSetContents">
+	<input type="hidden" name="actualId" value="empty">
+	<div class="seperator"> </div>
 	<div class="item" tal:repeat="item items">
-	<div> <!-- change position / delete -->
-		<a style="float:right" tal:attributes="class python:'editLink'; 
-			href python:'deleteObject?id=%s'%item.getId()">delete</a>
-		<a tal:attributes="class python:'editLink'; 
+	<br><a tal:attributes="name item/id" />
+	<div tal:condition="item/content_html" tal:content="structure item/content_html"
+			class="setItem" />
+	<table tal:condition="python:getattr(item, 'link', None) is not None"
+		cellspacing=0 cellpadding=0 width="100%" border=0 style="margin-top:5px;">
+	<tr>
+		<td width="1%">URL:&nbsp;</td>
+		<td><input type="text" style="width:100%"
+			tal:attributes="
+				name python:item.getId()+'_link';
+	 			value python:getattr(item,'link',None)"></td>
+	</tr>
+	<tr>
+		<td>Linktext:&nbsp;</td>
+		<td><input type="text" style="width:100%"
+			tal:attributes="
+				name python:item.getId()+'_linkText';
+	 			value python:getattr(item,'linkText',None)"></td>
+	</tr>	 											   
+	</table>
+	 
+	 <textarea class="setItemComment" rows="3" 
+	 	tal:attributes="name python:item.getId()+'_comment'" 
+	 	tal:content="structure item/comment"></textarea>	
+	<div> <!-- move / update file / save / delete -->
+		<div style="float:right">
+			<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>
+		</div>
+		move item: <a tal:attributes="class python:'editLink'; 
 			href python:'moveTop?id=%s'%item.getId()">top</a>
 	 	<a tal:attributes="class python:'editLink'; 
 	 		href python:'moveUp?id=%s'%item.getId()">up</a>
@@ -90,25 +126,17 @@ td.vario { background-color:#AC1D15 }
 	 		href python:'moveDown?id=%s'%item.getId()">down</a>
 	 	<a tal:attributes="class python:'editLink'; 
 	 		href python:'moveBottom?id=%s'%item.getId()">bottom</a>
-	 </div>
-	 <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>
+
+	
+	</div><br>
+	<div class="seperator"> </div>
+</div>
+</form>
+<br>
+<a tal:attributes="href python: '../' + here.id">return to set</a>
+
+</tal:block>
+</tal:block>
 
 
 <!-- user is not logged in -->