X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=root%2Fjs%2Frelationship.js;h=b2a6f2df75f1f6e4164230cf1379f12b3bb78bee;hb=cfa6ff766d71f99550b215cf31b9d5f82bdfcde4;hp=c4279ac7ac8c8fb6447fcc6b3775c8ae8d66329a;hpb=931ed23636fb3d5735ab5d026a72a289582b4dfa;p=scpubgit%2Fstemmaweb.git

diff --git a/root/js/relationship.js b/root/js/relationship.js
index c4279ac..b2a6f2d 100644
--- a/root/js/relationship.js
+++ b/root/js/relationship.js
@@ -58,14 +58,6 @@ function node_dblclick_listener( evt ) {
   	}
   	$('#reading_normal_form').attr( 'size', nfboxsize )
   	$('#reading_normal_form').val( normal_form );
-  	if( editable ) {
-	  	// Fill in the witnesses for the de-collation box.
-	  	$('#reading_decollate_witnesses').empty();
-	  	$.each( reading_info['witnesses'], function( idx, wit ) {
-	  		$('#reading_decollate_witnesses').append( $('<option/>').attr(
-	  			'value', wit ).text( wit ) );
-	  	});
-	}
   	// Now do the morphological properties.
   	morphology_form( reading_info['lexemes'] );
   	// and then open the dialog.
@@ -226,9 +218,8 @@ function svgEnlargementLoaded() {
         $.getJSON( rdgpath, function( data ) {
             readingdata = data;
             $('#svgenlargement ellipse').each( function( i, el ) { color_inactive( el ) });
-            detach_node(null);
+            $('#loading_overlay').hide(); 
         });
-        $('#loading_overlay').hide(); 
     });
     
     //initialize marquee
