commit fa88e023166db6193ae0087d1d552939e62c504f
Author: joehni <[email protected]>
AuthorDate: Wed, 1 May 2013 15:47:03 +0200
Commit: joehni <[email protected]>
CommitDate: Wed, 1 May 2013 15:47:03 +0200
Remove questionable default with the active AddFirstChildClassToHeader
rule and the bogus addition of 'centerClass' used in the test example
only.
diff --git
a/xsite-core/src/main/java/org/codehaus/xsite/skins/FreemarkerSkin.java
b/xsite-core/src/main/java/org/codehaus/xsite/skins/FreemarkerSkin.java
index 9f976e7..0cd007f 100644
--- a/xsite-core/src/main/java/org/codehaus/xsite/skins/FreemarkerSkin.java
+++ b/xsite-core/src/main/java/org/codehaus/xsite/skins/FreemarkerSkin.java
@@ -50,7 +50,6 @@ public class FreemarkerSkin implements Skin {
for ( String property : customProperties.keySet() ){
context.put(property, customProperties.get(property));
}
- context.put("centerClass", page.isIndex() ? "Content3Column" :
"Content2Column");
try {
Writer writer = new FileWriter(new File(outputDirectory,
page.getFilename()));
diff --git a/xsite-core/src/main/java/org/codehaus/xsite/xsite.xml
b/xsite-core/src/main/java/org/codehaus/xsite/xsite.xml
index 03068e5..f6a609e 100644
--- a/xsite-core/src/main/java/org/codehaus/xsite/xsite.xml
+++ b/xsite-core/src/main/java/org/codehaus/xsite/xsite.xml
@@ -12,7 +12,6 @@
<component-implementation key="org.codehaus.xsite.SitemapLoader"
class="org.codehaus.xsite.loaders.XStreamSitemapLoader"/>
<component-implementation key="org.codehaus.xsite.Skin"
class="org.codehaus.xsite.skins.FreemarkerSkin"/>
<component-implementation key="org.codehaus.xsite.PageExtractor"
class="org.codehaus.xsite.extractors.SiteMeshPageExtractor"/>
- <component-implementation
class="org.codehaus.xsite.extractors.sitemesh.rules.AddFirstChildClassToHeader"/>
<component-implementation
class="com.opensymphony.module.sitemesh.html.rules.RegexReplacementTextFilter">
<parameter><string>JIRA:([A-Z]+)-([0-9]+)</string></parameter>
<parameter><string><![CDATA[<a
href=\"http://jira.codehaus.org/browse/$1-$2\";>$1-$2</a>]]></string></parameter>
diff --git a/xsite-core/src/test/site/templates/skin.html
b/xsite-core/src/test/site/templates/skin.html
index c7f30a9..d0d81d7 100644
--- a/xsite-core/src/test/site/templates/skin.html
+++ b/xsite-core/src/test/site/templates/skin.html
@@ -8,10 +8,10 @@
<body id="${page.id}">
<div id="banner">
- <a href="index.html"><img id="logo" src="logo.gif"
alt="XStream"/></a>
+ <a href="index.html"><img id="logo" src="logo.gif" alt="Logo"/></a>
</div>
- <div id="center" class="${centerClass}">
+ <div id="center" class=<#if
page.isIndex()>"Content3Column"<#else>"Content2Column"</#if>>
<div id="content">
<h1 class="FirstChild">${title}</h1>
