X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=root%2Fsrc%2Frelate.tt;h=4573d8cd0df0a257653400e65d6a987d7f5d8eaa;hb=917bee1c66759cddcec3b5389a4de3b647b91f84;hp=d7d46422c74128eeb6ab0b280ef66311313b2861;hpb=3f9d7ae52124ba47d54d45a7c8e9f57455c9d389;p=scpubgit%2Fstemmaweb.git

diff --git a/root/src/relate.tt b/root/src/relate.tt
index d7d4642..4573d8c 100644
--- a/root/src/relate.tt
+++ b/root/src/relate.tt
@@ -1,12 +1,24 @@
 [% WRAPPER header.tt
 	pagetitle = "Stemmaweb - Relationship mapper"
-	applicationjs = c.uri_for("/js/relationship-" _ permission _ ".js")
+	applicationjs = c.uri_for("/js/relationship.js")
 	applicationstyle = c.uri_for('/css/relationship.css')
 %]
 <script type="text/javascript">
 // Load the text ID and the base path
 var basepath = "[% c.uri_for( '/relation/' ) %]";
 var textid = "[% textid %]";
+var can_morphologize = "[% can_morphologize %]";
+var editable = "[% permission %]" === "full";
+// URLs for images referenced in Javascript
+var merge_button_yes = "[% c.uri_for( '/images/tick_circle_frame.png' ) %]";
+var merge_button_no = "[% c.uri_for( '/images/no_entry.png' ) %]";
+[% IF error -%]
+var relationship_types = [];
+var relationship_scopes = [];
+[% ELSE -%]
+var relationship_types = [% relationship_types %];
+var relationship_scopes = [% relationship_scopes %];
+[% END -%]
 
 $(document).ready(function () {
   loadSVG('[% svg_string %]');
@@ -14,10 +26,10 @@ $(document).ready(function () {
 </script>
 [% END %]
 
-	<div id="topbanner">
-		<div id="bannerinfo">
-			<a href="help/[% text_lang %]" title="Relationship mapper help" class="helptag">Help / About</a> | <a href="[% c.uri_for( '/' ) %]?withtradition=[% textid %]" class="navlink">Return to index</a>
-		</div>
+  <div class="mainnav">
+	<span>[% IF c.user_exists %]Hello! [% c.user.get_object.email %]! &nbsp; <a class="navlink" href="[% c.uri_for( '/logout' ) %]">Sign out</a> | [% END %]<a href="help/[% text_lang %]" title="Relationship mapper help" class="helptag navlink">Help / About</a> | <a href="[% c.uri_for( '/' ) %]?withtradition=[% textid %]" class="navlink">Return to index</a> </span>
+   </div>
+    <div id="topbanner">
 		<h1>Relationship mapper</h1>
 		<h2>[% text_title %]</h2>
 		<div id="segmentation">
@@ -75,29 +87,49 @@ $(document).ready(function () {
 			<input type="hidden" name="source_id" id="delete_source_node_id"/>
 			<input type="hidden" name="target_id" id="delete_target_node_id"/>
 		</form>
-		<div id="delete-form-text"></div>
+		<div id="delete-form-text">Type: <span id="delete_relation_type"></span><br/>
+		    Scope: <span id="delete_relation_scope"></span><br/>
+		    <span id="delete_relation_note"></span></div>
+	</div>
+
+	<div id="multipleselect-form" title="Multiple nodes selected...">
+		<div id="multipleselect-form-status"></div>
+		<div id="multipleselect-form-text">Select witness(es) to detach:</div>
+		<form id="detach_collated_form" action="#">
+		</form>
 	</div>
 	
 	<div id="reading-form" title="Reading info...">
 		<form id="reading_data_form" action="#">
 			<input type="hidden" name="reading_id" id="reading_id"/>
-			<input type="checkbox" name="reading_is_nonsense" id="reading_is_nonsense"/>
-			<label for="reading_is_nonsense">This is a nonsense word</label>
-			<br/>
-			<input type="checkbox" name="reading_grammar_invalid" id="reading_grammar_invalid"/>
-			<label for="reading_grammar_invalid">This word's grammar cannot be right</label>
+			<div class="morph">
+				<input type="checkbox" name="reading_is_nonsense" id="reading_is_nonsense"/>
+				<label for="reading_is_nonsense">This is a nonsense word</label>
+				<br/>
+				<input type="checkbox" name="reading_grammar_invalid" id="reading_grammar_invalid"/>
+				<label for="reading_grammar_invalid">This word's grammar cannot be right</label>
+			</div>
 			<br/><br/>
+			<!-- Collation correction option goes here -->
+			<div id="decollation">
+				<label for="reading_decollate">Detach this reading with the selected witnesses:</label>
+				<select id="reading_decollate_witnesses" name="reading_decollate_witnesses"
+					multiple="multiple">
+				<!-- Fill in relevant reading witnesses here -->
+				</select>
+				<button id="reading_decollate" onclick="decollate(); return false;">Uncollate</button>
+			</div>
 			<!-- Morphological options go here -->
-			<div id="normalization">
+			<div id="normalization" class="morph">
 				<label for="reading_normal_form">Normalized form: </label>
 				<input type="text" name="reading_normal_form" id="reading_normal_form"></input>
-				<button id="#reading_relemmatize" onclick="relemmatize(); return false;">Re-lemmatize</button>
+				<button id="reading_relemmatize" onclick="relemmatize(); return false;">Re-lemmatize</button>
 			</div>
 			<div id="relemmatize_pending">
 				<img src="[% c.uri_for('/images/ajax-loader.gif') %]"/>
 			</div>
 			<br/><br/>
-			<div id="morph_outer">
+			<div id="morph_outer" class="morph">
 				<label>Lemma / part of speech:</label><br/>
 				<div id="morphology"></div>
 			</div>