X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=root%2Fjs%2Frelationship.js;h=c98077b7963aa88b9d2bc9e6dc8d1133ce3e60ff;hb=eae8de7aeb344df6ccc511fabdcc55ce6666d758;hp=2cbd7ee818c9705c91fda151a7555b9f30ba0074;hpb=69a19c917ed3a2303f3beb7f669c55e7f1bedb47;p=scpubgit%2Fstemmaweb.git

diff --git a/root/js/relationship.js b/root/js/relationship.js
index 2cbd7ee..c98077b 100644
--- a/root/js/relationship.js
+++ b/root/js/relationship.js
@@ -1,32 +1,211 @@
-function getTextPath() {
-    var currpath = window.location.pathname
-    if( currpath.lastIndexOf('/') == currpath.length - 1 ) { 
-    	currpath = currpath.slice( 0, currpath.length - 1) 
-    };
-    var path_elements = currpath.split('/');
-    var textid = path_elements.pop();
-    var basepath = path_elements.join( '/' );
-    var path_parts = [ basepath, textid ];
-    return path_parts;
+var MARGIN=30;
+var svg_root = null;
+var svg_root_element = null;
+var start_element_height = 0;
+var reltypes = {};
+var readingdata = {};
+
+jQuery.removeFromArray = function(value, arr) {
+    return jQuery.grep(arr, function(elem, index) {
+        return elem !== value;
+    });
+};
+
+function arrayUnique(array) {
+    var a = array.concat();
+    for(var i=0; i<a.length; ++i) {
+        for(var j=i+1; j<a.length; ++j) {
+            if(a[i] === a[j])
+                a.splice(j--, 1);
+        }
+    }
+    return a;
+};
+
+function getTextURL( which ) {
+	return basepath + textid + '/' + which;
+}
+
+function getReadingURL( reading_id ) {
+	return basepath + textid + '/reading/' + reading_id;
+}
+
+// Make an XML ID into a valid selector
+function jq(myid) { 
+	return '#' + myid.replace(/(:|\.)/g,'\\$1');
+}
+
+// Actions for opening the reading panel
+function node_dblclick_listener( evt ) {
+  	// Open the reading dialogue for the given node.
+  	// First get the reading info
+  	var reading_id = $(this).attr('id');
+  	var reading_info = readingdata[reading_id];
+  	// and then populate the dialog box with it.
+  	// Set the easy properties first
+  	$('#reading-form').dialog( 'option', 'title', 'Reading information for "' + reading_info['text'] + '"' );
+  	$('#reading_id').val( reading_id );
+  	toggle_checkbox( $('#reading_is_nonsense'), reading_info['is_nonsense'] );
+  	toggle_checkbox( $('#reading_grammar_invalid'), reading_info['grammar_invalid'] );
+  	// Use .text as a backup for .normal_form
+  	var normal_form = reading_info['normal_form'];
+  	if( !normal_form ) {
+  		normal_form = reading_info['text'];
+  	}
+  	var nfboxsize = 10;
+  	if( normal_form.length > 9 ) {
+  		nfboxsize = normal_form.length + 1;
+  	}
+  	$('#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.
+  	$('#reading-form').dialog("open");
 }
 
-function getRelativePath() {
-	var path_parts = getTextPath();
-	return path_parts[0];
+function toggle_checkbox( box, value ) {
+	if( value == null ) {
+		value = false;
+	}
+	box.attr('checked', value );
 }
 
-function getRelationshipURL() {
-	var path_parts = getTextPath();
-	return path_parts[0] + '/' + path_parts[1] + '/relationships';
+function morphology_form ( lexlist ) {
+  	if( lexlist.length ) {
+  		$('#morph_outer').show();
+		$('#morphology').empty();
+		$.each( lexlist, function( idx, lex ) {
+			var morphoptions = [];
+			if( 'wordform_matchlist' in lex ) {
+				$.each( lex['wordform_matchlist'], function( tdx, tag ) {
+					var tagstr = stringify_wordform( tag );
+					morphoptions.push( tagstr );
+				});
+			}
+			var formtag = 'morphology_' + idx;
+			var formstr = '';
+			if( 'form' in lex ) {
+				formstr = stringify_wordform( lex['form'] );
+			} 
+			var form_morph_elements = morph_elements( 
+				formtag, lex['string'], formstr, morphoptions );
+			$.each( form_morph_elements, function( idx, el ) {
+				$('#morphology').append( el );
+			});
+		});
+	} else {
+		$('#morph_outer').hide();
+	}
 }
 
+function stringify_wordform ( tag ) {
+	if( tag ) {
+		var elements = tag.split(' // ');
+		return elements[1] + ' // ' + elements[2];
+	}
+	return ''
+}
+
+function morph_elements ( formtag, formtxt, currform, morphoptions ) {
+	var clicktag = '(Click to select)';
+	if ( !currform ) {
+		currform = clicktag;
+	}
+	var formlabel = $('<label/>').attr( 'id', 'label_' + formtag ).attr( 
+		'for', 'reading_' + formtag ).text( formtxt + ': ' );
+	var forminput = $('<input/>').attr( 'id', 'reading_' + formtag ).attr( 
+		'name', 'reading_' + formtag ).attr( 'size', '50' ).attr(
+		'class', 'reading_morphology' ).val( currform );
+	forminput.autocomplete({ source: morphoptions, minLength: 0	});
+	forminput.focus( function() { 
+		if( $(this).val() == clicktag ) {
+			$(this).val('');
+		}
+		$(this).autocomplete('search', '') 
+	});
+	var morphel = [ formlabel, forminput, $('<br/>') ];
+	return morphel;
+}
+
+function color_inactive ( el ) {
+	var reading_id = $(el).parent().attr('id');
+	var reading_info = readingdata[reading_id];
+	// If the reading info has any non-disambiguated lexemes, color it yellow;
+	// otherwise color it green.
+	$(el).attr( {stroke:'green', fill:'#b3f36d'} );
+	if( reading_info ) {
+		$.each( reading_info['lexemes'], function ( idx, lex ) {
+			if( !lex['is_disambiguated'] || lex['is_disambiguated'] == 0 ) {
+				$(el).attr( {stroke:'orange', fill:'#fee233'} );
+			}
+		});
+	}
+}
+
+function relemmatize () {
+	// Send the reading for a new lemmatization and reopen the form.
+	$('#relemmatize_pending').show();
+	var reading_id = $('#reading_id').val()
+	ncpath = getReadingURL( reading_id );
+	form_values = { 
+		'normal_form': $('#reading_normal_form').val(), 
+		'relemmatize': 1 };
+	var jqjson = $.post( ncpath, form_values, function( data ) {
+		// Update the form with the return
+		if( 'id' in data ) {
+			// We got back a good answer. Stash it
+			readingdata[reading_id] = data;
+			// and regenerate the morphology form.
+			morphology_form( data['lexemes'] );
+		} else {
+			alert("Could not relemmatize as requested: " + data['error']);
+		}
+		$('#relemmatize_pending').hide();
+	});
+}
+
+// Initialize the SVG once it exists
 function svgEnlargementLoaded() {
-    //Set viewbox widht and height to widht and height of $('#svgenlargement svg').
-    //This is essential to make sure zooming and panning works properly.
-    $('#svgenlargement ellipse').attr( {stroke:'green', fill:'#b3f36d'} );
+	//Give some visual evidence that we are working
+	$('#loading_overlay').show();
+	lo_height = $("#enlargement_container").outerHeight();
+	lo_width = $("#enlargement_container").outerWidth();
+	$("#loading_overlay").height( lo_height );
+	$("#loading_overlay").width( lo_width );
+	$("#loading_overlay").offset( $("#enlargement_container").offset() );
+	$("#loading_message").offset(
+		{ 'top': lo_height / 2 - $("#loading_message").height() / 2,
+		  'left': lo_width / 2 - $("#loading_message").width() / 2 });
+    if( editable ) {
+    	// Show the update toggle button.
+	    $('#update_workspace_button').data('locked', false);
+    	$('#update_workspace_button').css('background-position', '0px 44px');
+    }
+    $('#svgenlargement ellipse').parent().dblclick( node_dblclick_listener );
     var graph_svg = $('#svgenlargement svg');
     var svg_g = $('#svgenlargement svg g')[0];
+    if (!svg_g) return;
     svg_root = graph_svg.svg().svg('get').root();
+
+    // Find the real root and ignore any text nodes
+    for (i = 0; i < svg_root.childNodes.length; ++i) {
+        if (svg_root.childNodes[i].nodeName != '#text') {
+		svg_root_element = svg_root.childNodes[i];
+		break;
+	   }
+    }
+
+    //Set viewbox width and height to width and height of $('#svgenlargement svg').
+    //This is essential to make sure zooming and panning works properly.
     svg_root.viewBox.baseVal.width = graph_svg.attr( 'width' );
     svg_root.viewBox.baseVal.height = graph_svg.attr( 'height' );
     //Now set scale and translate so svg height is about 150px and vertically centered in viewbox.
@@ -40,40 +219,63 @@ function svgEnlargementLoaded() {
     var transform = 'rotate(0) scale(' + scale + ') translate(4 ' + translate + ')';
     svg_g.setAttribute('transform', transform);
     //used to calculate min and max zoom level:
-    start_element_height = $("#svgenlargement .node title:contains('#START#')").siblings('ellipse')[0].getBBox().height;
-    add_relations();
-}
-
-function add_relations() {
-	var basepath = getRelativePath();
-	var textrelpath = getRelationshipURL();
-    $.getJSON( basepath + '/definitions', function(data) {
-        var rel_types = data.types.sort();
-        $.getJSON( textrelpath,
-        function(data) {
-            $.each(data, function( index, rel_info ) {
-                var type_index = $.inArray(rel_info.type, rel_types);
-                if( type_index != -1 ) {
-                    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 node_obj = get_node_obj(rel_info.source);
-                    node_obj.set_draggable( false );
-                    node_obj.ellipse.data( 'node_obj', null );
-                    node_obj = get_node_obj(rel_info.target);
-                    node_obj.set_draggable( false );
-                    node_obj.ellipse.data( 'node_obj', null );
-                }
-            })
+    start_element_height = $('#__START__').children('ellipse')[0].getBBox().height;
+    //some use of call backs to ensure succesive execution
+    add_relations( function() { 
+        var rdgpath = getTextURL( 'readings' );
+        $.getJSON( rdgpath, function( data ) {
+            readingdata = data;
+            $('#svgenlargement ellipse').each( function( i, el ) { color_inactive( el ) });
+            $('#loading_overlay').hide(); 
         });
     });
+    
+    //initialize marquee
+    marquee = new Marquee();
+    
+}
+
+function add_relations( callback_fn ) {
+	// Add the relationship types to the keymap list
+	$.each( relationship_types, function(index, typedef) {   
+		 li_elm = $('<li class="key">').css( "border-color", 
+		 	relation_manager.relation_colors[index] ).text(typedef.name);
+		 li_elm.append( $('<div>').attr('class', 'key_tip_container').append(
+		 	$('<div>').attr('class', 'key_tip').text(typedef.description) ) );
+		 $('#keymaplist').append( li_elm ); 
+	});
+	// Now fetch the relationships themselves and add them to the graph
+	var rel_types = $.map( relationship_types, function(t) { return t.name });
+	// Save this list of names to the outer element data so that the relationship
+	// factory can access it
+	$('#keymap').data('relations', rel_types);
+	var textrelpath = getTextURL( 'relationships' );
+	$.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 );
+			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 );
+				if( editable ) {
+					var node_obj = get_node_obj(rel_info.source);
+					node_obj.set_selectable( false );
+					node_obj.ellipse.data( 'node_obj', null );
+					node_obj = get_node_obj(rel_info.target);
+					node_obj.set_selectable( false );
+					node_obj.ellipse.data( 'node_obj', null );
+				}
+			}
+		});
+		callback_fn.call();
+	});
 }
 
 function get_ellipse( node_id ) {
-  return $('#svgenlargement .node').children('title').filter( function(index) {
-    return $(this).text() == node_id;
-  }).siblings('ellipse');
+	return $( jq( node_id ) + ' ellipse');
 }
 
 function get_node_obj( node_id ) {
@@ -84,12 +286,6 @@ function get_node_obj( node_id ) {
     return node_ellipse.data( 'node_obj' );
 }
 
-function get_edge( edge_id ) {
-  return $('#svgenlargement .edge').filter( function(index) {
-    return $(this).children( 'title' ).text() == $('<div/>').html(edge_id).text() ;
-  });
-}
-
 function node_obj(ellipse) {
   this.ellipse = ellipse;
   var self = this;
@@ -99,19 +295,46 @@ 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.siblings('title').text()
+    return $(self.ellipse).parent().attr('id')
+  }
+  
+  this.set_selectable = function( clickable ) {
+      if( clickable && editable ) {
+          $(self.ellipse).attr( {stroke:'black', fill:'#fff'} );
+          $(self.ellipse).parent().hover( this.enter_node, this.leave_node );
+          $(self.ellipse).parent().mousedown( function(evt) { evt.stopPropagation() } ); 
+          $(self.ellipse).parent().click( function(evt) { 
+              evt.stopPropagation();              
+              if( $('ellipse[fill="#9999ff"]').size() > 0 ) {
+                $('ellipse[fill="#9999ff"]').each( function() { 
+                    $(this).data( 'node_obj' ).set_draggable( false );
+                } );
+              }
+              self.set_draggable( true ) 
+          });
+      } else {
+          $(self.ellipse).attr( {stroke:'black', fill:'#fff'} );
+          self.ellipse.siblings('text').attr('class', '');
+          $(self.ellipse).parent().unbind(); 
+          $('body').unbind('mousemove');
+          $('body').unbind('mouseup');
+      }
   }
   
   this.set_draggable = function( draggable ) {
-    if( draggable ) {
-      self.ellipse.attr( {stroke:'black', fill:'#fff'} );
-      self.ellipse.mousedown( this.mousedown_listener );
-      self.ellipse.hover( this.enter_node, this.leave_node );  
+    if( draggable && editable ) {
+      $(self.ellipse).attr( {stroke:'black', fill:'#9999ff'} );
+      $(self.ellipse).parent().mousedown( this.mousedown_listener );
+      $(self.ellipse).parent().unbind( 'mouseenter' ).unbind( 'mouseleave' );
+      self.ellipse.siblings('text').attr('class', 'noselect draggable');
     } else {
-      self.ellipse.unbind('mouseenter').unbind('mouseleave').unbind('mousedown');
-      self.ellipse.attr( {stroke:'green', fill:'#b3f36d'} );
+      $(self.ellipse).attr( {stroke:'black', fill:'#fff'} );
+      self.ellipse.siblings('text').attr('class', '');
+      $(self.ellipse).parent().unbind( 'mousedown ');
+      $(self.ellipse).parent().mousedown( function(evt) { evt.stopPropagation() } ); 
+      $(self.ellipse).parent().hover( this.enter_node, this.leave_node );
     }
   }
 
@@ -121,8 +344,8 @@ function node_obj(ellipse) {
     self.y = evt.clientY;
     $('body').mousemove( self.mousemove_listener );
     $('body').mouseup( self.mouseup_listener );
-    self.ellipse.unbind('mouseenter').unbind('mouseleave')
-    self.ellipse.attr( 'fill', '#ff66ff' );
+    $(self.ellipse).parent().unbind('mouseenter').unbind('mouseleave')
+    self.ellipse.attr( 'fill', '#6b6bb2' );
     first_node_g_element = $("#svgenlargement g .node" ).filter( ":first" );
     if( first_node_g_element.attr('id') !== self.get_g().attr('id') ) { self.get_g().insertBefore( first_node_g_element ) };
   }
@@ -131,23 +354,29 @@ function node_obj(ellipse) {
     self.dx = (evt.clientX - self.x) / mouse_scale;
     self.dy = (evt.clientY - self.y) / mouse_scale;
     self.move_elements();
+    evt.returnValue = false;
+    evt.preventDefault();
+    return false;
   }
 
   this.mouseup_listener = function(evt) {    
     if( $('ellipse[fill="#ffccff"]').size() > 0 ) {
-        var source_node_id = self.ellipse.siblings('title').text();
-        var target_node_id = $('ellipse[fill="#ffccff"]').siblings("title").text();
+        var source_node_id = $(self.ellipse).parent().attr('id');
+        var source_node_text = self.ellipse.siblings('text').text();
+        var target_node_id = $('ellipse[fill="#ffccff"]').parent().attr('id');
+        var target_node_text = $('ellipse[fill="#ffccff"]').siblings("text").text();
         $('#source_node_id').val( source_node_id );
+        $('#source_node_text').val( source_node_text );
         $('#target_node_id').val( target_node_id );
+        $('#target_node_text').val( target_node_text );
         $('#dialog-form').dialog( 'open' );
     };
     $('body').unbind('mousemove');
     $('body').unbind('mouseup');
-    self.ellipse.attr( 'fill', '#fff' );
-    self.ellipse.hover( self.enter_node, self.leave_node );
+    self.ellipse.attr( 'fill', '#9999ff' );
     self.reset_elements();
   }
-
+  
   this.cpos = function() {
     return { x: self.ellipse.attr('cx'), y: self.ellipse.attr('cy') };
   }
@@ -176,32 +405,55 @@ 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() {
       self.node_elements = node_elements_for(self.ellipse);
   }
 
-  self.set_draggable( true );
+  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 ) {
@@ -220,24 +472,36 @@ 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');
           this.svg_element.siblings('text').attr('fill', '#e5e5e5');
+          this.svg_element.siblings('text').attr('class', 'noselect');
       }
   }
   this.un_grey_out = function(filter) {
       if( this.svg_element.parent(filter).size() != 0 ) {
           this.svg_element.attr('stroke', '#000000');
           this.svg_element.siblings('text').attr('fill', '#000000');
+          this.svg_element.siblings('text').attr('class', '');
       }
   }
 }
@@ -251,9 +515,9 @@ function node_elements_for( ellipse ) {
 
 function get_edge_elements_for( ellipse ) {
   edge_elements = new Array();
-  node_id = ellipse.siblings('title').text();
+  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) ) {
@@ -280,12 +544,8 @@ function relation_factory() {
     this.relation_colors = [ "#5CCCCC", "#67E667", "#F9FE72", "#6B90D4", "#FF7673", "#E467B3", "#AA67D5", "#8370D8", "#FFC173" ];
 
     this.create_temporary = function( source_node_id, target_node_id ) {
-        var relation = $('#svgenlargement .relation').filter( function(index) {
-            var relation_id = $(this).children('title').text();
-            if( ( relation_id == ( source_node_id + '->' + target_node_id ) ) || ( relation_id == ( target_node_id + '->' + source_node_id ) ) ) {
-                return true;
-            } 
-        } );
+    	var relation_id = get_relation_id( source_node_id, target_node_id );
+        var relation = $( jq( relation_id ) );
         if( relation.size() == 0 ) { 
             draw_relation( source_node_id, target_node_id, self.temp_color );
         } else {
@@ -313,16 +573,16 @@ function relation_factory() {
         return relation;
     }
     this.toggle_active = function( relation_id ) {
-        var relation = $("#svgenlargement .relation:has(title:contains('" + relation_id + "'))");
+        var relation = $( jq( relation_id ) );
         var relation_path = relation.children('path');
         if( !relation.data( 'active' ) ) {
             relation_path.css( {'cursor':'pointer'} );
             relation_path.mouseenter( function(event) { 
                 outerTimer = setTimeout( function() { 
                     timer = setTimeout( function() { 
-                        var title = relation.children('title').text();
-                        var source_node_id = title.substring( 0, title.indexOf( "->" ) );
-                        var target_node_id = title.substring( (title.indexOf( "->" ) + 2) );
+                        var related_nodes = get_related_nodes( relation_id );
+                        var source_node_id = related_nodes[0];
+                        var target_node_id = related_nodes[1];
                         $('#delete_source_node_id').val( source_node_id );
                         $('#delete_target_node_id').val( target_node_id );
                         self.showinfo(relation); 
@@ -342,11 +602,11 @@ function relation_factory() {
         }
     }
     this.showinfo = function(relation) {
-    	var htmlstr = 'type: ' + relation.data( 'type' ) + '<br/>scope: ' + relation.data( 'scope' );
+    	$('#delete_relation_type').text( relation.data('type') );
+    	$('#delete_relation_scope').text( relation.data('scope') );
     	if( relation.data( 'note' ) ) {
-    		htmlstr = htmlstr + '<br/>note: ' + relation.data( 'note' );
+    		$('#delete_relation_note').text('note: ' + relation.data( 'note' ) );
     	}
-        $('#delete-form-text').html( htmlstr );
         var points = relation.children('path').attr('d').slice(1).replace('C',' ').split(' ');
         var xs = parseFloat( points[0].split(',')[0] );
         var xe = parseFloat( points[1].split(',')[0] );
@@ -355,7 +615,7 @@ function relation_factory() {
         var p = svg_root.createSVGPoint();
         p.x = xs + ((xe-xs)*1.1);
         p.y = ye - ((ye-ys)/2);
-        var ctm = svg_root.children[0].getScreenCTM();
+        var ctm = svg_root_element.getScreenCTM();
         var nx = p.matrixTransform(ctm).x;
         var ny = p.matrixTransform(ctm).y;
         var dialog_aria = $ ("div[aria-labelledby='ui-dialog-title-delete-form']");
@@ -363,14 +623,31 @@ function relation_factory() {
         dialog_aria.offset({ left: nx, top: ny });
     }
     this.remove = function( relation_id ) {
-        var relation = $("#svgenlargement .relation:has(title:contains('" + relation_id + "'))");
+    	if( !editable ) {
+    		return;
+    	}
+        var relation = $( jq( relation_id ) );
         relation.remove();
     }
 }
 
+// Utility function to create/return the ID of a relation link between
+// a source and target.
+function get_relation_id( source_id, target_id ) {
+	var idlist = [ source_id, target_id ];
+	idlist.sort();
+	return 'relation-' + idlist[0] + '-...-' + idlist[1];
+}
+
+function get_related_nodes( relation_id ) {
+	var srctotarg = relation_id.substr( 9 );
+	return srctotarg.split('-...-');
+}
+
 function draw_relation( source_id, target_id, relation_color ) {
     var source_ellipse = get_ellipse( source_id );
     var target_ellipse = get_ellipse( target_id );
+    var relation_id = get_relation_id( source_id, target_id );
     var svg = $('#svgenlargement').children('svg').svg().svg('get');
     var path = svg.createPath(); 
     var sx = parseInt( source_ellipse.attr('cx') );
@@ -378,7 +655,7 @@ 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'} );
+    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 relation_element = $('#svgenlargement .relation').filter( ':last' );
@@ -386,27 +663,335 @@ function draw_relation( source_id, target_id, relation_color ) {
     return relation_element;
 }
 
+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
+    $.each( readings, function( node_id, reading ) {
+        $.each( reading.witnesses, function( index, witness ) {
+            var witnesses = readingdata[ reading.orig_rdg ].witnesses;
+            readingdata[ reading.orig_rdg ].witnesses = $.removeFromArray( witness, witnesses );
+        } );
+    } );    
+    
+    detached_edges = [];
+    
+    // here we detach witnesses from the existing edges accoring to what's being relayed by readings
+    $.each( readings, function( node_id, reading ) {
+        var edges = edges_of( get_ellipse( reading.orig_rdg ) );
+        incoming_remaining = [];
+        outgoing_remaining = [];
+        $.each( reading.witnesses, function( index, witness ) {
+            incoming_remaining.push( witness );
+            outgoing_remaining.push( witness );
+        } );
+        $.each( edges, function( index, edge ) {
+            detached_edge = edge.detach_witnesses( reading.witnesses );
+            if( detached_edge != null ) {
+                detached_edges.push( detached_edge );
+                $.each( detached_edge.witnesses, function( index, witness ) {
+                    if( detached_edge.is_incoming == true ) {
+                        incoming_remaining = $.removeFromArray( witness, incoming_remaining );
+                    } else {
+                        outgoing_remaining = $.removeFromArray( witness, outgoing_remaining );
+                    }
+                } );
+            }
+        } );
+        
+        // After detaching we still need to check if for *all* readings
+        // an edge was detached. It may be that a witness was not
+        // explicitly named on an edge but was part of a 'majority' edge
+        // in which case we need to duplicate and name that edge after those
+        // remaining witnesses.
+        if( outgoing_remaining.length > 0 ) {
+            $.each( edges, function( index, edge ) {
+                if( edge.get_label() == 'majority' && !edge.is_incoming ) {
+                    detached_edges.push( edge.clone_for( outgoing_remaining ) );
+                }
+            } );
+        }
+        if( incoming_remaining.length > 0 ) {
+            $.each( edges, function( index, edge ) {
+                if( edge.get_label() == 'majority' && edge.is_incoming ) {
+                    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 ) {
+            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
+        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, '/images/tick_circle_frame.png', { id: merge_id } );
+                svg.image( parent_g, (xC+20), (yC-8), 16, 16, '/images/no_entry.png', { 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() {
+    
+    var self = this;
+    
+    this.x = 0;
+    this.y = 0;
+    this.dx = 0;
+    this.dy = 0;
+    this.enlargementOffset = $('#svgenlargement').offset();
+    this.svg_rect = $('#svgenlargement svg').svg('get');
+
+    this.show = function( event ) {
+        self.x = event.clientX;
+        self.y = event.clientY;
+        p = svg_root.createSVGPoint();
+        p.x = event.clientX - self.enlargementOffset.left;
+        p.y = event.clientY - self.enlargementOffset.top;
+        self.svg_rect.rect( p.x, p.y, 0, 0, { fill: 'black', 'fill-opacity': '0.1', stroke: 'black', 'stroke-dasharray': '4,2', strokeWidth: '0.02em', id: 'marquee' } );
+    };
+
+    this.expand = function( event ) {
+        self.dx = (event.clientX - self.x);
+        self.dy = (event.clientY - self.y);
+        var rect = $('#marquee');
+        if( rect.length != 0 ) {            
+            var rect_w =  Math.abs( self.dx );
+            var rect_h =  Math.abs( self.dy );
+            var rect_x = self.x - self.enlargementOffset.left;
+            var rect_y = self.y - self.enlargementOffset.top;
+            if( self.dx < 0 ) { rect_x = rect_x - rect_w }
+            if( self.dy < 0 ) { rect_y = rect_y - rect_h }
+            rect.attr("x", rect_x).attr("y", rect_y).attr("width", rect_w).attr("height", rect_h);
+        }
+    };
+    
+    this.select = function() {
+        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 );
+              } );
+            }
+            //compute dimension of marquee
+            var left = $('#marquee').offset().left;
+            var top = $('#marquee').offset().top;
+            var right = left + parseInt( $('#marquee').attr( 'width' ) );
+            var bottom = top + parseInt( $('#marquee').attr( 'height' ) );
+            var tf = svg_root_element.getScreenCTM().inverse(); 
+            var p = svg_root.createSVGPoint();
+            p.x=left;
+            p.y=top;
+            var cx_min = p.matrixTransform(tf).x;
+            var cy_min = p.matrixTransform(tf).y;
+            p.x=right;
+            p.y=bottom;
+            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 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') );
+        }
+    };
+    
+    this.unselect = function() {
+        $('ellipse[fill="#9999ff"]').attr( 'fill', '#fff' );
+    }
+     
+}
+
+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 stlc = sourcetext.toLowerCase().replace(/[^\w\s]|_/g, "");
+	var ttlc = targettext.toLowerCase().replace(/[^\w\s]|_/g, "");
+	if( stlc === ttlc ) {
+		return true;
+	}	
+	return false;
+}
+
 
 $(document).ready(function () {
     
   timer = null;
   relation_manager = new relation_factory();
-  $('#update_workspace_button').data('locked', false);
   
+  $('#update_workspace_button').data('locked', false);
+   
+  // Set up the mouse events on the SVG enlargement             
   $('#enlargement').mousedown(function (event) {
     $(this)
         .data('down', true)
         .data('x', event.clientX)
         .data('y', event.clientY)
         .data('scrollLeft', this.scrollLeft)
-        stateTf = svg_root.children[0].getCTM().inverse();
-        var p = svg_root.createSVGPoint();
-        p.x = event.clientX;
-        p.y = event.clientY;
-        stateOrigin = p.matrixTransform(stateTf);
-        return false;
+    stateTf = svg_root_element.getCTM().inverse();
+    var p = svg_root.createSVGPoint();
+    p.x = event.clientX;
+    p.y = event.clientY;
+    stateOrigin = p.matrixTransform(stateTf);
+
+    // Activate marquee if in interaction mode
+    if( $('#update_workspace_button').data('locked') == true ) { marquee.show( event ) };
+        
+    event.returnValue = false;
+    event.preventDefault();
+    return false;
   }).mouseup(function (event) {
-        $(this).data('down', false);
+    marquee.select(); 
+    $(this).data('down', false);
   }).mousemove(function (event) {
     if( timer != null ) { clearTimeout(timer); } 
     if ( ($(this).data('down') == true) && ($('#update_workspace_button').data('locked') == false) ) {
@@ -416,22 +1001,29 @@ $(document).ready(function () {
         p = p.matrixTransform(stateTf);
         var matrix = stateTf.inverse().translate(p.x - stateOrigin.x, p.y - stateOrigin.y);
         var s = "matrix(" + matrix.a + "," + matrix.b + "," + matrix.c + "," + matrix.d + "," + matrix.e + "," + matrix.f + ")";
-        svg_root.children[0].setAttribute("transform", s);
+        svg_root_element.setAttribute("transform", s);
     }
+    marquee.expand( event ); 
+    event.returnValue = false;
+    event.preventDefault();
   }).mousewheel(function (event, delta) {
     event.returnValue = false;
     event.preventDefault();
     if ( $('#update_workspace_button').data('locked') == false ) {
+        if (!delta || delta == null || delta == 0) delta = event.originalEvent.wheelDelta;
+        if (!delta || delta == null || delta == 0) delta = -1 * event.originalEvent.detail;
         if( delta < -9 ) { delta = -9 }; 
         var z = 1 + delta/10;
-        var g = svg_root.children[0];
-        if( (z<1 && (g.getScreenCTM().a * start_element_height) > 4.0) || (z>1 && (g.getScreenCTM().a * start_element_height) < 100) ) {
+        z = delta > 0 ? 1 : -1;
+        var g = svg_root_element;
+        if (g && ((z<1 && (g.getScreenCTM().a * start_element_height) > 4.0) || (z>=1 && (g.getScreenCTM().a * start_element_height) < 100))) {
             var root = svg_root;
             var p = root.createSVGPoint();
-            p.x = event.clientX;
-            p.y = event.clientY;
+            p.x = event.originalEvent.clientX;
+            p.y = event.originalEvent.clientY;
             p = p.matrixTransform(g.getCTM().inverse());
-            var k = root.createSVGMatrix().translate(p.x, p.y).scale(z).translate(-p.x, -p.y);
+            var scaleLevel = 1+(z/20);
+            var k = root.createSVGMatrix().translate(p.x, p.y).scale(scaleLevel).translate(-p.x, -p.y);
             var matrix = g.getCTM().multiply(k);
             var s = "matrix(" + matrix.a + "," + matrix.b + "," + matrix.c + "," + matrix.d + "," + matrix.e + "," + matrix.f + ")";
             g.setAttribute("transform", s);
@@ -442,92 +1034,133 @@ $(document).ready(function () {
     'cursor' : '-moz-grab'
   });
   
+  
+  // Set up the relationship creation dialog. This also functions as the reading
+  // merge dialog where appropriate.
+			  
+  if( editable ) {
+	$( '#dialog-form' ).dialog( {
+	autoOpen: false,
+	height: 270,
+	width: 290,
+	modal: true,
+	buttons: {
+	  'Merge readings': function( evt ) {
+		  $( evt.target ).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 );
+			  $(evt.target).button( 'enable' );
+              $( '#dialog-form' ).dialog( 'close' );
+		  } );
+	  },
+	  OK: function( evt ) {
+		$( evt.target ).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 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' ) );
+				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()  );
+					relation_manager.toggle_active( relation.attr('id') );
+				}
+				$(evt.target).button( 'enable' );
+		   });
+			$( '#dialog-form' ).dialog( 'close' );
+		}, 'json' );
+	  },
+	  Cancel: function() {
+		  $( this ).dialog( 'close' );
+	  }
+	},
+	create: function(event, ui) { 
+		$(this).data( 'relation_drawn', false );
+		$('#rel_type').data( 'changed_after_open', false );
+		$.each( relationship_types, function(index, typedef) {   
+			 $('#rel_type').append( $('<option />').attr( "value", typedef.name ).text(typedef.name) ); 
+		});
+		$.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.
+		$('#rel_type').change( function () {
+			if( !$(this).data( 'changed_after_open' ) ) {
+				$('#note').val('');
+			}
+			$(this).data( 'changed_after_open', true );
+		});
+	},
+	open: function() {
+		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() );
+		$("#dialog_overlay").width( $("#enlargement_container").innerWidth() );
+		$("#dialog_overlay").offset( $("#enlargement_container").offset() );
+		$('#rel_type').data( 'changed_after_open', false );
+	},
+	close: function() {
+		relation_manager.remove_temporary();
+		$( '#status' ).empty();
+		$("#dialog_overlay").hide();
+	}
+	}).ajaxError( function(event, jqXHR, ajaxSettings, thrownError) {
+		if( ajaxSettings.url == getTextURL('relationships') 
+			&& 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;
+				}
+			}
+			$('#status').append( '<p class="error">Error: ' + error );
+		}
+		$(event.target).parent().find('.ui-button').button("enable");
+	} );
+  }
 
-  $( "#dialog-form" ).dialog({
-    autoOpen: false,
-    height: 270,
-    width: 290,
-    modal: true,
-    buttons: {
-      "Ok": function() {
-        $('#status').empty();
-        form_values = $('#collapse_node_form').serialize()
-        ncpath = getRelationshipURL();
-        $(':button :contains("Ok")').attr("disabled", true);
-        var jqjson = $.post( ncpath, form_values, function(data) {
-            $.each( data, function(item, source_target) { 
-                var relation = relation_manager.create( source_target[0], source_target[1], $('#rel_type').attr('selectedIndex') );
-                relation.data( 'type', $('#rel_type :selected').text()  );
-                relation.data( 'scope', $('#scope :selected').text()  );
-                relation.data( 'note', $('#note').val()  );
-                relation_manager.toggle_active( relation.children('title').text() );
-            });
-            $( "#dialog-form" ).dialog( "close" );
-        }, 'json' );
-      },
-      Cancel: function() {
-          $( this ).dialog( "close" );
-      }
-    },
-    create: function(event, ui) { 
-        $(this).data( 'relation_drawn', false );
-        //TODO? Err handling?
-		var basepath = getRelativePath();
-        var jqjson = $.getJSON( basepath + '/definitions', function(data) {
-            var types = data.types.sort();
-            $.each( types, function(index, value) {   
-                 $('#rel_type').append( $('<option>').attr( "value", value ).text(value) ); 
-                 $('#keymaplist').append( $('<li>').css( "border-color", relation_manager.relation_colors[index] ).text(value) ); 
-            });
-            var scopes = data.scopes;
-            $.each( scopes, function(index, value) {   
-                 $('#scope').append( $('<option>').attr( "value", value ).text(value) ); 
-            });
-        });        
-    },
-    open: function() {
-        relation_manager.create_temporary( $('#source_node_id').val(), $('#target_node_id').val() );
-        $(".ui-widget-overlay").css("background", "none");
-        $("#dialog_overlay").show();
-        $("#dialog_overlay").height( $("#enlargement_container").height() );
-        $("#dialog_overlay").width( $("#enlargement_container").width() );
-        $("#dialog_overlay").offset( $("#enlargement_container").offset() );
-    },
-    close: function() {
-        relation_manager.remove_temporary();
-        $( '#status' ).empty();
-        $("#dialog_overlay").hide();
-    }
-  }).ajaxError( function(event, jqXHR, ajaxSettings, thrownError) {
-      if( ( ajaxSettings.type == 'POST' ) && jqXHR.status == 403 ) {
-      	  var errobj = jQuery.parseJSON( jqXHR.responseText );
-          $('#status').append( '<p class="error">Error: ' + errobj.error + '</br>The relationship cannot be made.</p>' );
-      }
-  } );
-
+  // Set up the relationship info display and deletion dialog.  
   $( "#delete-form" ).dialog({
     autoOpen: false,
     height: 135,
-    width: 160,
+    width: 250,
     modal: false,
     buttons: {
-        Cancel: function() {
-            $( this ).dialog( "close" );
-        },
-        Delete: function() {
-          form_values = $('#delete_relation_form').serialize()
-          ncpath = getRelationshipURL()
-          var jqjson = $.ajax({ url: ncpath, data: form_values, success: function(data) {
-              $.each( data, function(item, source_target) { 
-                  relation_manager.remove( source_target[0] + '->' + source_target[1] );
-              });
-              $( "#delete-form" ).dialog( "close" );
-          }, dataType: 'json', type: 'DELETE' });
-        }
+        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']");  
         dialog_aria.mouseenter( function() {
             if( mouseWait != null ) { clearTimeout(mouseWait) };
@@ -537,20 +1170,218 @@ $(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 ) {
+    		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 );
+    		buttonset.find( "button:contains('Delete')" ).show();
+    		buttonset.find( "button:contains('Delete all')" ).hide();
+    	// Otherwise, show all three
+    	} else {
+    		$( this ).dialog( "option", "width", 200 );
+    		buttonset.find( "button:contains('Delete')" ).show();
+		}    	
         mouseWait = setTimeout( function() { $("#delete-form").dialog( "close" ) }, 2000 );
     },
-    close: function() {
-    }
+    close: function() {}
   });
 
+  $( "#multipleselect-form" ).dialog({
+    autoOpen: false,
+    height: 150,
+    width: 250,
+    modal: true,
+    buttons: {
+        Cancel: function() { $( this ).dialog( "close" ); },
+        Detach: function ( evt ) { 
+            var self = $(this);
+            $( evt.target ).button( "disable" );
+            var form_values = $('#detach_collated_form').serialize();
+            ncpath = getTextURL( 'duplicate' );
+            var jqjson = $.post( ncpath, form_values, function(data) {
+                detach_node( data );
+                $(evt.target).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 );
+        $(".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() );
+        $("#dialog_overlay").offset( $("#enlargement_container").offset() );
+    },
+    close: 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
+  
+  function delete_relation( scopewide ) {
+	  form_values = $('#delete_relation_form').serialize();
+	  if( scopewide ) {
+	  	form_values += "&scopewide=true";
+	  }
+	  ncpath = getTextURL( 'relationships' );
+	  var jqjson = $.ajax({ url: ncpath, data: form_values, success: function(data) {
+		  $.each( data, function(item, source_target) { 
+			  relation_manager.remove( get_relation_id( source_target[0], source_target[1] ) );
+		  });
+		  $( "#delete-form" ).dialog( "close" );
+	  }, dataType: 'json', type: 'DELETE' });
+  }
+  
+  function toggle_relation_active( node_id ) {
+      $('#svgenlargement .relation').find( "title:contains('" + node_id +  "')" ).each( function(index) {
+          matchid = new RegExp( "^" + node_id );
+          if( $(this).text().match( matchid ) != null ) {
+          	  var relation_id = $(this).parent().attr('id');
+              relation_manager.toggle_active( relation_id );
+          };
+      });
+  }
+
+  // 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,
+		width: 450,
+		modal: true,
+		buttons: {
+			Cancel: function() {
+				$( this ).dialog( "close" );
+			},
+			Update: function( evt ) {
+				// Disable the button
+				$(evt.target).button("disable");
+				$('#reading_status').empty();
+				var reading_id = $('#reading_id').val()
+				form_values = {
+					'id' : reading_id,
+					'is_nonsense': $('#reading_is_nonsense').is(':checked'),
+					'grammar_invalid': $('#reading_grammar_invalid').is(':checked'),
+					'normal_form': $('#reading_normal_form').val() };
+				// Add the morphology values
+				$('.reading_morphology').each( function() {
+					if( $(this).val() != '(Click to select)' ) {
+						var rmid = $(this).attr('id');
+						rmid = rmid.substring(8);
+						form_values[rmid] = $(this).val();
+					}
+				});
+				// Make the JSON call
+				ncpath = getReadingURL( reading_id );
+				var reading_element = readingdata[reading_id];
+				// $(':button :contains("Update")').attr("disabled", true);
+				var jqjson = $.post( ncpath, form_values, function(data) {
+					$.each( data, function(key, value) { 
+						reading_element[key] = value;
+					});
+					if( $('#update_workspace_button').data('locked') == false ) {
+						color_inactive( get_ellipse( reading_id ) );
+					}
+					$(evt.target).button("enable");
+					$( "#reading-form" ).dialog( "close" );
+				});
+				// Re-color the node if necessary
+				return false;
+			}
+		},
+		create: function() {
+			if( !editable ) {
+				// Get rid of the disallowed editing UI bits
+				$( this ).dialog( "option", "buttons", 
+					[{ text: "OK", click: function() { $( this ).dialog( "close" ); }}] );
+				$('#reading_relemmatize').hide();
+			}
+		},
+		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() );
+			$("#dialog_overlay").width( $("#enlargement_container").innerWidth() );
+			$("#dialog_overlay").offset( $("#enlargement_container").offset() );
+			$("#reading-form").parent().find('.ui-button').button("enable");
+		},
+		close: function() {
+			$("#dialog_overlay").hide();
+		}
+	  }).ajaxError( function(event, jqXHR, ajaxSettings, thrownError) {
+		if( ajaxSettings.url.lastIndexOf( getReadingURL('') ) > -1
+			&& 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;
+				}
+			}
+			$('#status').append( '<p class="error">Error: ' + error );
+		}
+		$(event.target).parent().find('.ui-button').button("enable");
+	  });
+	} else {
+		$('#reading-form').hide();
+	}
+  
+
   $('#update_workspace_button').click( function() {
+  	 if( !editable ) {
+  	 	return;
+  	 }
      var svg_enlargement = $('#svgenlargement').svg().svg('get').root();
-     mouse_scale = svg_root.children[0].getScreenCTM().a;
+     mouse_scale = svg_root_element.getScreenCTM().a;
      if( $(this).data('locked') == true ) {
          $('#svgenlargement ellipse' ).each( function( index ) {
              if( $(this).data( 'node_obj' ) != null ) {
                  $(this).data( 'node_obj' ).ungreyout_edges();
-                 $(this).data( 'node_obj' ).set_draggable( false );
+                 $(this).data( 'node_obj' ).set_selectable( false );
+                 color_inactive( $(this) );
                  var node_id = $(this).data( 'node_obj' ).get_id();
                  toggle_relation_active( node_id );
                  $(this).data( 'node_obj', null );
@@ -561,7 +1392,7 @@ $(document).ready(function () {
      } else {
          var left = $('#enlargement').offset().left;
          var right = left + $('#enlargement').width();
-         var tf = svg_root.children[0].getScreenCTM().inverse(); 
+         var tf = svg_root_element.getScreenCTM().inverse(); 
          var p = svg_root.createSVGPoint();
          p.x=left;
          p.y=100;
@@ -574,7 +1405,7 @@ $(document).ready(function () {
                  if( $(this).data( 'node_obj' ) == null ) {
                      $(this).data( 'node_obj', new node_obj( $(this) ) );
                  } else {
-                     $(this).data( 'node_obj' ).set_draggable( true );
+                     $(this).data( 'node_obj' ).set_selectable( true );
                  }
                  $(this).data( 'node_obj' ).greyout_edges();
                  var node_id = $(this).data( 'node_obj' ).get_id();
@@ -585,16 +1416,68 @@ $(document).ready(function () {
          $(this).data('locked', true );
      }
   });
-  
-  function toggle_relation_active( node_id ) {
-      $('#svgenlargement .relation').find( "title:contains('" + node_id +  "')" ).each( function(index) {
-          matchid = new RegExp( "^" + node_id );
-          if( $(this).text().match( matchid ) != null ) {
-              relation_manager.toggle_active( $(this).text() );
-          };
-      });
+
+  if( !editable ) {  
+    // Hide the unused elements
+    $('#dialog-form').hide();
+    $('#update_workspace_button').hide();
   }
 
+  
+  $('.helptag').popupWindow({ 
+	  height:500, 
+	  width:800, 
+	  top:50, 
+	  left:50,
+	  scrollbars:1 
+  }); 
+
+  expandFillPageClients();
+  $(window).resize(function() {
+    expandFillPageClients();
+  });
+
 });
 
 
+function expandFillPageClients() {
+	$('.fillPage').each(function () {
+		$(this).height($(window).height() - $(this).offset().top - MARGIN);
+	});
+}
+
+function loadSVG(svgData) {
+	var svgElement = $('#svgenlargement');
+
+	$(svgElement).svg('destroy');
+
+	$(svgElement).svg({
+		loadURL: svgData,
+		onLoad : svgEnlargementLoaded
+	});
+}
+
+
+
+/*	OS Gadget stuff
+
+function svg_select_callback(topic, data, subscriberData) {
+	svgData = data;
+	loadSVG(svgData);
+}
+
+function loaded() {
+	var prefs = new gadgets.Prefs();
+	var preferredHeight = parseInt(prefs.getString('height'));
+	if (gadgets.util.hasFeature('dynamic-height')) gadgets.window.adjustHeight(preferredHeight);
+	expandFillPageClients();
+}
+
+if (gadgets.util.hasFeature('pubsub-2')) {
+	gadgets.HubSettings.onConnect = function(hum, suc, err) {
+		subId = gadgets.Hub.subscribe("interedition.svg.selected", svg_select_callback);
+		loaded();
+	};
+}
+else gadgets.util.registerOnLoadHandler(loaded);
+*/