--- basket/zpt/BasketMain_manage_template_standard.zpt	2006/04/06 16:49:14	1.10
+++ basket/zpt/BasketMain_manage_template_standard.zpt	2007/08/15 15:49:03	1.14
@@ -18,7 +18,7 @@ td.vario { background-color:#AC1D15 }
 	<!--  -->
 	<tal:block tal:condition="python:here.checkPermission('edit') or here.checkPermission('admin')">
 	
-	<h2 class="setTitle"><span tal:replace="here/title" /> <a class="editLink" tal:attributes="href python: '../' + here.id">| return to set</a></h2>
+	<h2 class="setTitle"><span tal:replace="here/getTitle" /> <a class="editLink" tal:attributes="href python: '../' + here.id">|&nbsp;return to set</a></h2>
 
 	<i tal:condition="python: 
 		currentBasket and (here.title == currentBasket.title)">- This is the active set -</i>
@@ -28,41 +28,59 @@ td.vario { background-color:#AC1D15 }
 		<input type="hidden" name="target" value="manageBasket">
 		Title:<br>
 		<input class="setTitle" type="text" name="title" 
-			tal:attributes="value here/title"><br>
+			tal:attributes="value here/getTitle"><br>
 		Short Description:<br>
 		<textarea class="setDescription" name="shortDescription" rows="2" 
-			tal:content="here/shortDescription">Short description</textarea><br>
+			tal:content="here/getShortDescription">Short description</textarea><br>
 		Comment:<br>
 		<textarea class="setComment" name="comment" rows="7" 
-			tal:content="here/comment">A longer comment / introduction</textarea><br><br>
+			tal:content="here/getComment">A longer comment / introduction</textarea><br><br>
 			
 		<input type="submit" value="save">
 	</form>
 	<hr>
-	
-	<a href="manageUserRights_html">Manage the access rights for this set.</a><br>
+	<i tal:content="structure python: 
+		' - the access status of this set is: <b>' + here.publicationStatus + '</b> - '"/><br>
+	<a tal:condition="python:
+		here.checkPermission('admin')" 
+		href="manageUserRights_html">Manage the access rights for this set.</a>
+	<i tal:condition="not: python: here.checkPermission('admin')">
+		You don't have the permission to change the access rights for this set.</i><br>
 	<hr>
 
 	<h4>Add a new element to the end of this set</h4><br>
-	<!-- Change active basket -->
 	<a href="addBasketText">Add a new textelement</a><br>
 	<a href="addBasketExternalLink">Add a new hyperlink</a><br>
 	<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: <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>
+		please locate them and click the 'add to set' link on the bottom of the datasheet 
+		or the 	'addToSet' button <img src="images/addToSet.gif" width=16 height=16 align="middle"> 
+		in lists respectivly</i></p>
+		
+	<!-- Change active basket -->
+	<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/getTitle"/>!</span>
+		</i></p>
+		
 	<p tal:condition="not: python: 
 		currentBasket and here.title == currentBasket.title">
-	<a tal:condition="python: 
-		currentBasket and here.title != currentBasket.title" 
-		class="editLink"
-		href="selectThisBasketAsCurrent">Select this set as the active set.</a>
-
-	<a tal:condition="
-		not: currentBasket"
-		class="editLink"
-		href="selectThisBasketAsCurrent">Make this set the active set.</a>
+	<a class="editLink"
+		tal:condition="python: 
+			currentBasket and here.title != currentBasket.title" 
+		tal:attributes="
+			href python: 'selectThisBasketAsCurrent?target=/users/setFolder/' + 
+				here.id + '/manageBasket'">Select this set as the active set.</a>
+	<a class="editLink"
+		tal:condition="
+			not: currentBasket"
+		tal:attributes="
+			href python: 'selectThisBasketAsCurrent?target=/users/setFolder/' + 
+				here.id + '/manageBasket'">Make this set the active set.</a>
 	</p>
 
 	<hr>
@@ -88,20 +106,20 @@ td.vario { background-color:#AC1D15 }
 		<td><input type="text" style="width:100%"
 			tal:attributes="
 				name python:item.getId()+'_link';
-	 			value python:getattr(item,'link',None)"></td>
+	 			value python:getattr(item,'link', 'http://')"></td>
 	</tr>
 	<tr>
-		<td>Linktext:&nbsp;</td>
+		<td>Link&nbsp;title:&nbsp;</td>
 		<td><input type="text" style="width:100%"
 			tal:attributes="
 				name python:item.getId()+'_linkText';
-	 			value python:getattr(item,'linkText',None)"></td>
+	 			value python:getattr(item,'linkText', 'Untitled Link')"></td>
 	</tr>	 											   
 	</table>
 	 
 	 <textarea class="setItemComment" rows="3" 
 	 	tal:attributes="name python:item.getId()+'_comment'" 
-	 	tal:content="structure item/comment"></textarea>	
+	 	tal:content="structure item/getComment"></textarea>	
 	<div> <!-- move / update file / save / delete -->
 		<div style="float:right">
 			<a class="editLink"