roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ghu...@apache.org
Subject svn commit: r1603134 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/business/themes/ java/org/apache/roller/weblogger/ui/struts2/ajax/ webapp/WEB-INF/ webapp/WEB-INF/jsps/editor/ webapp/themes/basic/ webapp/themes/brushedmetal/ webap...
Date Tue, 17 Jun 2014 11:36:08 GMT
Author: ghuber
Date: Tue Jun 17 11:36:07 2014
New Revision: 1603134

URL: http://svn.apache.org/r1603134
Log:
Add theme description element to theme.xml.  See ROL-2015.

Added:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDescriptionServlet.java
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/ThemeManager.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadata.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/web.xml
    roller/trunk/app/src/main/webapp/themes/basic/theme.xml
    roller/trunk/app/src/main/webapp/themes/brushedmetal/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/sotto/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=1603134&r1=1603133&r2=1603134&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 Jun 17 11:36:07 2014
@@ -184,7 +184,11 @@ public class SharedThemeFromDir extends 
         // use parsed theme descriptor to load Theme data
         setId(themeMetadata.getId());
         setName(themeMetadata.getName());
-        setDescription(themeMetadata.getName());
+        if (StringUtils.isNotEmpty(themeMetadata.getDescription())) {
+            setDescription(themeMetadata.getDescription());
+        } else {
+            setDescription(themeMetadata.getName());
+        }
         setType(themeMetadata.getType());
         setAuthor(themeMetadata.getAuthor());
         setLastModified(null);

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java?rev=1603134&r1=1603133&r2=1603134&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java
Tue Jun 17 11:36:07 2014
@@ -19,8 +19,10 @@
 package org.apache.roller.weblogger.business.themes;
 
 import java.util.List;
+
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.business.InitializationException;
+import org.apache.roller.weblogger.pojos.Theme;
 import org.apache.roller.weblogger.pojos.WeblogTheme;
 import org.apache.roller.weblogger.pojos.Weblog;
 
