--- basket/zpt/BasketMain_template_standard.zpt	2006/03/19 03:26:56	1.2
+++ basket/zpt/BasketMain_template_standard.zpt	2007/08/15 15:49:03	1.11
@@ -1,40 +1,55 @@
 <html metal:use-macro="here/main_template/macros/page">
 <head>
-<title>Default</title>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8">
+  <title>Default</title>
+  <style metal:fill-slot="additionalStyles" type="text/css">
+td.vario { background-color:#AC1D15 }
+  </style>
 </head>
 <body>
 
 <!-- span = bodytext -->
 <span metal:fill-slot="body" tal:omit-tag="">
-<tal:block tal:define="authorized python:here.isAuthorized()">
+<tal:block tal:define="authorized python:1 or here.checkPermission('authorized')">
 
 <!-- user is logged in -->
 <tal:block tal:condition="authorized">
 
-	<!-- log in message -->
-	<div class="logout" style="float:right"><a href="/users/login.html?logout">log out</a></div>
-	<div class="userName">logged in as <span tal:content="here/getActualUserName"/></div>
+	<!-- option box ?! -->
+	<div class="optionBox" 
+		tal:condition="python: here.checkPermission('edit')" 
+		tal:define="global currentBasket here/getCurrentBasket">		
+	<i tal:condition="python: 
+		currentBasket and (here.id == currentBasket.id)">This is the active set</i>
+	<a class="editLink" 
+		tal:condition="not: python: currentBasket and (here.id == currentBasket.id)" 
+		tal:attributes=" 
+			href python: 'selectThisBasketAsCurrent?target=/users/setFolder/' + here.id"
+	>Make this <br>your active set.</a>
+	</div>
+
+	<h2 class="setTitle"><span tal:replace="here/title"/>
+		<span tal:condition="python: here.checkPermission('edit')">
+			<a class="editLink" href="manageBasket">| Edit</a></span>
+	</h2>
 	
-	<!-- id selected: manage set -->
-	<tal:block tal:condition="python:here.checkPermission('admin')">
-	<a href="manageBasket">Manage this set</a>
-
-	<h1 tal:content="here/title">Title</h1>
-	
-	<div class="comment_basket" tal:content="structure here/comment">Comment</div>
+	<div class="setDescription" 
+		tal:content="structure here/getShortDescription">shortDescription</div><br>
+	<div class="setComment" 
+		tal:content="structure python: here.formatAscii(here.vlp.link2html(here.comment))">Comment</div>
+	<br>
 	
+	<div class="seperator"> </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"/>
-    
-	</tal:x>
-	
+		<div class="setItem" tal:condition="item/content_html" 
+			tal:content="structure item/content_html"
+		/>
+		<div class="setItemComment" tal:condition="item/comment"  
+			tal:content="structure python: 
+				here.formatAscii(here.vlp.link2html(item.comment))"
+		/>
+		<div class="seperator"> </div>
+   </tal:x>
 	
 </tal:block>
 
@@ -42,10 +57,11 @@
 <!-- user is not logged in -->
 <tal:block tal:condition="not: authorized">
 	<h3>No access</h3>
-	<p>You sre not authorized to access this page, please <a href="/users/login.html">log in</a>.</p>
-</tal:block>
+	<p>You are not authorized to access this page, please <a href="/users/">log in</a>.</p>
 </tal:block>
+
 </tal:block>
+
 </span>
 <!-- ende bodytext -->
 </body>
