# HG changeset patch
# User Sebastian Kruse <skruse@mpiwg-berlin.mpg.de>
# Date 1357893676 -3600
# Node ID a610b45d0f90ddcd440b8fbd4c4c170e4ba4c716
# Parent  e6b72868e395c8d21e425a614170d7e9c833ba4f
Allow HTML in all Cells

diff -r e6b72868e395 -r a610b45d0f90 src/econnect/wp3_3/client/widgets/table/DynamicStiTable.java
--- a/src/econnect/wp3_3/client/widgets/table/DynamicStiTable.java	Thu Jan 10 13:21:12 2013 +0100
+++ b/src/econnect/wp3_3/client/widgets/table/DynamicStiTable.java	Fri Jan 11 09:41:16 2013 +0100
@@ -325,10 +325,14 @@
 	    for (int i = 0; i < descriptionDataColumns.length(); i++) {
 	    	final String columnName = descriptionDataColumns.get(i);
 	    	
-		    TextColumn<DataObject> column = new TextColumn<DataObject>() {
+	    	SafeHtmlCell htmlCell = new SafeHtmlCell();
+	    	
+	    	Column<DataObject, SafeHtml> column = new Column<DataObject, SafeHtml>(htmlCell) {
 		        @Override
-		        public String getValue(DataObject object) {
-		          return object.getDescriptionData(columnName);
+		        public SafeHtml getValue(DataObject object) {
+		        	SafeHtmlBuilder sb = new SafeHtmlBuilder();
+		        	sb.appendHtmlConstant(object.getDescriptionData(columnName));
+		        	return sb.toSafeHtml();
 		        }
 		    };
 
diff -r e6b72868e395 -r a610b45d0f90 war/scripts/sti/STICore.js
--- a/war/scripts/sti/STICore.js	Thu Jan 10 13:21:12 2013 +0100
+++ b/war/scripts/sti/STICore.js	Fri Jan 11 09:41:16 2013 +0100
@@ -380,7 +380,18 @@
 											lastHeader = $(this).text();
 											isHeader = false;
 										} else {
-											var value = $(this).text();
+											//var value = $(this).text();
+											var value = "";
+
+											$(this).children().each(
+												function() {
+													value += (new XMLSerializer()).serializeToString(this);
+												}
+											);
+											
+											if (value.length == 0)
+												value = $(this).text();
+											
 											if (descriptionData[lastHeader] != null)
 												//append if a field occures more than once 
 												descriptionData[lastHeader] += "\n" + value;