From 42683efab25f2463624b73bd5a6c4c6cf63dbd89 Mon Sep 17 00:00:00 2001 From: Jesse Morgan Date: Mon, 23 Jun 2014 20:47:42 -0700 Subject: Adding a domain label to the header. The page header now displays the domain label if the domain is not prod. This is useful for quickly identifying if you are modifying prod data. --- src/net/jesterpm/fmfacade/FMFacade.java | 15 ++++++++++++--- src/net/jesterpm/fmfacade/FreeMarkerPageResource.java | 1 + 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'src/net') diff --git a/src/net/jesterpm/fmfacade/FMFacade.java b/src/net/jesterpm/fmfacade/FMFacade.java index 0ea44f8..e80eeec 100644 --- a/src/net/jesterpm/fmfacade/FMFacade.java +++ b/src/net/jesterpm/fmfacade/FMFacade.java @@ -18,8 +18,10 @@ import freemarker.template.Template; import org.apache.log4j.Logger; +import com.p4square.grow.config.Config; + /** - * + * * @author Jesse Morgan */ public class FMFacade extends Application { @@ -32,11 +34,18 @@ public class FMFacade extends Application { mFMConfig.setObjectWrapper(new DefaultObjectWrapper()); } + /** + * @return a Config object. + */ + public Config getConfig() { + return null; + } + @Override public synchronized Restlet createInboundRoot() { return createRouter(); } - + /** * Retrieve a template. * @@ -75,7 +84,7 @@ public class FMFacade extends Application { component.getServers().add(Protocol.HTTP, 8085); component.getClients().add(Protocol.HTTP); component.getDefaultHost().attach(new FMFacade()); - + // Setup shutdown hook Runtime.getRuntime().addShutdownHook(new Thread() { public void run() { diff --git a/src/net/jesterpm/fmfacade/FreeMarkerPageResource.java b/src/net/jesterpm/fmfacade/FreeMarkerPageResource.java index dfdba39..75f2b8a 100644 --- a/src/net/jesterpm/fmfacade/FreeMarkerPageResource.java +++ b/src/net/jesterpm/fmfacade/FreeMarkerPageResource.java @@ -76,6 +76,7 @@ public class FreeMarkerPageResource extends ServerResource { root.put("attributes", getRequestAttributes()); root.put("query", getQuery().getValuesMap()); + root.put("config", mFMF.getConfig()); if (getClientInfo().isAuthenticated()) { final User user = getClientInfo().getUser(); -- cgit v1.2.3