--- ECHO_content/zpt/ECHO_linkCreator_main.zpt	2006/10/11 16:55:26	1.2
+++ ECHO_content/zpt/ECHO_linkCreator_main.zpt	2006/10/12 16:37:33	1.3
@@ -7,7 +7,7 @@ function openChild(file,window,button) {
     };
 //--></SCRIPT>
 </head>
-<body tal:define="col options/collection;global nr python:-1; masterUrl options/masterUrl; slaveUrl options/slaveUrl">
+<body tal:define="col options/collection;global nr python:-1; masterUrl options/masterUrl; slaveUrl options/slaveUrl; entries python:here.getCollectionEntries(col)">
 <h2>Collection: <span tal:replace="col"/></h2>
 <form id="urls" tal:attributes="action python:here.absolute_url()+'/setUrls'">
 <input type="hidden" name="collection" 
@@ -46,20 +46,20 @@ Slaveurl
 <button tal:attributes="onclick python:'openChild(document.getElementById(\'urls\').slaveUrl.value+\'collection=%s&type=slave&_pn=1&fn=\'+document.getElementById(\'docs\').slave.value,\'slaveWindow\',\'slave\')'%col">show slave</button>
 
 
-<tal:x tal:repeat="entry python:here.getCollectionEntries(col)">
+<tal:x tal:repeat="entry entries">
 <table>
 <tr tal:condition="python:entry.has_key('master')">
 <td >Master:</td> 
 <td tal:content="python:entry['master'][0]"/>
 <td tal:content="python:entry['master'][1]"/>
-<td><a target="master" tal:attributes="href python:masterUrl+'fn='+entry['master'][0]+'&_id='+entry['master'][1].split('(')[0]+'&_pagelink='+entry['master'][2]">show
+<td><a target="master" tal:attributes="href python:masterUrl+'fn='+entry['master'][0]+'&_id='+entry['master'][1].split('(')[0]+'&_pagelink='+entry['master'][2]+'&_links='+here.absolute_url()+'/'+col+'/getCollectionXML&_linkid='+str(entries.index(entry))+'&_linktype=source'">show
 </a>
 </tr>
 <tr tal:condition="python:entry.has_key('slave')">
 <td>Slave:</td> 
 <td tal:content="python:entry['slave'][0]"/>
 <td tal:content="python:entry['slave'][1]"/>
-<td><a target="slave" tal:attributes="href python:slaveUrl+'fn='+entry['slave'][0]+'&_id='+entry['slave'][1].split('(')[0]+'&_pagelink='+entry['slave'][2]">show
+<td><a target="slave" tal:attributes="href python:slaveUrl+'fn='+entry['slave'][0]+'&_id='+entry['slave'][1].split('(')[0]+'&_pagelink='+entry['slave'][2]+'&_links='+here.absolute_url()+'/'+col+'/getCollectionXML&_linkid='+str(entries.index(entry))+'&_linktype=target'">show
 </a>
 
 </tr>
