You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ga...@apache.org on 2005/12/23 02:59:13 UTC
svn commit: r358682 - in /incubator/roller/trunk/web: WEB-INF/classes/
WEB-INF/classes/flavors/ themes/basic/ themes/berkley/ themes/brushedmetal/
themes/cheb/ themes/clean/ themes/currency-i18n/ themes/currency/
themes/grey2/ themes/moonshine/ themes/...
Author: gangolli
Date: Thu Dec 22 17:59:08 2005
New Revision: 358682
URL: http://svn.apache.org/viewcvs?rev=358682&view=rev
Log:
Definition of macro #showRSDLink and addition of #showRSDLink() and #showRSSAutodiscoveryLink() to all themes. Resolves ROL-899, ROL-930, and ROL-945.
Modified:
incubator/roller/trunk/web/WEB-INF/classes/flavors/rsd.vm
incubator/roller/trunk/web/WEB-INF/classes/website.vm
incubator/roller/trunk/web/themes/basic/_decorator.vm
incubator/roller/trunk/web/themes/berkley/Weblog.vm
incubator/roller/trunk/web/themes/brushedmetal/Weblog.vm
incubator/roller/trunk/web/themes/cheb/Weblog.vm
incubator/roller/trunk/web/themes/clean/Weblog.vm
incubator/roller/trunk/web/themes/currency-i18n/Weblog.vm
incubator/roller/trunk/web/themes/currency/Weblog.vm
incubator/roller/trunk/web/themes/grey2/Weblog.vm
incubator/roller/trunk/web/themes/moonshine/Weblog.vm
incubator/roller/trunk/web/themes/movablemanila/Weblog.vm
incubator/roller/trunk/web/themes/pacifica/Weblog.vm
incubator/roller/trunk/web/themes/robot/Weblog.vm
incubator/roller/trunk/web/themes/rolling/_header.vm
incubator/roller/trunk/web/themes/sotto/Weblog.vm
incubator/roller/trunk/web/themes/sunsets/Weblog.vm
incubator/roller/trunk/web/themes/werner/Weblog.vm
incubator/roller/trunk/web/themes/x2/Weblog.vm
Modified: incubator/roller/trunk/web/WEB-INF/classes/flavors/rsd.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/flavors/rsd.vm?rev=358682&r1=358681&r2=358682&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/flavors/rsd.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/flavors/rsd.vm Thu Dec 22 17:59:08 2005
@@ -1,8 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
<rsd version="1.0">
<service>
<engineName>Roller Weblogger</engineName>
<engineLink>http://www.rollerweblogger.org/</engineLink>
- <homePageLink>${absBaseURL}/page/${website.handle}/</homePageLink>
+ <homePageLink>${absBaseURL}/page/${website.handle}</homePageLink>
<apis>
<api name="blogger" preferred="false"
apiLink="${absBaseURL}/xmlrpc"
Modified: incubator/roller/trunk/web/WEB-INF/classes/website.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/website.vm?rev=358682&r1=358681&r2=358682&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/website.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/website.vm Thu Dec 22 17:59:08 2005
@@ -131,4 +131,10 @@
#displayWeblogCalendar( true 'nil' )
#end
-
+#**
+ * Show RSD (Really Simple Discovery) link for your weblog.
+ *#
+#macro( showRSDLink )
+ <link rel="EditURI" type="application/rsd+xml"
+ title="RSD" href="$absBaseURL/rsd/${website.handle}"/>
+#end
Modified: incubator/roller/trunk/web/themes/basic/_decorator.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/basic/_decorator.vm?rev=358682&r1=358681&r2=358682&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/basic/_decorator.vm (original)
+++ incubator/roller/trunk/web/themes/basic/_decorator.vm Thu Dec 22 17:59:08 2005
@@ -6,6 +6,7 @@
#showContentLanguage($locale.language)
#includePage("_css")
#showRSSAutodiscoveryLink()
+ #showRSDLink()
<script type="text/javascript" src="$ctxPath/theme/scripts/roller.js">
</script>
<title>#showWebsiteTitle() : #showPageName()</title>
@@ -17,4 +18,4 @@
<!-- now print decorator footer/close html -->
</body>
-</html>
\ No newline at end of file
+</html>
Modified: incubator/roller/trunk/web/themes/berkley/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/berkley/Weblog.vm?rev=358682&r1=358681&r2=358682&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/berkley/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/berkley/Weblog.vm Thu Dec 22 17:59:08 2005
@@ -1,7 +1,9 @@
<html>
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ #showContentType("text/html; charset=utf-8")
#showContentLanguage($locale.language)
+ #showRSSAutodiscoveryLink()
+ #showRSDLink()
<title>#showWebsiteTitle()</title>
<link rel="stylesheet" type="text/css" href="$ctxPath/themes/base.css" />
<link rel="stylesheet" type="text/css" href="#showThemePath("berkley")/theme.css" />
Modified: incubator/roller/trunk/web/themes/brushedmetal/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/brushedmetal/Weblog.vm?rev=358682&r1=358681&r2=358682&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/brushedmetal/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/brushedmetal/Weblog.vm Thu Dec 22 17:59:08 2005
@@ -5,6 +5,7 @@
#showContentType("text/html; charset=utf-8")
#showContentLanguage($locale.language)
#showRSSAutodiscoveryLink()
+ #showRSDLink()
<script type="text/javascript" src="$ctxPath/theme/scripts/roller.js"></script>
<title>#showWebsiteTitle() : #showPageName()</title><title>Brushed Metal: It Worked!</title>
<style type="text/css">
@@ -49,4 +50,4 @@
</div> <!-- block -->
</body>
-</html>
\ No newline at end of file
+</html>
Modified: incubator/roller/trunk/web/themes/cheb/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/cheb/Weblog.vm?rev=358682&r1=358681&r2=358682&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/cheb/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/cheb/Weblog.vm Thu Dec 22 17:59:08 2005
@@ -3,8 +3,10 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ #showContentType("text/html; charset=utf-8")
#showContentLanguage($locale.language)
+ #showRSSAutodiscoveryLink()
+ #showRSDLink()
<title>#showWebsiteTitle()</title>
<link rel="stylesheet" type="text/css" href="$ctxPath/themes/base.css" />
<link rel="stylesheet" type="text/css" href="#showThemePath("cheb")/theme.css" />
Modified: incubator/roller/trunk/web/themes/clean/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/clean/Weblog.vm?rev=358682&r1=358681&r2=358682&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/clean/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/clean/Weblog.vm Thu Dec 22 17:59:08 2005
@@ -1,8 +1,10 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ #showContentType("text/html; charset=utf-8")
#showContentLanguage($locale.language)
+ #showRSSAutodiscoveryLink()
+ #showRSDLink()
<link rel="stylesheet" type="text/css" href="$ctxPath/themes/base.css" />
<link rel="stylesheet" type="text/css" href="#showThemePath("clean")/theme.css" />
<style type="text/css">#includePage("_css")</style>
@@ -33,4 +35,4 @@
</tbody>
</table>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: incubator/roller/trunk/web/themes/currency-i18n/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/currency-i18n/Weblog.vm?rev=358682&r1=358681&r2=358682&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/currency-i18n/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/currency-i18n/Weblog.vm Thu Dec 22 17:59:08 2005
@@ -2,9 +2,10 @@
<html>
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ #showContentType("text/html; charset=utf-8")
#showContentLanguage($locale.language)
- <meta name="generator" content="HTML Tidy, see www.w3.org">
+ #showRSSAutodiscoveryLink()
+ #showRSDLink()
<title>#showWebsiteTitle()</title>
<script type="text/javascript" language="JavaScript">
<!--
Modified: incubator/roller/trunk/web/themes/currency/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/currency/Weblog.vm?rev=358682&r1=358681&r2=358682&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/currency/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/currency/Weblog.vm Thu Dec 22 17:59:08 2005
@@ -2,9 +2,10 @@
<html>
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ #showContentType("text/html; charset=utf-8")
#showContentLanguage($locale.language)
- <meta name="generator" content="HTML Tidy, see www.w3.org">
+ #showRSSAutodiscoveryLink()
+ #showRSDLink()
<title>#showWebsiteTitle()</title>
<script type="text/javascript" language="JavaScript">
<!--
Modified: incubator/roller/trunk/web/themes/grey2/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/grey2/Weblog.vm?rev=358682&r1=358681&r2=358682&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/grey2/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/grey2/Weblog.vm Thu Dec 22 17:59:08 2005
@@ -1,10 +1,10 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
- <META http-equiv="Content-Type" content="text/html; charset=utf-8">
+ #showContentType("text/html; charset=utf-8")
#showContentLanguage($locale.language)
-
- <meta name="generator" content="HTML Tidy, see www.w3.org">
+ #showRSSAutodiscoveryLink()
+ #showRSDLink()
<title>#showWebsiteTitle()</title>
Modified: incubator/roller/trunk/web/themes/moonshine/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/moonshine/Weblog.vm?rev=358682&r1=358681&r2=358682&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/moonshine/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/moonshine/Weblog.vm Thu Dec 22 17:59:08 2005
@@ -19,8 +19,10 @@
-->
<html>
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ #showContentType("text/html; charset=utf-8")
#showContentLanguage($locale.language)
+ #showRSSAutodiscoveryLink()
+ #showRSDLink()
<title>#showWebsiteTitle()</title>
<link rel="stylesheet" type="text/css" href="$ctxPath/themes/base.css" />
<link rel="stylesheet" type="text/css" href="#showThemePath("moonshine")/theme.css" />
Modified: incubator/roller/trunk/web/themes/movablemanila/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/movablemanila/Weblog.vm?rev=358682&r1=358681&r2=358682&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/movablemanila/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/movablemanila/Weblog.vm Thu Dec 22 17:59:08 2005
@@ -5,6 +5,7 @@
#showContentType("text/html; charset=utf-8")
#showContentLanguage($locale.language)
#showRSSAutodiscoveryLink()
+ #showRSDLink()
<script type="text/javascript" src="$ctxPath/theme/scripts/roller.js"></script>
<title>#showWebsiteTitle() : #showPageName()</title><title>Brushed Metal: It Worked!</title>
<style type="text/css">
Modified: incubator/roller/trunk/web/themes/pacifica/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/pacifica/Weblog.vm?rev=358682&r1=358681&r2=358682&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/pacifica/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/pacifica/Weblog.vm Thu Dec 22 17:59:08 2005
@@ -1,9 +1,10 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ #showContentType("text/html; charset=utf-8")
#showContentLanguage($locale.language)
- <meta name="generator" content="HTML Tidy, see www.w3.org">
+ #showRSSAutodiscoveryLink()
+ #showRSDLink()
<title>#showWebsiteTitle()</title>
<link rel="stylesheet" type="text/css" href="$ctxPath/themes/base.css" />
Modified: incubator/roller/trunk/web/themes/robot/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/robot/Weblog.vm?rev=358682&r1=358681&r2=358682&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/robot/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/robot/Weblog.vm Thu Dec 22 17:59:08 2005
@@ -10,6 +10,7 @@
<link rel="stylesheet" type="text/css" href="#showThemePath("robot")/theme.css" />
<style type="text/css">#includePage("_css")</style>
#showRSSAutodiscoveryLink()
+ #showRSDLink()
<script type="text/javascript" src="$ctxPath/theme/scripts/roller.js">
</script>
@@ -49,4 +50,4 @@
</body>
-</html>
\ No newline at end of file
+</html>
Modified: incubator/roller/trunk/web/themes/rolling/_header.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/rolling/_header.vm?rev=358682&r1=358681&r2=358682&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/rolling/_header.vm (original)
+++ incubator/roller/trunk/web/themes/rolling/_header.vm Thu Dec 22 17:59:08 2005
@@ -4,8 +4,10 @@
<head>
<title>#showWebsiteTitle()</title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ #showContentType("text/html; charset=utf-8")
#showContentLanguage($locale.language)
+ #showRSSAutodiscoveryLink()
+ #showRSDLink()
<script type="text/javascript" src="$ctxPath/theme/scripts/roller.js"></script>
#showThemeScript("x2" "global.js")
Modified: incubator/roller/trunk/web/themes/sotto/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/sotto/Weblog.vm?rev=358682&r1=358681&r2=358682&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/sotto/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/sotto/Weblog.vm Thu Dec 22 17:59:08 2005
@@ -11,6 +11,7 @@
<link rel="stylesheet" type="text/css" href="$ctxPath/themes/base.css" />
#showThemeStyle("sotto" "default.css" false)
#showRSSAutodiscoveryLink()
+ #showRSDLink()
</head>
<body>
Modified: incubator/roller/trunk/web/themes/sunsets/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/sunsets/Weblog.vm?rev=358682&r1=358681&r2=358682&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/sunsets/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/sunsets/Weblog.vm Thu Dec 22 17:59:08 2005
@@ -8,6 +8,7 @@
<title>#showWebsiteTitle()</title>
<base href="$absBaseURL" />
#showRSSAutodiscoveryLink()
+ #showRSDLink()
<link rel="stylesheet" type="text/css" href="$ctxPath/themes/base.css" />
<link rel="stylesheet" type="text/css" media="all"
href="#showThemeStylePath("sunsets" "cherryeve.css")" />
Modified: incubator/roller/trunk/web/themes/werner/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/werner/Weblog.vm?rev=358682&r1=358681&r2=358682&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/werner/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/werner/Weblog.vm Thu Dec 22 17:59:08 2005
@@ -1,9 +1,11 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ #showContentType("text/html; charset=utf-8")
#showContentLanguage($locale.language)
- <link rel="stylesheet" type="text/css" href="$ctxPath/themes/base.css" />
+ #showRSSAutodiscoveryLink()
+ #showRSDLink()
+ <link rel="stylesheet" type="text/css" href="$ctxPath/themes/base.css" />
<link rel="stylesheet" type="text/css" href="#showThemePath("werner")/theme.css" />
<style type="text/css">
#includePage("_css")
Modified: incubator/roller/trunk/web/themes/x2/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/x2/Weblog.vm?rev=358682&r1=358681&r2=358682&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/x2/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/x2/Weblog.vm Thu Dec 22 17:59:08 2005
@@ -7,6 +7,7 @@
#showContentLanguage($locale.language)
<base href="$absBaseURL" />
#showRSSAutodiscoveryLink()
+ #showRSDLink()
#showThemeScript("x2" "global.js")
#showThemeScript("x2" "xmlextras.js")
#showThemeScript("x2" "comments.js")