--- ECHO_content/zpt/ECHO_collection_template_standard.zpt	2004/06/08 17:49:31	1.3
+++ ECHO_content/zpt/ECHO_collection_template_standard.zpt	2004/06/10 12:27:22	1.4
@@ -1,32 +1,108 @@
-      <table>
-	<div tal:omit-tag="" tal:define="item python:here">
-	  <tr>
-	    <td><a tal:attributes="href python:here.absolute_url()"><img src="image" tal:attributes="src python:'images/'+item.meta_type" border="0"></a>
-		  </td>
-	    <td>
-	      <h4>
-		<a tal:content="structure item/label" tal:attributes="href python:here.absolute_url()">TITLE</a>
-		  </h4>
-
-	       </td>
-	     </tr>
-	  <tr>
-	    <td>&nbsp;</td>
-	    <td>
-	      <p class="pindent">
-		<span tal:replace="structure item/description">DESCRIPTION</span>
-		 </p>
-	      <span tal:condition="item/credits">
-		<p class="partner"><i><b>Provided by:</b></i></p>
-		<span class="partner" tal:repeat="credit item/credits">
-		  <span tal:condition="not:python:credit==''"> 
-		    <p tal:content="python:here.getCreditObject(credit).title"/>
-		     </span>
-                   </span>
-		 </span>
-	    </td>
-		 </tr>
-	   </div>
-	 </table>
+<table class="collection" border="0" cellpadding="6" width="100%">
+<div tal:omit-tag="" tal:define="item python:here">
+
+
+<!-- Headline (Label and Title) for ECHO_collections -->
+<tr tal:condition="python:here.meta_type=='ECHO_collection'">
+	<td width="135" align="center">
+		<a class="label" tal:content="structure here/getLabel" tal:attributes="href python:here.absolute_url()">
+			label
+		</a>
+	</td>
+	<td>
+		<h3 class="collection">
+			<a tal:content="structure here/getTitle" tal:attributes="href python:here.absolute_url()">
+				Title 
+			</a>
+		</h3>
+	</td>
+</tr>
+<!-- -->
+
+<!-- Headline (Label and Title) for ECHO_links -->
+<tr tal:condition="not:python:here.meta_type=='ECHO_collection'">
+<td width="135px" align="center">
+	<a class="label" target="_blank" tal:content="structure here/getLabel" tal:attributes="href python:here.absolute_url()">
+		label
+	</a>
+</td>
+<td>
+	<h3 class="collection">
+		<a target="_blank" tal:content="structure here/getTitle" tal:attributes="href python:here.absolute_url()">
+			Title 
+		</a>
+	</h3>
+</td>
+</tr>
+<!-- -->
+
+<!-- Institution Logos -->
+<span tal:omit-tag="" tal:condition="item/credits">
+	<span tal:repeat="credit item/credits">
+		<span tal:omit-tag="" tal:condition="not:python:credit==''">
+		<tr>
+			<td align="right" valign="middle" width="135pt">
+				<span tal:content="structure python:here.getCreditObject(credit)">
+					title
+				</span>
+			</td>
+			<td>
+			
+<!-- Institution Links -->
+<!-- link of the institution exists -->
+				<span tal:condition="python:here.getCreditObject(credit).url">
+				<h4>
+					<a tal:attributes="href python:here.getCreditObject(credit).url" target="_blank">
+						<span tal:content="python:here.getCreditObject(credit).title">
+							title
+						</span>
+					</a>
+				</h4>
+			</span>
+<!-- -->
+<!-- no link -->
+			<span tal:condition="not:python:here.getCreditObject(credit).url">
+			<h4>
+				<span tal:content="python:here.getCreditObject(credit).title">
+					title
+				</span>
+			</h4>
+		</span>
+<!-- -->
+<!-- -->
+	</td>
+</tr>
+</span>
+</span>
+</span>
+<tr>
+<td colspan="2">
+	<span tal:condition="item/description">
+	<p>
+		<span tal:replace="structure item/description">
+			DESCRIPTION
+		</span>
+	</p>
+</span>
+</td>
+</tr>
+<span tal:condition="python:here.getSubCols(subColTypes=['ECHO_externalLink'])">
+<tr>
+	<td colspan="2">
+		<b>
+			Other Presentations on the Web: 
+		</b>
+		<br>
+		&nbsp; 
+		<div tal:omit-tag="" tal:repeat="item python:here.getSubCols(subColTypes=['ECHO_externalLink'])">
+			<div tal:replace="structure item/content_html" />
+		</div>
+	</td>
+</tr>
+</span>
+
+
+</div>
+</table>