diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpDirective.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpDirective.java index b6329acd4..08200a1c8 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpDirective.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpDirective.java @@ -11,6 +11,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHelper; import freemarker.core.Environment; import freemarker.template.Configuration; import freemarker.template.SimpleDate; +import freemarker.template.SimpleHash; import freemarker.template.SimpleScalar; import freemarker.template.SimpleSequence; import freemarker.template.TemplateBooleanModel; @@ -66,7 +67,8 @@ public class DumpDirective implements TemplateDirectiveModel { type = "boolean"; } else if (val instanceof SimpleSequence){ includeTemplate = "dump-array.ftl"; - type = "array"; + } else if (val instanceof SimpleHash) { + includeTemplate = "dump-hash.ftl"; } else { includeTemplate = "dump-string.ftl"; value = value.toString(); diff --git a/webapp/web/templates/freemarker/body/partials/dump/dump-array.ftl b/webapp/web/templates/freemarker/body/partials/dump/dump-array.ftl index 85969ea48..8e7dcb9ae 100644 --- a/webapp/web/templates/freemarker/body/partials/dump/dump-array.ftl +++ b/webapp/web/templates/freemarker/body/partials/dump/dump-array.ftl @@ -1,9 +1,11 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> -<#-- Template for dumping string values --> +<#-- Template for dumping array values --> +Type: array
+Values:
\ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/partials/dump/dump-hash.ftl b/webapp/web/templates/freemarker/body/partials/dump/dump-hash.ftl index e69de29bb..b55f33654 100644 --- a/webapp/web/templates/freemarker/body/partials/dump/dump-hash.ftl +++ b/webapp/web/templates/freemarker/body/partials/dump/dump-hash.ftl @@ -0,0 +1,12 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Template for dumping hash values --> + +Type: hash
+Values:
+ + \ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/partials/dump/dump-string.ftl b/webapp/web/templates/freemarker/body/partials/dump/dump-string.ftl index daf9f0b9a..54300bc33 100644 --- a/webapp/web/templates/freemarker/body/partials/dump/dump-string.ftl +++ b/webapp/web/templates/freemarker/body/partials/dump/dump-string.ftl @@ -2,5 +2,6 @@ <#-- Template for dumping string values --> -${value} +Type: ${type}
+Value: ${value}
diff --git a/webapp/web/templates/freemarker/body/partials/dump/dump-var.ftl b/webapp/web/templates/freemarker/body/partials/dump/dump-var.ftl index bef6ec915..baef8c018 100644 --- a/webapp/web/templates/freemarker/body/partials/dump/dump-var.ftl +++ b/webapp/web/templates/freemarker/body/partials/dump/dump-var.ftl @@ -2,16 +2,14 @@ <#-- Template for dumping a template variable --> -
+
<#-- turn these into borders once css is working -->
-
Freemarker template variable dump
- -Variable ${var}:
-Type: ${type}
-Value: -<#include includeTemplate /> +
Freemarker template variable dump
+ + Variable ${var}:
+ <#include includeTemplate />
-
\ No newline at end of file +
<#-- turn these into borders once css is working --> \ No newline at end of file