@@ -254,18 +245,20 @@ function add_relations( callback_fn ) {
 	$.getJSON( textrelpath, function(data) {
 		$.each(data, function( index, rel_info ) {
 			var type_index = $.inArray(rel_info.type, rel_types);
-			var source_found = get_ellipse( rel_info.source );
-			var target_found = get_ellipse( rel_info.target );
+			var source_found = get_ellipse( rel_info.source_id );
+			var target_found = get_ellipse( rel_info.target_id );
+			var emphasis = rel_info.is_significant;
 			if( type_index != -1 && source_found.size() && target_found.size() ) {
-				var relation = relation_manager.create( rel_info.source, rel_info.target, type_index );
-				relation.data( 'type', rel_info.type );
-				relation.data( 'scope', rel_info.scope );
-				relation.data( 'note', rel_info.note );
+				var relation = relation_manager.create( rel_info.source_id, rel_info.target_id, type_index, emphasis );
+				// Save the relationship data too.
+				$.each( rel_info, function( k, v ) {
+					relation.data( k, v );
+				});
 				if( editable ) {
-					var node_obj = get_node_obj(rel_info.source);
+					var node_obj = get_node_obj(rel_info.source_id);
 					node_obj.set_selectable( false );
 					node_obj.ellipse.data( 'node_obj', null );
-					node_obj = get_node_obj(rel_info.target);
+					node_obj = get_node_obj(rel_info.target_id);
 					node_obj.set_selectable( false );
 					node_obj.ellipse.data( 'node_obj', null );
 				}
@@ -296,7 +289,7 @@ function node_obj(ellipse) {
   this.dx = 0;
   this.dy = 0;
   this.node_elements = node_elements_for(self.ellipse);
-
+  
   this.get_id = function() {
     return $(self.ellipse).parent().attr('id')
   }
@@ -368,8 +361,10 @@ function node_obj(ellipse) {
         var target_node_text = $('ellipse[fill="#ffccff"]').siblings("text").text();
         $('#source_node_id').val( source_node_id );
         $('#source_node_text').val( source_node_text );
+        $('.rel_rdg_a').text( "'" + source_node_text + "'" );
         $('#target_node_id').val( target_node_id );
         $('#target_node_text').val( target_node_text );
+        $('.rel_rdg_b').text( "'" + target_node_text + "'" );
         $('#dialog-form').dialog( 'open' );
     };
     $('body').unbind('mousemove');
@@ -406,16 +401,22 @@ function node_obj(ellipse) {
       });
   }
 
+  this.reposition = function( dx, dy ) {
+    $.each( self.node_elements, function(index, value) {
+      value.reposition( dx, dy );
+    } );    
+  }
+
   this.move_elements = function() {
     $.each( self.node_elements, function(index, value) {
-      value.move(self.dx,self.dy);
-    });
+      value.move( self.dx, self.dy );
+    } );
   }
 
   this.reset_elements = function() {
     $.each( self.node_elements, function(index, value) {
       value.reset();
-    });
+    } );
   }
 
   this.update_elements = function() {
@@ -425,17 +426,30 @@ function node_obj(ellipse) {
   this.get_witnesses = function() {
       return readingdata[self.get_id()].witnesses
   }
-  
+
   self.set_selectable( true );
 }
 
 function svgshape( shape_element ) {
   this.shape = shape_element;
+  this.reposx = 0;
+  this.reposy = 0; 
+  this.repositioned = this.shape.parent().data( 'repositioned' );
+  if( this.repositioned != null ) {
+      this.reposx = this.repositioned[0];
+      this.reposy = this.repositioned[1]; 
+  }
+  this.reposition = function (dx, dy) {
+      this.move( dx, dy );
+      this.reposx = this.reposx + dx;
+      this.reposy = this.reposy + dy;
+      this.shape.parent().data( 'repositioned', [this.reposx,this.reposy] );
+  }
   this.move = function(dx,dy) {
-    this.shape.attr( "transform", "translate(" + dx + " " + dy + ")" );
+      this.shape.attr( "transform", "translate( " + (this.reposx + dx) + " " + (this.reposy + dy) + " )" );
   }
   this.reset = function() {
-    this.shape.attr( "transform", "translate( 0, 0 )" );
+    this.shape.attr( "transform", "translate( " + this.reposx + " " + this.reposy + " )" );
   }
   this.grey_out = function(filter) {
       if( this.shape.parent(filter).size() != 0 ) {
@@ -454,14 +468,24 @@ function svgpath( path_element, svg_element ) {
   this.path = path_element;
   this.x = this.path.x;
   this.y = this.path.y;
+
+  this.reposition = function (dx, dy) {
+      this.x = this.x + dx;
+      this.y = this.y + dy;      
+      this.path.x = this.x;
+      this.path.y = this.y;
+  }
+
   this.move = function(dx,dy) {
     this.path.x = this.x + dx;
     this.path.y = this.y + dy;
   }
+  
   this.reset = function() {
     this.path.x = this.x;
     this.path.y = this.y;
   }
+  
   this.grey_out = function(filter) {
       if( this.svg_element.parent(filter).size() != 0 ) {
           this.svg_element.attr('stroke', '#e5e5e5');
@@ -489,7 +513,7 @@ function get_edge_elements_for( ellipse ) {
   edge_elements = new Array();
   node_id = ellipse.parent().attr('id');
   edge_in_pattern = new RegExp( node_id + '$' );
-  edge_out_pattern = new RegExp( '^' + node_id );
+  edge_out_pattern = new RegExp( '^' + node_id + '-' );
   $.each( $('#svgenlargement .edge,#svgenlargement .relation').children('title'), function(index) {
     title = $(this).text();
     if( edge_in_pattern.test(title) ) {
@@ -536,10 +560,10 @@ function relation_factory() {
             temporary = null; 
         }
     }
-    this.create = function( source_node_id, target_node_id, color_index ) {
+    this.create = function( source_node_id, target_node_id, color_index, emphasis ) {
         //TODO: Protect from (color_)index out of bound..
         var relation_color = self.relation_colors[ color_index ];
-        var relation = draw_relation( source_node_id, target_node_id, relation_color );
+        var relation = draw_relation( source_node_id, target_node_id, relation_color, emphasis );
         get_node_obj( source_node_id ).update_elements();
         get_node_obj( target_node_id ).update_elements();
         return relation;
@@ -576,6 +600,27 @@ function relation_factory() {
     this.showinfo = function(relation) {
     	$('#delete_relation_type').text( relation.data('type') );
     	$('#delete_relation_scope').text( relation.data('scope') );
+    	$('#delete_relation_attributes').empty();
+    	var significance = ' is not ';
+    	if( relation.data( 'is_significant' ) === 'yes') {
+    		significance = ' is ';
+    	} else if ( relation.data( 'is_significant' ) === 'maybe' ) {
+    		significance = ' might be ';
+    	}
+		$('#delete_relation_attributes').append( 
+			"This relationship" + significance + "stemmatically significant<br/>");
+    	if( relation.data( 'a_derivable_from_b' ) ) {
+    		$('#delete_relation_attributes').append( 
+    			"'" + relation.data('source_text') + "' derivable from '" + relation.data('target_text') + "'<br/>");
+    	}
+    	if( relation.data( 'b_derivable_from_a' ) ) {
+    		$('#delete_relation_attributes').append( 
+    			"'" + relation.data('target_text') + "' derivable from '" + relation.data('source_text') + "'<br/>");
+    	}
+    	if( relation.data( 'non_independent' ) ) {
+    		$('#delete_relation_attributes').append( 
+    			"Variance unlikely to arise coincidentally<br/>");
+    	}
     	if( relation.data( 'note' ) ) {
     		$('#delete_relation_note').text('note: ' + relation.data( 'note' ) );
     	}
@@ -616,7 +661,7 @@ function get_related_nodes( relation_id ) {
 	return srctotarg.split('-...-');
 }
 
-function draw_relation( source_id, target_id, relation_color ) {
+function draw_relation( source_id, target_id, relation_color, emphasis ) {
     var source_ellipse = get_ellipse( source_id );
     var target_ellipse = get_ellipse( target_id );
     var relation_id = get_relation_id( source_id, target_id );
@@ -627,39 +672,29 @@ function draw_relation( source_id, target_id, relation_color ) {
     var sy = parseInt( source_ellipse.attr('cy') );
     var ex = parseInt( target_ellipse.attr('cx') );
     var ey = parseInt( target_ellipse.attr('cy') );
-    var relation = svg.group( $("#svgenlargement svg g"), 
-    	{ 'class':'relation', 'id':relation_id } );
+    var relation = svg.group( $("#svgenlargement svg g"), { 'class':'relation', 'id':relation_id } );
     svg.title( relation, source_id + '->' + target_id );
-    svg.path( relation, path.move( sx, sy ).curveC( sx + (2*rx), sy, ex + (2*rx), ey, ex, ey ), {fill: 'none', stroke: relation_color, strokeWidth: 4});
+    var stroke_width = emphasis === "yes" ? 6 : emphasis === "maybe" ? 4 : 2;
+    svg.path( relation, path.move( sx, sy ).curveC( sx + (2*rx), sy, ex + (2*rx), ey, ex, ey ), {fill: 'none', stroke: relation_color, strokeWidth: stroke_width });
     var relation_element = $('#svgenlargement .relation').filter( ':last' );
     relation_element.insertBefore( $('#svgenlargement g g').filter(':first') );
     return relation_element;
 }
 
-function detach_node( readingsgohere ) {
-    
-    // This method is work in progress
-    // Todos:
-    // 1) Unproven/untested: readings.each will get us in trouble most likely for
-    //    duplicating edges in a strand that both are incoming and outgoing
-    //    like b and c in -i-> a -ii-> b -iii-> c -iv->
-    // 2) Added edges and nodes look rough and unsmoothed, what the f.?
-    //
-    
-    var readings = { "n127_0": 
-        { 
-            "grammar_invalid": null,
-            "witnesses": ["Sg524"],
-            "normal_form": "Secundo ",
-            "is_nonsense": null,
-            "lexemes": [],
-            "variants": [],
-            "text": "Secundo",
-            "is_meta": null,
-            "orig_rdg": "n127"
-        }
+function detach_node( readings ) {
+    // separate out the deleted relationships, discard for now
+    if( 'DELETED' in readings ) {
+    	// Remove each of the deleted relationship links.
+    	$.each( readings['DELETED'], function( idx, pair ) {
+    		var relation_id = get_relation_id( pair[0], pair[1] );
+			var relation = $( jq( relation_id ) );
+			if( relation.size() == 0 ) { 
+    			relation_id = get_relation_id( pair[1], pair[0] );
+    		}
+    		relation_manager.remove( relation_id );
+    	});
+    	delete readings['DELETED'];
     }
-
     // add new node(s)
     $.extend( readingdata, readings );
     // remove from existing readings the witnesses for the new nodes/readings
@@ -710,39 +745,110 @@ function detach_node( readingsgohere ) {
         if( incoming_remaining.length > 0 ) {
             $.each( edges, function( index, edge ) {
                 if( edge.get_label() == 'majority' && edge.is_incoming ) {
-                    detached_edges.push( edge.clone_for( outgoing_remaining ) );
+                    detached_edges.push( edge.clone_for( incoming_remaining ) );
                 }
             } );
         }
         
+        // Finally multiple selected nodes may share edges
+        var copy_array = [];
+        $.each( detached_edges, function( index, edge ) {
+            var do_copy = true;
+            $.each( copy_array, function( index, copy_edge ) {
+                if( copy_edge.g_elem.attr( 'id' ) == edge.g_elem.attr( 'id' ) ) { do_copy = false }
+            } );
+            if( do_copy == true ) {
+                copy_array.push( edge );
+            }
+        } );
+        detached_edges = copy_array;
+        
         // Lots of unabstracted knowledge down here :/
         // Clone original node/reading, rename/id it..
         duplicate_node = get_ellipse( reading.orig_rdg ).parent().clone();
         duplicate_node.attr( 'id', node_id );
         duplicate_node.children( 'title' ).text( node_id );
         
+        // This needs somehow to move to node or even to shapes! #repositioned
+        duplicate_node_data = get_ellipse( reading.orig_rdg ).parent().data( 'repositioned' );
+        if( duplicate_node_data != null ) {
+            duplicate_node.children( 'ellipse' ).parent().data( 'repositioned', duplicate_node_data );
+        }
+        
         // Add the node and all new edges into the graph
         var graph_root = $('#svgenlargement svg g.graph');
         graph_root.append( duplicate_node );
         $.each( detached_edges, function( index, edge ) {
-            edge.g_elem.attr( 'id', ( edge.g_elem.attr( 'id' ) + "_0" ) );
+            id_suffix = node_id.slice( node_id.indexOf( '_' ) );
+            edge.g_elem.attr( 'id', ( edge.g_elem.attr( 'id' ) + id_suffix ) );
             edge_title = edge.g_elem.children( 'title' ).text();
+            edge_weight = 0.8 + ( 0.2 * edge.witnesses.length );
             edge_title = edge_title.replace( reading.orig_rdg, node_id );
             edge.g_elem.children( 'title' ).text( edge_title );
+            edge.g_elem.children( 'path').attr( 'stroke-width', edge_weight );
             // Reg unabstracted knowledge: isn't it more elegant to make 
             // it edge.append_to( graph_root )?
             graph_root.append( edge.g_elem );
         } );
-        
+                
+        // Make the detached node a real node_obj
+        var ellipse_elem = get_ellipse( node_id );
+        var new_node = new node_obj( ellipse_elem );
+        ellipse_elem.data( 'node_obj', new_node );
+
         // Move the node somewhat up for 'dramatic effect' :-p
-        var node_elements = node_elements_for( get_ellipse( node_id ) ); 
-        $.each( node_elements, function( index, element ) {
-            element.move( 0, -150 );
-        } );
+        new_node.reposition( 0, -70 );        
         
     } );
     
+}
+
+function merge_nodes( source_node_id, target_node_id, consequences ) {
+    if( consequences.status != null && consequences.status == 'ok' ) {
+        merge_node( source_node_id, target_node_id );
+        if( consequences.checkalign != null ) {
+            $.each( consequences.checkalign, function( index, node_ids ) {
+                var temp_relation = draw_relation( node_ids[0], node_ids[1], "#89a02c" );
+                var sy = parseInt( temp_relation.children('path').attr('d').split('C')[0].split(',')[1] );
+                var ey = parseInt( temp_relation.children('path').attr('d').split(' ')[2].split(',')[1] );
+                var yC = ey + (( sy - ey )/2); 
+                // TODO: compute xC to be always the same distance to the amplitude of the curve
+                var xC = parseInt( temp_relation.children('path').attr('d').split(' ')[1].split(',')[0] );
+                var svg = $('#svgenlargement').children('svg').svg('get');
+                parent_g = svg.group( $('#svgenlargement svg g') );
+                var ids_text = node_ids[0] + '-' + node_ids[1]; 
+                var merge_id = 'merge-' + ids_text;
+                svg.image( parent_g, xC, (yC-8), 16, 16, merge_button_yes, { id: merge_id } );
+                svg.image( parent_g, (xC+20), (yC-8), 16, 16, merge_button_no, { id: 'no' + merge_id } );
+                $( '#' + merge_id ).hover( function(){ $(this).addClass( 'draggable' ) }, function(){ $(this).removeClass( 'draggable' ) } );
+                $( '#no' + merge_id ).hover( function(){ $(this).addClass( 'draggable' ) }, function(){ $(this).removeClass( 'draggable' ) } );
+                $( '#' + merge_id ).click( function( evt ){ 
+                    merge_node( node_ids[0], node_ids[1] );
+                    temp_relation.remove();
+                    $( '#' + merge_id ).parent().remove();
+                    //notify backend
+                    var ncpath = getTextURL( 'merge' );
+                    var form_values = "source_id=" + node_ids[0] + "&target_id=" + node_ids[1] + "&single=true";
+                    $.post( ncpath, form_values );
+                } );
+                $( '#no' + merge_id ).click( function( evt ) {
+                    temp_relation.remove();
+                    $( '#' + merge_id ).parent().remove();
+                } );
+            } );
+        }
+    }
+}
 
+function merge_node( source_node_id, target_node_id ) {
+    $.each( edges_of( get_ellipse( source_node_id ) ), function( index, edge ) {
+        if( edge.is_incoming == true ) {
+            edge.attach_endpoint( target_node_id );
+        } else {
+            edge.attach_startpoint( target_node_id );
+        }
+    } );
+    $( jq( source_node_id ) ).remove();    
 }
 
 function Marquee() {
@@ -757,8 +863,6 @@ function Marquee() {
     this.svg_rect = $('#svgenlargement svg').svg('get');
 
     this.show = function( event ) {
-        // TODO: uncolor possible selected
-        // TODO: unless SHIFT?
         self.x = event.clientX;
         self.y = event.clientY;
         p = svg_root.createSVGPoint();
@@ -786,6 +890,7 @@ function Marquee() {
         var rect = $('#marquee');
         if( rect.length != 0 ) {
             //unselect any possible selected first
+            //TODO: unless SHIFT?
             if( $('ellipse[fill="#9999ff"]').size() > 0 ) {
               $('ellipse[fill="#9999ff"]').each( function() { 
                   $(this).data( 'node_obj' ).set_draggable( false );
@@ -807,25 +912,47 @@ function Marquee() {
             var cx_max = p.matrixTransform(tf).x;
             var cy_max = p.matrixTransform(tf).y;
             //select any node with its center inside the marquee
+            var readings = [];
             //also merge witness sets from nodes
             var witnesses = [];
             $('#svgenlargement ellipse').each( function( index ) {
                 var cx = parseInt( $(this).attr('cx') );
                 var cy = parseInt( $(this).attr('cy') );
+                
+                // This needs somehow to move to node or even to shapes! #repositioned
+                // We should ask something more aling the lines of: nodes.each { |item| node.selected? }
+                var org_translate = $(this).parent().data( 'repositioned' );
+                if( org_translate != null ) {
+                    cx = cx + org_translate[0];
+                    cy = cy + org_translate[1];
+                }
+                
                 if( cx > cx_min && cx < cx_max) {
                     if( cy > cy_min && cy < cy_max) {
                         // we actually heve no real 'selected' state for nodes, except coloring
                         $(this).attr( 'fill', '#9999ff' );
+                        // Take note of the selected reading(s) and applicable witness(es)
+                        // so we can populate the multipleselect-form 
+                        readings.push( $(this).parent().attr('id') ); 
                         var this_witnesses = $(this).data( 'node_obj' ).get_witnesses();
                         witnesses = arrayUnique( witnesses.concat( this_witnesses ) );
                     }
                 }
             });
             if( $('ellipse[fill="#9999ff"]').size() > 0 ) {
-                //add interesectio of witnesses sets to the multi select form and open it
-                $.each( witnesses, function( index, value ) {
-                    $('#multipleselect-form').append( '<input type="checkbox" name="witnesses" value="' + value + '">' + value + '<br>' );
+                //add intersection of witnesses sets to the multi select form and open it
+                $('#detach_collated_form').empty();
+                $.each( readings, function( index, value ) {
+                  $('#detach_collated_form').append( $('<input>').attr(
+                    "type", "hidden").attr("name", "readings[]").attr(
+                    "value", value ) );
+              	});
+				$.each( witnesses, function( index, value ) {
+                    $('#detach_collated_form').append( 
+                      '<input type="checkbox" name="witnesses[]" value="' + value 
+                      + '">' + value + '<br>' ); 
                 });
+                $('#multiple_selected_readings').attr('value', readings.join(',') ); 
                 $('#multipleselect-form').dialog( 'open' );
             }
             self.svg_rect.remove( $('#marquee') );
@@ -838,6 +965,22 @@ function Marquee() {
      
 }
 
+function readings_equivalent( source, target ) {
+	var sourcetext = readingdata[source].text;
+	var targettext = readingdata[target].text;
+	if( sourcetext === targettext ) {
+		return true;
+	}
+	// Lowercase and strip punctuation from both and compare again
+	var nonwc = XRegExp('[^\\p{L}\\s]|_');
+	var stlc = XRegExp.replace( sourcetext.toLocaleLowerCase(), nonwc, "", 'all' );
+	var ttlc = XRegExp.replace( targettext.toLocaleLowerCase(), nonwc, "", 'all' );
+	if( stlc === ttlc ) {
+		return true;
+	}	
+	return false;
+}
+
 
 $(document).ready(function () {
     
@@ -845,7 +988,8 @@ $(document).ready(function () {
   relation_manager = new relation_factory();
   
   $('#update_workspace_button').data('locked', false);
-                
+   
+  // Set up the mouse events on the SVG enlargement             
   $('#enlargement').mousedown(function (event) {
     $(this)
         .data('down', true)
@@ -910,37 +1054,54 @@ $(document).ready(function () {
   });
   
   
+  // Set up the relationship creation dialog. This also functions as the reading
+  // merge dialog where appropriate.
+			  
   if( editable ) {
-	$( "#dialog-form" ).dialog({
+	$( '#dialog-form' ).dialog( {
 	autoOpen: false,
-	height: 270,
-	width: 290,
+	height: 350,
+	width: 340,
 	modal: true,
 	buttons: {
-	  "Ok": function( evt ) {
-		$(evt.target).button("disable");
-		$('#status').empty();
-		form_values = $('#collapse_node_form').serialize();
+	  'Merge readings': function( evt ) {
+	  	  var mybuttons = $(evt.target).closest('button').parent().find('button');
+		  mybuttons.button( 'disable' );
+		  $( '#status' ).empty();
+		  form_values = $( '#collapse_node_form' ).serialize();
+		  ncpath = getTextURL( 'merge' );
+		  var jqjson = $.post( ncpath, form_values, function( data ) {
+			  merge_nodes( $( '#source_node_id' ).val(), $( '#target_node_id' ).val(), data );
+			  mybuttons.button( 'enable' );
+              $( '#dialog-form' ).dialog( 'close' );
+		  } );
+	  },
+	  OK: function( evt ) {
+	  	var mybuttons = $(evt.target).closest('button').parent().find('button');
+		mybuttons.button( 'disable' );
+		$( '#status' ).empty();
+		form_values = $( '#collapse_node_form' ).serialize();
 		ncpath = getTextURL( 'relationships' );
-		var jqjson = $.post( ncpath, form_values, function(data) {
-			$.each( data, function(item, source_target) { 
+		var jqjson = $.post( ncpath, form_values, function( data ) {
+			$.each( data, function( item, source_target ) { 
 				var source_found = get_ellipse( source_target[0] );
 				var target_found = get_ellipse( source_target[1] );
-				var relation_found = $.inArray( source_target[2], $('#keymap').data('relations') );
+				var relation_found = $.inArray( source_target[2], $( '#keymap' ).data( 'relations' ) );
 				if( source_found.size() && target_found.size() && relation_found > -1 ) {
-					var relation = relation_manager.create( source_target[0], source_target[1], relation_found );
-					relation.data( 'type', source_target[2]  );
-					relation.data( 'scope', $('#scope :selected').text()  );
-					relation.data( 'note', $('#note').val()  );
+					var emphasis = $('#is_significant option:selected').attr('value');
+					var relation = relation_manager.create( source_target[0], source_target[1], relation_found, emphasis );
 					relation_manager.toggle_active( relation.attr('id') );
+					$.each( $('#collapse_node_form').serializeArray(), function( i, k ) {
+						relation.data( k.name, k.value );
+					});
 				}
-				$(evt.target).button("enable");
+				mybuttons.button( 'enable' );
 		   });
-			$( "#dialog-form" ).dialog( "close" );
+			$( '#dialog-form' ).dialog( 'close' );
 		}, 'json' );
 	  },
 	  Cancel: function() {
-		  $( this ).dialog( "close" );
+		  $( this ).dialog( 'close' );
 	  }
 	},
 	create: function(event, ui) { 
@@ -952,17 +1113,29 @@ $(document).ready(function () {
 		$.each( relationship_scopes, function(index, value) {   
 			 $('#scope').append( $('<option />').attr( "value", value ).text(value) ); 
 		});
-		// Handler to clear the annotation field, the first time the relationship is
-		// changed after opening the form.
+		$.each( ternary_values, function( index, value ) {
+			$('#is_significant').append( $('<option />').attr( "value", value ).text(value) );
+		});
+		// Handler to reset fields to default, the first time the relationship 
+		// is changed after opening the form.
 		$('#rel_type').change( function () {
 			if( !$(this).data( 'changed_after_open' ) ) {
 				$('#note').val('');
+				$(this).find(':checked').removeAttr('checked');
 			}
 			$(this).data( 'changed_after_open', true );
 		});
 	},
 	open: function() {
-		relation_manager.create_temporary( $('#source_node_id').val(), $('#target_node_id').val() );
+		relation_manager.create_temporary( 
+			$('#source_node_id').val(), $('#target_node_id').val() );
+		var buttonset = $(this).parent().find( '.ui-dialog-buttonset' )
+		if( readings_equivalent( $('#source_node_id').val(), 
+				$('#target_node_id').val() ) ) {
+			buttonset.find( "button:contains('Merge readings')" ).show();
+		} else {
+			buttonset.find( "button:contains('Merge readings')" ).hide();
+		}
 		$(".ui-widget-overlay").css("background", "none");
 		$("#dialog_overlay").show();
 		$("#dialog_overlay").height( $("#enlargement_container").height() );
@@ -976,7 +1149,8 @@ $(document).ready(function () {
 		$("#dialog_overlay").hide();
 	}
 	}).ajaxError( function(event, jqXHR, ajaxSettings, thrownError) {
-		if( ajaxSettings.url == getTextURL('relationships') 
+		if( ( ajaxSettings.url == getTextURL('relationships')
+			  || ajaxSettings.url == getTextURL('merge') )
 			&& ajaxSettings.type == 'POST' && jqXHR.status == 403 ) {
 			var error;
 			if( jqXHR.responseText.indexOf('do not have permission to modify') > -1 ) {
@@ -995,23 +1169,23 @@ $(document).ready(function () {
 	} );
   }
 
-  var deletion_buttonset = {
-        cancel: function() { $( this ).dialog( "close" ); },
-        global: function () { delete_relation( true ); },
-        delete: function() { delete_relation( false ); }
-  };  	
-  
+  // Set up the relationship info display and deletion dialog.  
   $( "#delete-form" ).dialog({
     autoOpen: false,
     height: 135,
-    width: 250,
+    width: 300,
     modal: false,
+    buttons: {
+        OK: function() { $( this ).dialog( "close" ); },
+        "Delete all": function () { delete_relation( true ); },
+        Delete: function() { delete_relation( false ); }
+    },
     create: function(event, ui) {
     	// TODO What is this logic doing?
     	// This scales the buttons in the dialog and makes it look proper
     	// Not sure how essential it is, does anything break if it's not here?
         var buttonset = $(this).parent().find( '.ui-dialog-buttonset' ).css( 'width', '100%' );
-        buttonset.find( "button:contains('Cancel')" ).css( 'float', 'right' );
+        buttonset.find( "button:contains('OK')" ).css( 'float', 'right' );
     	// A: This makes sure that the pop up delete relation dialogue for a hovered over
     	// relation auto closes if the user doesn't engage (mouseover) with it.
         var dialog_aria = $("div[aria-labelledby='ui-dialog-title-delete-form']");  
@@ -1023,49 +1197,54 @@ $(document).ready(function () {
         })
     },
     open: function() {
+    	// Show the appropriate buttons...
+		var buttonset = $(this).parent().find( '.ui-dialog-buttonset' )
+		// If the user can't edit, show only the OK button
     	if( !editable ) {
-    		$( this ).dialog( "option", "buttons", 
-    			[{ text: "OK", click: deletion_buttonset['cancel'] }] );
+    		buttonset.find( "button:contains('Delete')" ).hide();
+    	// If the relationship scope is local, show only OK and Delete
     	} else if( $('#delete_relation_scope').text() === 'local' ) {
     		$( this ).dialog( "option", "width", 160 );
-    		$( this ).dialog( "option", "buttons",
-    			[{ text: "Delete", click: deletion_buttonset['delete'] },
-    			 { text: "Cancel", click: deletion_buttonset['cancel'] }] );
+    		buttonset.find( "button:contains('Delete')" ).show();
+    		buttonset.find( "button:contains('Delete all')" ).hide();
+    	// Otherwise, show all three
     	} else {
     		$( this ).dialog( "option", "width", 200 );
-    		$( this ).dialog( "option", "buttons",
-    			[{ text: "Delete", click: deletion_buttonset['delete'] },
-    			 { text: "Delete all", click: deletion_buttonset['global'] },
-    			 { text: "Cancel", click: deletion_buttonset['cancel'] }] );
+    		buttonset.find( "button:contains('Delete')" ).show();
 		}    	
-    			
         mouseWait = setTimeout( function() { $("#delete-form").dialog( "close" ) }, 2000 );
     },
     close: function() {}
   });
 
-  var multipleselect_buttonset = {
-        cancel: function() { $( this ).dialog( "close" ); },
-        button1: function () {  },
-        button2: function() {  }
-  };  	
-
   $( "#multipleselect-form" ).dialog({
     autoOpen: false,
     height: 150,
     width: 250,
     modal: true,
+    buttons: {
+        Cancel: function() { $( this ).dialog( "close" ); },
+        Detach: function ( evt ) { 
+            var self = $(this);
+	  		var mybuttons = $(evt.target).closest('button').parent().find('button');
+			mybuttons.button( 'disable' );
+            var form_values = $('#detach_collated_form').serialize();
+            ncpath = getTextURL( 'duplicate' );
+            var jqjson = $.post( ncpath, form_values, function(data) {
+                detach_node( data );
+                mybuttons.button("enable");
+                self.dialog( "close" );
+            } );
+        }
+    },
     create: function(event, ui) {
         var buttonset = $(this).parent().find( '.ui-dialog-buttonset' ).css( 'width', '100%' );
         buttonset.find( "button:contains('Cancel')" ).css( 'float', 'right' );
     },
     open: function() {
         $( this ).dialog( "option", "width", 200 );
-        $( this ).dialog( "option", "buttons",
-            [{ text: "Button_1", click: multipleselect_buttonset['button1'] },
-             { text: "Button_2", click: multipleselect_buttonset['button2'] },
-             { text: "Cancel", click: multipleselect_buttonset['cancel'] }] );
         $(".ui-widget-overlay").css("background", "none");
+        $('#multipleselect-form-status').empty();
         $("#dialog_overlay").show();
         $("#dialog_overlay").height( $("#enlargement_container").height() );
         $("#dialog_overlay").width( $("#enlargement_container").innerWidth() );
@@ -1075,7 +1254,25 @@ $(document).ready(function () {
         marquee.unselect();
         $("#dialog_overlay").hide();
     }
-  });
+  }).ajaxError( function(event, jqXHR, ajaxSettings, thrownError) {
+    if( ajaxSettings.url == getTextURL('duplicate') 
+      && ajaxSettings.type == 'POST' && jqXHR.status == 403 ) {
+      var error;
+      if( jqXHR.responseText.indexOf('do not have permission to modify') > -1 ) {
+        error = 'You are not authorized to modify this tradition. (Try logging in again?)';
+      } else {
+        try {
+          var errobj = jQuery.parseJSON( jqXHR.responseText );
+          error = errobj.error + '</br>The relationship cannot be made.</p>';
+        } catch(e) {
+          error = jqXHR.responseText;
+        }
+      }
+      $('#multipleselect-form-status').append( '<p class="error">Error: ' + error );
+    }
+    $(event.target).parent().find('.ui-button').button("enable");
+  }); 
+
 
   // Helpers for relationship deletion
   
@@ -1106,11 +1303,6 @@ $(document).ready(function () {
   // function for reading form dialog should go here; 
   // just hide the element for now if we don't have morphology
   if( can_morphologize ) {
-  	  if( editable ) {
-	  	  $('#reading_decollate_witnesses').multiselect();
-	  } else {
-	  	  $('#decollation').hide();
-	  }
 	  $('#reading-form').dialog({
 		autoOpen: false,
 		// height: 400,
@@ -1122,7 +1314,8 @@ $(document).ready(function () {
 			},
 			Update: function( evt ) {
 				// Disable the button
-				$(evt.target).button("disable");
+	  			var mybuttons = $(evt.target).closest('button').parent().find('button');
+				mybuttons.button( 'disable' );
 				$('#reading_status').empty();
 				var reading_id = $('#reading_id').val()
 				form_values = {
@@ -1149,7 +1342,7 @@ $(document).ready(function () {
 					if( $('#update_workspace_button').data('locked') == false ) {
 						color_inactive( get_ellipse( reading_id ) );
 					}
-					$(evt.target).button("enable");
+					mybuttons.button("enable");
 					$( "#reading-form" ).dialog( "close" );
 				});
 				// Re-color the node if necessary
@@ -1166,8 +1359,6 @@ $(document).ready(function () {
 		},
 		open: function() {
 			$(".ui-widget-overlay").css("background", "none");
-			$('#reading_decollate_witnesses').multiselect("refresh");
-			$('#reading_decollate_witnesses').multiselect("uncheckAll");
 			$("#dialog_overlay").show();
 			$('#reading_status').empty();
 			$("#dialog_overlay").height( $("#enlargement_container").height() );