--- zogiLib/zpt/main_metaData.zpt	2005/11/08 10:13:31	1.1
+++ zogiLib/zpt/main_metaData.zpt	2005/11/08 18:10:10	1.2
@@ -1,48 +1,46 @@
 <html tal:define="dummy here/storeQuery">
-<head tal:content="structure here/createHeadJS">
+<head tal:content="structure here/head_js">
 </head>
 <body onload="dl_init()">
 <div id="navigation">
 <form method="get" tal:attributes="action python:here.zogilibAction('setDLParams')">
-<input type="hidden" name="wid" tal:attributes="value here/getWID" />
 <select onchange="setDLParam(event, this)" name="ws">
-	<option value="1" selected>Size</option>
-	<option tal:attributes="value python:here.getBiggerWS()">bigger</option>
-	<option tal:attributes="value python:here.getSmallerWS()">smaller</option>
-	<option value="1">1 x</option>
-	<option value="1.5">1.5 x</option>
-	<option value="2">2 x</option>
-	<option value="3">3 x</option>
-</select>
-<a href="javascript:setMark()">set a mark</a>
-<a tal:attributes="href python:here.zogilibAction('dl_Unmark')">delete mark</a>
-<a href="javascript:getRef(1)">get reference</a>
-<a href="javascript:zoomArea()">zoom area</a>
-<a tal:attributes="href python:here.zogilibAction('dl_ZoomIn')">zoom in</a>
-<a tal:attributes="href python:here.zogilibAction('dl_ZoomOut')">zoom out</a>
-<a tal:attributes="href python:here.zogilibAction('dl_WholePage')">whole page</a>
-<a tal:attributes="href python:here.zogilibAction('dl_HMirror')">Mirror (h)</a>
-<a tal:attributes="href python:here.zogilibAction('dl_VMirror')">Mirror (v)</a>
-<a tal:attributes="href python:'javascript:openWin(\''+here.zogilibAction('optionwindow')+'&frametarget=\'+dlTarget,\'options_\'+dlTarget,\'width=300,height=250,resizable\')'">options</a>
+  <option value="+0" selected>Size</option>
+  <option value="+0.5">bigger</option>
+  <option value="-0.5">smaller</option>
+  <option value="1">1 x</option>
+  <option value="1.5">1.5 x</option>
+  <option value="2">2 x</option>
+  <option value="3">3 x</option>
+</select> <a href="javascript:setMark()">set a mark</a> <a href="javascript:removeMark()">delete mark</a> <a
+  href="javascript:getRefWin()">get reference</a> <a href="javascript:zoomArea()">zoom area</a> <a href="javascript:zoomBy(1.4)">zoom
+in</a> <a href="javascript:zoomBy(0.7)">zoom out</a> <a href="javascript:zoomFullpage()">whole page</a> <a
+  href="javascript:showOptions(1)">options</a>
 </form>
 </div>
 
-<div tal:replace="structure here/createScalerDiv"/>
-<div tal:replace="structure here/createAuxDiv"/>
+<div tal:replace="structure here/template/img_div" />
+<div tal:replace="structure here/template/aux_divs" />
+<tal:block tal:define="statics here/getContextStatic; dynamics here/getContextDatabases;">
+  <h2 tal:condition="statics">Static Links</h2>
+  
+  <p tal:repeat="static statics">
+    <a tal:attributes="href python:static[1]" tal:content="python:static[0]" />
+  </p>
 
-<tal:block tal:define="statics here/getContextStatic;
-                       dynamics here/getContextDatabases;
-">  
-<h2  tal:condition="statics">Static Links</h2>
-<p tal:repeat="static statics"><a tal:attributes="href python:static[1]" tal:content="python:static[0]"/></p>
+  <tal:block tal:condition="python:(dynamics and len(dynamics)>1)">
+    <h2>Dynamic Links</h2>
 
-
-<tal:block  tal:condition="python:(dynamics and len(dynamics)>1)">
-<h2>Dynamic Links</h2>
-<p tal:repeat="static here/getContextDatabases"><a tal:attributes="href python:static[1]" tal:content="python:static[0]"/></p>
-</tal:block>
-<h2>Data</h2>
-<p tal:replace="structure here/getMetaData"/>
+    <p tal:repeat="static here/getContextDatabases">
+      <a tal:attributes="href python:static[1]" tal:content="python:static[0]" />
+    </p>
+  </tal:block>
+  
+  <h2>Data</h2>
+  
+  <p tal:replace="structure here/getMetaData" />
 </tal:block>
+
+<div tal:replace="structure here/template/options" />
 </body>
 </html>
