X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=stemmaweb%2Froot%2Fjs%2Frelationship.js;h=3fa40d1bc41b2eec15c8310eff4bc0bbb165d3a5;hb=a7f4020a1a1fd72aba6e25dc0a8f8aa9a1891202;hp=bd78e3136e6d0f330ab0779b8ffb5106aefaa205;hpb=988c76194e582e2a91a2d076060bc58619c28fdf;p=scpubgit%2Fstemmatology.git

diff --git a/stemmaweb/root/js/relationship.js b/stemmaweb/root/js/relationship.js
index bd78e31..3fa40d1 100644
--- a/stemmaweb/root/js/relationship.js
+++ b/stemmaweb/root/js/relationship.js
@@ -1,5 +1,12 @@
+var MARGIN=30;
+var svg_root = null;
+var svg_root_element = null;
+var start_element_height = 0;
+var reltypes = {};
+var readingdata = {};
+
 function getTextPath() {
-    var currpath = window.location.pathname
+    var currpath = window.location.pathname;
     // Get rid of trailing slash
     if( currpath.lastIndexOf('/') == currpath.length - 1 ) { 
     	currpath = currpath.slice( 0, currpath.length - 1) 
@@ -20,11 +27,136 @@ function getRelativePath() {
 	return path_parts[0];
 }
 
-function getRelationshipURL() {
+function getTextURL( which ) {
+	var path_parts = getTextPath();
+	return path_parts[0] + '/' + path_parts[1] + '/' + which;
+}
+
+function getReadingURL( reading_id ) {
 	var path_parts = getTextPath();
-	return path_parts[0] + '/' + path_parts[1] + '/relationships';
+	return path_parts[0] + '/' + path_parts[1] + '/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 );
+  	$('#reading_is_nonsense').attr( 'checked', reading_info['is_nonsense'] );
+  	$('#reading_grammar_invalid').attr( 'checked', 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 );
+  	// Now do the morphological properties.
+  	morphology_form( reading_info['lexemes'] );
+  	// and then open the dialog.
+  	$('#reading-form').dialog("open");
+}
+
+function morphology_form ( lexlist ) {
+  	$('#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 );
+		});
+  	});
+}
+
+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'} );
+	$.each( reading_info['lexemes'], function ( idx, lex ) {
+		if( !lex['is_disambiguated'] ) {
+			$(el).attr( {stroke:'orange', fill:'#fee233'} );
+		}
+	});
+}
+
+function relemmatize () {
+	// Send the reading for a new lemmatization and reopen the form.
+	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']);
+		}
+	});
 }
 
+// Initialize the SVG once it exists
 function svgEnlargementLoaded() {
 	//Give some visual evidence that we are working
 	$('#loading_overlay').show();
@@ -37,11 +169,28 @@ function svgEnlargementLoaded() {
 		{ 'top': lo_height / 2 - $("#loading_message").height() / 2,
 		  'left': lo_width / 2 - $("#loading_message").width() / 2 });
     //Set viewbox widht and height to widht and height of $('#svgenlargement svg').
+    $('#update_workspace_button').data('locked', false);
+    $('#update_workspace_button').css('background-position', '0px 44px');
     //This is essential to make sure zooming and panning works properly.
-    $('#svgenlargement ellipse').attr( {stroke:'green', fill:'#b3f36d'} );
+	var rdgpath = getTextURL( 'readings' );
+		$.getJSON( rdgpath, function( data ) {
+  		readingdata = data;
+	    $('#svgenlargement ellipse').each( function( i, el ) { color_inactive( el ) });
+  	});
+    $('#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;
+	   }
+    }
+
     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.
