diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/TestWidget.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/TestWidget.java index bc7cc918d..71c1e3702 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/TestWidget.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/TestWidget.java @@ -8,6 +8,7 @@ import java.util.Map; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; +import edu.cornell.mannlib.vedit.beans.LoginStatusBean; import freemarker.core.Environment; public class TestWidget extends Widget { @@ -16,8 +17,15 @@ public class TestWidget extends Widget { protected WidgetTemplateValues process(Environment env, Map params, HttpServletRequest request, ServletContext context) { Map map = new HashMap(); - map.put("fruit", "bananas"); - return new WidgetTemplateValues (getMarkupMacroName(), map); + String macroName; + if (LoginStatusBean.getBean(request).isLoggedIn()) { + map.put("status", "logged in"); + macroName = "loggedIn"; + } else { + map.put("status", "not logged in"); + macroName = "notLoggedIn"; + } + return new WidgetTemplateValues (macroName, map); } } diff --git a/webapp/web/templates/freemarker/widgets/widget-test.ftl b/webapp/web/templates/freemarker/widgets/widget-test.ftl index 3571a2909..3bedce176 100644 --- a/webapp/web/templates/freemarker/widgets/widget-test.ftl +++ b/webapp/web/templates/freemarker/widgets/widget-test.ftl @@ -8,17 +8,16 @@ ${headScripts.add("/js/testheadscript.js")} -<#macro markup> -<#import "lib-list.ftl" as l> +<#macro loggedIn>
-

This is the test widget using macros.

-

I like ${fruit}.

+

This is the test widget for logged-in users.

+

Login status: ${status}.

-<#macro altMarkup> +<#macro notLoggedIn>
-

This is the alternate version of the test widget.

-

I hate ${fruit}.

+

This is the test widget for non-logged-in users.

+

Login status: ${status}.

\ No newline at end of file