--- OSAS/OSA_system/zpt/contextDataMain.zpt	2004/04/02 16:28:57	1.3
+++ OSAS/OSA_system/zpt/contextDataMain.zpt	2005/01/21 17:31:48	1.7
@@ -1,45 +1,30 @@
 <html metal:use-macro="here/main_template/macros/page">
   <body metal:fill-slot="body">
     <h2>Add a document to a collection</h2>
-    
+    <p>(<b>Bold face is required</b>,<i>Italics is optional</i>)</p>
     <form action="addContextData2">
-      <table border="1">
-      <tr>
-       <td valign="top">
-      <h3>Select the collection or subcollection</h3>
-      <div tal:replace="structure python:here.XmlToTree('http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/echo_pages/content/getCollectionTreeXML')"/>
-       </td>
-    
-        <td valign="top">
-      <h3>Link</h3>
-      <input tal:repeat="link python:here.REQUEST.SESSION['links']" type="radio" name="link" tal:attributes="value python:link[0]" tal:content="python:link[1]"/>
+      <h3>Select the collection or subcollection (required)</h3>
+      
+      <div tal:replace="structure python:here.XmlToTree(here.collection,getattr(here,'pwstr',''))"/>
+      <h3>Which type of View</h3>
+      <span tal:omit-tag="" tal:repeat="link python:here.REQUEST.SESSION['links']"> 
+	<input type="radio" name="link" tal:attributes="value python:link[0]" tal:content="python:link[1]"/>
+	<a tal:attributes="href python:link[0]" target="preview">(preview)</a><br>
+      </span>
       <input type="hidden" name="path" tal:attributes="value python:here.REQUEST['path']"/>
-
+	    
       <h3>Additional Information</h3>
+      <table>
+	<tr><td><i> Label: </i></td><td><input type="text" name="label" size="100"></td></tr>
+	<tr><td><i> Description:</i></td><td><textarea name="description" cols="80" rows="5"></textarea></td></tr>
+	<tr><td><i> Content-Type: </i></td><td><input type="text" name="content_type"></td></tr>
+	<tr><td><i> Responsible: </i></td><td><input type="text" name="responsible"></td></tr>
+	<tr><td><i> Weight: </i></td><td><input type="text" name="weight"></td></tr>
+      </table>
 
-      <b> Label: </b><input type="text" name="label"><br>
-      
-      <b> Description:</b><textarea name="description"></textarea><br>
-      <b> Content-Type: </b><input type="text" name="content_type"><br><br>
-      <b> Responsible: </b><input type="text" name="responsible"><br><br>
-      <b> Weight: </b><input type="text" name="weight"><br><br>
-
-      <h3>Scientific Information</h3>
-      <b> Source-Type: </b><input type="text" name="source_type"><br>
-      <b> Period: </b><input type="text" name="period"><br>
-      <h4>Classification</h4>
-      <b> Context: </b><input type="text" name="context"><br>
-      <b> Science: </b><input type="text" name="science"><br>
-      <b> Practice: </b><input type="text" name="practice"><br>
-
-      <b> Credits:</b><br>
-
-      <div tal:omit-tag="" tal:repeat="item python:here.getPartners()"> <input type="checkbox" name="credits"  tal:attributes="value item/id" tal:content="item/title"><br></div>
-    
-</td>
-</tr>
-</table>
-<input type="submit" value="submit"/>
+      <h3> Credits:</h3><br>
+      <div tal:omit-tag="" tal:repeat="item python:here.getPartners(here.collection)"> <input type="checkbox" name="credits"  tal:attributes="value python:item[0]" tal:content="python:item[1]"><br></div>
+            <input type="submit" value="submit"/>
       </form>
    </body>
   </html>
