Author: gmazza
Date: Tue Aug 12 16:25:50 2014
New Revision: 1617521
URL: http://svn.apache.org/r1617521
Log:
In themes.xml, switch element from templatecode to rendition, type element
formerly under templatecode is now an attribute and defaults to 'standard' so
needs to appear only for dual theme e.g. basic-mobile; added more logging
during the theme-loading-from-file-system process.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java
roller/trunk/app/src/main/webapp/themes/basic/theme.xml
roller/trunk/app/src/main/webapp/themes/basicmobile/theme.xml
roller/trunk/app/src/main/webapp/themes/fauxcoly/theme.xml
roller/trunk/app/src/main/webapp/themes/frontpage/theme.xml
roller/trunk/app/src/main/webapp/themes/gaurav/theme.xml
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java?rev=1617521&r1=1617520&r2=1617521&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
Tue Aug 12 16:25:50 2014
@@ -176,8 +176,7 @@ public class SharedThemeFromDir extends
themeMetadata = parser.unmarshall(is);
} catch (Exception ex) {
throw new ThemeInitializationException(
- "Unable to parse theme descriptor for theme "
- + this.themeDir, ex);
+ "Unable to parse theme.xml for theme " + this.themeDir,
ex);
}
log.debug("Loading Theme " + themeMetadata.getName());
@@ -266,7 +265,7 @@ public class SharedThemeFromDir extends
templateFile.lastModified()), false, false);
for (RenditionType type : availableTypesList) {
- SharedThemeTemplateRendition rendition =
createTemplateCode(
+ SharedThemeTemplateRendition rendition = createRendition(
themeTemplate.getId(),
stylesheetTmpl.getTemplateRendition(type));
@@ -364,7 +363,7 @@ public class SharedThemeFromDir extends
templateMetadata.isHidden(), templateMetadata.isNavbar());
for (RenditionType type : availableTypesList) {
- SharedThemeTemplateRendition templateCode = createTemplateCode(
+ SharedThemeTemplateRendition templateCode = createRendition(
themeTemplate.getId(),
templateMetadata.getTemplateRendition(type));
@@ -434,7 +433,7 @@ public class SharedThemeFromDir extends
this.resources.put(normalizedPath, resource);
}
- private SharedThemeTemplateRendition createTemplateCode(String templateId,
+ private SharedThemeTemplateRendition createRendition(String templateId,
ThemeMetadataTemplateRendition templateCodeMetadata) {
SharedThemeTemplateRendition templateRendition = new
SharedThemeTemplateRendition();
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java?rev=1617521&r1=1617520&r2=1617521&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
Tue Aug 12 16:25:50 2014
@@ -119,7 +119,7 @@ public class ThemeManagerImpl implements
// the disk preemptive and cache them
this.themes = loadAllThemesFromDisk();
- log.info("Loaded " + this.themes.size() + " themes from
disk.");
+ log.info("Successfully loaded " + this.themes.size() +
" themes from disk.");
}
}
@@ -401,18 +401,21 @@ public class ThemeManagerImpl implements
String[] themenames = themesdir.list(filter);
if (themenames == null) {
- log.warn("No themes loaded! Perhaps you specified the
wrong "
- + "location for your themes
directory?");
+ log.warn("No themes found! Perhaps wrong directory for
themes specified? "
+ + "(Check themes.dir setting in
roller[-custom].properties file.)");
} else {
+ log.info("Loading themes from " + themesdir.getAbsolutePath() +
"...");
+
// now go through each theme and load it into a Theme object
for (String themeName : themenames) {
try {
Theme theme = new SharedThemeFromDir(this.themeDir
+ File.separator + themeName);
themeMap.put(theme.getId(), theme);
+ log.info("Loaded theme '" + themeName + "'");
} catch (Exception unexpected) {
// shouldn't happen, so let's learn why it did
- log.error("Problem reading theme " + themeName,
unexpected);
+ log.error("Problem processing theme '" + themeName + "':",
unexpected);
}
}
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java?rev=1617521&r1=1617520&r2=1617521&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
Tue Aug 12 16:25:50 2014
@@ -135,35 +135,36 @@ public class ThemeMetadataParser {
}
//parsing template code segment
- List<Element> templateCodeList =
element.getChildren("templateCode");
+ List<Element> renditionList = element.getChildren("rendition");
- for (Element templateCodeElement : templateCodeList) {
- ThemeMetadataTemplateRendition templateCode = new
ThemeMetadataTemplateRendition();
- String templateString =
templateCodeElement.getChildText("templateLanguage");
- if (StringUtils.isEmpty(templateString)) {
- throw new ThemeParsingException("templateCode must contain a
'templateLanguage' element");
- } else {
+ for (Element renditionElement : renditionList) {
+ ThemeMetadataTemplateRendition rendition = new
ThemeMetadataTemplateRendition();
+ String renditionValue = renditionElement.getAttributeValue("type");
+ if (renditionValue != null) {
try {
-
templateCode.setTemplateLang(TemplateLanguage.valueOf(templateString.toUpperCase()));
+
rendition.setType(RenditionType.valueOf(renditionValue.toUpperCase()));
} catch (IllegalArgumentException e) {
- throw new ThemeParsingException("Unknown templateLanguage
value '" + templateString + "'");
+ throw new ThemeParsingException("Invalid rendition type "
+ renditionValue + " found.");
}
+ } else {
+ // default to standard if type not provided (most templates
don't have multiple renditions anyway)
+ rendition.setType(RenditionType.STANDARD);
}
-
templateCode.setContentsFile(templateCodeElement.getChildText("contentsFile"));
- if (StringUtils.isEmpty(templateCode.getContentsFile())) {
- throw new ThemeParsingException("templateCode must contain a
'contentsFile' element");
- }
- String renditionValue = templateCodeElement.getChildText("type");
- if (renditionValue != null) {
+ String templateString =
renditionElement.getChildText("templateLanguage");
+ if (StringUtils.isEmpty(templateString)) {
+ throw new ThemeParsingException("rendition must contain a
'templateLanguage' element");
+ } else {
try {
-
templateCode.setType(RenditionType.valueOf(renditionValue.toUpperCase()));
+
rendition.setTemplateLang(TemplateLanguage.valueOf(templateString.toUpperCase()));
} catch (IllegalArgumentException e) {
- throw new ThemeParsingException("Invalid rendition type "
+ renditionValue + " found.");
+ throw new ThemeParsingException("Unknown templateLanguage
value '" + templateString + "'");
}
- } else {
- throw new ThemeParsingException("templateCode must contain a
'type' element");
}
- template.addTemplateRendition(templateCode);
+
rendition.setContentsFile(renditionElement.getChildText("contentsFile"));
+ if (StringUtils.isEmpty(rendition.getContentsFile())) {
+ throw new ThemeParsingException("Rendition must contain a
'contentsFile' element");
+ }
+ template.addTemplateRendition(rendition);
}
String navbar = element.getChildText("navbar");
@@ -196,35 +197,36 @@ public class ThemeMetadataParser {
template.setContentType(element.getChildText("contentType"));
template.setAction(ComponentType.STYLESHEET);
- // parsing templatecode segment
- List<Element> templateCodeList = element.getChildren("templateCode");
- for (Element templateCodeElement : templateCodeList) {
- ThemeMetadataTemplateRendition templateCode = new
ThemeMetadataTemplateRendition();
- String templateString =
templateCodeElement.getChildText("templateLanguage");
+ // parsing rendition segment
+ List<Element> renditionList = element.getChildren("rendition");
+ for (Element renditionElement : renditionList) {
+ ThemeMetadataTemplateRendition rendition = new
ThemeMetadataTemplateRendition();
+ String renditionValue = renditionElement.getAttributeValue("type");
+ if (renditionValue != null) {
+ try {
+
rendition.setType(RenditionType.valueOf(renditionValue.toUpperCase()));
+ } catch (IllegalArgumentException e) {
+ throw new ThemeParsingException("Invalid rendition type "
+ renditionValue + " found.");
+ }
+ } else {
+ // default to standard if type not provided (most templates
don't have multiple renditions anyway)
+ rendition.setType(RenditionType.STANDARD);
+ }
+ String templateString =
renditionElement.getChildText("templateLanguage");
if (StringUtils.isEmpty(templateString)) {
- throw new ThemeParsingException("templateCode must contain a
'templateLanguage' element");
+ throw new ThemeParsingException("rendition must contain a
'templateLanguage' element");
} else {
try {
-
templateCode.setTemplateLang(TemplateLanguage.valueOf(templateString.toUpperCase()));
+
rendition.setTemplateLang(TemplateLanguage.valueOf(templateString.toUpperCase()));
} catch (IllegalArgumentException e) {
throw new ThemeParsingException("Unknown templateLanguage
value '" + templateString + "'");
}
}
-
templateCode.setContentsFile(templateCodeElement.getChildText("contentsFile"));
- if (StringUtils.isEmpty(templateCode.getContentsFile())) {
+
rendition.setContentsFile(renditionElement.getChildText("contentsFile"));
+ if (StringUtils.isEmpty(rendition.getContentsFile())) {
throw new ThemeParsingException("stylesheet must contain a
'contentsFile' element");
}
- String renditionValue = templateCodeElement.getChildText("type");
- if (renditionValue != null) {
- try {
-
templateCode.setType(RenditionType.valueOf(renditionValue.toUpperCase()));
- } catch (IllegalArgumentException e) {
- throw new ThemeParsingException("Invalid rendition type "
+ renditionValue + " found.");
- }
- } else {
- throw new ThemeParsingException("templateCode must contain a
'type' element");
- }
- template.addTemplateRendition(templateCode);
+ template.addTemplateRendition(rendition);
}
// validate template
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java?rev=1617521&r1=1617520&r2=1617521&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java
Tue Aug 12 16:25:50 2014
@@ -86,7 +86,7 @@ public class TemplateEditBean {
public void setDescription( String description ) {
this.description = description;
}
-
+
public String getLink() {
return this.link;
}
@@ -94,7 +94,7 @@ public class TemplateEditBean {
public void setLink( String link ) {
this.link = link;
}
-
+
public String getContentsStandard() {
return this.contentsStandard;
}
Modified: roller/trunk/app/src/main/webapp/themes/basic/theme.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/basic/theme.xml?rev=1617521&r1=1617520&r2=1617521&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basic/theme.xml (original)
+++ roller/trunk/app/src/main/webapp/themes/basic/theme.xml Tue Aug 12 16:25:50
2014
@@ -15,11 +15,10 @@
<description>Stylesheet for Basic theme</description>
<link>basic-custom.css</link>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
+ <rendition>
<contentsFile>basic-custom.css</contentsFile>
- <type>standard</type>
- </templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</stylesheet>
<!-- templates -->
@@ -30,11 +29,10 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
+ <rendition>
<contentsFile>weblog.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="permalink">
@@ -44,11 +42,10 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
+ <rendition>
<contentsFile>permalink.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="search">
@@ -58,11 +55,10 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
+ <rendition>
<contentsFile>searchresults.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="custom">
@@ -72,11 +68,10 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
+ <rendition>
<contentsFile>_day.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="custom">
@@ -86,10 +81,9 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
+ <rendition>
<contentsFile>sidebar.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
</weblogtheme>
Modified: roller/trunk/app/src/main/webapp/themes/basicmobile/theme.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/basicmobile/theme.xml?rev=1617521&r1=1617520&r2=1617521&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basicmobile/theme.xml (original)
+++ roller/trunk/app/src/main/webapp/themes/basicmobile/theme.xml Tue Aug 12
16:25:50 2014
@@ -18,16 +18,14 @@
<description>Stylesheet for Basic theme</description>
<link>basic-custom.css</link>
<contentType>text/html</contentType>
- <templateCode>
+ <rendition type="standard">
<templateLanguage>velocity</templateLanguage>
<contentsFile>basic-custom.css</contentsFile>
- <type>standard</type>
- </templateCode>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
+ </rendition>
+ <rendition type="mobile">
<contentsFile>basic-mobile-custom.css</contentsFile>
- <type>mobile</type>
- </templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</stylesheet>
<!-- templates -->
@@ -38,16 +36,14 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
+ <rendition type="standard">
<templateLanguage>velocity</templateLanguage>
<contentsFile>weblog.vm</contentsFile>
- <type>standard</type>
- </templateCode>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
+ </rendition>
+ <rendition type="mobile">
<contentsFile>weblog-mobile.vm</contentsFile>
- <type>mobile</type>
- </templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="permalink">
@@ -57,16 +53,14 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
+ <rendition type="standard">
<contentsFile>permalink.vm</contentsFile>
- <type>standard</type>
- </templateCode>
- <templateCode>
<templateLanguage>velocity</templateLanguage>
+ </rendition>
+ <rendition type="mobile">
<contentsFile>permalink-mobile.vm</contentsFile>
- <type>mobile</type>
- </templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="search">
@@ -76,16 +70,14 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
+ <rendition type="standard">
<contentsFile>searchresults.vm</contentsFile>
- <type>standard</type>
- </templateCode>
- <templateCode>
<templateLanguage>velocity</templateLanguage>
+ </rendition>
+ <rendition type="mobile">
<contentsFile>searchresults-mobile.vm</contentsFile>
- <type>mobile</type>
- </templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="custom">
@@ -95,16 +87,14 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
+ <rendition type="standard">
<templateLanguage>velocity</templateLanguage>
<contentsFile>_day.vm</contentsFile>
- <type>standard</type>
- </templateCode>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
+ </rendition>
+ <rendition type="mobile">
<contentsFile>_day-mobile.vm</contentsFile>
- <type>mobile</type>
- </templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="custom">
@@ -114,11 +104,10 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
+ <rendition type="standard">
<contentsFile>sidebar.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<!-- resources -->
Modified: roller/trunk/app/src/main/webapp/themes/fauxcoly/theme.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/fauxcoly/theme.xml?rev=1617521&r1=1617520&r2=1617521&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/fauxcoly/theme.xml (original)
+++ roller/trunk/app/src/main/webapp/themes/fauxcoly/theme.xml Tue Aug 12
16:25:50 2014
@@ -17,11 +17,10 @@
<description>Custom style sheet</description>
<link>custom.css</link>
<contentType>text/html</contentType>
- <templateCode>
+ <rendition>
<templateLanguage>velocity</templateLanguage>
<contentsFile>custom_css.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ </rendition>
</stylesheet>
<!-- templates -->
@@ -32,11 +31,10 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
+ <rendition>
<templateLanguage>velocity</templateLanguage>
<contentsFile>weblog.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ </rendition>
</template>
<template action="permalink">
@@ -46,11 +44,10 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
+ <rendition>
<templateLanguage>velocity</templateLanguage>
<contentsFile>entry.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ </rendition>
</template>
<template action="tagsIndex">
@@ -60,11 +57,10 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
+ <rendition>
<templateLanguage>velocity</templateLanguage>
<contentsFile>tags_index.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ </rendition>
</template>
<template action="search">
@@ -74,11 +70,10 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
+ <rendition>
<templateLanguage>velocity</templateLanguage>
<contentsFile>search.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ </rendition>
</template>
<template action="custom">
@@ -88,11 +83,10 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
+ <rendition>
<templateLanguage>velocity</templateLanguage>
<contentsFile>day.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ </rendition>
</template>
<template action="custom">
@@ -102,11 +96,10 @@
<navbar>true</navbar>
<hidden>false</hidden>
<contentType>text/html</contentType>
- <templateCode>
+ <rendition>
<templateLanguage>velocity</templateLanguage>
<contentsFile>archives.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ </rendition>
</template>
<template action="custom">
@@ -116,11 +109,10 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
+ <rendition>
<templateLanguage>velocity</templateLanguage>
<contentsFile>std_head.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ </rendition>
</template>
<template action="custom">
@@ -130,11 +122,10 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
+ <rendition>
<templateLanguage>velocity</templateLanguage>
<contentsFile>std_header.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ </rendition>
</template>
<template action="custom">
@@ -144,11 +135,10 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
+ <rendition>
<templateLanguage>velocity</templateLanguage>
<contentsFile>std_footer.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ </rendition>
</template>
<template action="custom">
@@ -158,11 +148,10 @@
<navbar>false</navbar>
<hidden>false</hidden>
<contentType>text/html</contentType>
- <templateCode>
+ <rendition>
<templateLanguage>velocity</templateLanguage>
<contentsFile>style_css.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ </rendition>
</template>
<template action="custom">
@@ -172,11 +161,10 @@
<navbar>false</navbar>
<hidden>false</hidden>
<contentType>text/html</contentType>
- <templateCode>
+ <rendition>
<templateLanguage>velocity</templateLanguage>
<contentsFile>searchhi.js</contentsFile>
- <type>standard</type>
- </templateCode>
+ </rendition>
</template>
<resource path="images/faux-columns-950.png" />
Modified: roller/trunk/app/src/main/webapp/themes/frontpage/theme.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/frontpage/theme.xml?rev=1617521&r1=1617520&r2=1617521&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/frontpage/theme.xml (original)
+++ roller/trunk/app/src/main/webapp/themes/frontpage/theme.xml Tue Aug 12
16:25:50 2014
@@ -13,155 +13,144 @@
<template action="weblog">
<name>Weblog</name>
<description>Weblog</description>
- <link></link>
+ <link></link>
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>weblog.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <rendition>
+ <contentsFile>weblog.vm</contentsFile>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="custom">
<name>_blogdirectory</name>
<description>_blogdirectory</description>
- <link></link>
+ <link></link>
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>_blogdirectory.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <rendition>
+ <contentsFile>_blogdirectory.vm</contentsFile>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="custom">
<name>_blogprofile</name>
<description>_blogprofile</description>
- <link></link>
+ <link></link>
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>_blogprofile.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <rendition>
+ <contentsFile>_blogprofile.vm</contentsFile>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="custom">
<name>_blogs</name>
<description>_blogs</description>
- <link></link>
+ <link></link>
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>_blogs.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <rendition>
+ <contentsFile>_blogs.vm</contentsFile>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="custom">
<name>_css</name>
<description>_css</description>
- <link></link>
+ <link></link>
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>_css.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <rendition>
+ <contentsFile>_css.vm</contentsFile>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="custom">
<name>_day</name>
<description>_day</description>
- <link></link>
+ <link></link>
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>_day.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <rendition>
+ <contentsFile>_day.vm</contentsFile>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="custom">
<name>_decorator</name>
<description>_decorator</description>
- <link></link>
+ <link></link>
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>_decorator.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <rendition>
+ <contentsFile>_decorator.vm</contentsFile>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="custom">
<name>_entry</name>
<description>_entry</description>
- <link></link>
+ <link></link>
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>_entry.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <rendition>
+ <contentsFile>_entry.vm</contentsFile>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="custom">
<name>_footer</name>
<description>_footer</description>
- <link></link>
+ <link></link>
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>_footer.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <rendition>
+ <contentsFile>_footer.vm</contentsFile>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="custom">
<name>_header</name>
<description>_header</description>
- <link></link>
+ <link></link>
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>_header.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <rendition>
+ <contentsFile>_header.vm</contentsFile>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="custom">
<name>directory</name>
<description>weblog directory</description>
- <link>directory</link>
+ <link>directory</link>
<navbar>false</navbar>
<hidden>false</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>directory.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <rendition>
+ <contentsFile>directory.vm</contentsFile>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<!-- resources -->
Modified: roller/trunk/app/src/main/webapp/themes/gaurav/theme.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/gaurav/theme.xml?rev=1617521&r1=1617520&r2=1617521&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/gaurav/theme.xml (original)
+++ roller/trunk/app/src/main/webapp/themes/gaurav/theme.xml Tue Aug 12
16:25:50 2014
@@ -17,11 +17,10 @@
<description>Custom style sheet</description>
<link>custom.css</link>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>custom_css.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <rendition>
+ <contentsFile>custom_css.vm</contentsFile>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</stylesheet>
<!-- templates -->
@@ -32,11 +31,10 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>weblog.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <rendition>
+ <contentsFile>weblog.vm</contentsFile>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="permalink">
@@ -46,11 +44,10 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>entry.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <rendition>
+ <contentsFile>entry.vm</contentsFile>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="tagsIndex">
@@ -60,11 +57,10 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>tags_index.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <rendition>
+ <contentsFile>tags_index.vm</contentsFile>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="search">
@@ -74,11 +70,10 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>search.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <rendition>
+ <contentsFile>search.vm</contentsFile>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="custom">
@@ -88,11 +83,10 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>day.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <rendition>
+ <templateLanguage>velocity</templateLanguage>
+ <contentsFile>day.vm</contentsFile>
+ </rendition>
</template>
<template action="custom">
@@ -102,11 +96,10 @@
<navbar>true</navbar>
<hidden>false</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>archives.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <rendition>
+ <contentsFile>archives.vm</contentsFile>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="custom">
@@ -116,11 +109,10 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>std_head.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <rendition>
+ <contentsFile>std_head.vm</contentsFile>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="custom">
@@ -130,11 +122,10 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>std_header.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <rendition>
+ <contentsFile>std_header.vm</contentsFile>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<template action="custom">
@@ -144,11 +135,10 @@
<navbar>false</navbar>
<hidden>true</hidden>
<contentType>text/html</contentType>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>std_footer.vm</contentsFile>
- <type>standard</type>
- </templateCode>
+ <rendition>
+ <contentsFile>std_footer.vm</contentsFile>
+ <templateLanguage>velocity</templateLanguage>
+ </rendition>
</template>
<resource path="css/font-awesome.min.css" />
