You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sh...@apache.org on 2011/08/13 19:42:20 UTC
svn commit: r1157397 [2/2] - in /roller/branches/roller_mobile:
weblogger-business/src/main/java/org/apache/roller/weblogger/business/
weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/
weblogger-business/src/main/java/org/apach...
Modified: roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java?rev=1157397&r1=1157396&r2=1157397&view=diff
==============================================================================
--- roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java (original)
+++ roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java Sat Aug 13 17:42:17 2011
@@ -26,6 +26,7 @@ import org.apache.roller.weblogger.busin
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.WeblogTemplate;
+import org.apache.roller.weblogger.pojos.WeblogTemplateCode;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
import org.apache.roller.weblogger.util.Utilities;
import org.apache.roller.weblogger.util.cache.CacheManager;
@@ -50,7 +51,7 @@ public class TemplateEdit extends UIActi
// the template we are working on
private WeblogTemplate template = null;
- private boolean mobileTemplateAvailable = false;
+ private String type = null;
public TemplateEdit() {
@@ -69,15 +70,12 @@ public class TemplateEdit extends UIActi
public void myPrepare() {
try {
setTemplate(WebloggerFactory.getWeblogger().getWeblogManager().getPage(getBean().getId()));
- getBean().setStandardTemplateId(getStandardID());
- getBean().setMobileTemplateId(getMobileID());
- setMobileTemplateAvailable(hasManyTemplates());
} catch (WebloggerException ex) {
log.error("Error looking up template - "+getBean().getId(), ex);
}
}
-
-
+
+
/**
* Show template edit page.
*/
@@ -93,6 +91,19 @@ public class TemplateEdit extends UIActi
WeblogTemplate page = getTemplate();
getBean().copyFrom(template);
+ WeblogTemplateCode templateCode = null;
+
+ // look for the template code
+ try {
+ templateCode = WebloggerFactory.getWeblogger().getWeblogManager().
+ getTemplateCodeByType(template.getId(), getBean().getType());
+ } catch (WebloggerException e) {
+ log.error("Unable to look weblog code for template "+template.getName() +"of type "+getBean().getType());
+ }
+ //set the content for the type.
+ if(templateCode != null){
+ getBean().setContents(templateCode.getTemplate());
+ }
// empty content-type indicates that page uses auto content-type detection
if (StringUtils.isEmpty(page.getOutputContentType())) {
@@ -177,14 +188,24 @@ public class TemplateEdit extends UIActi
template.setOutputContentType(null);
}
- // save template and flush
+ // save template
WebloggerFactory.getWeblogger().getWeblogManager().savePage(template);
- WebloggerFactory.getWeblogger().flush();
-
+
+
+ //save template code
+ WeblogTemplateCode templateCode = WebloggerFactory.getWeblogger().getWeblogManager().
+ getTemplateCodeByType(template.getId(),getBean().getType());
+ templateCode.setTemplate(template.getContents());
+
+ WebloggerFactory.getWeblogger().getWeblogManager().saveTemplateCode(templateCode);
+
+ //flush
+ WebloggerFactory.getWeblogger().flush();
+
// notify caches
CacheManager.invalidate(template);
- synchronizeThemes();
+ // synchronizeThemes();
// success message
addMessage("pageForm.save.success", template.getName());
@@ -247,19 +268,18 @@ public class TemplateEdit extends UIActi
log.error("Error checking page name uniqueness", ex);
}
}
- //TODO handle validation for link with combining type and link together
- // if link changed make sure there isn't a conflict
- /* if(!StringUtils.isEmpty(getBean().getLink()) &&
+
+ // if link changed make sure there isn't a conflict
+ if(!StringUtils.isEmpty(getBean().getLink()) &&
!getBean().getLink().equals(getTemplate().getLink())) {
try {
- if(WebloggerFactory.getWeblogger().getWeblogManager().getPagesByLink(getActionWeblog(), getBean().getLink()) != null &&
- ) {
+ if(WebloggerFactory.getWeblogger().getWeblogManager().getPageByLink(getActionWeblog(), getBean().getLink()) != null) {
addError("pagesForm.error.alreadyExists", getBean().getLink());
}
} catch (WebloggerException ex) {
log.error("Error checking page link uniqueness", ex);
}
- }*/
+ }
}
@@ -285,73 +305,14 @@ public class TemplateEdit extends UIActi
public void setTemplate(WeblogTemplate template) {
this.template = template;
-
- }
- //get the ID for mobile tempalte
- private String getMobileID(){
-
- List<WeblogTemplate> templates = null;
- try {
- templates = WebloggerFactory.getWeblogger().getWeblogManager().
- getPagesByLink(getActionWeblog(), template.getLink()) ;
- } catch (WebloggerException e) {
- log.error("error while getting template list." , e);
- }
-
- if (templates != null && templates.size() >1){
- for(WeblogTemplate template : templates){
- if("mobile".equals(template.getType())){
- return template.getId();
- }
- }
- }
- return null;
- }
-
- public String getStandardID(){
-
- List<WeblogTemplate> templates = null;
- try {
- templates = WebloggerFactory.getWeblogger().getWeblogManager().
- getPagesByLink(getActionWeblog(), template.getLink()) ;
- } catch (WebloggerException e) {
- log.error("error while getting template list." , e);
- }
-
- if (templates != null && !templates.isEmpty()){
- for(WeblogTemplate template : templates){
- if("standard".equals(template.getType())){
- return template.getId();
- }
- }
- }
- return null;
}
- public boolean hasManyTemplates() {
-
- List<WeblogTemplate> templates = null;
- try {
- templates = WebloggerFactory.getWeblogger().getWeblogManager().
- getPagesByLink(getActionWeblog(), template.getLink());
- } catch (WebloggerException e) {
- log.error("error while getting template list.", e);
- }
- // we do not support editing mobile template pages for custom themes.
- if( "custom".equals(getActionWeblog().getEditorTheme())){
- return false;
- }
- else if (templates != null && templates.size() > 1) {
- return true;
- }
- return false;
- }
- public boolean isMobileTemplateAvailable() {
- return mobileTemplateAvailable;
+ public String getType() {
+ return type;
}
- public void setMobileTemplateAvailable(boolean mobileTemplateAvailable) {
- this.mobileTemplateAvailable = mobileTemplateAvailable;
+ public void setType(String type) {
+ this.type = type;
}
}
\ No newline at end of file
Modified: roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java?rev=1157397&r1=1157396&r2=1157397&view=diff
==============================================================================
--- roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java (original)
+++ roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java Sat Aug 13 17:42:17 2011
@@ -89,7 +89,7 @@ public class TemplateEditBean {
public String getContents() {
return this.contents;
}
-
+
public void setContents( String contents ) {
this.contents = contents;
}
@@ -164,8 +164,6 @@ public class TemplateEditBean {
this.navbar = dataHolder.isNavbar();
this.hidden = dataHolder.isHidden();
this.templateLanguage = dataHolder.getTemplateLanguage();
- this.type = dataHolder.getType();
-
setManualContentType(dataHolder.getOutputContentType());
if(getManualContentType() != null) {
setAutoContentType(Boolean.FALSE);
@@ -192,4 +190,11 @@ public class TemplateEditBean {
return (id.equals(mobileTemplateId));
}
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
}
Modified: roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java?rev=1157397&r1=1157396&r2=1157397&view=diff
==============================================================================
--- roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java (original)
+++ roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java Sat Aug 13 17:42:17 2011
@@ -18,19 +18,18 @@
package org.apache.roller.weblogger.ui.struts2.editor;
+import java.util.Collections;
+import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.WeblogTemplate;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
import org.apache.roller.weblogger.util.cache.CacheManager;
-import java.util.Collections;
-import java.util.List;
-
/**
* Remove a template.
@@ -41,13 +40,9 @@ public class TemplateRemove extends UIAc
// id of template to remove
private String removeId = null;
-
- private String removeMobileId = null;
// template object that we will remove
private WeblogTemplate template = null;
-
- private WeblogTemplate mobileTemplate = null;
public TemplateRemove() {
@@ -66,8 +61,6 @@ public class TemplateRemove extends UIAc
public void myPrepare() {
if(getRemoveId() != null) try {
setTemplate(WebloggerFactory.getWeblogger().getWeblogManager().getPage(getRemoveId()));
- setRemoveMobileId(getMobileID());
- setMobileTemplate(WebloggerFactory.getWeblogger().getWeblogManager().getPage(getRemoveMobileId()));
} catch (WebloggerException ex) {
log.error("Error looking up template by id - "+getRemoveId(), ex);
// TODO: i18n
@@ -97,13 +90,6 @@ public class TemplateRemove extends UIAc
CacheManager.invalidate(getTemplate());
WebloggerFactory.getWeblogger().getWeblogManager().removePage(getTemplate());
-
- if (getMobileTemplate() != null) {
- CacheManager.invalidate(getMobileTemplate());
-
- WebloggerFactory.getWeblogger().getWeblogManager().removePage(getMobileTemplate());
- }
-
WebloggerFactory.getWeblogger().flush();
return SUCCESS;
@@ -137,42 +123,5 @@ public class TemplateRemove extends UIAc
public void setTemplate(WeblogTemplate template) {
this.template = template;
}
-
- //get the ID for mobile tempalte
- private String getMobileID(){
-
- List<WeblogTemplate> templates = null;
- try {
- templates = WebloggerFactory.getWeblogger().getWeblogManager().
- getPagesByLink(getActionWeblog(), template.getLink()) ;
- } catch (WebloggerException e) {
- log.error("error while getting template list." , e);
- }
-
- if (templates != null && templates.size() >1){
- for(WeblogTemplate template : templates){
- if("mobile".equals(template.getType())){
- return template.getId();
- }
- }
- }
- return null;
- }
-
-
- public String getRemoveMobileId() {
- return removeMobileId;
- }
-
- public void setRemoveMobileId(String removeMobileId) {
- this.removeMobileId = removeMobileId;
- }
-
- public WeblogTemplate getMobileTemplate() {
- return mobileTemplate;
- }
-
- public void setMobileTemplate(WeblogTemplate mobileTemplate) {
- this.mobileTemplate = mobileTemplate;
- }
+
}
Modified: roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java?rev=1157397&r1=1157396&r2=1157397&view=diff
==============================================================================
--- roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java (original)
+++ roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java Sat Aug 13 17:42:17 2011
@@ -25,6 +25,7 @@ import org.apache.roller.weblogger.Weblo
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.WeblogTemplate;
+import org.apache.roller.weblogger.pojos.WeblogTemplateCode;
import org.apache.roller.weblogger.pojos.WeblogTheme;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -70,24 +71,13 @@ public class Templates extends UIAction
// query for templates list
try {
- // get current list of templates, minus custom stylesheet and auto generated mobile templates
- List<WeblogTemplate> raw = WebloggerFactory.getWeblogger().getWeblogManager().getPages(getActionWeblog());
+ // get current list of templates, minus custom stylesheet
+ List<WeblogTemplate> raw = WebloggerFactory.getWeblogger().getWeblogManager().getPages(getActionWeblog());
List<WeblogTemplate> pages = new ArrayList<WeblogTemplate>();
-
pages.addAll(raw);
-
- for(WeblogTemplate template : raw){
- if("mobile".equals(template.getType())&&template.getName().endsWith(".Mobile")){
- pages.remove(template);
- }
- }
-
- if (getActionWeblog().getTheme().getStylesheet() != null) {
- List<WeblogTemplate> stylesheets = WebloggerFactory.getWeblogger().getWeblogManager().getPagesByLink(getActionWeblog(),
- getActionWeblog().getTheme().getStylesheet().getLink());
- if (stylesheets != null && !stylesheets.isEmpty()) {
- pages.remove(stylesheets.get(0));
- }
+ if(getActionWeblog().getTheme().getStylesheet() != null) {
+ pages.remove(WebloggerFactory.getWeblogger().getWeblogManager().getPageByLink(getActionWeblog(),
+ getActionWeblog().getTheme().getStylesheet().getLink()));
}
setTemplates(pages);
@@ -140,7 +130,6 @@ public class Templates extends UIAction
newTemplate.setHidden(false);
newTemplate.setNavbar(false);
newTemplate.setLastModified( new Date() );
- newTemplate.setType("standard");
if(WeblogTemplate.ACTION_CUSTOM.equals(getNewTmplAction())){
newTemplate.setLink(getNewTmplName());
@@ -156,7 +145,20 @@ public class Templates extends UIAction
// save the new Template
WebloggerFactory.getWeblogger().getWeblogManager().savePage( newTemplate );
-
+
+ //Create weblog template codes for available types.
+ WeblogTemplateCode standardTemplCode = new WeblogTemplateCode(newTemplate.getId(),"standard");
+ WeblogTemplateCode mobileTemplCode = new WeblogTemplateCode(newTemplate.getId(),"mobile");
+
+ standardTemplCode.setTemplate(newTemplate.getContents());
+ standardTemplCode.setTemplateLanguage("velocity");
+
+ mobileTemplCode.setTemplate(newTemplate.getContents());
+ mobileTemplCode.setTemplateLanguage("velocity");
+
+ WebloggerFactory.getWeblogger().getWeblogManager().saveTemplateCode(standardTemplCode);
+ WebloggerFactory.getWeblogger().getWeblogManager().saveTemplateCode(mobileTemplCode);
+
// if this person happened to create a Weblog template from
// scratch then make sure and set the defaultPageId
if(WeblogTemplate.DEFAULT_PAGE.equals(newTemplate.getName())) {
@@ -168,7 +170,7 @@ public class Templates extends UIAction
WebloggerFactory.getWeblogger().flush();
// add roller generated mobile template
- addMobileTemplate();
+ //addMobileTemplate();
} catch (WebloggerException ex) {
log.error("Error adding new template for weblog - "+getActionWeblog().getHandle(), ex);
@@ -179,62 +181,6 @@ public class Templates extends UIAction
return execute();
}
- public void addMobileTemplate(){
-
- // validation
- // myValidate();
-
- if(!hasActionErrors()) try {
-
- WeblogTemplate newMobileTemplate = new WeblogTemplate();
- newMobileTemplate.setWebsite(getActionWeblog());
- newMobileTemplate.setAction(getNewTmplAction());
- newMobileTemplate.setName(getNewTmplName()+".Mobile");
- newMobileTemplate.setDescription(newMobileTemplate.getName());
- newMobileTemplate.setContents(getText("pageForm.newTemplateContent"));
- newMobileTemplate.setHidden(false);
- newMobileTemplate.setNavbar(false);
- newMobileTemplate.setLastModified( new Date() );
- newMobileTemplate.setType("mobile");
-
- if(WeblogTemplate.ACTION_CUSTOM.equals(getNewTmplAction())){
- newMobileTemplate.setLink(getNewTmplName());
- }
-
- // all templates start out as velocity templates
- newMobileTemplate.setTemplateLanguage("velocity");
-
- // for now, all templates just use _decorator
- if(!"_decorator".equals(newMobileTemplate.getName())) {
- newMobileTemplate.setDecoratorName("_decorator");
- }
-
- // save the new Template
- WebloggerFactory.getWeblogger().getWeblogManager().savePage( newMobileTemplate );
-
- // if this person happened to create a Weblog template from
- // scratch then make sure and set the defaultPageId
- if(WeblogTemplate.DEFAULT_PAGE.equals(newMobileTemplate.getName())) {
- getActionWeblog().setDefaultPageId(newMobileTemplate.getId());
- WebloggerFactory.getWeblogger().getWeblogManager().saveWeblog(getActionWeblog());
- }
-
- // flush results to db
- WebloggerFactory.getWeblogger().flush();
-
- // reset form fields
- setNewTmplName(null);
- setNewTmplAction(null);
- setType(null);
-
- } catch (WebloggerException ex) {
- log.error("Error adding new mobile template for weblog - "+getActionWeblog().getHandle(), ex);
- // TODO: i18n
- addError("Error adding new mobile template");
- }
-
- }
-
// validation when adding a new template
private void myValidate() {
@@ -260,6 +206,8 @@ public class Templates extends UIAction
} catch (WebloggerException ex) {
log.error("Error checking for existing template", ex);
}
+
+
}
@@ -295,12 +243,5 @@ public class Templates extends UIAction
this.newTmplAction = newTmplAction;
}
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
}
Modified: roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java?rev=1157397&r1=1157396&r2=1157397&view=diff
==============================================================================
--- roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java (original)
+++ roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java Sat Aug 13 17:42:17 2011
@@ -88,7 +88,7 @@ public class ThemeEdit extends UIAction
setThemeId(null);
} else {
setThemeId(getActionWeblog().getTheme().getId());
- setMobileThemeId(getActionWeblog().getMobileTheme().getId());
+ // setMobileThemeId(getActionWeblog().getMobileTheme().getId());
setImportThemeId(getActionWeblog().getTheme().getId());
}
@@ -241,9 +241,8 @@ public class ThemeEdit extends UIAction
addError("Theme not found");
}
}
-
if(!hasActionErrors()) try {
- weblog.setMobileThemeName(getMobileThemeId());
+ // weblog.setMobileThemeName(getMobileThemeId());
WeblogThemeAssoc themeAssoc = WebloggerFactory.getWeblogger().getWeblogManager().
getThemeAssoc(getActionWeblog(),"mobile");
themeAssoc.setName(getMobileThemeId());
Modified: roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java?rev=1157397&r1=1157396&r2=1157397&view=diff
==============================================================================
--- roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java (original)
+++ roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java Sat Aug 13 17:42:17 2011
@@ -47,8 +47,6 @@ class RollerWeblogHandler extends Handle
/** Theme name used when creating weblogs */
private static final String DEFAULT_THEME = "basic";
- //Default mobile theme when creating weblogs//
- private static final String DEFAULT_MOBILE_THEME = "mobile";
public RollerWeblogHandler(HttpServletRequest request) throws HandlerException {
super(request);
@@ -172,7 +170,7 @@ class RollerWeblogHandler extends Handle
entry.getDescription(),
entry.getEmailAddress(),
entry.getEmailAddress(),
- DEFAULT_THEME,DEFAULT_MOBILE_THEME,
+ DEFAULT_THEME,
entry.getLocale().toString(),
entry.getTimezone().getID());
Modified: roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp?rev=1157397&r1=1157396&r2=1157397&view=diff
==============================================================================
--- roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp (original)
+++ roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp Sat Aug 13 17:42:17 2011
@@ -23,9 +23,6 @@ function previewImage(theme) {
document.preview.src="<s:property value="siteURL" />/roller-ui/authoring/previewtheme?theme="+theme;
}
-function previewMobileThemeImage(theme) {
- document.mobile_preview.src="<s:property value="siteURL" />/roller-ui/authoring/previewtheme?theme="+theme;
-}
function handlePreview(handle) {
previewSpan = document.getElementById("handlePreview");
@@ -97,7 +94,7 @@ function handlePreview(handle) {
<tr>
<td class="label"><label for="theme" /><s:text name="createWebsite.theme" /></label></td>
<td class="field">
- <s:select name="bean.theme" size="1" list="standardThemes" listKey="id" listValue="name" onchange="previewImage(this[selectedIndex].value)"/>
+ <s:select name="bean.theme" size="1" list="themes" listKey="id" listValue="name" onchange="previewImage(this[selectedIndex].value)"/>
<br />
<br />
<img name="preview" src='' />
@@ -114,26 +111,6 @@ function handlePreview(handle) {
<td class="description"><s:text name="createWebsite.tip.theme" /></td>
</tr>
-<tr>
- <td class="label"><label for="mobileTheme" /><s:text name="Mobile Theme" /></label></td>
- <td class="field">
- <s:select name="bean.mobileTheme" size="1" list="mobileThemes" listKey="id" listValue="name" onchange="previewMobileThemeImage(this[selectedIndex].value)"/>
- <br />
- <br />
- <img name="mobile_preview" src='' />
- <!-- initialize preview image at page load -->
- <script type="text/javascript">
- <s:if test="bean.mobileTheme == null">
- previewMobileThemeImage('<s:property value="mobileThemes[0].id"/>');
- </s:if>
- <s:else>
- previewMobileThemeImage('<s:property value="bean.mobileTheme"/>');
- </s:else>
- </script>
- </td>
- <td class="description"><s:text name="The theme to be used for mobile devices." /></td>
-</tr>
-
</table>
<br />
Modified: roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp?rev=1157397&r1=1157396&r2=1157397&view=diff
==============================================================================
--- roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp (original)
+++ roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp Sat Aug 13 17:42:17 2011
@@ -22,15 +22,52 @@
<p class="pagetip">
<s:text name="stylesheetEdit.tip" />
<s:if test="!customTheme"><s:text name="stylesheetEdit.revertTip" /></s:if>
+ <s:if test="$(type == null)"><s:param name="type">standard</s:param></s:if>
</p>
<s:form action="stylesheetEdit!save">
<s:hidden name="weblog" />
-
+ <s:hidden name="type"/>
+ <s:set name="type" value="type"/>
+
+ <table class="menuTabTable" cellspacing="0" >
+ <tr>
+ <s:if test="%{#type=='standard'}">
+ <td class="menuTabSelected">
+ </s:if>
+ <s:else>
+ <td class="menuTabUnselected">
+ </s:else>
+
+ <div class="menu-tr">
+ <s:url id="styleEdit" action="stylesheetEdit">
+ <s:param name="weblog" value="actionWeblog.handle" />
+ <s:param name="type">standard</s:param>
+ </s:url>
+ <div class="menu-tl"> <s:a href="%{styleEdit}">Standard</s:a> </div>
+ </div></td>
+
+ <td class="menuTabSeparator"></td>
+ <s:if test="%{#type == 'mobile'}">
+ <td class="menuTabSelected">
+ </s:if>
+ <s:else>
+ <td class="menuTabUnselected">
+ </s:else>
+ <div class="menu-tr">
+
+ <s:url id="styleEdit" action="stylesheetEdit">
+ <s:param name="weblog" value="actionWeblog.handle" />
+ <s:param name="type">mobile</s:param>
+ </s:url>
+ <div class="menu-tl"> <s:a href="%{styleEdit}">Mobile</s:a> </div>
+ </div></td>
+
+ </tr>
+ </table>
+
<%-- ================================================================== --%>
<%-- Template editing area w/resize buttons --%>
-
- <br />
<s:textarea name="contents" cols="80" rows="30" cssStyle="width:100%" />
<script type="text/javascript"><!--
Modified: roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp?rev=1157397&r1=1157396&r2=1157397&view=diff
==============================================================================
--- roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp (original)
+++ roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp Sat Aug 13 17:42:17 2011
@@ -34,6 +34,7 @@
<s:form action="templateEdit!save" id="template">
<s:hidden name="weblog" />
<s:hidden name="bean.id"/>
+ <s:hidden name ="bean.type"/>
<%-- ================================================================== --%>
<%-- Name, link and desription: disabled when page is a required page --%>
@@ -64,6 +65,7 @@
<!--
var weblogURL = '<s:property value="actionWeblog.absoluteURL" />';
var originalLink = '<s:property value="bean.link" />';
+ var type = '<s:property value="bean.type" /> ' ;
// Update page URL when user changes link
function updatePageURLDisplay() {
@@ -81,13 +83,13 @@
if (originalLink != document.getElementById('template_bean_link').value) {
window.alert("Link changed, not launching page");
} else {
- window.open(weblogURL + 'page/' + originalLink, '_blank');
+ window.open(weblogURL + 'page/' + originalLink+'?type='+type, '_blank');
}
}
-->
</script>
- <s:if test="!template.required && template.custom && !bean.mobile">
+ <s:if test="!template.required && template.custom">
<tr>
<td class="label" valign="top"><s:text name="pageForm.link" /> </td>
<td class="field">
@@ -99,18 +101,6 @@
<td class="description"></td>
</tr>
</s:if>
-
- <s:elseif test="!template.required && template.custom && bean.mobile">
- <tr>
- <td class="label" valign="top"><s:text name="pageForm.link" /> </td>
- <td class="field">
- <s:textfield name="bean.link" size="50" readonly="true" cssStyle="background: #e5e5e5" />
- <br />
- </td>
- <td class="description"></td>
- </tr>
- </s:elseif>
-
<tr>
<td class="label" valign="top" style="padding-top: 4px"><s:text name="pageForm.description" /> </td>
<td class="field">
@@ -126,13 +116,12 @@
</table>
- <s:if test="mobileTemplateAvailable">
-
<s:set name="tabMenu" value="menu"/>
+ <s:set name="type" value="bean.type"/>
<table class="menuTabTable" cellspacing="0" >
<tr>
- <s:if test="!bean.mobile">
+ <s:if test="%{#type=='standard'}">
<td class="menuTabSelected">
</s:if>
<s:else>
@@ -142,15 +131,15 @@
<div class="menu-tr">
<s:url id="edit" action="templateEdit">
<s:param name="weblog" value="actionWeblog.handle" />
- <s:param name="bean.id" value="bean.standardTemplateId" />
+ <s:param name="bean.id" value="template.id" />
+ <s:param name="bean.type">standard</s:param>
</s:url>
<div class="menu-tl"> <s:a href="%{edit}">Standard</s:a> </div>
</div></td>
<td class="menuTabSeparator"></td>
-
- <s:if test="bean.mobile">
+ <s:if test="%{#type == 'mobile'}">
<td class="menuTabSelected">
</s:if>
<s:else>
@@ -160,14 +149,14 @@
<s:url id="edit" action="templateEdit">
<s:param name="weblog" value="actionWeblog.handle" />
- <s:param name="bean.id" value="bean.mobileTemplateId" />
+ <s:param name="bean.id" value="template.id" />
+ <s:param name="bean.type">mobile</s:param>
</s:url>
- <div class="menu-tl"> <s:a href="%{edit}">mobile</s:a> </div>
+ <div class="menu-tl"> <s:a href="%{edit}">Mobile</s:a> </div>
</div></td>
</tr>
</table>
- </s:if>
<%-- ================================================================== --%>
<%-- Template editing area w/resize buttons --%>
Modified: roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp?rev=1157397&r1=1157396&r2=1157397&view=diff
==============================================================================
--- roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp (original)
+++ roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp Sat Aug 13 17:42:17 2011
@@ -56,6 +56,7 @@
<s:url id="edit" action="templateEdit">
<s:param name="weblog" value="actionWeblog.handle" />
<s:param name="bean.id" value="#p.id" />
+ <s:param name="bean.type">standard</s:param>
</s:url>
<s:a href="%{edit}"><s:property value="#p.name" /></s:a>
</td>
Modified: roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/theme.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/theme.xml?rev=1157397&r1=1157396&r2=1157397&view=diff
==============================================================================
--- roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/theme.xml (original)
+++ roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/theme.xml Sat Aug 13 17:42:17 2011
@@ -14,8 +14,12 @@
<name>basic-custom.css</name>
<description>Stylesheet for Basic theme</description>
<link>basic-custom.css</link>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>basic-custom.css</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>basic-custom.css</contentsFile>
+ <type>standard</type>
+ </templateCode>
</stylesheet>
<!-- templates -->
@@ -25,9 +29,18 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>weblog.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>weblog.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>weblog-mobile.vm</contentsFile>
+ <type>mobile</type>
+ </templateCode>
</template>
<template action="permalink">
@@ -36,9 +49,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>permalink.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>permalink.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="search">
@@ -47,9 +63,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>searchresults.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>searchresults.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -58,9 +77,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>_day.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>_day.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -69,9 +91,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>sidebar.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>sidebar.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
</weblogtheme>
Added: roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/weblog-mobile.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/weblog-mobile.vm?rev=1157397&view=auto
==============================================================================
--- roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/weblog-mobile.vm (added)
+++ roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/weblog-mobile.vm Sat Aug 13 17:42:17 2011
@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+
+</head>
+<body>
+This is the mobile template
+
+</body>
+</html>
Modified: roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/brushedmetal/theme.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/brushedmetal/theme.xml?rev=1157397&r1=1157396&r2=1157397&view=diff
==============================================================================
--- roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/brushedmetal/theme.xml (original)
+++ roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/brushedmetal/theme.xml Sat Aug 13 17:42:17 2011
@@ -14,8 +14,12 @@
<name>brushedmetal-custom.css</name>
<description>Stylesheet for Brushed Metal theme</description>
<link>brushedmetal-custom.css</link>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>brushedmetal-custom.css</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>brushedmetal-custom.css</contentsFile>
+ <type>standard</type>
+ </templateCode>
</stylesheet>
<!-- templates -->
@@ -25,9 +29,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>weblog.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>weblog.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="permalink">
@@ -36,9 +43,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>permalink.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>permalink.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="search">
@@ -47,9 +57,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>searchresults.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>searchresults.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -58,9 +71,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>_day.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>_day.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -69,9 +85,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>sidebar.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>sidebar.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<!-- resources -->
Modified: roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/fauxcoly/theme.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/fauxcoly/theme.xml?rev=1157397&r1=1157396&r2=1157397&view=diff
==============================================================================
--- roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/fauxcoly/theme.xml (original)
+++ roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/fauxcoly/theme.xml Sat Aug 13 17:42:17 2011
@@ -16,8 +16,12 @@
<name>custom.css</name>
<description>Custom style sheet</description>
<link>custom.css</link>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>custom_css.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>custom_css.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</stylesheet>
<!-- templates -->
@@ -27,9 +31,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>weblog.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>weblog.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="permalink">
@@ -38,9 +45,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>entry.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>entry.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="tagsIndex">
@@ -49,9 +59,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>tags_index.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>tags_index.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="search">
@@ -60,9 +73,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>search.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>search.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -71,9 +87,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>day.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>day.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -82,9 +101,12 @@
<link>archives</link>
<navbar>true</navbar>
<hidden>false</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>archives.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>archives.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -93,9 +115,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>std_head.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>std_head.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -104,9 +129,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>std_header.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>std_header.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -115,9 +143,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>std_footer.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>std_footer.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -126,9 +157,12 @@
<link>style.css</link>
<navbar>false</navbar>
<hidden>false</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>style_css.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>style_css.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -137,9 +171,12 @@
<link>searchhi.js</link>
<navbar>false</navbar>
<hidden>false</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>searchhi.js</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>searchhi.js</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<resource path="images/faux-columns-950.png" />
Modified: roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/frontpage/theme.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/frontpage/theme.xml?rev=1157397&r1=1157396&r2=1157397&view=diff
==============================================================================
--- roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/frontpage/theme.xml (original)
+++ roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/frontpage/theme.xml Sat Aug 13 17:42:17 2011
@@ -16,9 +16,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>Weblog.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>Weblog.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -27,9 +30,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType></contentType>
- <contentsFile>_blogdirectory.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>_blogdirectory.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -38,9 +44,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType></contentType>
- <contentsFile>_blogprofile.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>_blogprofile.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -49,9 +58,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType></contentType>
- <contentsFile>_blogs.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>_blogs.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -60,9 +72,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType></contentType>
- <contentsFile>_css.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>_css.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -71,9 +86,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType></contentType>
- <contentsFile>_day.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>_day.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -82,9 +100,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType></contentType>
- <contentsFile>_decorator.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>_decorator.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -93,9 +114,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType></contentType>
- <contentsFile>_entry.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>_entry.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -104,9 +128,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType></contentType>
- <contentsFile>_footer.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>_footer.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -115,9 +142,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType></contentType>
- <contentsFile>_header.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>_header.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -126,9 +156,12 @@
<link>directory</link>
<navbar>false</navbar>
<hidden>false</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType></contentType>
- <contentsFile>directory.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>directory.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<!-- resources -->
Modified: roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/sotto/theme.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/sotto/theme.xml?rev=1157397&r1=1157396&r2=1157397&view=diff
==============================================================================
--- roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/sotto/theme.xml (original)
+++ roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/sotto/theme.xml Sat Aug 13 17:42:17 2011
@@ -14,8 +14,12 @@
<name>sotto-custom.css</name>
<description>Stylesheet for Sotto theme</description>
<link>sotto-custom.css</link>
- <templateLanguage>velocity</templateLanguage>
- <contentsFile>sotto-custom.css</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>sotto-custom.css</contentsFile>
+ <type>standard</type>
+ </templateCode>
</stylesheet>
<!-- templates -->
@@ -25,9 +29,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>weblog.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>weblog.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="permalink">
@@ -36,9 +43,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>permalink.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>permalink.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="search">
@@ -47,9 +57,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>searchresults.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>searchresults.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -58,9 +71,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>_day.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>_day.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -69,9 +85,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>sidebar.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>sidebar.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<template action="custom">
@@ -80,9 +99,12 @@
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>header.vm</contentsFile>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>header.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
</template>
<!-- resources -->