@@ -55,13 +204,13 @@ 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;
+    start_element_height = $('#__START__').children('ellipse')[0].getBBox().height;
     add_relations( function() { $('#loading_overlay').hide(); });
 }
 
 function add_relations( callback_fn ) {
 	var basepath = getRelativePath();
-	var textrelpath = getRelationshipURL();
+	var textrelpath = getTextURL( 'relationships' );
     $.getJSON( basepath + '/definitions', function(data) {
         var rel_types = data.types.sort();
         $.getJSON( textrelpath,
@@ -89,9 +238,7 @@ function add_relations( callback_fn ) {
 }
 
 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 ) {
@@ -102,12 +249,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;
@@ -119,7 +260,7 @@ function node_obj(ellipse) {
   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_draggable = function( draggable ) {
@@ -130,8 +271,8 @@ function node_obj(ellipse) {
       self.ellipse.siblings('text').attr('class', 'noselect draggable');
     } else {
       self.ellipse.siblings('text').attr('class', '');
-      $(self.ellipse).parent().unbind('mouseenter').unbind('mouseleave').unbind('mousedown');     
-      $(self.ellipse).attr( {stroke:'green', fill:'#b3f36d'} );
+	  $(self.ellipse).parent().unbind( 'mouseenter' ).unbind( 'mouseleave' ).unbind( 'mousedown' );     
+      color_inactive( self.ellipse );
     }
   }
 
@@ -158,9 +299,9 @@ function node_obj(ellipse) {
 
   this.mouseup_listener = function(evt) {    
     if( $('ellipse[fill="#ffccff"]').size() > 0 ) {
-        var source_node_id = self.ellipse.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"]').siblings("title").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 );
@@ -174,7 +315,7 @@ function node_obj(ellipse) {
     $(self.ellipse).parent().hover( self.enter_node, self.leave_node );
     self.reset_elements();
   }
-
+  
   this.cpos = function() {
     return { x: self.ellipse.attr('cx'), y: self.ellipse.attr('cy') };
   }
@@ -280,7 +421,7 @@ 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 );
   $.each( $('#svgenlargement .edge,#svgenlargement .relation').children('title'), function(index) {
@@ -309,12 +450,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 {
@@ -342,16 +479,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); 
@@ -384,7 +521,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']");
@@ -392,14 +529,28 @@ function relation_factory() {
         dialog_aria.offset({ left: nx, top: ny });
     }
     this.remove = function( relation_id ) {
-        var relation = $("#svgenlargement .relation:has(title:contains('" + relation_id + "'))");
+        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') );
@@ -407,7 +558,8 @@ 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' );
@@ -428,11 +580,13 @@ $(document).ready(function () {
         .data('x', event.clientX)
         .data('y', event.clientY)
         .data('scrollLeft', this.scrollLeft)
-        stateTf = svg_root.children[0].getCTM().inverse();
+        stateTf = svg_root_element.getCTM().inverse();
         var p = svg_root.createSVGPoint();
         p.x = event.clientX;
         p.y = event.clientY;
         stateOrigin = p.matrixTransform(stateTf);
+        event.returnValue = false;
+        event.preventDefault();
         return false;
   }).mouseup(function (event) {
         $(this).data('down', false);
@@ -445,22 +599,28 @@ $(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);
     }
+    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);
@@ -480,19 +640,19 @@ $(document).ready(function () {
     buttons: {
       "Ok": function() {
         $('#status').empty();
-        form_values = $('#collapse_node_form').serialize()
-        ncpath = getRelationshipURL();
+        form_values = $('#collapse_node_form').serialize();
+        ncpath = getTextURL( 'relationships' );
         $(':button :contains("Ok")').attr("disabled", true);
         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] );
             	if( source_found.size() && target_found.size() ) {
-					var relation = relation_manager.create( source_target[0], source_target[1], $('#rel_type').attr('selectedIndex') );
+                    var relation = relation_manager.create( source_target[0], source_target[1], $('#rel_type')[0].selectedIndex-1 );
 					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() );
+					relation_manager.toggle_active( relation.attr('id') );
 				}
             });
             $( "#dialog-form" ).dialog( "close" );
@@ -509,12 +669,12 @@ $(document).ready(function () {
         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) ); 
+                 $('#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) ); 
+                 $('#scope').append( $('<option />').attr( "value", value ).text(value) ); 
             });
         });        
     },
@@ -532,7 +692,8 @@ $(document).ready(function () {
         $("#dialog_overlay").hide();
     }
   }).ajaxError( function(event, jqXHR, ajaxSettings, thrownError) {
-      if( ( ajaxSettings.type == 'POST' ) && jqXHR.status == 403 ) {
+      if( ajaxSettings.url == getTextURL('relationships') 
+      	&& 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>' );
       }
@@ -548,11 +709,11 @@ $(document).ready(function () {
             $( this ).dialog( "close" );
         },
         Delete: function() {
-          form_values = $('#delete_relation_form').serialize()
-          ncpath = getRelationshipURL()
+          form_values = $('#delete_relation_form').serialize();
+          ncpath = getTextURL( 'relationships' );
           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] );
+                  relation_manager.remove( get_relation_id( source_target[0], source_target[1] ) );
               });
               $( "#delete-form" ).dialog( "close" );
           }, dataType: 'json', type: 'DELETE' });
@@ -576,9 +737,72 @@ $(document).ready(function () {
     }
   });
 
+  // function for reading form dialog should go here; for now hide the element
+  $('#reading-form').dialog({
+  	autoOpen: false,
+  	height: 400,
+  	width: 600,
+  	modal: true,
+  	buttons: {
+  		Cancel: function() {
+  			$( this ).dialog( "close" );
+  		},
+  		Update: function() {
+  			$('#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() {
+  				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 ) );
+				}
+				$( "#reading-form" ).dialog( "close" );
+			});
+			// Re-color the node if necessary
+			return false;
+  		}
+  	},
+  	create: function() {
+  	},
+  	open: function() {
+        $(".ui-widget-overlay").css("background", "none");
+        $("#dialog_overlay").show();
+        $('#reading_status').empty();
+        $("#dialog_overlay").height( $("#enlargement_container").height() );
+        $("#dialog_overlay").width( $("#enlargement_container").innerWidth() );
+        $("#dialog_overlay").offset( $("#enlargement_container").offset() );
+  	},
+	close: function() {
+		$("#dialog_overlay").hide();
+	}
+  }).ajaxError( function(event, jqXHR, ajaxSettings, thrownError) {
+      if( ajaxSettings.url.lastIndexOf( getReadingURL('') ) > -1
+      	&& ajaxSettings.type == 'POST' && jqXHR.status == 403 ) {
+      	  var errobj = jQuery.parseJSON( jqXHR.responseText );
+          $('#reading_status').append( '<p class="error">Error: ' + errobj.error + '</p>' );
+      }
+  });
+  
+
   $('#update_workspace_button').click( function() {
      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 ) {
@@ -594,7 +818,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;
@@ -632,11 +856,57 @@ $(document).ready(function () {
       $('#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() );
+          	  var relation_id = $(this).parent().attr('id');
+              relation_manager.toggle_active( relation_id );
           };
       });
   }
 
+  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);
+*/