--- ImageArchive/zpt/standardSearchPage.zpt	2006/05/15 13:14:16	1.1
+++ ImageArchive/zpt/standardSearchPage.zpt	2006/05/16 10:28:09	1.2
@@ -10,24 +10,20 @@
 <h1>Search</h1>
 <form action="searchDB" method="get">
 
-<table>
-  <tr>
-    <td class="fieldname">Author</td>
-    <td tal:content="structure python:here.ZSQLsearchOptions('_op_artist_author')"/>
-    <td><input name="artist_author" size="50"></td>
-  </tr>
-  <tr>
-    <td class="fieldname">Title</td>
-    <td tal:content="structure python:here.ZSQLsearchOptions('_op_title')"/>
-    <td><input name="title" size="50"></td>
-  </tr>
-  <tr tal:define="mediumList python:here.ZSQLSimpleSearch('select distinct material from vision_main order by material')">
-    <td class="fieldname">Medium</td>
-    <td>&nbsp;</td>
-    <td tal:content="structure python:here.ZSQLOptionsFromSearchList('material',mediumList,'material',start=' ')"/>
-    <!--<td><input name="medium" size="50"></td>-->
-  </tr>
+ <table>
+	<tr tal:repeat="field python:here.imageCollectionConfig.getFields().keys()">
+   
+	<td>
+		<tal:x replace="python:here.imageCollectionConfig.getFields()[field][0]"/>
+    </td>
+ 	<td tal:content="structure python:here.ZSQLsearchOptions(field)"/>
+ 	<td>
+ 		 <input size="70" tal:attributes="name field"/>
+ 	</td>
+	</tr>
 </table>
+
+
 <input type="submit">
 </form>