@@ -65,7 +67,7 @@ public interface ThemeManager {
      *
      * @return List A list of Theme objects which are enabled.
      */
-    List getEnabledThemesList();
+    List<Theme> getEnabledThemesList();
 
     /**
      * Import all the contents for a Theme into a weblog.

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadata.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadata.java?rev=1603134&r1=1603133&r2=1603134&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadata.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadata.java
Tue Jun 17 11:36:07 2014
@@ -21,34 +21,32 @@ package org.apache.roller.weblogger.busi
 import java.util.HashSet;
 import java.util.Set;
 
-
 /**
  * Represents a parsed version of a theme xml metadata descriptor.
  */
 public class ThemeMetadata {
-    
+
     private String id = null;
     private String name = null;
+    private String description = null;
     private String author = null;
     private String type = null;
     private String previewImage = null;
     private ThemeMetadataTemplate stylesheet = null;
     private Set<ThemeMetadataTemplate> templates = new HashSet<ThemeMetadataTemplate>();
     private Set<String> resources = new HashSet<String>();
-    
-    
-    public ThemeMetadata() {}
 
-    
+    public ThemeMetadata() {
+    }
+
     public void addTemplate(ThemeMetadataTemplate template) {
         this.templates.add(template);
     }
-    
+
     public void addResource(String resource) {
         this.resources.add(resource);
     }
-    
-    
+
     public String getId() {
         return id;
     }
@@ -56,7 +54,7 @@ public class ThemeMetadata {
     public void setId(String id) {
         this.id = id;
     }
-    
+
     public String getName() {
         return name;
     }
@@ -65,6 +63,14 @@ public class ThemeMetadata {
         this.name = name;
     }
 
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
     public String getPreviewImage() {
         return previewImage;
     }

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=1603134&r1=1603133&r2=1603134&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 Jun 17 11:36:07 2014
@@ -53,10 +53,11 @@ public class ThemeMetadataParser {
         SAXBuilder builder = new SAXBuilder();
         Document doc = builder.build(instream);
         
-        // start at root and get theme id, name, and author
+        // start at root and get theme id, name, description and author
         Element root = doc.getRootElement();
         theme.setId(root.getChildText("id"));
         theme.setName(root.getChildText("name"));
+        theme.setDescription(root.getChildText("description"));
         theme.setAuthor(root.getChildText("author"));
         theme.setType(root.getChildText("type"));
         

Added: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDescriptionServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDescriptionServlet.java?rev=1603134&view=auto
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDescriptionServlet.java
(added)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDescriptionServlet.java
Tue Jun 17 11:36:07 2014
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
+
+package org.apache.roller.weblogger.ui.struts2.ajax;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.roller.weblogger.WebloggerException;
+import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.business.themes.ThemeManager;
+import org.apache.roller.weblogger.pojos.Theme;
+
+/**
+ * Returns a string with the theme description
+ * 
+ * web.xml: <url-pattern>/roller-ui/authoring/themedata/*</url-pattern>
+ * security.xml: <intercept-url pattern="/roller-ui/authoring/**"
+ * access="admin,editor"/>
+ */
+public class ThemeDescriptionServlet extends HttpServlet {
+
+    private static final long serialVersionUID = -200891465040607014L;
+
+    public void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+
+        String theTheme = request.getParameter("theme");
+        if (StringUtils.isNotEmpty(theTheme)) {
+            try {
+                ThemeManager themeMgr = WebloggerFactory.getWeblogger()
+                        .getThemeManager();
+                Theme theme = themeMgr.getTheme(theTheme);
+                if (theme != null) {
+                    response.getWriter().print(theme.getDescription());
+                    response.flushBuffer();
+                } else {
+                    response.sendError(HttpServletResponse.SC_NOT_FOUND);
+                }
+            } catch (WebloggerException e) {
+                throw new ServletException(e.getMessage());
+            }
+        } else {
+            response.sendError(HttpServletResponse.SC_NOT_FOUND);
+        }
+    }
+
+}

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp?rev=1603134&r1=1603133&r2=1603134&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp Tue Jun 17 11:36:07
2014
@@ -22,6 +22,8 @@
 <!--
 function previewImage(q, theme) {
     q.attr('src','<s:property value="siteURL" />/roller-ui/authoring/previewtheme?theme='
+ theme);
+    var url = "<%= request.getContextPath() %>/roller-ui/authoring/themedata/";
+	$.ajax({ url: url, data: {theme:theme}, success: function(data) { $('#themedescription').html(data);}
});
 }
 function fullPreview(selector) {
     selected = selector.selectedIndex;
@@ -108,6 +110,7 @@ function toggleImportThemeDisplay() {
                       listKey="id" listValue="name" size="1"
                       onchange="previewImage($('#sharedPreviewImg'), this[selectedIndex].value)"/>
         </p>
+        <p id="themedescription"></p>
         <p>
             <img id="sharedPreviewImg" src="" />
             <!-- initialize preview image at page load -->

Modified: roller/trunk/app/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/web.xml?rev=1603134&r1=1603133&r2=1603134&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/web.xml (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/web.xml Tue Jun 17 11:36:07 2014
@@ -277,6 +277,11 @@
     </servlet>
 
     <servlet>
+        <servlet-name>ThemeDescriptionServlet</servlet-name>
+        <servlet-class>org.apache.roller.weblogger.ui.struts2.ajax.ThemeDescriptionServlet</servlet-class>
+    </servlet>
+
+    <servlet>
         <servlet-name>TagDataServlet</servlet-name>
         <servlet-class>org.apache.roller.weblogger.webservices.tagdata.TagDataServlet</servlet-class>
     </servlet>
@@ -407,6 +412,10 @@
         <url-pattern>/roller-ui/authoring/userdata/*</url-pattern>
     </servlet-mapping>
 
+    <servlet-mapping>
+        <servlet-name>ThemeDescriptionServlet</servlet-name>
+        <url-pattern>/roller-ui/authoring/themedata/*</url-pattern>
+    </servlet-mapping>
 
     <!-- Web Service Servlets -->
     <servlet-mapping>

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=1603134&r1=1603133&r2=1603134&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basic/theme.xml (original)
+++ roller/trunk/app/src/main/webapp/themes/basic/theme.xml Tue Jun 17 11:36:07 2014
@@ -1,128 +1,129 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <weblogtheme>
     
-	<id>basic</id>
-	<name>Basic</name>
-	<author>Roller Weblogger</author>
-	<type>standard</type>
+    <id>basic</id>
+    <name>Basic</name>
+    <description>Basic Theme by Roller Weblogger</description>
+    <author>Roller Weblogger</author>
+    <type>standard</type>
     
     <!-- theme preview image -->
-	<preview-image path="basic-preview.png" />
+    <preview-image path="basic-preview.png" />
     
     <!-- stylesheet -->
-	<stylesheet>
-		<name>basic-custom.css</name>
-		<description>Stylesheet for Basic theme</description>
-		<link>basic-custom.css</link>
-		<templateCode>
-			<templateLanguage>velocity</templateLanguage>
-			<contentType>text/html</contentType>
-			<contentsFile>basic-custom.css</contentsFile>
-			<type>standard</type>
-		</templateCode>
-		<templateCode>
-			<templateLanguage>velocity</templateLanguage>
-			<contentType>text/html</contentType>
-			<contentsFile>basic-mobile-custom.css</contentsFile>
-			<type>mobile</type>
-		</templateCode>
-	</stylesheet>
+    <stylesheet>
+        <name>basic-custom.css</name>
+        <description>Stylesheet for Basic theme</description>
+        <link>basic-custom.css</link>
+        <templateCode>
+            <templateLanguage>velocity</templateLanguage>
+            <contentType>text/html</contentType>
+            <contentsFile>basic-custom.css</contentsFile>
+            <type>standard</type>
+        </templateCode>
+        <templateCode>
+            <templateLanguage>velocity</templateLanguage>
+            <contentType>text/html</contentType>
+            <contentsFile>basic-mobile-custom.css</contentsFile>
+            <type>mobile</type>
+        </templateCode>
+    </stylesheet>
     
     <!-- templates -->
-	<template action="weblog">
-		<name>Weblog</name>
-		<description>weblog</description>
-		<link></link>
-		<navbar>false</navbar>
-		<hidden>true</hidden>
-		<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">
-		<name>permalink</name>
-		<description>permalink</description>
-		<link></link>
-		<navbar>false</navbar>
-		<hidden>true</hidden>
-		<templateCode>
-			<templateLanguage>velocity</templateLanguage>
-			<contentType>text/html</contentType>
-			<contentsFile>permalink.vm</contentsFile>
-			<type>standard</type>
-		</templateCode>
-		<templateCode>
-			<templateLanguage>velocity</templateLanguage>
-			<contentType>text/html</contentType>
-			<contentsFile>permalink-mobile.vm</contentsFile>
-			<type>mobile</type>
-		</templateCode>
-	</template>
-    
-	<template action="search">
-		<name>searchresults</name>
-		<description>searchresults</description>
-		<link></link>
-		<navbar>false</navbar>
-		<hidden>true</hidden>
-		<templateCode>
-			<templateLanguage>velocity</templateLanguage>
-			<contentType>text/html</contentType>
-			<contentsFile>searchresults.vm</contentsFile>
-			<type>standard</type>
-		</templateCode>
-		<templateCode>
-			<templateLanguage>velocity</templateLanguage>
-			<contentType>text/html</contentType>
-			<contentsFile>searchresults-mobile.vm</contentsFile>
-			<type>mobile</type>
-		</templateCode>
-	</template>
-    
-	<template action="custom">
-		<name>_day</name>
-		<description>_day</description>
-		<link></link>
-		<navbar>false</navbar>
-		<hidden>true</hidden>
-		<templateCode>
-			<templateLanguage>velocity</templateLanguage>
-			<contentType>text/html</contentType>
-			<contentsFile>_day.vm</contentsFile>
-			<type>standard</type>
-		</templateCode>
-		<templateCode>
-			<templateLanguage>velocity</templateLanguage>
-			<contentType>text/html</contentType>
-			<contentsFile>_day-mobile.vm</contentsFile>
-			<type>mobile</type>
-		</templateCode>
-	</template>
-    
-	<template action="custom">
-		<name>sidebar</name>
-		<description>sidebar</description>
-		<link></link>
-		<navbar>false</navbar>
-		<hidden>true</hidden>
-		<templateCode>
-			<templateLanguage>velocity</templateLanguage>
-			<contentType>text/html</contentType>
-			<contentsFile>sidebar.vm</contentsFile>
-			<type>standard</type>
-		</templateCode>
-	</template>
+    <template action="weblog">
+        <name>Weblog</name>
+        <description>weblog</description>
+        <link></link>
+        <navbar>false</navbar>
+        <hidden>true</hidden>
+        <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">
+        <name>permalink</name>
+        <description>permalink</description>
+        <link></link>
+        <navbar>false</navbar>
+        <hidden>true</hidden>
+        <templateCode>
+            <templateLanguage>velocity</templateLanguage>
+            <contentType>text/html</contentType>
+            <contentsFile>permalink.vm</contentsFile>
+            <type>standard</type>
+        </templateCode>
+        <templateCode>
+            <templateLanguage>velocity</templateLanguage>
+            <contentType>text/html</contentType>
+            <contentsFile>permalink-mobile.vm</contentsFile>
+            <type>mobile</type>
+        </templateCode>
+    </template>
+    
+    <template action="search">
+        <name>searchresults</name>
+        <description>searchresults</description>
+        <link></link>
+        <navbar>false</navbar>
+        <hidden>true</hidden>
+        <templateCode>
+            <templateLanguage>velocity</templateLanguage>
+            <contentType>text/html</contentType>
+            <contentsFile>searchresults.vm</contentsFile>
+            <type>standard</type>
+        </templateCode>
+        <templateCode>
+            <templateLanguage>velocity</templateLanguage>
+            <contentType>text/html</contentType>
+            <contentsFile>searchresults-mobile.vm</contentsFile>
+            <type>mobile</type>
+        </templateCode>
+    </template>
+    
+    <template action="custom">
+        <name>_day</name>
+        <description>_day</description>
+        <link></link>
+        <navbar>false</navbar>
+        <hidden>true</hidden>
+        <templateCode>
+            <templateLanguage>velocity</templateLanguage>
+            <contentType>text/html</contentType>
+            <contentsFile>_day.vm</contentsFile>
+            <type>standard</type>
+        </templateCode>
+        <templateCode>
+            <templateLanguage>velocity</templateLanguage>
+            <contentType>text/html</contentType>
+            <contentsFile>_day-mobile.vm</contentsFile>
+            <type>mobile</type>
+        </templateCode>
+    </template>
+    
+    <template action="custom">
+        <name>sidebar</name>
+        <description>sidebar</description>
+        <link></link>
+        <navbar>false</navbar>
+        <hidden>true</hidden>
+        <templateCode>
+            <templateLanguage>velocity</templateLanguage>
+            <contentType>text/html</contentType>
+            <contentsFile>sidebar.vm</contentsFile>
+            <type>standard</type>
+        </templateCode>
+    </template>
     
      <!-- resources -->
-	<resource path="images/forward_mobile.png" />
+    <resource path="images/forward_mobile.png" />
 </weblogtheme>

Modified: roller/trunk/app/src/main/webapp/themes/brushedmetal/theme.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/brushedmetal/theme.xml?rev=1603134&r1=1603133&r2=1603134&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/brushedmetal/theme.xml (original)
+++ roller/trunk/app/src/main/webapp/themes/brushedmetal/theme.xml Tue Jun 17 11:36:07 2014
@@ -3,6 +3,7 @@
     
     <id>brushedmetal</id>
     <name>Brushed Metal</name>
+    <description>Brushed Metal Theme by Bryan Bell</description>
     <author>Bryan Bell</author>
     <type>standard</type>
     
@@ -13,7 +14,7 @@
     <stylesheet>
         <name>brushedmetal-custom.css</name>
         <description>Stylesheet for Brushed Metal theme</description>
-	<link>brushedmetal-custom.css</link>
+    <link>brushedmetal-custom.css</link>
         <templateCode>
            <templateLanguage>velocity</templateLanguage>
            <contentType>text/html</contentType>
@@ -26,7 +27,7 @@
     <template action="weblog">
         <name>Weblog</name>
         <description>weblog</description>
-	<link></link>
+    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
          <templateCode>
@@ -40,7 +41,7 @@
     <template action="permalink">
         <name>permalink</name>
         <description>permalink</description>
-	<link></link>
+    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
          <templateCode>
@@ -54,7 +55,7 @@
     <template action="search">
         <name>searchresults</name>
         <description>searchresults</description>
-	<link></link>
+    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
          <templateCode>
@@ -68,7 +69,7 @@
     <template action="custom">
         <name>_day</name>
         <description>_day</description>
-	<link></link>
+    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
         <templateCode>
@@ -82,7 +83,7 @@
     <template action="custom">
         <name>sidebar</name>
         <description>sidebar</description>
-	<link></link>
+    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
          <templateCode>

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=1603134&r1=1603133&r2=1603134&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/fauxcoly/theme.xml (original)
+++ roller/trunk/app/src/main/webapp/themes/fauxcoly/theme.xml Tue Jun 17 11:36:07 2014
@@ -5,6 +5,7 @@
     
     <id>fauxcoly</id>
     <name>Fauxcoly</name>
+    <description>Fauxcoly Theme by Dave Johnson</description>
     <author>Dave Johnson</author>
     <type>standard</type>
     
@@ -15,7 +16,7 @@
     <stylesheet>
         <name>custom.css</name>
         <description>Custom style sheet</description>
-	    <link>custom.css</link>
+        <link>custom.css</link>
         <templateCode>
            <templateLanguage>velocity</templateLanguage>
            <contentType>text/html</contentType>
@@ -28,7 +29,7 @@
     <template action="weblog">
         <name>Weblog</name>
         <description>Main page of weblog</description>
-	    <link></link>
+        <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
         <templateCode>
@@ -42,7 +43,7 @@
     <template action="permalink">
         <name>Entry</name>
         <description>Page for one weblog entry</description>
-	    <link></link>
+        <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
         <templateCode>
@@ -56,7 +57,7 @@
     <template action="tagsIndex">
         <name>TagsIndex</name>
         <description>Tag index page</description>
-	    <link></link>
+        <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
         <templateCode>
@@ -70,7 +71,7 @@
     <template action="search">
         <name>Search</name>
         <description>Search results page</description>
-	    <link></link>
+        <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
         <templateCode>
@@ -84,7 +85,7 @@
     <template action="custom">
         <name>_day</name>
         <description>One day's worth of entries</description>
-	    <link></link>
+        <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
         <templateCode>
@@ -98,7 +99,7 @@
     <template action="custom">
         <name>Archives</name>
         <description>Calendar browser and links to latest entries</description>
-	    <link>archives</link>
+        <link>archives</link>
         <navbar>true</navbar>
         <hidden>false</hidden>
          <templateCode>
@@ -112,7 +113,7 @@
     <template action="custom">
         <name>standard_head</name>
         <description>Contents of HTML head</description>
-	    <link></link>
+        <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
          <templateCode>
@@ -126,7 +127,7 @@
     <template action="custom">
         <name>standard_header</name>
         <description>Displayed in header of each page</description>
-	    <link></link>
+        <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
         <templateCode>
@@ -140,7 +141,7 @@
     <template action="custom">
         <name>standard_footer</name>
         <description>For footer of each page</description>
-	    <link></link>
+        <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
          <templateCode>
@@ -154,7 +155,7 @@
     <template action="custom">
         <name>style.css</name>
         <description>Base stylesheet for theme</description>
-	    <link>style.css</link>
+        <link>style.css</link>
         <navbar>false</navbar>
         <hidden>false</hidden>
          <templateCode>
@@ -168,7 +169,7 @@
     <template action="custom">
         <name>searchhi.js</name>
         <description>3rd party script for search term highlighting</description>
-	    <link>searchhi.js</link>
+        <link>searchhi.js</link>
         <navbar>false</navbar>
         <hidden>false</hidden>
         <templateCode>

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=1603134&r1=1603133&r2=1603134&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/frontpage/theme.xml (original)
+++ roller/trunk/app/src/main/webapp/themes/frontpage/theme.xml Tue Jun 17 11:36:07 2014
@@ -3,6 +3,7 @@
     
     <id>frontpage</id>
     <name>Frontpage</name>
+    <description>Frontpage Theme by Dave Johnson</description>
     <author>Dave Johnson</author>
     <type>standard</type>
     
@@ -13,7 +14,7 @@
     <template action="weblog">
         <name>Weblog</name>
         <description>Weblog</description>
-	<link></link>
+    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
         <templateCode>
@@ -27,7 +28,7 @@
     <template action="custom">
         <name>_blogdirectory</name>
         <description>_blogdirectory</description>
-	<link></link>
+    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
          <templateCode>
@@ -41,7 +42,7 @@
     <template action="custom">
         <name>_blogprofile</name>
         <description>_blogprofile</description>
-	<link></link>
+    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
         <templateCode>
@@ -55,7 +56,7 @@
     <template action="custom">
         <name>_blogs</name>
         <description>_blogs</description>
-	<link></link>
+    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
         <templateCode>
@@ -69,7 +70,7 @@
     <template action="custom">
         <name>_css</name>
         <description>_css</description>
-	<link></link>
+    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
         <templateCode>
@@ -83,7 +84,7 @@
     <template action="custom">
         <name>_day</name>
         <description>_day</description>
-	<link></link>
+    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
         <templateCode>
@@ -97,7 +98,7 @@
     <template action="custom">
         <name>_decorator</name>
         <description>_decorator</description>
-	<link></link>
+    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
         <templateCode>
@@ -111,7 +112,7 @@
     <template action="custom">
         <name>_entry</name>
         <description>_entry</description>
-	<link></link>
+    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
         <templateCode>
@@ -125,7 +126,7 @@
     <template action="custom">
         <name>_footer</name>
         <description>_footer</description>
-	<link></link>
+    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
         <templateCode>
@@ -139,7 +140,7 @@
     <template action="custom">
         <name>_header</name>
         <description>_header</description>
-	<link></link>
+    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
          <templateCode>
@@ -153,7 +154,7 @@
     <template action="custom">
         <name>directory</name>
         <description>weblog directory</description>
-	<link>directory</link>
+    <link>directory</link>
         <navbar>false</navbar>
         <hidden>false</hidden>
          <templateCode>

Modified: roller/trunk/app/src/main/webapp/themes/sotto/theme.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/sotto/theme.xml?rev=1603134&r1=1603133&r2=1603134&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/sotto/theme.xml (original)
+++ roller/trunk/app/src/main/webapp/themes/sotto/theme.xml Tue Jun 17 11:36:07 2014
@@ -3,6 +3,7 @@
     
     <id>sotto</id>
     <name>Sotto</name>
+    <description>Sotto Theme by Matt Raible</description>
     <author>Matt Raible</author>
     <type>standard</type>
     
@@ -13,7 +14,7 @@
     <stylesheet>
         <name>sotto-custom.css</name>
         <description>Stylesheet for Sotto theme</description>
-	<link>sotto-custom.css</link>
+    <link>sotto-custom.css</link>
         <templateCode>
            <templateLanguage>velocity</templateLanguage>
            <contentType>text/html</contentType>
@@ -26,7 +27,7 @@
     <template action="weblog">
         <name>Weblog</name>
         <description>weblog</description>
-	<link></link>
+    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
          <templateCode>
@@ -40,7 +41,7 @@
     <template action="permalink">
         <name>permalink</name>
         <description>permalink</description>
-	<link></link>
+    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
          <templateCode>
@@ -54,7 +55,7 @@
     <template action="search">
         <name>searchresults</name>
         <description>searchresults</description>
-	<link></link>
+    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
         <templateCode>
@@ -68,7 +69,7 @@
     <template action="custom">
         <name>_day</name>
         <description>_day</description>
-	<link></link>
+    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
          <templateCode>
@@ -82,7 +83,7 @@
     <template action="custom">
         <name>sidebar</name>
         <description>sidebar</description>
-	<link></link>
+    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
         <templateCode>
@@ -96,7 +97,7 @@
     <template action="custom">
         <name>header</name>
         <description>header</description>
-	<link></link>
+    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
         <templateCode>



Mime
View raw message