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/08/08 16:43:03 UTC
svn commit: r230810 [6/6] - in /incubator/roller/branches/roller_2.0: ./
contrib/plugins/src/org/roller/presentation/velocity/plugins/acronyms/
contrib/plugins/src/org/roller/presentation/velocity/plugins/convertbreaks/
contrib/plugins/src/org/roller/p...
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.properties?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.properties (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.properties Mon Aug 8 07:41:04 2005
@@ -24,9 +24,7 @@
# properties in this file are accessed like this ...
# RollerConfig.getProperty("propname");
-#----------------------------------
-
-# user management settings
+# User management settings
# True to allow users to register themselves via a "register" link on the main
# page. False to disable user self-registration entirely, allowing only global
@@ -38,25 +36,32 @@
groupblogging.enabled=true
#----------------------------------
+# 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
@@ -65,25 +70,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 \
@@ -94,33 +106,37 @@
,org.roller.presentation.velocity.plugins.readmore.ReadMorePlugin
#----------------------------------
-
# scheduled tasks, each is comma separated list of classes
-tasks.daily=\
-org.roller.presentation.TurnoverReferersTask\
+# Comma separated list of task classnames to be executed once per day
+tasks.daily=org.roller.presentation.TurnoverReferersTask\
+# Needed to enable nightly fetching of blacklist
#,org.roller.presentation.BlacklistUpdateTask\
+
+# Daily Planet task: syncs weblog list with Roller, refreshes Technorati stats
#,org.roller.presentation.planet.SyncWebsitesTask
+# Comma separated list of task classnames to be executed hourly
tasks.hourly=\
+# Hourly Planet task: refresh latest entry list from all weblogs in list
#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
@@ -135,25 +151,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}}\
@@ -161,41 +179,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
@@ -204,9 +239,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/branches/roller_2.0/web/WEB-INF/classes/roller.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.vm?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.vm (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.vm Mon Aug 8 07:41:04 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/branches/roller_2.0/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml Mon Aug 8 07:41:04 2005
@@ -61,10 +61,6 @@
<type>boolean</type>
<default-value>true</default-value>
</property-def>
- <property-def name="users.themes.path" key="configForm.newUserThemes">
- <type>string</type>
- <default-value>/themes</default-value>
- </property-def>
<property-def name="users.editor.pages" key="configForm.editorPages">
<type>text</type>
<default-value>editor-ekit.jsp,editor-text.jsp,editor-dhtml.jsp,editor-text-js.jsp,editor-wiki-js.jsp,editor-rte.jsp</default-value>
@@ -111,6 +107,19 @@
</property-def>
</display-group >
+
+ <display-group name="themeSettings" key="configForm.themeSettings">
+
+ <property-def name="users.themes.path" key="configForm.newUserThemes">
+ <type>string</type>
+ <default-value>/themes</default-value>
+ </property-def>
+ <property-def name="themes.customtheme.allowed" key="configForm.allowCustomTheme">
+ <type>boolean</type>
+ <default-value>true</default-value>
+ </property-def>
+
+ </display-group>
<!-- Debugging Settings Group -->
<!--
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rssmacros.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rssmacros.vm?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rssmacros.vm (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rssmacros.vm Mon Aug 8 07:41:04 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/branches/roller_2.0/web/WEB-INF/classes/searchdisabled.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/searchdisabled.vm?rev=230810&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/searchdisabled.vm (added)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/searchdisabled.vm Mon Aug 8 07:41:04 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/branches/roller_2.0/web/WEB-INF/classes/searchresults_day.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/searchresults_day.vm?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/searchresults_day.vm (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/searchresults_day.vm Mon Aug 8 07:41:04 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/branches/roller_2.0/web/WEB-INF/classes/user.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/user.vm?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/user.vm (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/user.vm Mon Aug 8 07:41:04 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/branches/roller_2.0/web/WEB-INF/classes/weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/weblog.vm?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/weblog.vm (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/weblog.vm Mon Aug 8 07:41:04 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/branches/roller_2.0/web/WEB-INF/classes/website.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/website.vm?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/website.vm (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/website.vm Mon Aug 8 07:41:04 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/branches/roller_2.0/web/WEB-INF/velocity.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/velocity.properties?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/velocity.properties (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/velocity.properties Mon Aug 8 07:41:04 2005
@@ -1,12 +1,12 @@
# specify resource loaders to use
-resource.loader = webapp, preview, roller, class
+resource.loader = webapp, theme, roller, class
-# for the loader we call 'preview', use the PreviewResourceLoader
-preview.resource.loader.public.name=preview
-preview.resource.loader.description=Roller Preview Resource Loader
-preview.resource.loader.class=org.roller.presentation.velocity.PreviewResourceLoader
-preview.resource.loader.cache=false
-preview.resource.loader.modificationCheckInterval=60
+# theme resource loader
+theme.resource.loader.public.name=theme
+theme.resource.loader.description=Roller Theme Resource Loader
+theme.resource.loader.class=org.roller.presentation.velocity.ThemeResourceLoader
+theme.resource.loader.cache=false
+theme.resource.loader.modificationCheckInterval=2
# for the loader we call 'roller', use the RollerResourceLoader
roller.resource.loader.public.name=roller
Propchange: incubator/roller/branches/roller_2.0/web/editor/ekitappletspell.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/roller/branches/roller_2.0/web/planet.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/planet.jsp?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/planet.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/planet.jsp Mon Aug 8 07:41:04 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/branches/roller_2.0/web/planet/PlanetConfig.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/planet/PlanetConfig.jsp?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/planet/PlanetConfig.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/planet/PlanetConfig.jsp Mon Aug 8 07:41:04 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/branches/roller_2.0/web/weblog/WeblogEdit.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp Mon Aug 8 07:41:04 2005
@@ -285,6 +285,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/branches/roller_2.0/web/weblog/editor-ekit.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/editor-ekit.jsp?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/editor-ekit.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/editor-ekit.jsp Mon Aug 8 07:41:04 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>
Modified: incubator/roller/branches/roller_2.0/web/website/edit-page.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/edit-page.jsp?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/edit-page.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/edit-page.jsp Mon Aug 8 07:41:04 2005
@@ -4,7 +4,7 @@
<html:form action="/editor/page" method="post">
- <h1><fmt:message key="pageForm.editPage" />:<bean:write name="pageForm" property="name" /></h1>
+ <h1><fmt:message key="pageForm.editPage" />:<bean:write name="weblogTemplateForm" property="name" /></h1>
<table>
<tr>
@@ -24,7 +24,7 @@
</tr>
<tr>
<td><fmt:message key="pageForm.template" /><br />
- <html:textarea property="template" cols="80" rows="30" style="width: 100%" />
+ <html:textarea property="contents" cols="80" rows="30" style="width: 100%" />
</td>
</tr>
</table>
Modified: incubator/roller/branches/roller_2.0/web/website/edit-pages.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/edit-pages.jsp?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/edit-pages.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/edit-pages.jsp Mon Aug 8 07:41:04 2005
@@ -1,8 +1,13 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %><%
+request.setAttribute("customTheme", org.roller.pojos.Theme.CUSTOM); %>
<roller:StatusMessage/>
<h1><fmt:message key="pagesForm.title" /></h1>
+
+<c:if test="${website.editorTheme ne customTheme}">
+<p><fmt:message key="pagesForm.themesReminder"><fmt:param value="${website.editorTheme}"/></fmt:message></p>
+</c:if>
<%-- table of pages --%>
<table class="rollertable">
Modified: incubator/roller/branches/roller_2.0/web/website/remove-page.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/remove-page.jsp?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/remove-page.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/remove-page.jsp Mon Aug 8 07:41:04 2005
@@ -2,15 +2,15 @@
<h3>
-<jsp:useBean id="pageForm" scope="session"
- class="org.roller.presentation.forms.PageForm"/>
-Remove Page [<jsp:getProperty name="pageForm" property="name"/>]
+<jsp:useBean id="weblogTemplateForm" scope="session"
+ class="org.roller.presentation.forms.WeblogTemplateForm"/>
+Remove Page [<jsp:getProperty name="weblogTemplateForm" property="name"/>]
</h3>
<p>Are you sure you want to remove this page?</p>
<p>
-Page name = [<jsp:getProperty name="pageForm" property="name"/>]<br />
-Page id = [<jsp:getProperty name="pageForm" property="id"/>]
+Page name = [<jsp:getProperty name="weblogTemplateForm" property="name"/>]<br />
+Page id = [<jsp:getProperty name="weblogTemplateForm" property="id"/>]
</p>
<table>
Modified: incubator/roller/branches/roller_2.0/web/website/theme-editor.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/theme-editor.jsp?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/theme-editor.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/theme-editor.jsp Mon Aug 8 07:41:04 2005
@@ -1,79 +1,115 @@
<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp"%>
<%
+// this just makes the name for a custom theme available to our jstl EL
+String customTheme = org.roller.pojos.Theme.CUSTOM;
+request.setAttribute("customTheme", customTheme);
+boolean allowCustom = org.roller.config.RollerRuntimeConfig.getBooleanProperty("themes.customtheme.allowed");
+request.setAttribute("allowCustom", new Boolean(allowCustom));
+
String username = "";
-try
-{
+try {
RollerSession rollerSession = RollerSession.getRollerSession(request);
WebsiteData wd = rollerSession.getCurrentWebsite();
username = wd.getHandle();
-}
-catch (Exception e)
-{
+} catch (Exception e) {
throw new ServletException(e);
}
%>
<h1><fmt:message key="themeEditor.title" /></h1>
-<html:form action="/editor/themeEditor" method="post">
+<form action="themeEditor.do" method="post">
-<input type=hidden name="method" value='preview' />
+ <input type=hidden name="method" value="preview" />
-<table width="95%">
+ <table width="95%">
- <tr>
- <td>
- <c:if test='${empty themeEditorForm.themeName || themeEditorForm.themeName == "Custom"}' >
- <p><fmt:message key="themeEditor.yourThemeIsShownBelow" /></p>
- </c:if>
- <c:if test='${!empty themeEditorForm.themeName && themeEditorForm.themeName != "Custom"}' >
- <p><fmt:message key="themeEditor.themeBelowIsCalled" /> <b><c:out value="${themeEditorForm.themeName}" /></b></p>
- <p><fmt:message key="themeEditor.savePrompt" /></p>
- <p><fmt:message key="themeEditor.saveWarning" /></p>
- <input type="button" value='<fmt:message key="themeEditor.save" />' name="saveButton"
- onclick="this.form.method.value='save';this.form.submit()" tabindex="4" />
-
- <input type="button" value='<fmt:message key="themeEditor.cancel" />' name="cancelButton"
- onclick="this.form.method.value='cancel';this.form.submit()" tabindex="5" />
- </c:if>
- </td>
- </tr>
-
- <tr>
- <td> </td>
- </tr>
-
- <tr>
- <td>
- <p><fmt:message key="themeEditor.selectTheme" />:
- <html:select property="themeName" size="1" onchange="this.form.submit()" >
- <html:options name="themes"/>
- </html:select> </p>
- </td>
- </tr>
+ <tr>
+ <td>
+ <p>
+ Your current theme is : <b><c:out value="${currentTheme}"/></b><br/>
+
+ <c:choose>
+ <c:when test="${currentTheme ne previewTheme}" >
+ <fmt:message key="themeEditor.themeBelowIsCalled" /> <b><c:out value="${previewTheme}" /></b><br/>
+ <fmt:message key="themeEditor.savePrompt" /><br/>
+ <input type="button"
+ value='<fmt:message key="themeEditor.save" />'
+ name="saveButton"
+ onclick="this.form.method.value='save';this.form.submit()"
+ tabindex="4" />
+
+ <input type="button"
+ value='<fmt:message key="themeEditor.cancel" />'
+ name="cancelButton"
+ onclick="this.form.method.value='edit';this.form.submit()"
+ tabindex="4" />
+ </c:when>
+
+ <c:when test="${(currentTheme ne customTheme) and allowCustom}">
+ If you like you may customize a personal copy of this theme.<br/>
+ <fmt:message key="themeEditor.saveWarning" /><br/>
+ <input type="button"
+ value='<fmt:message key="themeEditor.customize" />'
+ name="customizeButton"
+ onclick="this.form.method.value='customize';this.form.submit()"
+ tabindex="4" />
+ </c:when>
+ </c:choose>
+ </p>
+ </td>
+ </tr>
+
+ <tr>
+ <td> </td>
+ </tr>
+
+ <tr>
+ <td>
+ <p>
+ <fmt:message key="themeEditor.selectTheme" /> :
+ <select name="theme" size="1" onchange="this.form.submit()" >
+ <c:forEach var="themeName" items="${themesList}">
+ <c:choose>
+ <c:when test="${themeName eq previewTheme}">
+ <option value="<c:out value="${themeName}"/>" selected>
+ <c:out value="${themeName}"/>
+ </option>
+ </c:when>
+ <c:otherwise>
+ <option value="<c:out value="${themeName}"/>">
+ <c:out value="${themeName}"/>
+ </option>
+ </c:otherwise>
+ </c:choose>
+ </c:forEach>
+ </select>
+ </p>
+ </td>
+ </tr>
- <tr>
- <td>
- <iframe name="preview" id="preview"
- src="<%= request.getContextPath() %>/preview/<%= username %>/"
- frameborder=1 width="100%" height="400"
- marginheight="0" marginwidth="0"></iframe>
- </td>
- </tr>
+ <tr>
+ <td>
+ <iframe name="preview" id="preview"
+ src='<%= request.getContextPath() %>/preview/<%= username %>?theme=<c:out value="${previewTheme}"/>'
+ frameborder=1 width="100%" height="400"
+ marginheight="0" marginwidth="0"></iframe>
+ </td>
+ </tr>
-</table>
+ </table>
-</html:form>
+</form>
<script type="text/javascript">
-<!--
+ <!--
function save()
{
- //alert(document.themeEditorForm.method.value);
- document.themeEditorForm.method.value = "save";
- document.themeEditorForm.submit();
+ //alert(document.themeEditorForm.method.value);
+ document.themeEditorForm.method.value = "save";
+ document.themeEditorForm.submit();
}
-// -->
+ // -->
</script>
-<%@ include file="/theme/footer.jsp"%>
\ No newline at end of file
+<%@ include file="/theme/footer.jsp"%>