updating branch prod to 2319

git-svn-id: http://oryx-editor.googlecode.com/svn/branches/prod@2320 d672c736-503d-0410-a38a-9366997c882b

Author: NicoPeters.NP

editor/client/images/design-thinking/admin.png

@@ -272,21 +272,51 @@ ORYX.Plugins.AbstractPlugin = Clazz.extend({
      */
     getRDFFromDOM: function(){
         //convert to RDF
-        var parser = new DOMParser();
-        var parsedDOM = parser.parseFromString(this.getSerializedDOM(), "text/xml");
-        var xsltPath = ORYX.PATH + "lib/extract-rdf.xsl";
-        var xsltProcessor = new XSLTProcessor();
-        var xslRef = document.implementation.createDocument("", "", null);
-        xslRef.async = false;
-        xslRef.load(xsltPath);
-        xsltProcessor.importStylesheet(xslRef);
-        try {
-            var rdf = xsltProcessor.transformToDocument(parsedDOM);
-            return (new XMLSerializer()).serializeToString(rdf);
-        } catch (error) {
-            Ext.Msg.alert("Oryx", error);
-            return null;
-        }
+		try {
+			var xsl = "";
+			source=ORYX.PATH + "lib/extract-rdf.xsl";
+			new Ajax.Request(source, {
+				asynchronous: false,
+				method: 'get',
+				onSuccess: function(transport){
+					xsl = transport.responseText
+				}.bind(this),
+				onFailure: (function(transport){
+					ORYX.Log.error("XSL load failed" + transport);
+				}).bind(this)
+			});
+			/*
+			 var parser = new DOMParser();
+			 var parsedDOM = parser.parseFromString(this.getSerializedDOM(), "text/xml");
+			 var xsltPath = ORYX.PATH + "lib/extract-rdf.xsl";
+			 var xsltProcessor = new XSLTProcessor();
+			 var xslRef = document.implementation.createDocument("", "", null);
+			 xslRef.async = false;
+			 xslRef.load(xsltPath);
+			 xsltProcessor.importStylesheet(xslRef);
+			 try {
+			 var rdf = xsltProcessor.transformToDocument(parsedDOM);
+			 return (new XMLSerializer()).serializeToString(rdf);
+			 } catch (error) {
+			 Ext.Msg.alert("Oryx", error);
+			 return null;
+			 }*/
+			var domParser = new DOMParser();
+			var xmlObject = domParser.parseFromString(this.getSerializedDOM(), "text/xml");
+			var xslObject = domParser.parseFromString(xsl, "text/xml");
+			var xsltProcessor = new XSLTProcessor();
+			xsltProcessor.importStylesheet(xslObject);
+			var result = xsltProcessor.transformToFragment(xmlObject, document);
+			
+			var serializer = new XMLSerializer();
+			
+			return serializer.serializeToString(result);
+		}catch(e){
+			alert("Oryx", error);
+			return "";
+		}
+
+		
     },
 
 

editor/client/images/design-thinking/author.jpg

@@ -108,8 +108,13 @@ ORYX.Plugins.Overlay = Clazz.extend({
 
 		}	
 
+		var isSVG = true
+		try {
+			isSVG = options.node && options.node instanceof SVGElement;
+		} catch(e){}
+		
 		// Checks if node is setted and if this is an SVGElement		
-		if ( options.node && options.node instanceof SVGElement) {
+		if ( options.node && isSVG) {
 
 			options["_temps"] = []
 

editor/client/images/design-thinking/corrections_for_article.png

@@ -55,7 +55,9 @@
 		<plugin source="file.js" name="ORYX.Plugins.File" />
 		<plugin source="file.js" name="ORYX.Plugins.Save"/>
 
-		<plugin source="view.js" name="ORYX.Plugins.View" />
+		<plugin source="view.js" name="ORYX.Plugins.View">
+			<property zoomLevel="2" maxFitToScreenLevel="1.24" />
+		</plugin>
 		<plugin source="dragdropresize.js" name="ORYX.Plugins.DragDropResize" />
 		<plugin source="grouping.js" name="ORYX.Plugins.Grouping">
 			<notUsesIn namespace="http://b3mn.org/stencilset/xforms#" />