X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=root%2Fsrc%2Findex.tt;h=54dea5f189f724aa809a6b5eac5ebeb23c9889df;hb=e239d45f9ea50e2a3ee2e4575a6b5ea33eaa7dee;hp=884a68e5e4eba7eb0303f1d9cbbac98734bc1fb3;hpb=5800cf9ea8c4513f385b9823f4778bce34caf8fd;p=scpubgit%2Fstemmaweb.git

diff --git a/root/src/index.tt b/root/src/index.tt
index 884a68e..54dea5f 100644
--- a/root/src/index.tt
+++ b/root/src/index.tt
@@ -91,11 +91,12 @@ var textOnLoad = "[% withtradition %]";
               <span id='relatebutton_label'>View collation and relationships</span>
             </div>
           </form>
-          <a id="dl_tradition" href="" download="file.xml">
-            <div class="button" id="download_button">
-              <span id='dlbutton_label'>Download tradition as XML</span>
+          <form id="dl_tradition" action="" method="GET" name="run_downloader">
+            <div class="button" id="download_button"
+            	onClick="$('#download-dialog').dialog('open');">
+              <span id='dlbutton_label'>Download tradition</span>
             </div>
-          </a>
+          </form>
       </div>
       <div id="stemma_load_status"></div>
       <div id="stemma_graph"></div>
@@ -167,15 +168,45 @@ var textOnLoad = "[% withtradition %]";
       <div id="stemweb_ui_container">
     	<form id="call_stemweb">
     		<input id="stemweb_tradition" type="hidden" name="tradition"/>
+    		<h5>Choose an algorithm</h5>
     		<label for="algorithm">Run algorithm: </label>
-    		<select id="stemweb_algorithm" name="algorithm"></select><br/>
+    		<select id="stemweb_algorithm" name="algorithm"></select>
+    		<span id="stemweb_algorithm_help">What is this?</span><br/>
+			<div id="stemweb_algorithm_desc_text"></div>
+			<br/>
+			<h5>Select the options</h5>
     		<!-- Algorithm-specific options, if any, will be added within this div -->
     		<div id="stemweb_runtime_options"></div>
+    		<br/>
+    		<!-- Options applicable to all algorithms belong within this div -->
+    		<div id="stemweb_local_options">
+    			<label for="merge_reltypes">Disregard variation of type:</label>
+    			<select multiple name="merge_reltypes" id="stemweb_merge_reltypes"></select>
+    		</div>
     	</form>
     	<div id="stemweb_run_status"></div>
       </div>
     </div>
     
+    <!-- Data download dialog box -->
+    <div id="download-dialog" title="Download tradition data">
+      <div id="download_container">
+    	<form id="download_form">
+    		<input id="download_tradition" type="hidden" name="tradition"/><br/>
+    		<label for="download_format">Choose a format for download: </label>
+    		<select id="download_format" name="format">
+    			<option value="GraphML">Native XML format</option>
+    			<option value="CSV">Comma-separated values (collation only)</option>
+    			<option value="TSV">Tab-separated values (collation only)</option>
+    			<option value="SVG">SVG graph display (collation and relationships)</option>    			
+    			<!-- option value="tei_ps" -->
+    			<!-- option value="tei_dea" -->
+    		</select>
+    	</form>
+    	<div id="download_status"></div>
+      </div>
+    </div>    
+    
     <!-- File upload dialog box -->
     <div id="upload-collation-dialog" title="Upload a collation">
       <div id="upload_container">