#12 Added element type "html"

echocat · Apr 4, 2014 · c6b97df · c6b97df
1 parent cb47d1b
commit c6b97df
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/src/main/java/org/echocat/adam/profile/element/ElementModel.java b/src/main/java/org/echocat/adam/profile/element/ElementModel.java
@@ -70,7 +70,8 @@ public static enum Type {
         emailAddress,
         url,
         phoneNumber,
-        wikiMarkup
+        wikiMarkup,
+        html
     }
 
 }
diff --git a/src/main/java/org/echocat/adam/profile/element/ElementRenderer.java b/src/main/java/org/echocat/adam/profile/element/ElementRenderer.java
@@ -28,7 +28,6 @@
 import com.atlassian.renderer.WikiStyleRenderer;
 import com.atlassian.user.User;
 import org.echocat.adam.profile.Profile;
-import org.echocat.adam.profile.element.ElementModelProvider.DefaultStandardElement;
 import org.echocat.adam.template.Template;
 import org.echocat.adam.template.TemplateFormat;
 import org.springframework.beans.factory.DisposableBean;
@@ -192,6 +191,12 @@ public String plainToXhtml(@SuppressWarnings("UnusedParameters") @Nonnull Elemen
         return result;
     }
 
+    @Nonnull
+    @HtmlSafe
+    public String getAsString(@SuppressWarnings("UnusedParameters") @Nonnull ElementModel mode, @Nullable Object input) {
+        return input != null ? input.toString() : "";
+    }
+
     @Nullable
     protected String getViewValueFor(@Nonnull ElementModel model, @Nonnull User currentUser, @Nonnull Profile profile) {
         final String value = profile.getValue(model);

diff --git a/src/main/resources/org/echocat/adam/profile/element/ElementRenderer.html.edit.xhtml.vm b/src/main/resources/org/echocat/adam/profile/element/ElementRenderer.html.edit.xhtml.vm
@@ -0,0 +1 @@
+<textarea name="${elementModel.id}" id="${nodeId}" cols="70" rows="8" class="monospaceInput textarea" data-cip-id="${elementModel.id}"#if($readOnly) readonly#end>$!{generalUtil.htmlEncode($value)}</textarea>
diff --git a/src/main/resources/org/echocat/adam/profile/element/ElementRenderer.html.view.xhtml.vm b/src/main/resources/org/echocat/adam/profile/element/ElementRenderer.html.view.xhtml.vm
@@ -0,0 +1,3 @@
+#if($!value != $!null)
+    <span class="field-value" id="${nodeId}">$!{elementRenderer.getAsString($elementModel, $value)}</span>
+#end
diff --git a/src/main/resources/org/echocat/adam/schemas/configuration.xsd b/src/main/resources/org/echocat/adam/schemas/configuration.xsd
@@ -100,6 +100,7 @@
             <xsd:enumeration value="url"/>
             <xsd:enumeration value="phoneNumber"/>
             <xsd:enumeration value="wikiMarkup"/>
+            <xsd:enumeration value="html"/>
         </xsd:restriction>
     </xsd:simpleType>