X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=root%2Fjs%2Frelationship.js;h=708883124125338cb612ed612693ceb2304575a2;hb=8f6a090156b798530c69d925664637557ea7342f;hp=b19e8d853994a6bcf3c97f995e7ee234826aa7f1;hpb=6c8d18803cfa55f7c6ae0ef6befdc4c05be5508f;p=scpubgit%2Fstemmaweb.git

diff --git a/root/js/relationship.js b/root/js/relationship.js
index b19e8d8..7088831 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,14 +218,16 @@ 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
     marquee = new Marquee();
-    
+
+	if (text_direction == 'RL') {
+		scrollToEnd();
+	}
 }
 
 function add_relations( callback_fn ) {
@@ -254,18 +248,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 );
 				}
@@ -368,8 +364,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');
@@ -565,10 +563,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;
@@ -605,6 +603,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' ) );
     	}
@@ -645,7 +664,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 );
@@ -656,25 +675,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( readings ) {
-    
-    // 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.?
-    //
-    
+    // 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
@@ -725,7 +748,7 @@ function detach_node( readings ) {
         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 ) );
                 }
             } );
         }
@@ -759,7 +782,8 @@ function detach_node( readings ) {
         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 );
@@ -776,11 +800,105 @@ function detach_node( readings ) {
         ellipse_elem.data( 'node_obj', new_node );
 
         // Move the node somewhat up for 'dramatic effect' :-p
-        new_node.reposition( 0, -54 );        
+        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;
+                var yes = svg.image( parent_g, xC, (yC-8), 16, 16, merge_button_yes, { id: merge_id } );
+                var no = svg.image( parent_g, (xC+20), (yC-8), 16, 16, merge_button_no, { id: 'no' + merge_id } );
+                $(yes).hover( function(){ $(this).addClass( 'draggable' ) }, function(){ $(this).removeClass( 'draggable' ) } );
+                $(no).hover( function(){ $(this).addClass( 'draggable' ) }, function(){ $(this).removeClass( 'draggable' ) } );
+                $(yes).click( function( evt ){ 
+                    merge_node( node_ids[0], node_ids[1] );
+                    temp_relation.remove();
+                    $(evt.target).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).click( function( evt ) {
+                    temp_relation.remove();
+                    $(evt.target).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 compress_nodes(readings) {
+    //add text of other readings to 1st reading
+
+    var first = get_ellipse(readings[0]);
+    var first_title = first.parent().find('text')[0];
+
+    for (var i = 1; i < readings.length; i++) {
+        var cur         = get_ellipse(readings[i]);
+        var cur_title   = cur.parent().find('text')[0];
+
+        first_title.textContent += " " + cur_title.textContent;
+    };
+
+    //delete all others
+    for (var i = 1; i < readings.length; i++) {
+        var node = get_ellipse(readings[i]);
+        var rid = readings[i-1] + '->' + readings[i];
+
+        //[].slice.call(s.getElementsByTagName('title')).find(function(elem){return elem.textContent=='r64.2->r66.2'}).parentNode.remove()
 
+        var titles = svg_root.getElementsByTagName('title');
+        var titlesArray = [].slice.call(titles);
+
+        if (titlesArray.length > 0) {
+            var title = titlesArray.find(function(elem){
+                return elem.textContent === rid;
+            });
+
+            if (title && title.parentNode) {
+                title.parentNode.remove();
+            }
+        }
+
+        var x = parseInt(first[0].getAttribute('cx'), 10);
+
+        first[0].setAttribute('rx', 4.5 * first_title.textContent.length);
+
+        if (text_direction !== "BI") {
+            first[0].setAttribute('cx', x +  first_title.textContent.length + 20);
+            first_title.setAttribute('x', first[0].getAttribute('cx'));
+        }
+
+        merge_node(readings[i], readings[0]);
+        //node.parent().remove();
+    }
 }
 
 function Marquee() {
@@ -874,17 +992,53 @@ function Marquee() {
             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 ) {
+                });
+                $.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(',') ); 
+
+                if ($('#action-merge')[0].checked) {
+                    $('#detach_collated_form').hide();
+                    $('#multipleselect-form-text').hide();
+
+                    $('#detach_btn').hide();
+                    $('#merge_btn').show();
+                } else {
+                    $('#detach_collated_form').show();
+                    $('#multipleselect-form-text').show();
+
+                    $('#detach_btn').show();
+                    $('#merge_btn').hide();
+                }
+
+                $('#action-detach').change(function() {
+                    if ($('#action-detach')[0].checked) {
+                        $('#detach_collated_form').show();
+                        $('#multipleselect-form-text').show();
+
+                        $('#detach_btn').show();
+                        $('#merge_btn').hide();
+                    }
+                });
+
+                $('#action-merge').change(function() {
+                    if ($('#action-merge')[0].checked) {
+                        $('#detach_collated_form').hide();
+                        $('#multipleselect-form-text').hide();
+
+                        $('#detach_btn').hide();
+                        $('#merge_btn').show();
+                    }
+                });
+
                 $('#multipleselect-form').dialog( 'open' );
             }
             self.svg_rect.remove( $('#marquee') );
@@ -904,14 +1058,30 @@ function readings_equivalent( source, target ) {
 		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, "");
+	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;
 }
 
+function scrollToEnd() {
+	var stateTf = svg_root_element.getCTM().inverse();
+
+	var vbdim = svg_root.viewBox.baseVal;
+	var width = Math.floor(svg_root_element.getBoundingClientRect().width) - vbdim.width;
+
+	var p = svg_root.createSVGPoint();
+	p.x = width;
+	p.y = 0;
+	p = p.matrixTransform(stateTf);
+
+	var matrix = stateTf.inverse().translate(-p.x, -100);
+	var s = "matrix(" + matrix.a + "," + matrix.b + "," + matrix.c + "," + matrix.d + "," + matrix.e + "," + matrix.f + ")";
+	svg_root_element.setAttribute("transform", s);
+}
 
 $(document).ready(function () {
     
@@ -989,45 +1159,50 @@ $(document).ready(function () {
   // 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: {
-	  "Merge readings": 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) {
-			  alert( "Did a node 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 ) {
-		$(evt.target).button("disable");
-		$('#status').empty();
-		form_values = $('#collapse_node_form').serialize();
+	  	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) { 
@@ -1039,11 +1214,15 @@ $(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 );
 		});
@@ -1071,7 +1250,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 ) {
@@ -1094,7 +1274,7 @@ $(document).ready(function () {
   $( "#delete-form" ).dialog({
     autoOpen: false,
     height: 135,
-    width: 250,
+    width: 300,
     modal: false,
     buttons: {
         OK: function() { $( this ).dialog( "close" ); },
@@ -1144,17 +1324,50 @@ $(document).ready(function () {
     width: 250,
     modal: true,
     buttons: {
-        Cancel: function() { $( this ).dialog( "close" ); },
-        Detach: function ( evt ) { 
+        Cancel: function() {
+            document.getElementById('duplicate-merge-error').innerHTML = "";
+            $( this ).dialog( "close" );
+        },
+        Detach: function ( evt ) {
+            evt.target.id = 'detach_btn';
+
             var self = $(this);
-            $( evt.target ).button( "disable" );
+            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 );
-                $(evt.target).button("enable");
+                mybuttons.button("enable");
                 self.dialog( "close" );
             } );
+        },
+        Merge: function (evt) {
+            evt.target.id = 'merge_btn';
+
+            var self = $(this);
+            var mybuttons = $(evt.target).closest('button').parent().find('button');
+            mybuttons.button('disable');
+
+            var ncpath = getTextURL('compress');
+            var form_values = $('#detach_collated_form').serialize();
+
+            var jqjson = $.post(ncpath, form_values, function(data) {
+                if (data.success) {
+                    document.getElementById('duplicate-merge-error').innerHTML = "";
+
+                    if (data.nodes) {
+                        compress_nodes(data.nodes);
+                    }
+
+                    mybuttons.button('enable');
+                    self.dialog('close');
+                } else if (data.error_msg) {
+                    document.getElementById('duplicate-merge-error').innerHTML = data.error_msg;
+                    mybuttons.button('enable');
+
+                }
+            });
         }
     },
     create: function(event, ui) {
@@ -1169,6 +1382,25 @@ $(document).ready(function () {
         $("#dialog_overlay").height( $("#enlargement_container").height() );
         $("#dialog_overlay").width( $("#enlargement_container").innerWidth() );
         $("#dialog_overlay").offset( $("#enlargement_container").offset() );
+
+        var mybuttons = $(this).parent().find('button');
+
+        mybuttons[1].id = 'detach_btn';
+        mybuttons[2].id = 'merge_btn';
+
+        if ($('#action-merge')[0].checked) {
+            $('#detach_collated_form').hide();
+            $('#multipleselect-form-text').hide();
+
+            $('#detach_btn').hide();
+            $('#merge_btn').show();
+        } else {
+            $('#detach_collated_form').show();
+            $('#multipleselect-form-text').show();
+
+            $('#detach_btn').show();
+            $('#merge_btn').hide();
+        }
     },
     close: function() { 
         marquee.unselect();
@@ -1223,11 +1455,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,
@@ -1239,7 +1466,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 = {
@@ -1266,7 +1494,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
@@ -1283,8 +1511,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() );