From 6ea23218c92c4d1b7c95e54bfec019983297a6a2 Mon Sep 17 00:00:00 2001 From: ryounes Date: Fri, 18 Mar 2011 19:26:11 +0000 Subject: [PATCH] NIHVIVO-1516 Url directive --- .../webapp/controller/freemarker/FreemarkerHttpServlet.java | 2 +- .../mannlib/vitro/webapp/web/directives/UrlDirective.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java index e8bb5502b..70519e3f6 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java @@ -314,7 +314,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet { map.put("dump", new edu.cornell.mannlib.vitro.webapp.web.directives.dump.DumpDirective()); map.put("dumpAll", new edu.cornell.mannlib.vitro.webapp.web.directives.dump.DumpAllDirective()); map.put("help", new edu.cornell.mannlib.vitro.webapp.web.directives.dump.HelpDirective()); - //map.put("url", new edu.cornell.mannlib.vitro.webapp.web.directives.UrlDirective()); + map.put("url", new edu.cornell.mannlib.vitro.webapp.web.directives.UrlDirective()); map.put("widget", new edu.cornell.mannlib.vitro.webapp.web.directives.WidgetDirective()); return map; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/UrlDirective.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/UrlDirective.java index 6106115c2..ba9fffd8d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/UrlDirective.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/UrlDirective.java @@ -65,16 +65,16 @@ public class UrlDirective extends BaseTemplateDirectiveModel { map.put("name", name); - map.put("effect", "Generate a full url from a path. Use for generating src attribute of image tags."); + map.put("effect", "Generate a full url from a path by prepending the servlet context path. Use for generating src attribute of image tags, href attribute of anchor tags, etc."); - map.put("comments", "The path should be an absolute path, starting with '/'."); + map.put("comments", "The path should be an absolute path, starting with \"/\"."); Map params = new HashMap(); params.put("path", "path"); map.put("params", params); List examples = new ArrayList(); - examples.add("<@" + name + " path=\"/images/placeholders/person.thumbnail.jpg\" />"); + examples.add("<img src=\"<@url path=\"/images/placeholders/person.thumbnail.jpg\" />\" />" ); map.put("examples", examples); return mergeToHelpTemplate(map, env);