--- ECHO_content/zpt/ECHO_linkCreator_main.zpt	2006/09/14 14:31:53	1.1
+++ ECHO_content/zpt/ECHO_linkCreator_main.zpt	2006/10/11 16:55:26	1.2
@@ -1,7 +1,15 @@
 <html>
+<head>
+<SCRIPT LANGUAGE="JavaScript"><!--
+function openChild(file,window,button) {
+    childWindow=open(file,window);
+    if (childWindow.opener == null) childWindow.opener = self;
+    };
+//--></SCRIPT>
+</head>
 <body tal:define="col options/collection;global nr python:-1; masterUrl options/masterUrl; slaveUrl options/slaveUrl">
 <h2>Collection: <span tal:replace="col"/></h2>
-<form tal:attributes="action python:here.absolute_url()+'/setUrls'">
+<form id="urls" tal:attributes="action python:here.absolute_url()+'/setUrls'">
 <input type="hidden" name="collection" 
 tal:attributes="value col">
 <table>
@@ -9,33 +17,49 @@ tal:attributes="value col">
 <td>
 Masterurl
 </td>
-<td><input type="text" size="100" name="masterUrl" tal:attributes="value masterUrl">
+<td><input type="text" size="100" id="masterUrl" name="masterUrl" tal:attributes="value masterUrl">
 </td>
 </tr>
 <tr>
 <td>
 Slaveurl
 </td>
-<td><input type="text" size="100" name="slaveUrl" tal:attributes="value slaveUrl">
+<td><input type="text" size="100" id="slaveUrl" name="slaveUrl" tal:attributes="value slaveUrl">
 </td>
 </tr>
 </table>
 <input type="submit" value="submit">
 </form>
+<form id="docs">
+<table>
+<tr>
+<td>Master document</td>
+<td><input size="50" id="master"></td>
+</tr>
+<tr>
+<td>Slave document</td>
+<td><input size="50" id="slave"></td>
+</tr>
+</table>
+</form>
+<button tal:attributes="onclick python:'openChild(document.getElementById(\'urls\').masterUrl.value+\'collection=%s&type=master&_pn=1&fn=\'+document.getElementById(\'docs\').master.value,\'masterWindow\',\'master\')'%col">show master</button>
+<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)">
 <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]">show
+<td><a target="master" tal:attributes="href python:masterUrl+'fn='+entry['master'][0]+'&_id='+entry['master'][1].split('(')[0]+'&_pagelink='+entry['master'][2]">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]">show
+<td><a target="slave" tal:attributes="href python:slaveUrl+'fn='+entry['slave'][0]+'&_id='+entry['slave'][1].split('(')[0]+'&_pagelink='+entry['slave'][2]">show
 </a>
 
 </tr>
