inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Website framework (pagerenderer servlet) added "theme" to Freemarker models for page template and web scripts

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6863 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mike Hatfield
2007-09-25 13:25:44 +00:00
parent 80cb406f01
commit 3735fbee42
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/web/app/servlet/PageRendererServlet.java
View File

@@ -199,6 +199,7 @@ public class PageRendererServlet extends WebScriptServlet
context.PageDef = pageDefinition; context.PageDef = pageDefinition;
context.AVMStore = store; context.AVMStore = store;
context.Theme = theme; context.Theme = theme;
pageDefinition.Theme = theme;
this.webscriptTemplateLoader.setContext(context); this.webscriptTemplateLoader.setContext(context);
// Process the template page using our custom loader - the loader will find and buffer // Process the template page using our custom loader - the loader will find and buffer
@@ -240,6 +241,7 @@ public class PageRendererServlet extends WebScriptServlet
Map<String, Object> model = new HashMap<String, Object>(); Map<String, Object> model = new HashMap<String, Object>();
model.put("url", new URLHelper(req.getContextPath())); model.put("url", new URLHelper(req.getContextPath()));
model.put("title", pageDef.Title); model.put("title", pageDef.Title);
model.put("theme", pageDef.Theme);
return model; return model;
} }
@@ -438,15 +440,17 @@ public class PageRendererServlet extends WebScriptServlet
private String scriptUrl; private String scriptUrl;
private String encoding; private String encoding;
private String avmStore; private String avmStore;
private String theme;
private PageComponent component; private PageComponent component;
private ByteArrayOutputStream baOut = null; private ByteArrayOutputStream baOut = null;
PageRendererWebScriptRuntime( PageRendererWebScriptRuntime(
PageComponent component, String avmStore, String webScript, String executeUrl, String encoding) PageComponent component, String avmStore, String theme, String webScript, String executeUrl, String encoding)
{ {
super(registry, serviceRegistry); super(registry, serviceRegistry);
this.component = component; this.component = component;
this.avmStore = avmStore; this.avmStore = avmStore;
this.theme = theme;
this.webScript = webScript; this.webScript = webScript;
this.scriptUrl = executeUrl; this.scriptUrl = executeUrl;
this.encoding = encoding; this.encoding = encoding;
@@ -468,6 +472,7 @@ public class PageRendererServlet extends WebScriptServlet
attributes.putAll(component.Properties); attributes.putAll(component.Properties);
// add the well known attribute - such as avm store // add the well known attribute - such as avm store
attributes.put("store", this.avmStore); attributes.put("store", this.avmStore);
attributes.put("theme", this.theme);
return new WebScriptPageRendererRequest(scriptUrl, match, attributes); return new WebScriptPageRendererRequest(scriptUrl, match, attributes);
} }
@@ -706,7 +711,7 @@ public class PageRendererServlet extends WebScriptServlet
// Execute the webscript and return a Reader to the textual content // Execute the webscript and return a Reader to the textual content
String executeUrl = context.Path + component.Url; String executeUrl = context.Path + component.Url;
PageRendererWebScriptRuntime runtime = new PageRendererWebScriptRuntime( PageRendererWebScriptRuntime runtime = new PageRendererWebScriptRuntime(
component, context.AVMStore, webscript, executeUrl, encoding); component, context.AVMStore, context.Theme, webscript, executeUrl, encoding);
runtime.executeScript(); runtime.executeScript();
// Return a reader from the runtime that executed the webscript - this effectively // Return a reader from the runtime that executed the webscript - this effectively
@@ -764,6 +769,7 @@ public class PageRendererServlet extends WebScriptServlet
{ {
public String TemplateName; public String TemplateName;
public String Title; public String Title;
public String Theme;
public Map<String, PageComponent> Components = new HashMap<String, PageComponent>(); public Map<String, PageComponent> Components = new HashMap<String, PageComponent>();
PageDefinition(String templateId) PageDefinition(String templateId)