You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2005/06/26 11:57:53 UTC
svn commit: r201785 [3/3] - in /incubator/roller/trunk: ./
sandbox/planetroller/src/org/roller/tools/planet/ sandbox/standalone/
sandbox/standalone/tomcat/ src/org/roller/ src/org/roller/business/
src/org/roller/business/hibernate/ src/org/roller/busin...
Modified: incubator/roller/trunk/web/WEB-INF/classes/bookmark.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/bookmark.vm?rev=201785&r1=201784&r2=201785&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/bookmark.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/bookmark.vm Sat Jun 25 12:45:36 2005
@@ -1,5 +1,5 @@
#**
- * Macros to display Bookmark Folders and Bookmarks.
+ * Bookmarks and bookmark folders.
* @author Lance Lavandowska (conversion to Velocimacros)
*#
@@ -33,6 +33,9 @@
#**
* Displays the Bookmarks in a Folder instance.
+ * @param folder FolderData object to be displayed
+ * @param showFolderName True to show folder's name
+ * @param expandingFolder True to show expandable folder
*#
#macro( showFolder $folder $showFolderName $expandingFolder )
#set( $bookmarks = $pageModel.getBookmarks($folder) )
@@ -67,9 +70,9 @@
#**
* Displays a bookmark folder as named.
- * @param folderName Name of the folder to be displayed.
- * @param showFolderName True if folder's name is to be displayed.
- * @param expandingFolder True if folder is to be displayed as a expanding folder.
+ * @param folderName Name of the folder to be displayed.
+ * @param showFolderName True to show folder's name
+ * @param expandingFolder True to show expandable folder
*#
#macro( showBookmarks $folderName $showFolderName $expandingFolder )
#if ( $pageModel.getFolder($folderName) )
@@ -82,16 +85,22 @@
#**
* Display all Bookmarks (from all Folders) for user.
+ * @param expandingFolder True to show expandable folder
**#
#macro( showAllBookmarks $expandingFolder )
#set( $root = $pageModel.getFolderByPath("/") )
#showFolder($root true $expandingFolder)
#end
+#**
+ * Show link to OPML file for specified folder.
+ * @param folderName Name of folder to be displayed (or / separated path)
+ *#
#macro( showOpmlLink $folderName )
#if ( $pageModel.getFolder( $folderName ) )
- <a href="$ctxPath/flavor/$userName?flavor=opml&path=$folder.path">
- <img src="$ctxPath/images/opml.png" alt="OPML for $folderName" />
+ <a href="$ctxPath/flavor/$userName?flavor=opml&path=$folderName">
+ <img src="$ctxPath/images/opml.png"
+ alt="OPML badge" title="OPML for $folderName" />
</a>
#else
<span class="error">$text.get( "macro.bookmark.error", [$folderName])</span>
Modified: incubator/roller/trunk/web/WEB-INF/classes/comments.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/comments.vm?rev=201785&r1=201784&r2=201785&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/comments.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/comments.vm Sat Jun 25 12:45:36 2005
@@ -1,9 +1,12 @@
+#**
+ * Comment page links and comment forms.
+ *#
#**
* Display the pop-up comments link for a weblog entry.
* Use the URL for the href attribute for those who have disabled
* javascript or who desire to open the comments window in another (Mozilla) tab.
- * @param entry WeblogEntry object.
+ * @param entry WeblogEntryData object for which link is to be displayed.
*#
#macro( showCommentsLink $entry )
#set( $commentCount = $pageModel.getCommentCount($entry.Id) )
@@ -17,7 +20,7 @@
#**
* Display the in-page comments link for a weblog entry.
- * @param entry WeblogEntry object.
+ * @param entry WeblogEntryData object for which link is to be displayed.
*#
#macro( showCommentsPageLink $entry )
#set( $commentCount = $pageModel.getCommentCount($entry.Id) )
@@ -29,8 +32,8 @@
#**
* Display link for comments that renders a dynamically (DHTML) generated
- * comments form - Matt Raible style.
- * @param entry WeblogEntry object.
+ * comments form - Matt Raible's "twisty comments" style.
+ * @param entry WeblogEntryData object for which link is to be displayed.
*#
#macro( showCommentsDiv $entry )
#set( $commentCount = $pageModel.getCommentCount($entry.Id) )
@@ -84,8 +87,8 @@
#end
#**
- * Display comments for an entry.
- * @param entry WeblogEntry object.
+ * Display all comments comments for an entry.
+ * @param entry WeblogEntryData object for which comments are to be displayed.
*#
#macro( showComments $entry )
<div class="comments" id="comments">
@@ -117,6 +120,7 @@
#**
* Display recent comments for whole blog (not just one entry).
+ * @param numComments Maximum number of comments to be displayed
**#
#macro( showRecentComments $numComments )
#if( !$numComments ) #set( $numComments = 20 ) #end
@@ -143,8 +147,9 @@
#end
#**
- * Display list of recent comments. $maxWidth determines the amount of text
- * from the comment to display in the list.
+ * Display list of most recent comments for a blog.
+ * @param numComments Max number of comments to show.
+ * @param maxWidth Limit width of comment text to this number of characters
**#
#macro( showRecentCommentsListWidth $numComments $maxWidth )
#if( !$numComments ) #set( $numComments = 20 ) #end
@@ -165,8 +170,10 @@
#end
</ul>
#end
+
#**
- * Convenience method. Show list with 25 character width.
+ * Display list of most recent comments for a blog (with maxWidth = 25)
+ * @param numComments Max number of comments to show.
**#
#macro( showRecentCommentsList $numComments )
#showRecentCommentsListWidth( $numComments 25 )
@@ -174,7 +181,7 @@
#**
* Display comment form for a weblog entry.
- * @param entry WeblogEntry object.
+ * @param entry WeblogEntry object for which form is to be shown.
*#
#macro( showCommentForm $entry )
<div class="comments-form">
@@ -307,7 +314,7 @@
#**
* Display hidden comment form for a weblog entry.
- * @param entry WeblogEntry object.
+ * @param entry WeblogEntry object for which form is to be shown,
*#
#macro( showHiddenCommentForm )
<div style="display: none" class="comments">
Modified: incubator/roller/trunk/web/WEB-INF/classes/flavors/atom.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/flavors/atom.vm?rev=201785&r1=201784&r2=201785&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/flavors/atom.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/flavors/atom.vm Sat Jun 25 12:45:36 2005
@@ -22,7 +22,7 @@
<author><name>$entry.website.user.fullName</name></author>
#end
<link rel="alternate" type="text/html" href="$absBaseURL$entry.permaLink"/>
- <id>tag:$host,$utilities.formatIso8601Day($entry.pubTime):/$entry.website.user.userName?anchor=$entry.anchor</id>
+ <id>tag:$host,$utilities.formatIso8601Day($entry.pubTime):/$entry.website.user.userName?entry=$entry.anchor</id>
<content type="text/html" mode="escaped">#showEntryDescription($entry)</content>
</entry>
#end
Modified: incubator/roller/trunk/web/WEB-INF/classes/navbar.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/navbar.vm?rev=201785&r1=201784&r2=201785&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/navbar.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/navbar.vm Sat Jun 25 12:45:36 2005
@@ -1,5 +1,5 @@
#**
- * Macros to display the Roller Navigation bars.
+ * Roller menus and navigation bars.
* @author Lance Lavandowska (conversion to Velocimacros)
*#
@@ -28,15 +28,15 @@
#end
#**
- * Print a link for a menu item. Take into consideration:
- * 1. Should this be particularly CSS friendly.
- * 2. Or is this specifically a vertical menu.
- * 3. Otherwise use the specified delimiter.
+ * Print a link for a menu item. Take into consideration:<br />
+ * 1. Should this be particularly CSS friendly.<br />
+ * 2. Or is this specifically a vertical menu.<br />
+ * 3. Otherwise use the specified delimiter.<br />
*
- * @param linkUrl The URL to be used in the href attribute.
+ * @param linkUrl The URL to be used in the href attribute.
* @param linkValue The value used to look up the link's label.
- * @param useCSS Use CSS based formatting.
- * @param vertical Use "hard-formatting" to create vertical menu.
+ * @param useCSS Use CSS based formatting.
+ * @param vertical Use "hard-formatting" to create vertical menu.
* @param delimiter Seperate horizontal items with this value.
*#
#macro( printNavLink $linkUrl $linkValue $useCSS $vertical $delimiter )
@@ -49,8 +49,9 @@
#**
* Show Roller Page Navigation Bar, includes links to all pages
* except those that are hidden (because the start with "_").
- * @param vertical True if bar is to be displayed vertically.
+ * @param vertical True if bar is to be displayed vertically.
* @param delimiter Delimiter between entries in bar.
+ * @param useCSS Use CSS based formatting.
*#
#macro( showNavBar2 $vertical $delimiter $useCSS)
#set( $container = "div" )
@@ -105,7 +106,10 @@
#end
#**
- * Backwards compatibility version.
+ * Show Roller Page Navigation Bar, includes links to all pages
+ * except those that are hidden (because the start with "_").
+ * @param vertical True if bar is to be displayed vertically.
+ * @param delimiter Delimiter between entries in bar.
*#
#macro( showNavBar $vertical $delimiter )
#showNavBar2( $vertical $delimiter false)
Modified: incubator/roller/trunk/web/WEB-INF/classes/newsfeed.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/newsfeed.vm?rev=201785&r1=201784&r2=201785&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/newsfeed.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/newsfeed.vm Sat Jun 25 12:45:36 2005
@@ -1,5 +1,5 @@
#**
- * Macros to display RSS Newschannels.
+ * The deprecated #showNewsfeeds() macro.
* @author Lance Lavandowska (conversion to Velocimacros)
* @author Dave Johnson (conversion from Digestor to Flock)
*#
Modified: incubator/roller/trunk/web/WEB-INF/classes/planetrss.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/planetrss.vm?rev=201785&r1=201784&r2=201785&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/planetrss.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/planetrss.vm Sat Jun 25 12:45:36 2005
@@ -1,13 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
<channel>
+ #if($group)
+ <title>$utilities.textToHTML($group.title,true)</title>
+ <description>Aggregated feed for group [$utilities.textToHTML($group.title,true)]</description>
+ #else
<title>$utilities.textToHTML($planet.configuration.title,true)</title>
- <description>Aggregated Feed generated by Roller Planet aggregator</description>
+ <description>$utilities.textToHTML($planet.configuration.title,true)</description>
+ #end
<link>$utilities.textToHTML($planet.configuration.siteUrl)</link>
<lastBuildDate>$utilities.formatRfc822Date($planet.lastUpdated)</lastBuildDate>
- <generator>Roller Planet 1.1-dev</generator>
- #if($groupName)
- #set($entries = $planet.getAggregation($groupName,50))
+ <generator>Roller</generator>
+ #if($group)
+ #set($entries = $planet.getAggregation($group, 50))
#else
#set($entries = $planet.getAggregation(50))
#end
@@ -32,4 +37,4 @@
</item>
#end
</channel>
-</rss>
+</rss>
\ No newline at end of file
Modified: incubator/roller/trunk/web/WEB-INF/classes/referer.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/referer.vm?rev=201785&r1=201784&r2=201785&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/referer.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/referer.vm Sat Jun 25 12:45:36 2005
@@ -1,5 +1,5 @@
#**
- * Macros to display referers and Linkbacks.
+ * Referers and linkbacks.
* @author Lance Lavandowska (conversion to Velocimacros)
*#
Modified: incubator/roller/trunk/web/WEB-INF/classes/roller.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/roller.properties?rev=201785&r1=201784&r2=201785&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/roller.properties (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/roller.properties Sat Jun 25 12:45:36 2005
@@ -25,25 +25,31 @@
# RollerConfig.getProperty("propname");
#----------------------------------
+# Upload settings
-# upload settings
+# The directory in which Roller will upload files
uploads.dir=${user.home}/roller_data/uploads
+# The context path under which resoures will be made available
uploads.url=/resources
#----------------------------------
+# Search index settings
-# search index settings
+# Enables indexing of weblog entries and comments and enables search servlet
+search.enabled=true
+# Directory in which search index is to be created (delete this directory to
+# force Roller to recreate the entire search index)
search.index.dir=${user.home}/roller_data/search-index
#----------------------------------
+# Cache settings, remember ... times are in milliseconds
+# Default settings suitable for 100 user system
-# cache settings, remember ... times are in milliseconds
-
-# number of RSS feeds to cache (and timeout)
+# Number of RSS feeds to cache (and timeout)
cache.filter.rss.size=100
cache.filter.rss.timeout=3600
-# number of if-modified dates to cache (and timeout)
+# Number of if-modified dates to cache (and timeout)
cache.filter.ifmodified.size=100
cache.filter.ifmodified.timeout=1800
@@ -52,25 +58,32 @@
cache.filter.page.timeout=3600
#----------------------------------
+# Secure login configs
-# secure login configs
+# Enables HTTPS for login page only
securelogin.enabled=false
-# these are only used if secure login is enabled
+# These are only used if secure login is enabled
securelogin.http.port=80
securelogin.https.port=443
+
+# Header to be used to determine if HTTPS is active. Needed in cases where
+# request.isSecure() cannot be relied on (e.g if system is behind an SSL
+# accelerator).
#securelogin.https.headername=X-SSL
+# Header value to be used to determine if HTTPS is active. Leave this empty
+# to simply check for the existance of the header.
#securelogin.https.headervalue=
-# password security settings
+# Password security settings. Warning enabling password encryption may make
+# if more difficult to support the Atom Protocol (due in Fall 2005).
passwds.encryption.enabled=false
passwds.encryption.algorithm=SHA
#----------------------------------
+# Enabled plugins ... remember, order does matter!!
-# enabled plugins ... remember, order does matter!!
-
-# these are plugins available for a weblog
+# Weblog entry editor plugins (all are off by default).
plugins.page=\
org.roller.presentation.velocity.plugins.topictag.TopicTagPlugin \
,org.roller.presentation.velocity.plugins.textile.TextilePlugin \
@@ -81,32 +94,35 @@
,org.roller.presentation.velocity.plugins.readmore.ReadMorePlugin
#----------------------------------
-
# scheduled tasks, each is comma separated list of classes
+# Comma separated list of task classnames to be executed once per day
tasks.daily=org.roller.presentation.BlacklistUpdateTask\
,org.roller.presentation.TurnoverReferersTask\
+# Daily task needed by Planet aggregator
#,org.roller.presentation.planet.SyncWebsitesTask
+# Comma separated list of task classnames to be executed hourly
tasks.hourly=\
+# Hourly task needed by Planet aggregator
#org.roller.presentation.planet.RefreshEntriesTask
#----------------------------------
+# Velocity settings
-# velocity settings
velocity.properties=/WEB-INF/velocity.properties
velocity.toolbox.file=/WEB-INF/toolbox.xml
# Page model implementation
velocity.pagemodel.classname=org.roller.presentation.velocity.PageModel
-# Experimental page model that allows user's access to planet aggregations
+# Experimental page model that allows user's access to Planet aggregations
#velocity.pagemodel.classname=org.roller.presentation.velocity.planet.PlanetPageModel
#----------------------------------
+# Persistence settings
-# persistence settings
persistence.roller.classname=org.roller.business.hibernate.HibernateRollerImpl
persistence.filemanager.classname=org.roller.business.FileManagerImpl
@@ -121,25 +137,27 @@
comment.notification.hideCommenterAddresses=false
#----------------------------------
-
# ping settings
-# The number of attempts to try to reach a ping target before refusing to requeue it for further retrials
-# If absent, this defaults to 3.
+# The number of attempts to try to reach a ping target before refusing to
+# requeue it for further retrials. If absent, this defaults to 3.
pings.maxPingAttempts=3
-# The interval between ping queue processing runs in minutes. Must be between 0 and 120.
-# If set to 0, ping queue processing is disabled on this server; this is for clustered environments.
-# Make sure it is nonzero on one host in a cluster. Don't use the value 0 here to disable ping functionality,
-# you will instead get an infinitely growing ping queue. See the documentation on the properties below
-# to disable ping functionality if you need to.
+# The interval between ping queue processing runs in minutes. Must be between
+# 0 and 120. If set to 0, ping queue processing is disabled on this server;
+# this is for clustered environments. Make sure it is nonzero on one host in
+# a cluster. Don't use the value 0 here to disable ping functionality, you
+# will instead get an infinitely growing ping queue. See the documentation on
+# the properties below to disable ping functionality if you need to.
# If absent, this defaults to 5.
pings.queueProcessingIntervalMins=5
-# The set of initial common ping targets. This is used to initialize the database if there are no common
-# ping targets at startup. Ping targets are specified as a comma-separated list, each target in the form
-# {{name}{url}}. To disable initialization of common ping targets, comment this out, or set it to the
-# empty value. Common targets can be edited in the UI; this is just used to set up some typical ones.
+# The set of initial common ping targets. This is used to initialize the
+# database if there are no common ping targets at startup. Ping targets are
+# specified as a comma-separated list, each target in the form {{name}{url}}.
+# To disable initialization of common ping targets, comment this out, or set it
+# to the empty value. Common targets can be edited in the UI; this is just
+# used to set up some typical ones.
pings.initialCommonTargets=\
{{Technorati}{http://rpc.technorati.com/rpc/ping}}\
,{{Weblogs.com}{http://rpc.weblogs.com/RPC2}}\
@@ -147,41 +165,58 @@
,{{java.blogs}{http://javablogs.com/xmlrpc}}\
,{{blogrolling.com}{http://rpc.blogrolling.com/pinger/}}
-# This controls whether users are allowed to add custom ping targets. Set this to false to disallow adding custom
-# targets; if false, the Weblog:Custom Ping Targets menu item will not appear and associated actions will result in
-# access denied messages. Leave this false or commented for normal behavior.
-# CAUTION: Setting this to true will cause the server to remove all users' existing custom targets on startup.
+# This controls whether users are allowed to add custom ping targets.
+# Set this to false to disallow adding custom targets; if false, the
+# Weblog:Custom Ping Targets menu item will not appear and associated actions
+# will result in access denied messages. Leave this false or commented for
+# normal behavior.
+# CAUTION: Setting this to true will cause the server to remove all users'
+# existing custom targets on startup.
pings.disallowCustomTargets=false
-# This controls whether the Weblog:Pings menu item and its associated actions are enabled. Set this to false to
-# disallow users from configuring autopings and doing manual pings. If absent, this defaults to true.
-# NOTE: There is a separate runtime property (configurable from the Admin:Configuration page, that can be used to
-# suspend ping processing without disabling the UI.
-# CAUTION: Setting this to true will cause the server to remove all users' existing autoping
-# configurations on startup. Leave this false or commented for normal behavior.
+# This controls whether the Weblog:Pings menu item and its associated actions
+# are enabled. Set this to false to disallow users from configuring autopings
+# and doing manual pings. If absent, this defaults to true.
+# NOTE: There is a separate runtime property (configurable from the
+# Admin:Configuration page, that can be used to suspend ping processing without
+# disabling the UI.
+# CAUTION: Setting this to true will cause the server to remove all users'
+# existing autoping configurations on startup. Leave this false or commented
+# for normal behavior.
pings.disablePingUsage=false
-# Setting both pings.disallowCustomTarget=true and pings.disablePingUsage=true will effectively disable
-# the ping functionality.
+# Setting both pings.disallowCustomTarget=true and pings.disablePingUsage=true
+# will effectively disable the ping functionality.
-# This is used for debugging the ping mechanism in Roller. If this is set to true,
-# pings that would normally be sent will cause log messages to be sent but will
-# NOT actually result in real pings being sent. Leave this false or commented for normal behavior.
+# This is used for debugging the ping mechanism in Roller. If this is set
+# to true, pings that would normally be sent will cause log messages to be sent
+# but will NOT actually result in real pings being sent. Leave this false or
+# commented for normal behavior.
pings.logOnly=false
-
#----------------------------------
+# Planet Aggregator settings
-# misc settings
-
-# Set to true to show the Planet tab in the Roller menu (only admins will see it)
+# Set to true to enable the Planet aggregator. This will cause:
+# - The main page of Roller will become an aggregated view of all blogs in the
+# Roller database, plus those defined in the Planet group 'external'.
+# - A new menu tab will appear for Roller admin users. This allows admins to
+# add/remove newsfeed subscriptions in the 'external' group.
+# - Users can then subscribe to several newsfeeds:
+# - http://localhost:8080/roller/rss
+# - http://localhost:8080/roller/planetrss
+# - http://localhost:8080/roller/planetrss?group='external'
planet.aggregator.enabled=false
+#----------------------------------
+# misc settings
+
loginfilter.rememberme.enabled=true
breadcrumbs.stacksize=3
debug.memory.enabled=false
-# settings for the rss aggregator (not related to planet stuff)
+# settings for old #showNewseeds macro (not related to Planet stuff)
+# this should probably be deprecated
aggregator.enabled=true
aggregator.cache.enabled=true
aggregator.cache.timeout=14400
@@ -190,9 +225,12 @@
# settings for various plugins
# Optional site-wide customization settings for the TopicTag plugin.
-# n.b. these default settings match the coded default values that would be applied if these were omitted.
+# n.b. these default settings match the coded default values that would be
+# applied if these were omitted.
org.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.defaultTopicBookmarkName=Default Topic Site
org.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.defaultTopicSite=http://www.technorati.com/tag
org.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.tagRegexWithBookmark=topic:\\{(.*?)\\}\\[(.*?)\\]
org.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.tagRegexWithoutBookmark=topic:\\[(.*?)\\]
org.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.linkFormatString=<a rel=\"tag\" href=\"{0}{1}\">{2}</a>
+
+
Modified: incubator/roller/trunk/web/WEB-INF/classes/roller.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/roller.vm?rev=201785&r1=201784&r2=201785&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/roller.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/roller.vm Sat Jun 25 12:45:36 2005
@@ -1,5 +1,5 @@
#**
- * General purpose, or not user-specific, macros.
+ * Date formatting, theme image and theme paths.
* @author Lance Lavandowska (conversion to Velocimacros)
*#
Modified: incubator/roller/trunk/web/WEB-INF/classes/rssmacros.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/rssmacros.vm?rev=201785&r1=201784&r2=201785&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/rssmacros.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/rssmacros.vm Sat Jun 25 12:45:36 2005
@@ -1,5 +1,5 @@
#**
- * Macros for displaying RSS links and badges.
+ * RSS feed links and badges.
* @author Lance Lavandowska (conversion to Velocimacros)
*#
Added: incubator/roller/trunk/web/WEB-INF/classes/searchdisabled.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/searchdisabled.vm?rev=201785&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/searchdisabled.vm (added)
+++ incubator/roller/trunk/web/WEB-INF/classes/searchdisabled.vm Sat Jun 25 12:45:36 2005
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+ <title>$siteName: Search Disabled</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <script type="text/javascript"
+ src="$ctxPath/theme/scripts/roller.js"></script>
+ <link rel="stylesheet" type="text/css" media="all"
+ href="$ctxPath/themes/base.css" />
+ <link rel="stylesheet" type="text/css" media="all"
+ href="$ctxPath/theme/layout.css" />
+ <link rel="stylesheet" type="text/css" media="all"
+ href="$ctxPath/theme/roller.css" />
+ <link rel="stylesheet" type="text/css" media="all"
+ href="$ctxPath/theme/menu.css" />
+</head>
+<body>
+
+<div id="content">
+ #showStatusMessage()
+
+ <center>
+ <h1>$siteName: Search Disabled</h1>
+ </center>
+
+ <p>
+ Sorry! The administrator of this site has disabled Roller's built-in
+ search capabilities.
+ </p>
+
+ <div id="footer"></div>
+
+</div> <!-- close content div -->
+
+</body>
+</html>
\ No newline at end of file
Modified: incubator/roller/trunk/web/WEB-INF/classes/searchresults_day.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/searchresults_day.vm?rev=201785&r1=201784&r2=201785&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/searchresults_day.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/searchresults_day.vm Sat Jun 25 12:45:36 2005
@@ -1,5 +1,5 @@
#macro( showEntryPermalink $entry )
-<a href="$baseURL/page/$entry.website.user.userName/?anchor=$entry.Anchor"
+<a href="$baseURL/page/$entry.website.user.userName/?entry=$entry.Anchor"
title="$text.get( "macro.searchresultsday.entrypermalink.title" )"
class="entrypermalink">posted</a>
#end
Modified: incubator/roller/trunk/web/WEB-INF/classes/user.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/user.vm?rev=201785&r1=201784&r2=201785&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/user.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/user.vm Sat Jun 25 12:45:36 2005
@@ -1,5 +1,5 @@
#**
- * Macros for displaying images and accessing uploaded files.
+ * Uploaded image display and resource paths.
* @author Lance Lavandowska (conversion to Velocimacros)
*#
Modified: incubator/roller/trunk/web/WEB-INF/classes/weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/weblog.vm?rev=201785&r1=201784&r2=201785&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/weblog.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/weblog.vm Sat Jun 25 12:45:36 2005
@@ -1,5 +1,5 @@
#**
- * Macros for displaying weblog entries, comments, and related links.
+ * Weblog entries, comments, and related links.
* @author Lance Lavandowska (conversion to Velocimacros)
* @author David M Johnson (comment macros)
*#
@@ -19,23 +19,6 @@
#end
#**
- * Sets content type header for page, must be first line in template.
-**#
-#macro( setContentType $ctype )
-$pageHelper.setContentType($ctype)## comment here kills trailing whitespace
-#end
-
-#**
- * Set the META tag for ContentType. We do this in addition to
- * setting the Response header because the header does not get
- * cached. So in order to maintain the ContentType we must present
- * it inside the rendered page itself.
-**#
-#macro( showContentType $ctype )
- <meta http-equiv="Content-Type" content="$ctype">
-#end
-
-#**
* Set the META tag for ContentLanguage. We do this rather than
* setting the Response header because the header does not get
* cached. So in order to maintain the ContentType we must present
@@ -369,7 +352,7 @@
#foreach( $day in $xmap.keySet() )
#set( $recentEntries = $xmap.get($day) )
#foreach ($var in $recentEntries)
- <li class="recentposts"><a href="$baseURL/page/$userName/?anchor=$utilities.encode($var.anchor)">$var.title</a></li>
+ <li class="recentposts"><a href="$baseURL/page/$userName/?entry=$utilities.encode($var.anchor)">$var.title</a></li>
#end
#end
</ul>
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=201785&r1=201784&r2=201785&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/website.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/website.vm Sat Jun 25 12:45:36 2005
@@ -1,9 +1,26 @@
#**
- * Website and Page macros.
+ * Website and page information and display.
* @author Lance Lavandowska (conversion to Velocimacros)
*#
#**
+ * Sets content type header for page, must be first line in template.
+**#
+#macro( setContentType $ctype )
+$pageHelper.setContentType($ctype)## comment here kills trailing whitespace
+#end
+
+#**
+ * Set the META tag for ContentType. We do this in addition to
+ * setting the Response header because the header does not get
+ * cached. So in order to maintain the ContentType we must present
+ * it inside the rendered page itself.
+**#
+#macro( showContentType $ctype )
+ <meta http-equiv="Content-Type" content="$ctype">
+#end
+
+#**
* Display website title.
*#
#macro( showWebsiteTitle )$website.Name#end
@@ -42,18 +59,10 @@
#macro( showPageUpdateTime )$page.UpdateTime#end
#**
- * Display weblog calandar.
- * @param big True to display a BIG calendar, good for an archive page.
- *#
-#macro( displayWeblogCalendar $big $cat)
- $pageHelper.showWeblogCalendar( $big, $cat )
-#end
-
-#**
- * Shows weblog category chooser.
+ * Shows weblog category chooser with support for hierarhical categories.
* To style completely with CSS, set $divider to "" (empty string).
- * @param parentCategory The top level Category to display.
- * @param divider The text to place between each Category.
+ * @param parentCategory Name of top-level category to display.
+ * @param divider The text to place between each category.
*#
#macro( showWeblogSubcategoryChooser2 $parentCategory $divider )
#set( $rawUrl = "$ctxPath/page/$userName/$page.link" )
@@ -85,26 +94,31 @@
#end
</div>
#end
-## backwards compatibility
+
+#**
+ * Shows weblog category chooser using "|" as divider.
+ * @param parentCategory Name of top-level category to display.
+ *#
#macro( showWeblogSubcategoryChooser $parentCategory )
#showWeblogSubcategoryChooser2( $parentCategory "|" )
#end
#**
- * Shows weblog category chooser.
+ * Shows weblog category chooser for all categories using "|" as divider.
*#
#macro( showWeblogCategoryChooser )#showWeblogSubcategoryChooser2("nil" "|")#end
#**
- * Display weblog calandar.
- * @param big True to display a BIG calendar, good for an archive page.
+ * Display weblog calandar for one specific category.
+ * @param big True to display a BIG calendar, good for an archive page.
+ * @param parentCategory Name of top-level category to display.
*#
#macro( displayWeblogCalendar $big $cat)
$pageHelper.showWeblogCalendar( $big, $cat )
#end
#**
- * Display weblog calandar.
+ * Show weblog calandar.
*#
#macro( showWeblogCalendar )
#displayWeblogCalendar( false 'nil' )
@@ -116,3 +130,5 @@
#macro( showBigWeblogCalendar )
#displayWeblogCalendar( true 'nil' )
#end
+
+
Modified: incubator/roller/trunk/web/WEB-INF/editor-menu.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/editor-menu.xml?rev=201785&r1=201784&r2=201785&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/editor-menu.xml (original)
+++ incubator/roller/trunk/web/WEB-INF/editor-menu.xml Sat Jun 25 12:45:36 2005
@@ -4,10 +4,9 @@
<menu-bar>
<menu name="tabbedmenu.main">
+ <menu-item name="tabbedmenu.main" forward="main" />
<menu-item name="tabbedmenu.planet" forward="planet"
enabledProperty="planet.aggregator.enabled" />
- <menu-item name="tabbedmenu.main" forward="main"
- disabledProperty="planet.aggregator.enabled" />
</menu>
<menu name="tabbedmenu.weblog" roles="editor,admin">
Added: incubator/roller/trunk/web/editor/ekitappletspell.jar
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/editor/ekitappletspell.jar?rev=201785&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/roller/trunk/web/editor/ekitappletspell.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/roller/trunk/web/local-banner-planet.jspf
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/local-banner-planet.jspf?rev=201785&view=auto
==============================================================================
--- incubator/roller/trunk/web/local-banner-planet.jspf (added)
+++ incubator/roller/trunk/web/local-banner-planet.jspf Sat Jun 25 12:45:36 2005
@@ -0,0 +1,10 @@
+
+ <br />
+ <center><img src="images/roller-logo.png" /></center>
+
+ <h1>
+ <c:out value="${data.title}" />
+ </h1>
+ <p class="websiteDescription">
+ <c:out value="${data.description}" />
+ </p>
Modified: incubator/roller/trunk/web/main.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/main.jsp?rev=201785&r1=201784&r2=201785&view=diff
==============================================================================
--- incubator/roller/trunk/web/main.jsp (original)
+++ incubator/roller/trunk/web/main.jsp Sat Jun 25 12:45:36 2005
@@ -1,18 +1,18 @@
<%@
-page import="org.roller.presentation.MainPageAction" %><%@
+page import="org.roller.presentation.MainPageAction" %><%@
page import="java.util.Locale" %><%@
include file="/taglibs.jsp" %><%@
include file="/theme/header.jsp" %>
<table>
-<tr><%
-request.setAttribute("pinnedPosts",
- ((MainPageAction.MainPageData)request.getAttribute("data")).getWeblogEntriesPinnedToMain(5));
-request.setAttribute("recentPosts",
- ((MainPageAction.MainPageData)request.getAttribute("data")).getRecentWeblogEntries(45));
-request.setAttribute("popularWebsites",
- ((MainPageAction.MainPageData)request.getAttribute("data")).getPopularWebsites(65));
-%>
-<td width="70%">
+<tr><%
+request.setAttribute("pinnedPosts",
+ ((MainPageAction.MainPageData)request.getAttribute("data")).getWeblogEntriesPinnedToMain(5));
+request.setAttribute("recentPosts",
+ ((MainPageAction.MainPageData)request.getAttribute("data")).getRecentWeblogEntries(45));
+request.setAttribute("popularWebsites",
+ ((MainPageAction.MainPageData)request.getAttribute("data")).getPopularWebsites(65));
+%>
+<td width="70%" valign="top">
<div class="bannerBox">
<%@ include file="local-banner.jspf" %>
Modified: incubator/roller/trunk/web/planet.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/planet.jsp?rev=201785&r1=201784&r2=201785&view=diff
==============================================================================
--- incubator/roller/trunk/web/planet.jsp (original)
+++ incubator/roller/trunk/web/planet.jsp Sat Jun 25 12:45:36 2005
@@ -26,10 +26,10 @@
request.setAttribute("featuredGroup2_entries",((PlanetAction.PlanetPageData)
request.getAttribute("data")).getAggregation("featuredGroup2",20));
%>
-<td width="70%">
+<td width="70%" valign="top">
<div class="bannerBox">
- <%@ include file="local-banner.jspf" %>
+ <%@ include file="local-banner-planet.jspf" %>
</div>
<div class="entryTitleBox">
Modified: incubator/roller/trunk/web/planet/PlanetConfig.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/planet/PlanetConfig.jsp?rev=201785&r1=201784&r2=201785&view=diff
==============================================================================
--- incubator/roller/trunk/web/planet/PlanetConfig.jsp (original)
+++ incubator/roller/trunk/web/planet/PlanetConfig.jsp Sat Jun 25 12:45:36 2005
@@ -31,6 +31,15 @@
</div>
<div class="formrow">
+ <label for="description" class="formrow" />
+ <fmt:message key="planetConfig.description" />
+ </label>
+ <html:text property="description" size="40" maxlength="255" />
+ <img src="../images/help.jpeg" alt="help"
+ title='<fmt:message key="planetConfig.tip.description" />' />
+ </div>
+
+ <div class="formrow">
<label for="siteUrl" class="formrow" />
<fmt:message key="planetConfig.siteUrl" />
</label>
Modified: incubator/roller/trunk/web/weblog/WeblogEdit.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/WeblogEdit.jsp?rev=201785&r1=201784&r2=201785&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/WeblogEdit.jsp (original)
+++ incubator/roller/trunk/web/weblog/WeblogEdit.jsp Sat Jun 25 12:45:36 2005
@@ -248,6 +248,7 @@
</html:select>
<roller:Date property="dateString" dateFormat='<%= model.getShortDateFormat() %>' />
+ <c:out value="${model.weblogEntry.website.timezone}" />
</div>
<script type="text/javascript">
<!--
Modified: incubator/roller/trunk/web/weblog/editor-ekit.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/editor-ekit.jsp?rev=201785&r1=201784&r2=201785&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/editor-ekit.jsp (original)
+++ incubator/roller/trunk/web/weblog/editor-ekit.jsp Sat Jun 25 12:45:36 2005
@@ -18,60 +18,40 @@
<html:hidden property="text" />
<%-- Use the Ekit applet --%>
-
-<%--
-<%
-String text = "";
-WeblogEntryFormEx form
- = (WeblogEntryFormEx) request.getAttribute("weblogEntryFormEx");
-if (form.getText() != null) {
- text = form.getText();
-}
-String entryText = "<html><head></head><body>"+text+"</body></html>";
-%>
-<jsp:plugin type="applet" code="com.hexidec.ekit.EkitApplet.class" tabindex="2"
- codebase="." jreversion="1.3" height="350" width="90%" name="Ekit"
- archive="ekitapplet.jar" type="application/x-java-applet;version=1.3"
- nspluginurl="http://java.sun.com/products/plugin/1.3.0_01/plugin-install.html"
- iepluginurl="http://java.sun.com/products/plugin/1.3.0_01/jinstall-130_01-win32.cab#Version=1,3,0,1">
- <jsp:params>
- <jsp:param name="stylesheet" value="ekit.css"/>
- <jsp:param name="langcode" value="en" />
- <jsp:param name="langcountry" value="US" />
- <jsp:param name="toolbar" value="true"/>
- <jsp:param name="sourceview" value="false"/>
- <jsp:param name="exclusive" value="true"/>
- <jsp:param name="menuicons" value="true"/>
- <jsp:param name="scriptable" value="true"/>
- <jsp:param name="document" value="<%=entryText%>"/>
- </jsp:params>
- <jsp:fallback>
- <p>Unable to start Java Plugin.</p>
- </jsp:fallback>
-</jsp:plugin>
---%>
-
-<APPLET CODEBASE="." CODE="com.hexidec.ekit.EkitApplet.class"
- ARCHIVE="ekitapplet.jar" NAME="Ekit" WIDTH="95%" HEIGHT="350">
-<PARAM NAME="codebase" VALUE=".">
+<APPLET CODEBASE="../" CODE="com.hexidec.ekit.EkitApplet.class"
+ ARCHIVE="ekitappletspell.jar" NAME="Ekit" WIDTH="95%" HEIGHT="550">
+<PARAM NAME="codebase" VALUE="../">
<PARAM NAME="code" VALUE="com.hexidec.ekit.EkitApplet.class">
-<PARAM NAME="archive" VALUE="ekitapplet.jar">
+<PARAM NAME="archive" VALUE="ekitappletspell.jar">
<PARAM NAME="type" VALUE="application/x-java-applet;version=1.3">
<PARAM NAME="scriptable" VALUE="true">
<!-- Load text into Ekit applet by using the form bean -->
-<PARAM NAME="DOCUMENT"
- VALUE="<HTML><HEAD></HEAD><BODY><bean:write
+<PARAM NAME="DOCUMENT"
+ VALUE="<HTML><HEAD></HEAD><BODY><bean:write
name="weblogEntryFormEx" property="text" /></BODY></HTML>">
-
+
+<PARAM NAME="BASE64" VALUE="false">
<PARAM NAME="STYLESHEET" VALUE="ekit.css">
<PARAM NAME="LANGCODE" VALUE="en">
<PARAM NAME="LANGCOUNTRY" VALUE="US">
<PARAM NAME="TOOLBAR" VALUE="true">
+<PARAM NAME="TOOLBARMULTI" VALUE="true">
<PARAM NAME="SOURCEVIEW" VALUE="false">
<PARAM NAME="EXCLUSIVE" VALUE="true">
+<PARAM NAME="SPELLCHECK" VALUE="true">
<PARAM NAME="MENUICONS" VALUE="true">
-</APPLET>
+<PARAM NAME="MENU_EDIT" VALUE="true">
+<PARAM NAME="MENU_VIEW" VALUE="true">
+<PARAM NAME="MENU_FONT" VALUE="true">
+<PARAM NAME="MENU_FORMAT" VALUE="true">
+<PARAM NAME="MENU_INSERT" VALUE="true">
+<PARAM NAME="MENU_TABLE" VALUE="true">
+<PARAM NAME="MENU_FORMS" VALUE="true">
+<PARAM NAME="MENU_SEARCH" VALUE="true">
+<PARAM NAME="MENU_TOOLS" VALUE="true">
+<PARAM NAME="MENU_HELP" VALUE="true">
+</APPLET>
<br /><a href="http://www.hexidec.com">Ekit</a>