merged trunk into prod (3075)

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

editor/client/css/feedback.css

@@ -0,0 +1,125 @@
+#feedback {
+	bottom: 0;
+	font-family: Arial,Verdana;
+	font-size: 13px;
+	left: 10px;
+	position: absolute;
+	width: 600px;
+}
+#feedback .tab {
+	background-image: url(../images/header_bg.small.gif);
+	background-position: center -5px;
+	background-repeat: repeat-x;
+	border-color: black black transparent;
+	border-style: solid;
+	border-width: 1px;
+	cursor: pointer;
+	font-weight: bold;
+	height: 19px;
+	line-height: 150%;
+	position: absolute;
+	text-align: center;
+	top: -20px;
+	width: 80px;
+	z-index: 2;
+}
+
+#feedback .head {
+	position: relative;
+	width: 100%;
+	height: 5px;
+	background-image: url(../images/header_bg.small.gif);
+	background-position: center -25px;
+	background-repeat: repeat-x;
+}
+
+#feedback .dialog {
+	background-color: #EEEEEE;
+	background-image: url(../images/feedback/gradient.png);
+	background-repeat: repeat-x;
+	border-color: #000000;
+	border-style: solid;
+	border-width: 1px 1px 0;
+	height: 350px;
+	position: relative;
+	width: 100%;
+}
+
+#feedback .info {
+	float: left;	
+	margin-left: 10px;
+	width: 36%;
+	padding: 40px 5px 0px;
+}
+
+#feedback .info strong {
+	font-weight:bold;
+}
+
+#feedback .info p {
+	margin: 0 0 0.5em 0;
+}
+
+#feedback .info, #feedback .info a  {
+    color: #1a1c1f;
+}
+
+#feedback form {
+	margin-left: 40%;
+	margin-right: 10px;
+}
+
+#feedback form ul {
+	list-style-type: none;
+	margin: 5px;
+}
+
+#feedback form ul li {
+	color: #666666;
+	cursor: pointer;
+	float: right;
+	font-size: 120%;
+	font-weight: bold;
+	padding: 10px 0;
+	text-align: center;
+}
+
+#feedback form ul li.active {
+	color: #1A1C1F;
+	background-image:url(/oryx/images/feedback/pointer.png);
+	background-repeat:no-repeat;
+	background-position:center bottom;
+}
+
+
+#feedback form .fieldset {
+	background-color: #EEEEEE;
+	clear: right;
+	padding: 5px;
+}
+#feedback form .fieldset input, #feedback form .fieldset textarea {
+	background-color: #FFFFFF;
+	border: 1px solid #666666;
+	display: block;
+	font-family: Verdana,Arial;
+	font-size: 12px;
+	margin: 5px auto;
+	padding: 2px;
+	width: 95%;
+}
+
+#feedback form .fieldset input.low, 
+#feedback form .fieldset textarea.low {
+	color: #888;
+}
+
+#feedback form .fieldset textarea {
+	height: 200px;
+}
+
+#feedback form .fieldset .submit {
+    width: 40%;
+    margin-left: 6px;
+    font-weight: bold;
+    background-color: #aaa;
+}

editor/client/scripts/Plugins/bpmn2.0/bpmn2.0serialization.js

@@ -39,11 +39,14 @@ if(!ORYX.Plugins)
 ORYX.Plugins.BPMN2_0Serialization = {
 	bpmnSerializationHandlerUrl: ORYX.CONFIG.ROOT_PATH + "bpmn2_0serialization",
 	bpmnDeserializationHandlerUrl : ORYX.CONFIG.ROOT_PATH + "bpmn2_0deserialization",
+	bpmn2XpdlSerializationHandlerUrl : ORYX.CONFIG.ROOT_PATH + "bpmn2xpdlserialization",
 
 	construct: function(facade) {
 
 		this.facade = facade;
 
+		/* BPMN 2.0 XML */
+
 		this.facade.offer({
 			'name'				: ORYX.I18N.Bpmn2_0Serialization.show,
 			'functionality'		: this.showBpmnXml.bind(this),
@@ -68,6 +71,34 @@ ORYX.Plugins.BPMN2_0Serialization = {
 			'maxShape'			: 0
 		});
 
+		/* XPDL 2.2 */
+
+		this.facade.offer({
+			'name'				: ORYX.I18N.Bpmn2_0Serialization.xpdlShow,
+			'functionality'		: this.showXpdl.bind(this),
+			'group'				: 'Export',
+            dropDownGroupIcon : ORYX.PATH + "images/export2.png",
+			'icon' 				: ORYX.PATH + "images/source.png",
+			'description'		: ORYX.I18N.Bpmn2_0Serialization.xpdlShowDesc,
+			'index'				: 0,
+			'minShape'			: 0,
+			'maxShape'			: 0
+		});
+
+		this.facade.offer({
+			'name'				: ORYX.I18N.Bpmn2_0Serialization.download,
+			'functionality'		: this.downloadXpdl.bind(this),
+			'group'				: 'Export',
+            dropDownGroupIcon : ORYX.PATH + "images/export2.png",
+			'icon' 				: ORYX.PATH + "images/source.png",
+			'description'		: ORYX.I18N.Bpmn2_0Serialization.xpdlDownloadDesc,
+			'index'				: 0,
+			'minShape'			: 0,
+			'maxShape'			: 0
+		});
+
+		/* Import BPMN 2.0 XML */
+
 		this.facade.offer({
 			'name'				: ORYX.I18N.Bpmn2_0Serialization['import'],
 			'functionality'		: this.showImportDialog.bind(this),
@@ -86,7 +117,8 @@ ORYX.Plugins.BPMN2_0Serialization = {
 
 		this.generateBpmnXml( function( xml ) {
 			this.openXMLWindow(xml);
-		}.bind(this));
+		}.bind(this),
+		this.bpmnSerializationHandlerUrl);
 	},
 
 	downloadBpmnXml: function() {	
@@ -97,13 +129,35 @@ ORYX.Plugins.BPMN2_0Serialization = {
 			}.bind(this));
 	},
 
-	generateBpmnXml: function( bpmnHandleFunction ) {
+	/**
+	 * Calls the serialization to XPDL 2.2 and shows the result in a XML-Window.
+	 */
+	showXpdl: function() {
+		this.generateBpmnXml( function( xml ) {
+			this.openXMLWindow(xml);
+		}.bind(this),
+		this.bpmn2XpdlSerializationHandlerUrl);
+	},
+
+	/**
+	 * Calls the serialization to XPDL 2.2 and offers the result as a file
+	 * download.
+	 */
+	downloadXpdl: function() {
+		this.generateBpmnXml(
+			function ( xml ) {
+				this.openDownloadWindow("Oryx-BPMN 2.0", xml);
+			}.bind(this),
+			this.bpmn2XpdlSerializationHandlerUrl);
+	},
+
+	generateBpmnXml: function( bpmnHandleFunction, handlerUrl ) {
 		var loadMask = new Ext.LoadMask(Ext.getBody(), {msg:"Serialization of BPMN 2.0 model"});
 		loadMask.show();
 
 		var jsonString = this.facade.getSerializedJSON();
 		this._sendRequest(
-				this.bpmnSerializationHandlerUrl,
+				handlerUrl,
 				'POST',
 				{ 'data' : jsonString },
 				function( bpmnXml ) {