--- basket/zpt/BasketMain_manage_template_standard.zpt	2006/03/19 03:26:56	1.2
+++ basket/zpt/BasketMain_manage_template_standard.zpt	2006/04/05 16:54:59	1.7
@@ -1,6 +1,9 @@
 <html metal:use-macro="here/main_template/macros/page">
 <head>
 <title>Default</title>
+<style metal:fill-slot="additionalStyles" type="text/css">
+td.vario { background-color:#AC1D15 } 
+</style>
 </head>
 <body>
 
@@ -9,63 +12,93 @@
 <tal:block tal:define="authorized python:here.isAuthorized()">
 
 <!-- user is logged in -->
-<tal:block tal:condition="authorized">
+<tal:block tal:condition="authorized"
+	 tal:define="global currentBasket here/getCurrentBasket">
 
 	<!-- log in message -->
-	<div class="logout" style="float:right"><a href="/users/login.html?logout">log out</a></div>
+	<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>
 	
-	<!-- id selected: manage set -->
-	<tal:block tal:condition="python:here.checkPermission('edit')">
+	<!--  -->
+	<tal:block tal:condition="python:here.checkPermission('edit') or here.checkPermission('admin')">
 	
-	<h3>Manage your Set</h3>
+	<h2 class="setTitle" tal:content="here/title"/>
+	<i tal:condition="python: 
+		currentBasket and (here.title == currentBasket.title)">- This is the active set -</i>
+	<h4>Edit the set description:</h4>
 	<br>
-	<p tal:define="currentBasket here/getCurrentBasket"><a href="selectThisBasketAsCurrent">Select this basket.</a>
-	<span tal:condition="currentBasket">The active basket at the moment is <b tal:content="currentBasket"/>.</span>
-	<span tal:condition="not:currentBasket">Currently, there is no active basket.</span>
-	</p>
-	
-	<a href="manageUserRights_html">Change editor/admin rights for this set</a><br>
-	<a href="addBasketText">Add a new textelement</a><br>
-	<a href="addBasketExternalLink">Add a new externalLink</a>
 	<form action="changeBasket">
 		<input type="hidden" name="target" value="manageBasket">
 		Title:<br>
-		<input type="text" name="title" tal:attributes="value here/title" size="50"><br>
+		<input class="setTitle" type="text" name="title" 
+			tal:attributes="value here/title"><br>
 		Short Description:<br>
-		<textarea name="shortDescription" rows="2" cols="50" tal:content="here/shortDescription">Short description</textarea><br>
+		<textarea class="setDescription" name="shortDescription" rows="2" 
+			tal:content="here/shortDescription">Short description</textarea><br>
 		Comment:<br>
-		<textarea name="comment" rows="7" cols="50" tal:content="here/comment">A longer comment / introduction</textarea><br>
-		<tal:x repeat="item here/publicationStatusList">
-		<tal:x replace="python:here.checkPermission('publish')"/>
-		<tal:x condition="python:(item!='open') or (item=='open' and here.checkPermission('publish'))">
-		<input tal:condition="python:item==here.publicationStatus" type="radio" name="publicationStatus" tal:attributes="value item" checked>
-		<input tal:condition="not:python:item==here.publicationStatus" type="radio" name="publicationStatus" tal:attributes="value item">
-		<span tal:content="item"/>
-		</tal:x>
-		</tal:x>
-		
+		<textarea class="setComment" name="comment" rows="7" 
+			tal:content="here/comment">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>
+	<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.</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">
+	<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>
+	</p>
+
+	<hr>
 	
 	</tal:block>
 	
-	<h4>Contents:</h4>
+	<!-- Content -->
+	<tal:block tal:define="items here/getBasketObjects"
+		tal:condition="items">
+	<h4>Edit Contents:</h4><br>
+	
 	<form action="changeBasketComments">
-	<div class="item" tal:repeat="item here/getBasketObjects">
-	<hr>
-	 <div>
-		<a tal:attributes="href python:'moveTop?id=%s'%item.getId()">top</a>
-	 	<a tal:attributes="href python:'moveUp?id=%s'%item.getId()">up</a>
-	 	<a tal:attributes="href python:'moveDown?id=%s'%item.getId()">down</a>
-	 	<a tal:attributes="href python:'moveBottom?id=%s'%item.getId()">bottom</a>
-	 	&nbsp;&nbsp;<a tal:attributes="href python:'deleteObject?id=%s'%item.getId()">delete</a>
+	<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'; 
+			href python:'moveTop?id=%s'%item.getId()">top</a>
+	 	<a tal:attributes="class python:'editLink'; 
+	 		href python:'moveUp?id=%s'%item.getId()">up</a>
+	 	<a tal:attributes="class python:'editLink'; 
+	 		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="100" tal:attributes="name python:item.getId()+'_link';
+	 	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="100" tal:attributes="name python:item.getId()+'_linkText';
+ 	    Linktext:<input type="text" size="40" tal:attributes="name python:item.getId()+'_linkText';
 	 											   value python:getattr(item,'linkText',None)"><br>
 	 											   
 	 </div>
@@ -74,14 +107,14 @@
 	 </div>
 	<input type="submit" value="change">
 	</div>
-	
+	</tal:block>
 	</tal:block>
 
 
 <!-- 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>
+	<p>You are not authorized to access this page, please <a href="/users/login.html">log in</a>.</p>
 </tal:block>
 </tal:block>
 </span>
