--- ECHO_content/zpt/ECHO_movie_template_standard.zpt	2005/04/24 10:20:22	1.5
+++ ECHO_content/zpt/ECHO_movie_template_standard.zpt	2005/05/01 06:21:20	1.6
@@ -1,18 +1,13 @@
 <table cellpadding="3" width="95%" border=0>
 	<tr>
 		
-		<td>
+		<td colspan="2">
 			<!-- Label -->
 			<!-- with link if there is one -->
 			<span tal:condition="here/link">
 				        
-					<b><tal:block tal:content="structure here/getLabel"/> [<a tal:attributes="href python:here.linkRTSP()">streaming</a>] [<a tal:attributes="href python:here.linkHTTP()" target="_blank">http</a>]</b>
-			</span>
-			<span tal:condition="here/lowresHTTP">
-				        
-					<b>Lowres: [<a tal:attributes="href python:here.lowresRTSP()">streaming</a>] [<a tal:attributes="href python:here.lowresHTTP()" target="_blank">http</a>]</b>
-			</span>
-                        <b>[<a tal:attributes="href string:${here/id}/RDF">RDF metadata</a>]</b>
+					<b><tal:block tal:content="structure here/getLabel"/>
+                        </span>
 
 			<!-- without link if there isn't one -->
 			<span tal:condition="not:here/link">
@@ -28,33 +23,41 @@
 	
 	<tr>
 		
-		<td>
+		<td width="200">
 		        <!--Thumb-->
-			<img tal:attributes="src python:here.thumbUrl">
-			<!-- Title -->
-			<span tal:content="structure here/getTitle">
-				Title
-			</span>
-			<!-- -->
+                        <a tal:attributes="href string:${here/id}/RDF">
+				<img tal:attributes="src python:here.thumbUrl" border="no">
+			</a>
 		</td>
+                <td>
+			<span tal:condition="here/link">
+                        	<b>large format:</b>
+                                [<a tal:attributes="href python:here.linkHTTP()" target="_blank">http</a>]
+			</span><br>
+			<span tal:condition="here/lowresHTTP">
+                                <b>small format:</b>
+			        [<a tal:attributes="href python:here.lowresHTTP()" target="_blank">http</a>] [<a tal:attributes="href python:here.lowresRTSP()">streaming</a>]
+			</span><br>
+                        <b>[<a tal:attributes="href string:${here/id}/RDF">RDF metadata</a>]</b>
+
+	<p tal:condition="here/description">
+		<span tal:replace="structure here/description">
+			DESCRIPTION
+		</span>
+	</p>
+
+                </td>
 	</tr>
+<!--
         <tr>
 	      <td>
 		The raw file can be found at<br>
 		  <a tal:attributes="href here/rawFile" tal:content="here/rawFile"/>
 	     </td>
         </tr>
+-->
 	
-	<!-- Description if there ist one -->
-	<tr tal:condition="here/description">
-		
-		<td>
-			<span tal:replace="structure here/description">
-				DESCRIPTION
-			</span>
-		</td>
-	</tr>
-	<!-- -->
+	<!-- Description if there is one -->
 	
 	<!-- Copyrights -->