--- basket/zpt/BasketMain_template_standard.zpt	2006/04/03 17:46:43	1.4
+++ basket/zpt/BasketMain_template_standard.zpt	2006/04/05 14:16:26	1.5
@@ -20,8 +20,14 @@ td.vario { background-color:#AC1D15 }
 	<div class="userName">logged in as <span tal:content="here/getActualUserName"/></div>
 	
 	<!-- option box ?! -->
-	<div class="optionBox" tal:condition="python: here.checkPermission('edit')">		
-		<a class="editLink" href="selectThisBasketAsCurrent">Make this your active set.</a>
+	<div class="optionBox" 
+		tal:condition="python: here.checkPermission('edit')" 
+		tal:define="global currentBasket here/getCurrentBasket">		
+	<i tal:condition="python: 
+		currentBasket and (here.title == currentBasket.title)">This is the <br>active set</i>
+	<a class="editLink" tal:condition="not: python: 
+		currentBasket and (here.title == currentBasket.title)" 
+		href="selectThisBasketAsCurrent">Make this your active set.</a>
 	</div>
 
 	<h2 class="setTitle"><span tal:replace="here/title"/>
@@ -33,20 +39,15 @@ td.vario { background-color:#AC1D15 }
 		tal:content="structure here/shortDescription">shortDescription</div><br>
 	<div class="setComment" 
 		tal:content="structure here/comment">Comment</div>
-	<hr>
 	
+	<div style="height:2px;background-color:white;margin-bottom:3px;"> </div>
 	<tal:x tal:repeat="item here/getBasketObjects">
-	 <div tal:condition="item/linkToObject">
-	 	<a tal:attributes="href item/linkToObject">
-	 	<div tal:replace="structure item/content_html"/></a>
-	 </div>
-	 <div tal:condition="not:item/linkToObject">
-	 	<div tal:replace="structure item/content_html"/>
-	 </div>
-	 <br>
-	 <div tal:content="structure item/comment"/>
-	 <hr>
-    </tal:x>
+		<div tal:content="structure item/content_html"
+			style="background-color:#d7d7d7;margin-bottom:3px;"/>
+		<!--<div style="height:2px;background-color:#d7d7d7;margin-bottom:3px;"> </div-->
+		<div tal:content="structure item/comment"/>
+		<div style="height:2px;background-color:white;margin:5px 5px 10px 0px;"> </div>
+   </tal:x>
 	
 </tal:block>