LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added themePrefix variable 

git-svn-id: https://svn.libreccm.org/ccm/trunk@5852 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2019-03-06 16:33:31 +00:00
parent 1aa179fcd0
commit e5c162fc31
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ccm-themedirector/src/org/libreccm/theming/FreeMarkerPresentationManager.java
View File

@ -11,6 +11,7 @@ import com.arsdigita.globalization.GlobalizationHelper;
import com.arsdigita.subsite.Site; import com.arsdigita.subsite.Site;
import com.arsdigita.templating.PresentationManager; import com.arsdigita.templating.PresentationManager;
import com.arsdigita.themedirector.ThemeDirector; import com.arsdigita.themedirector.ThemeDirector;
import com.arsdigita.themedirector.ui.ThemeXSLParameterGenerator;
import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.util.UncheckedWrapperException;
import com.arsdigita.web.Web; import com.arsdigita.web.Web;
import com.arsdigita.xml.Document; import com.arsdigita.xml.Document;
@ -173,6 +174,9 @@ public class FreeMarkerPresentationManager implements PresentationManager {
Web.getWebContext().getRequestURL().getContextPath()); Web.getWebContext().getRequestURL().getContextPath());
data.put("dcpOnButtons", data.put("dcpOnButtons",
Bebop.getConfig().doubleClickProtectionOnButtons()); Bebop.getConfig().doubleClickProtectionOnButtons());
final ThemeXSLParameterGenerator paramGenerator
= new ThemeXSLParameterGenerator();
data.put("themePrefix", paramGenerator.generateValue(request));
data.put("dcpOnLinks", data.put("dcpOnLinks",
Bebop.getConfig().doubleClickProtectionOnLinks()); Bebop.getConfig().doubleClickProtectionOnLinks());
data.put("dispatcherPrefix", com.arsdigita.web.URL.getDispatcherPath()); data.put("dispatcherPrefix", com.arsdigita.web.URL.getDispatcherPath());
@ -339,15 +343,14 @@ public class FreeMarkerPresentationManager implements PresentationManager {
// "Parameter item must be a NodeModel."); // "Parameter item must be a NodeModel.");
// } // }
// final NodeModel itemModel = (NodeModel) arg0; // final NodeModel itemModel = (NodeModel) arg0;
final String objectType = ((TemplateScalarModel) list final String objectType = ((TemplateScalarModel) list
.get(0)) .get(0))
.getAsString(); .getAsString();
final String view; final String view;
if (list.size() >= 2) { if (list.size() >= 2) {
view = ((TemplateScalarModel) list view = ((TemplateScalarModel) list
.get(1)) .get(1))
.getAsString() .getAsString()
.toUpperCase(Locale.ROOT); .toUpperCase(Locale.ROOT);
} else { } else {
@ -379,7 +382,6 @@ public class FreeMarkerPresentationManager implements PresentationManager {
// final String nodeNamespace = itemModel.getNodeNamespace(); // final String nodeNamespace = itemModel.getNodeNamespace();
// final String nodeName = itemModel.getNodeName(); // final String nodeName = itemModel.getNodeName();
// final String contentType; // final String contentType;
// if ("http://www.arsdigita.com/cms/1.0".equals(nodeNamespace) // if ("http://www.arsdigita.com/cms/1.0".equals(nodeNamespace)
// && "item".equals(nodeName)) { // && "item".equals(nodeName)) {
@ -410,7 +412,6 @@ public class FreeMarkerPresentationManager implements PresentationManager {
// nodeNamespace, // nodeNamespace,
// nodeName)); // nodeName));
// } // }
final Optional<ContentItemTemplate> forTypeViewAndStyle = templates final Optional<ContentItemTemplate> forTypeViewAndStyle = templates
.getContentItems() .getContentItems()
.stream() .stream()