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/08 18:06:46 UTC
svn commit: r189602 [40/50] - in /incubator/roller/trunk: ./ contrib/
contrib/lib/ contrib/plugins/ contrib/plugins/src/ contrib/plugins/src/org/
contrib/plugins/src/org/roller/ contrib/plugins/src/org/roller/presentation/
contrib/plugins/src/org/roller/presentation/velocity/
contrib/plugins/src/org/roller/presentation/velocity/plugins/
contrib/plugins/src/org/roller/presentation/velocity/plugins/acronyms/
contrib/plugins/src/org/roller/presentation/velocity/plugins/bookmarks/
contrib/plugins/src/org/roller/presentation/velocity/plugins/email/
contrib/plugins/src/org/roller/presentation/velocity/plugins/jspwiki/
contrib/plugins/src/org/roller/presentation/velocity/plugins/radeox/
contrib/plugins/src/org/roller/presentation/velocity/plugins/readmore/
contrib/plugins/src/org/roller/presentation/velocity/plugins/smileys/
contrib/plugins/src/org/roller/presentation/velocity/plugins/textile/ docs/
docs/images/ docs/installguide/ docs/installguide/old/ docs/userguide/
docs/userguide/images/ docs/userguide/old/ metadata/ metadata/database/
metadata/database/hibernate/ metadata/xdoclet/ personal/ personal/eclipse/
personal/testing/ src/ src/org/ src/org/roller/ src/org/roller/business/
src/org/roller/business/hibernate/ src/org/roller/business/utils/
src/org/roller/model/ src/org/roller/pojos/ src/org/roller/presentation/
src/org/roller/presentation/atom/ src/org/roller/presentation/bookmarks/
src/org/roller/presentation/bookmarks/actions/
src/org/roller/presentation/bookmarks/formbeans/
src/org/roller/presentation/bookmarks/tags/
src/org/roller/presentation/filters/ src/org/roller/presentation/forms/
src/org/roller/presentation/newsfeeds/ src/org/roller/presentation/pagecache/
src/org/roller/presentation/pagecache/rollercache/
src/org/roller/presentation/tags/ src/org/roller/presentation/tags/calendar/
src/org/roller/presentation/tags/menu/
src/org/roller/presentation/velocity/ src/org/roller/presentation/weblog/
src/org/roller/presentation/weblog/actions/
src/org/roller/presentation/weblog/formbeans/
src/org/roller/presentation/weblog/search/
src/org/roller/presentation/weblog/search/operations/
src/org/roller/presentation/weblog/tags/ src/org/roller/presentation/website/
src/org/roller/presentation/website/actions/
src/org/roller/presentation/website/formbeans/
src/org/roller/presentation/website/tags/
src/org/roller/presentation/xmlrpc/ src/org/roller/util/ tests/ tests/org/
tests/org/roller/ tests/org/roller/business/ tests/org/roller/model/
tests/org/roller/persistence/ tests/org/roller/presentation/
tests/org/roller/presentation/atom/ tests/org/roller/presentation/bookmarks/
tests/org/roller/presentation/velocity/
tests/org/roller/presentation/velocity/plugins/
tests/org/roller/presentation/velocity/plugins/smileys/
tests/org/roller/presentation/velocity/plugins/textile/
tests/org/roller/presentation/xmlrpc/ tests/org/roller/util/ tools/
tools/buildtime/ tools/buildtime/mockrunner-0.2.6/
tools/buildtime/mockrunner-0.2.6/lib/ tools/buildtime/tomcat-4.1.24/
tools/buildtime/xdoclet-1.2/ tools/buildtime/xdoclet-1.2/lib/
tools/hibernate-2.1/ tools/hibernate-2.1/lib/ tools/lib/
tools/standard-1.0.3/ tools/standard-1.0.3/lib/ tools/standard-1.0.3/tld/
tools/struts-1.1/ tools/struts-1.1/lib/ web/ web/WEB-INF/
web/WEB-INF/classes/ web/WEB-INF/classes/flavors/
web/WEB-INF/classes/themes/ web/bookmarks/ web/images/ web/images/editor/
web/images/midas/ web/images/preview/ web/images/smileys/ web/tags/
web/templates/ web/theme/ web/theme/images/ web/theme/lavender/
web/theme/scripts/ web/theme/scripts/classes/ web/themes/ web/themes/basic/
web/themes/berkley/ web/themes/berkley/images/ web/themes/cheb/
web/themes/cheb/images/ web/themes/cheb/scripts/ web/themes/clean/
web/themes/currency-i18n/ web/themes/currency-i18n/images/
web/themes/currency/ web/themes/currency/images/ web/themes/grey2/
web/themes/moonshine/ web/themes/pacifica/ web/themes/robot/
web/themes/rolling/ web/themes/rolling/images/ web/themes/sotto/
web/themes/sotto/images/ web/themes/sotto/styles/ web/themes/sunsets/
web/themes/sunsets/images/ web/themes/sunsets/scripts/
web/themes/sunsets/styles/ web/themes/werner/ web/themes/x2/
web/themes/x2/images/ web/themes/x2/scripts/ web/themes/x2/styles/
web/weblog/ web/website/
Added: incubator/roller/trunk/web/WEB-INF/classes/flavors/rss092.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/flavors/rss092.vm?rev=189602&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/flavors/rss092.vm (added)
+++ incubator/roller/trunk/web/WEB-INF/classes/flavors/rss092.vm Wed Jun 8 09:06:16 2005
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+$pageHelper.setContentType("text/xml;charset=utf-8")
+<rss version="0.92">
+ <channel>
+ <title>$utilities.textToHTML($website.name,true)</title>
+ <link>$websiteURL</link>
+ <description>$utilities.textToHTML($website.description,true)</description>
+ <lastBuildDate>#formatDate("E, dd MMM yyyy hh:mm:ss z" $updateTime)</lastBuildDate>
+ <docs>$websiteURL</docs>
+ <managingEditor>$emailAddress</managingEditor>
+ <webMaster>$emailAddress</webMaster>
+ <!-- cloud domain="" port="" path="" registerProcedure="" protocol=""/ -->
+ #set( $entries = $pageModel.getRecentWeblogEntriesArray($entryCount, 'nil') )
+ #foreach( $entry in $entries )
+ <item>
+ <description>#showEntryDescription($entry)</description>
+ <!-- source url=""></source -->
+ <!-- enclosure url="" length="" type=""/ -->
+ </item>
+ #end
+ </channel>
+</rss>
\ No newline at end of file
Added: incubator/roller/trunk/web/WEB-INF/classes/log4j.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/log4j.properties?rev=189602&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/log4j.properties (added)
+++ incubator/roller/trunk/web/WEB-INF/classes/log4j.properties Wed Jun 8 09:06:16 2005
@@ -0,0 +1,55 @@
+# Properties for configuring Log4j for this application
+# This is the configuring for logging displayed in the Application Server
+# log4j.rootCategory=INFO, stdout, R, mail
+log4j.rootCategory=INFO, stdout, R
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+
+# Pattern to output the caller's file name and line number.
+#log4j.appender.stdout.layout.ConversionPattern=%p [%t] [%c] %C{1}.%M(%L) | %m%n
+log4j.appender.stdout.layout.ConversionPattern=%-5p %d{yyyy-MM-dd HH:mm:ss,SSS} | %C{1}:%M | %m%n
+
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=roller.log
+
+# Keep two 1MB log backup files
+log4j.appender.R.MaxFileSize=1MB
+log4j.appender.R.MaxBackupIndex=2
+
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+#log4j.appender.R.layout.ConversionPattern=%5p %t %c - %m%n
+log4j.appender.R.layout.ConversionPattern=%-5p %d{yyyy-MM-dd HH:mm:ss,SSS} %C{1}:%M - %m%n
+
+# If programmed properly the most messages would be at DEBUG
+# and the least at FATAL.
+
+# Options are: DEBUG, INFO, WARN, ERROR, FATAL
+log4j.category.com.ecyrd.jspwiki=ERROR
+log4j.category.com.opensymphony.oscache=ERROR
+log4j.category.net.sf.hibernate=ERROR
+log4j.category.org.roller=ERROR
+log4j.category.org.roller.business.utils=INFO
+log4j.category.org.apache.struts=ERROR
+#log4j.category.org.roller.presentation.MainPageAction=DEBUG
+#log4j.category.org.roller.presentation.pagecache.rollercache.LRUCacheHandler=DEBUG
+#log4j.category.org.roller.presentation.filters.IfModifiedFilter=DEBUG
+#log4j.category.org.roller.persistence.hibernate.HibernateStrategy=DEBUG
+
+# Tomcat's ClientAbortExceptions cause Velocity to talk way
+# too much so by default Velocity is set to STFU mode.
+log4j.category.org.apache.velocity=FATAL
+
+# Configuration for receiving e-mails when ERROR messages occur.
+#log4j.appender.mail=org.apache.log4j.net.SMTPAppender
+#log4j.appender.mail.To=you@yours.com
+#log4j.appender.mail.From=you@yours.com
+#log4j.appender.mail.SMTPHost=127.0.0.1
+#log4j.appender.mail.Threshold=ERROR
+#log4j.appender.mail.BufferSize=1
+#log4j.appender.mail.Subject=Roller Exception
+
+#log4j.appender.mail.layout=org.apache.log4j.PatternLayout
+#log4j.appender.mail.layout.ConversionPattern=%p [%d{yyyy-MM-dd HH:mm:ss,SSS}] %C{1}.%M(%L) | %m%n
+
+
Added: incubator/roller/trunk/web/WEB-INF/classes/menu-tabbed.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/menu-tabbed.vm?rev=189602&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/menu-tabbed.vm (added)
+++ incubator/roller/trunk/web/WEB-INF/classes/menu-tabbed.vm Wed Jun 8 09:06:16 2005
@@ -0,0 +1,54 @@
+
+
+<table class="tmTabTable" cellspacing="0" >
+<tr>
+ #foreach( $menu in $menuModel.getMenus() )
+ #if( $menu.isPermitted( $req ) )
+ #if( $menu.isSelected( $req ) )
+ <td class="tmSelectedSepLeft"></td>
+ <td class="tmSelectedMenu">
+ #else
+ <td class="tmSepLeft"></td>
+ <td class="tmMenu">
+ #end
+
+ <a href="$menu.getUrl( $ctx )">$text.get( $menu.getName() )</a>
+
+ </td>
+ #if( $menu.isSelected( $req ) )
+ <td class="tmSelectedSepRight"></td>
+ #else
+ <td class="tmSepRight"></td>
+ #end
+ #end
+ #end
+</tr>
+</table>
+
+<table class="tmItemTable" cellspacing="0">
+<tr>
+ <td class="tmItemLeft"></td>
+ <td class="tmItemCell">
+ #set( $count = 0 )
+ #set( $currentMenu = $menuModel.getSelectedMenu( $req ) )
+ #if( $currentMenu.isPermitted( $req ) )
+ #foreach( $item in $currentMenu.getMenuItems() )
+
+ #if ( $count > 0 )
+ |
+ #end
+
+ #if ( $item.isSelected( $req ) )
+ <a class="tmItemLinkSelected" href="$item.getUrl($ctx)">$text.get( $item.getName() )</a>
+ #else
+ <a class="tmItemLink" href="$item.getUrl($ctx)">$text.get( $item.getName() )</a>
+ #end
+
+ #set( $count = $count + 1 )
+ #end
+ #end
+ </td>
+ <td class="tmItemRight"></td>
+</tr>
+</table>
+
Added: incubator/roller/trunk/web/WEB-INF/classes/navbar-css.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/navbar-css.vm?rev=189602&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/navbar-css.vm (added)
+++ incubator/roller/trunk/web/WEB-INF/classes/navbar-css.vm Wed Jun 8 09:06:16 2005
@@ -0,0 +1,14 @@
+
+<ul class="rMenu">
+#foreach( $menu in $menuModel.getMenus() )
+ #foreach( $item in $menu.getMenuItems() )
+ #if( $item.isSelected( $req ) )<strong>#end
+ <li class="rMenuItem"><a
+ href="$item.getUrl( $ctx )"
+ title="$text.get( $menu.getName() ):$text.get( $item.getName() )"
+ >$text.get( $menu.getName() ):$text.get( $item.getName() )</a></li>
+ #if( $item.isSelected( $req ) )</strong>#end
+ #end
+#end
+</ul>
+
Added: incubator/roller/trunk/web/WEB-INF/classes/navbar-horizontal.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/navbar-horizontal.vm?rev=189602&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/navbar-horizontal.vm (added)
+++ incubator/roller/trunk/web/WEB-INF/classes/navbar-horizontal.vm Wed Jun 8 09:06:16 2005
@@ -0,0 +1,18 @@
+
+#set( $count = 0 )
+#foreach( $menu in $menuModel.getMenus() )
+ #foreach( $item in $menu.getMenuItems() )
+ #if ( $count > 0 )
+ |
+ #end
+ #if( $item.isSelected( $req ) )
+ <b>
+ #end
+<a href="$item.getUrl( $ctx )">$text.get( $item.getName() )</a>
+ #if( $item.isSelected( $req ) )
+ </b>
+ #end
+ #set( $count = $count + 1 )
+ #end
+#end
+
Added: incubator/roller/trunk/web/WEB-INF/classes/navbar-vertical.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/navbar-vertical.vm?rev=189602&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/navbar-vertical.vm (added)
+++ incubator/roller/trunk/web/WEB-INF/classes/navbar-vertical.vm Wed Jun 8 09:06:16 2005
@@ -0,0 +1,12 @@
+#foreach( $menu in $menuModel.getMenus() )
+ #foreach( $item in $menu.getMenuItems() )
+ #if( $item.isSelected( $req ) )
+ <b>
+ #end
+<a href="$item.getUrl( $ctx )">$text.get( $menu.getName() ):$text.get( $item.getName() )</a> <br />
+ #if( $item.isSelected( $req ) )
+ </b>
+ #end
+ #end
+#end
+
Added: 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=189602&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/navbar.vm (added)
+++ incubator/roller/trunk/web/WEB-INF/classes/navbar.vm Wed Jun 8 09:06:16 2005
@@ -0,0 +1,126 @@
+#**
+ * Macros to display the Roller Navigation bars.
+ * @author Lance Lavandowska (conversion to Velocimacros)
+ *#
+
+#**
+ * Show menu using specified model file and Velocity template.
+ * @param $model Name of XML file in WEB-INF that contains XML for menu.
+ * @param $template Name of Velocity template to display menu.
+ *#
+#macro( showMenu $model $template )
+ $pageHelper.showMenu($model, $template)
+#end
+
+#**
+ * Show Roller Editor Navigation Bar.
+ * @param vertical True if bar is to be displayed vertically.
+ *#
+#macro( showEditorNavBar $vertical )
+ $pageHelper.showEditorNavBar($vertical)
+#end
+
+#**
+ * Show Editor navbar using CSS friendly template.
+ *#
+#macro( showEditorMenu )
+ $pageHelper.showMenu("editor-menu.xml", "/navbar-css.vm")
+#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.
+ *
+ * @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 delimiter Seperate horizontal items with this value.
+ *#
+#macro( printNavLink $linkUrl $linkValue $useCSS $vertical $delimiter )
+ #if( $useCSS )<li class="rNavItem">
+ #elseif( $vertical ) <br />
+ #else $delimiter
+ #end<a href="$linkUrl">$linkValue</a>#if ($useCSS)</li>#end
+#end
+
+#**
+ * 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( showNavBar2 $vertical $delimiter $useCSS)
+ #set( $container = "div" )
+ #if ( $useCSS ) #set( $container = "ul" ) #end
+ #set( $rawUrl = "$ctxPath/page/$userName" )
+ <$container class="rNavigationBar">
+ #if ($siteName=="Main")
+ #set( $mainUrl = "$ctxPath?rmk=tabbedmenu.main&rmik=tabbedmenu.main" )
+ #printNavLink( $mainUrl $text.get("navigationBar.main") $useCSS $vertical "" )
+ #else
+ #printNavLink( "$ctxPath/" $siteName $useCSS $vertical "" )
+ #end
+ #if( $website )
+ #foreach( $iPage in $pages )
+ #set( $invisible = $iPage.Name.startsWith("_") )
+ ## Again, there is no "break" in Velocity
+ #if( !$invisible )
+ #set( $isSelected = false )
+ #if( $page && $iPage.Id == $page.Id && !$editorui) #set($isSelected = true) #end
+
+ #if( !$isSelected )
+ #printNavLink( "$rawUrl/$iPage.Link" $iPage.Name $useCSS $vertical $delimiter )
+ #else
+ #if( $useCSS )<li class="rNavItem">
+ #elseif( $vertical ) <br />
+ #else $delimiter
+ #end
+ $iPage.Name
+ #end
+ #end
+ #end
+ #end
+
+ ## strutsUrlHelper( useIds, isAction, path, val1, val2)
+ #if( $req.getUserPrincipal() )
+ #set( $editUrl = $rawUrl )
+ #set( $editUrl = $pageHelper.strutsUrlHelper(false, true, "weblogCreate", "tabbedmenu.weblog", "tabbedmenu.weblog.newEntry") )
+ #printNavLink( $editUrl $text.get("navigationBar.newEntry") $useCSS $vertical $delimiter )
+
+ #set( $editUrl = $rawUrl )
+ #set( $editUrl = $pageHelper.strutsUrlHelper(false, true, "editWebsite", "tabbedmenu.website", "tabbedmenu.website.settings") )
+ #printNavLink( $editUrl $text.get("navigationBar.settings") $useCSS $vertical $delimiter )
+
+ #set( $editUrl = $rawUrl )
+ #set( $editUrl = $pageHelper.strutsUrlHelper(false, true, "logout-redirect", "", "") )
+ #printNavLink( $editUrl $text.get("navigationBar.logout") $useCSS $vertical $delimiter )
+ #else
+ #set( $editUrl = $pageHelper.strutsUrlHelper(false, true, "login-redirect", "", "") )
+ #printNavLink( $editUrl $text.get("navigationBar.login") $useCSS $vertical $delimiter )
+
+ #if ($req.getAttribute("allowNewUsers"))
+ #set( $registerUrl = $pageHelper.strutsUrlHelper(false, true, "newUser", "", "") )
+ #printNavLink( $registerUrl $text.get("navigationBar.register") $useCSS $vertical $delimiter )
+ #end
+ #end
+ </$container >
+#end
+
+#**
+ * Backwards compatibility version.
+ *#
+#macro( showNavBar $vertical $delimiter )
+ #showNavBar2( $vertical $delimiter false)
+#end
+
+#**
+ * Show Roller Page Navigation Bar with "|" delimiter, includes links to all pages
+ * except those that are hidden (because the start with "_").
+ * @param vertical True if bar is to be displayed vertically.
+ *#
+#macro( showBasicNavBar $vertical )
+ #showNavBar2( $vertical '|' false )
+#end
Added: 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=189602&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/newsfeed.vm (added)
+++ incubator/roller/trunk/web/WEB-INF/classes/newsfeed.vm Wed Jun 8 09:06:16 2005
@@ -0,0 +1,64 @@
+#**
+ * Macros to display RSS Newschannels.
+ * @author Lance Lavandowska (conversion to Velocimacros)
+ * @author Dave Johnson (conversion from Digestor to Flock)
+ *
+ * TODO: convert from Flock to Informa
+ *#
+
+#**
+ * Display an RSS newschannel.
+ * @param feedUrl URL of RSS newschannel you wish to display.
+ * @param showDescription True to show full content for each item in channel.
+ * @param maxItems Maximum number of news items to display from newschannel.
+ * @param expandingFolders True to display channel as a folding folder.
+ *#
+#macro( showNewsfeed $feedUrl $showDescription $maxItems $expandingFolders )
+#set( $channel = $newsfeedCache.getChannel( $feedUrl ) )
+#if( $channel )
+ #set( $channelId = $utilities.stringReplace( $channel.title, " ", "_" ) )
+ #set( $channelId = $utilities.stringReplace( $channelId, "'", "_" ) )
+ #if( $expandingFolders )
+ <div class="rNewsfeedTitle">
+ <a href="javascript:toggleFolder('$channelId')">
+ <span id="i$channelId">+</span> $channel.title</a>
+ </div>
+ <div id="$channelId" style="display:none">
+ #else
+ <div class="rNewsfeedTitle">$channel.title</div>
+ #end
+
+ #foreach( $item in $channel.items )
+ ## NOTE: Velocity does not have "break" command
+ #if ( $maxItems == -1 || $velocityCount <= $maxItems )
+ #if( $item.title && $item.title!="<No Title>" && $item.guid )
+ <a class="rNewsfeedLink" href="$item.guid.location">$item.title</a>
+ #elseif( $item.title && $item.title!="<No Title>" && $item.link )
+ <a class="rNewsfeedLink" href="$item.link">$item.title</a>
+ #elseif( $item.description && $item.guid )
+ <a class="rNewsfeedLink" href="$item.guid.location">$utilities.truncateNicely($utilities.removeHTML($item.description),25,30,"...")</a>
+ #elseif($item.description && $item.link)
+ <a class="rNewsfeedLink" href="$item.link">$utilities.truncateNicely($utilities.removeHTML($item.description),25,30,"...")</a>
+ #elseif( $item.title )
+ <span class="rNewsfeedLink">$item.title</span>
+ #else
+ <span class="rNewsfeedLink">$utilities.truncateNicely($utilities.removeHTML($item.description),25,30,"...")</span>
+ #end
+ #if( $showDescription && $item.description )
+ <span class="rNewsfeedDesc">$item.description</span>
+ #end
+ #end
+ #end
+ #if( $expandingFolders )
+ </div>
+ <script type="text/javascript">
+ <!--
+ folderPreference("$channelId");
+ // -->
+ </script>
+ #end
+#else
+ <div class="rNewsfeedTitle">Unable to display <a href="$feedUrl">feed</a></div>
+#end
+#end
+
Added: 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=189602&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/referer.vm (added)
+++ incubator/roller/trunk/web/WEB-INF/classes/referer.vm Wed Jun 8 09:06:16 2005
@@ -0,0 +1,79 @@
+#**
+ * Macros to display referers and Linkbacks.
+ * @author Lance Lavandowska (conversion to Velocimacros)
+ *#
+
+#**
+ * Internal macro to build and display a link to a referer, use showReferers instead.
+ *#
+#macro( refererDisplayUrl $ref $maxWidth $includeHits )
+ #set( $qq = '"' )
+ #set( $url = $utilities.escapeHTML( $ref.RefererUrl ) )
+ #set( $displayUrl = $url )
+ #set( $restOfUrl = "" )
+ #set( $displayLink = "" )
+ #if ( $displayUrl.startsWith("http://") )
+ #set( $displayUrl = $displayUrl.substring( 7 ) )
+ #end
+ #if ( $displayUrl.length() > $maxWidth )
+ #set( $restOfUrl = "...$displayUrl.substring($maxWidth, $displayUrl.length())" )
+ #set( $displayUrl = $displayUrl.substring(0, $maxWidth) )
+ #end
+ #if ( $url.startsWith("http://") )
+ #set( $displayLink = "<a href=${qq}$url${qq}" )
+ #if ( $restOfUrl )
+ #set( $displayLink = "$displayLink title=${qq}$restOfUrl${qq}" )
+ #end
+ #set( $displayLink = "$displayLink >" )
+ #end
+ #set( $displayLink = "$displayLink$displayUrl" )
+ #if ( $includeHits )
+ #set( $displayLink = "$displayLink ($ref.DayHits)" )
+ #end
+ #if ( $url.startsWith("http://") )
+ #set( $displayLink = "$displayLink</a>" )
+ #end
+ $displayLink
+#end
+
+#**
+ * Show top referers for today.
+ * @param max Number of referers to display.
+ * @param maxWidth Maximum width of referer text to be displayed.
+ *#
+#macro( showReferers $max $maxWidth )
+ <p>$text.get( "macro.referer.todaysHits" ) $pageModel.getDayHits()</p>
+ #set( $refs = $pageModel.getTodaysReferers() )
+ <ul class="rReferersList">
+ #foreach( $ref in $refs )
+ #if ($velocityCount <= $max)
+ <li class="rReferersListItem">#refererDisplayUrl( $ref $maxWidth true)</li>
+ #end
+ #end
+ </ul>
+#end
+
+#**
+ * Display the Linkbacks that have been extracted for a specified day.
+ * @param day Date object that specifies day (type java.util.Date).
+ *#
+#macro( showLinkbacks $day )
+ #set( $date = "#formatDate($plainFormat $day )" )
+ #set( $refs = $pageModel.getReferers($date) )
+ #if ( $refs.size() > 0 )
+ <p>
+ <b>$text.get( "macro.referer.furtherReading" )</b></p>
+ <ul>
+ #foreach( $ref in $refs )
+ #set( $url = $utilities.escapeHTML( $ref.getUrl() ) )
+ <li> $pageHelper.getToggleLinkbackDisplayHTML($ref)
+ <a class="linkback" href="$url">$ref.getTitle()</a>
+ #if( $ref.getVisible() )
+ : $utilities.removeHTML( $ref.getExcerpt() )
+ #end
+ </li>
+ #end
+ </ul>
+ #end
+#end
+
Added: 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=189602&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/roller.vm (added)
+++ incubator/roller/trunk/web/WEB-INF/classes/roller.vm Wed Jun 8 09:06:16 2005
@@ -0,0 +1,95 @@
+#**
+ * General purpose, or not user-specific, macros.
+ * @author Lance Lavandowska (conversion to Velocimacros)
+ *#
+
+#**
+ * General purpose date formatter. Need to be careful of whitespace.
+ * @param dateFormat Date format to be used (see java.text.SimpleDateFormat).
+ * @param date Date object to be formatted (see java.util.Date).
+ *#
+#macro( formatDate $dateFormat $date )$dateFormatter.applyPattern($dateFormat)
+#if ($date)$dateFormatter.format( $date )
+#else$dateFormat
+#end
+#end
+
+#**
+ * Show Roller version number string.
+ *#
+#macro( showVersion )$rollerVersion#end
+
+#**
+ * Show path to a theme directory.
+ * @param theme Name of the theme.
+ *#
+#macro( showThemePath $theme )$ctxPath/themes/$theme#end
+
+#**
+ * Show path to a theme image.
+ * @param theme Name of the theme.
+ * @param imageName Name of the image.
+ *#
+#macro( showThemeImagePath $theme $imageName )#showThemePath($theme)/images/$imageName#end
+
+#**
+ * Shows an IMG tag for a theme image.
+ * @param theme Name of the theme.
+ * @param imageName Name of the image.
+ *#
+#macro( showThemeImage $theme $imageName )
+<img alt="$imageName" src="#showThemeImagePath($theme $imageName)" />#end
+
+#**
+ * Shows path to a file in a theme's style directory.
+ * @param theme Name of the theme.
+ * @param stylesheet Name of the file.
+ *#
+#macro( showThemeStylePath $theme $stylesheet )#showThemePath($theme)/styles/$stylesheet#end
+
+#**
+ * Shows a STYLE or LINK REL tag for a file in a theme's style directory.
+ * @param theme Name of the theme.
+ * @param stylesheet Name of the file.
+ * @param useImport true to use STYLE tag, otherwhise uses LINK REL
+ *#
+#macro( showThemeStyle $theme $stylesheet $useImport )
+#if ($useImport)
+<style type="text/css">
+@import url(#showThemeStylePath($theme $stylesheet));
+</style>
+#else
+<link rel="stylesheet" type="text/css" href="#showThemeStylePath($theme $stylesheet)" />
+#end
+#end
+
+#**
+ * Shows a STYLE tag a file in a theme's style directory.
+ * @param theme Name of the theme.
+ * @param stylesheet Name of the file.
+ * @param useImport true to use STYLE tag, otherwhise uses LINK REL
+ *#
+#macro( showThemeStyleImport $theme $stylesheet )#showThemeStyle($theme $stylesheet true)#end
+
+#**
+ * Shows path to a file in a theme's scripts directory.
+ * @param theme Name of the theme.
+ * @param scriptFile Name of the file.
+ *#
+#macro( showThemeScriptPath $theme $scriptFile )#showThemePath($theme)/scripts/$scriptFile#end
+
+#**
+ * Shows SCRIPT tag for a file in a theme's scripts directory.
+ * @param theme Name of the theme.
+ * @param scriptFile Name of the file.
+ *#
+#macro( showThemeScript $theme $scriptFile )
+<script type="text/javascript" src="#showThemeScriptPath($theme $scriptFile)"></script>
+#end
+
+#**
+ * Evaluate string as a Velocity template.
+ * @param str String to be evaluated.
+ *#
+#macro( evaluateString $str )$pageHelper.evaluateString( $str )#end
+
Added: 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=189602&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/rssmacros.vm (added)
+++ incubator/roller/trunk/web/WEB-INF/classes/rssmacros.vm Wed Jun 8 09:06:16 2005
@@ -0,0 +1,39 @@
+#**
+ * Macros for displaying RSS links and badges.
+ * @author Lance Lavandowska (conversion to Velocimacros)
+ *#
+
+#**
+ * Show links to category feeds for categories that are immediate children
+ * of the specified category.
+ *#
+#macro( showRSSLinksForCategory $category )
+ <a href="$ctxPath/rss/$userName">$text.get("macro.rss.all")</a>
+ [<a href="$ctxPath/rss/$userName?excerpts=true">$text.get("macro.rss.excerpts")</a>]<br />
+ #set( $categories = $pageModel.getWeblogCategories($category) )
+ #foreach( $cat in $categories )
+ <a href="$ctxPath/rss/$userName?catname=$cat.path">$cat.path</a>
+ [<a href="$ctxPath/rss/$userName?catname=$cat.path&excerpts=true">$text.get("macro.rss.excerpts")</a>]<br />
+ #end
+#end
+
+#**
+ * Show links to all available RSS feeds for your weblog.
+ *#
+#macro( showRSSLinks )#showRSSLinksForCategory("nil")#end
+
+#**
+ * Show RSS Autodiscovery link for your weblog.
+ *#
+#macro( showRSSAutodiscoveryLink )
+ <link rel="alternate" type="application/rss+xml"
+ title="RSS" href="$absBaseURL/rss/$userName" />
+#end
+
+#**
+ * Show RSS badge with link to your weblog's main RSS feed.
+ *#
+#macro( showRSSBadge )
+ <a href="$ctxPath/rss/$userName"><img class="rssbadge"
+ src="$ctxPath/images/rssbadge.gif" alt="XML" /></a>
+#end
Added: incubator/roller/trunk/web/WEB-INF/classes/searchresults.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/searchresults.vm?rev=189602&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/searchresults.vm (added)
+++ incubator/roller/trunk/web/WEB-INF/classes/searchresults.vm Wed Jun 8 09:06:16 2005
@@ -0,0 +1,92 @@
+<!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">
+## "no user" versions
+#macro( showSearchResults $dayTemplate )
+ #foreach( $day in $map.keySet() )
+ #set( $entries = $map.get($day) )
+ #parse( $dayTemplate )
+ #end
+#end
+<head>
+ <title>$siteName $text.get("macro.searchresults.results")</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="header">
+ <span style="width:100%; text-align:right; margin: 3px">
+ #showBasicNavBar( false )
+ </span>
+ <span>
+ #showMenu( "editor-menu.xml" "/menu-tabbed.vm" )
+ </span>
+</div>
+
+<div id="content">
+ #showStatusMessage()
+
+ <center>
+ <h1>$siteName $text.get("macro.searchresults.results")</h1>
+ </center>
+
+ <p>
+ #set ( $siteText = "this site")
+ #set ( $inUrl = "")
+ #if ($username)
+ #set ($siteText = "$username's site")
+ #set ($inUrl = " inurl:$username" )
+ #end
+ $text.get("macro.searchresults.searchFor", [$siteText])
+ "<a href="http://dictionary.com/search?q=$utilities.encode($term)"
+ title="$text.get( "macro.searchresults.title", [$term])"
+ class="dictionary">$term</a>".
+
+ $text.get("macro.searchresults.hits_1", [$hits])
+ <a href="http://google.com/search?q=$utilities.encode($term)%20site:${absBaseURL}${inUrl}"
+ class="google">$text.get("macro.searchresults.hits_2")
+
+ <form method="get" action="$ctxPath/search"
+ style="margin: 5px">
+ <input type="text" id="q" name="q" size="31"
+ maxlength="255" value="$term"
+ style="padding-left: 1px" />
+ <input type="hidden" name="$USERNAME_KEY" value="$!{username}" />
+ #if ($categories)
+ <select name="c">
+ <option value="">- Restrict By Category -</option>
+ #foreach( $cat in $categories )
+ <option #if($cat == $req.getParameter('c'))selected="selected"#end>$cat</option>
+ #end
+ </select>
+ #end
+ <input type="submit" value="$text.get("macro.searchresults.again")" />
+ </form>
+ </p>
+ <script type="text/javascript"
+ src="$ctxPath/theme/scripts/searchhi.js"></script>
+ <br />
+
+ #if ($hits > 0)
+ #set( $map = $searchResults )
+ #showSearchSummary()
+
+ #showSearchResults("searchresults_day.vm")
+
+ #showSearchPager()
+ #end
+ <div id="footer"></div>
+
+</div> <!-- close content div -->
+
+</body>
+</html>
\ No newline at end of file
Added: 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=189602&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/searchresults_day.vm (added)
+++ incubator/roller/trunk/web/WEB-INF/classes/searchresults_day.vm Wed Jun 8 09:06:16 2005
@@ -0,0 +1,39 @@
+#macro( showEntryPermalink $entry )
+<a href="$baseURL/page/$entry.website.user.userName/?anchor=$entry.Anchor"
+ title="$text.get( "macro.searchresultsday.entrypermalink.title" )"
+ class="entrypermalink">posted</a>
+#end
+
+## you have to be so damn careful with whitespace in Velocity
+#macro( showUserPermalink $entry )
+<a href="$baseURL/page/$entry.website.user.userName/"
+ title="$text.get( "macro.searchresultsday.userpermalink.title" )"
+ class="entrypermalink">$entry.website.user.userName</a>#if ($entry.category),
+in #showCategoryPermalink($entry) #end
+#end
+
+## you have to be so damn careful with whitespace in Velocity
+#macro( showCategoryPermalink $entry )
+<a href="$baseURL/page/$entry.website.user.userName/?catname=#$utilities.encode($entry.category.name)"
+ title="$text.get( "macro.searchresultsday.categorypermalink.title" )"
+ class="entrypermalink">$entry.category.name</a>,
+#end
+
+<div class="box">
+ <div class="entry">
+ <img src="$ctxPath/images/permalink.gif" alt="#formatDate( $plainFormat $day )" />
+ #showEntryDate( $day )
+ </div>
+ #foreach( $entry in $entries )
+ <p>
+ <b>$entry.title</b> $entry.text
+ #showEntryPermalink( $entry )
+ by #showUserPermalink( $entry )
+ on #showTimestamp($entry.pubTime).
+ <span style="font-size:x-small;">(<a
+ href="?q=${utilities.encode($term)}&${USERNAME_KEY}=$!{entry.website.user.userName}"
+ >restrict search</a> to just this blog)</span>
+ </p>
+ #end
+ <br />
+</div>
Added: incubator/roller/trunk/web/WEB-INF/classes/themes/css.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/themes/css.vm?rev=189602&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/themes/css.vm (added)
+++ incubator/roller/trunk/web/WEB-INF/classes/themes/css.vm Wed Jun 8 09:06:16 2005
@@ -0,0 +1,4 @@
+<link rel="stylesheet" type="text/css" href="$ctxPath/themes/base.css" />
+#if( $theme )
+ <link rel="stylesheet" type="text/css" href="#showThemePath($theme)/theme.css" />
+#end
\ No newline at end of file
Added: incubator/roller/trunk/web/WEB-INF/classes/themes/day.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/themes/day.vm?rev=189602&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/themes/day.vm (added)
+++ incubator/roller/trunk/web/WEB-INF/classes/themes/day.vm Wed Jun 8 09:06:16 2005
@@ -0,0 +1,16 @@
+<div class="entry">
+ #showDayPermalink( $day )
+ #showEntryDate( $day )
+</div>
+
+#foreach( $entry in $entries )
+<p>
+ <a name="$utilities.encode($entry.anchor)" id="$utilities.encode($entry.anchor)"></a>
+ <b>$entry.title</b> #showEntryText($entry)
+ <font class="date">(#showTimestamp($entry.pubTime))</font>
+ #showEntryPermalink( $entry )
+ #showCommentsPageLink( $entry )
+</p>
+#end
+
+#showLinkbacks( $day )
\ No newline at end of file
Added: incubator/roller/trunk/web/WEB-INF/classes/themes/new_page.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/themes/new_page.vm?rev=189602&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/themes/new_page.vm (added)
+++ incubator/roller/trunk/web/WEB-INF/classes/themes/new_page.vm Wed Jun 8 09:06:16 2005
@@ -0,0 +1,4 @@
+
+<h1>#showPageName()</h1>
+
+<p>#showPageDescription()</p>
\ No newline at end of file
Added: incubator/roller/trunk/web/WEB-INF/classes/themes/noop_decorator.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/themes/noop_decorator.vm?rev=189602&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/themes/noop_decorator.vm (added)
+++ incubator/roller/trunk/web/WEB-INF/classes/themes/noop_decorator.vm Wed Jun 8 09:06:16 2005
@@ -0,0 +1 @@
+$decorator_body
\ No newline at end of file
Added: 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=189602&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/user.vm (added)
+++ incubator/roller/trunk/web/WEB-INF/classes/user.vm Wed Jun 8 09:06:16 2005
@@ -0,0 +1,37 @@
+#**
+ * Macros for displaying images and accessing uploaded files.
+ * @author Lance Lavandowska (conversion to Velocimacros)
+ *#
+
+#**
+ * Show an image IMG tag, optionally surrounded with an 'A HREF' link tag
+ * @param imageUrl URL for the image.
+ * @param linkUrl URL for the link or empty string if none.
+ * @param alt ALT text for the IMG tag.
+ * @param border BORDER for the IMG tag.
+ * @param halign HALIGN horizontal alignment for the IMG tag.
+ * @pram valign VALIGN vertical ailignment for the IMG tag.
+ *#
+#macro( showImage $imageUrl $linkUrl $alt $border $halign $valign )
+ #if ($utilities.isNotEmpty($linkUrl))
+ <a href="$linkUrl"/><img src="$imageUrl" alt="$alt"
+ border="$border" halign="$halign" valign="$valign" /></a>
+ #else
+ <img src="$imageUrl" alt="$alt" border="$border"
+ halign="$halign" valign="$valign" />
+ #end
+#end
+
+#**
+ * Show an image IMG tag for an image you have uploaded to Roller,
+ * optionally surrounded with an 'A HREF' link tag
+ *#
+#macro( showResourceImage $fileName $linkUrl $alt $border $halign $valign )
+ #set( $imageUrl = $uploadPath/$userName/$fileName )
+ #showImage( $imageUrl $linkUrl $alt $border $halign $valign )
+#end
+
+#**
+ * Show path to your file upload directory, for use in building URLs.
+ *#
+#macro( showResourcePath )$uploadPath/$userName#end
\ No newline at end of file
Added: 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=189602&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/weblog.vm (added)
+++ incubator/roller/trunk/web/WEB-INF/classes/weblog.vm Wed Jun 8 09:06:16 2005
@@ -0,0 +1,473 @@
+#**
+ * Macros for displaying weblog entries, comments, and related links.
+ * @author Lance Lavandowska (conversion to Velocimacros)
+ * @author David M Johnson (comment macros)
+ *#
+
+#**
+ * Print status/error message if exists.
+ * Note: "error" and "status" styles should be moved out into
+ * invididual Themes' theme.css files.
+ **#
+#macro( showStatusMessage )
+ #if( $errorMessage )
+ <span class="error">$errorMessage</span>
+ #end
+ #if( $statusMessage )
+ <span class="status">$statusMessage</span>
+ #end
+#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 $charset )
+ $pageHelper.setContentType("text/html;charset='$charset'")
+ <meta http-equiv="Content-Type" content="text/html;charset=$charset">
+#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
+ * it inside the rendered page itself.
+**#
+#macro( showContentLanguage $lang )
+ <meta http-equiv="Content-Language" content="$lang">
+#end
+
+#**
+ * Use this macro in your day template if you want to override
+ * entry rendering in both your HTML and RSS weblog output by defining
+ * a page template named _entry.
+ *
+ * <p>It is no longer necessary to use a page template named _entry
+ * if you want to override entry rendering in both your
+ * HTML and RSS weblog output (for support of PagePlugins).
+ * However, backwards compatibility for such use is still included,
+ * or if you have some other need to override entry rendering.
+ * The _entry page is now loaded by ContextLoader as $entryPage.</p>
+ *#
+#macro( showEntryText $entry )
+ #if( $entryPage )
+ #parse($entryPage.id)
+ #else
+ #if ( $entry.plugins )
+ #set( $entryText = $pageHelper.renderPlugins( $entry ) )
+ #else
+ #set( $entryText = $entry.text )
+ #end
+ #if( $entryLength == -1 )
+ $utilities.textToCDATA($entryText)
+ #else
+ #set( $entryText = $utilities.textToCDATA($utilities.removeHTML($entryText)) )
+ $stringUtils.left( $entryText, $entryLength )... [$entryText.length() characters]
+ #end
+ #end
+#end
+
+#**
+ * Use this macro in your day template if you want to override
+ * entry rendering in both your HTML and RSS weblog output by defining
+ * a page template named _desc.
+ *
+ * <p>It is no longer necessary to use a page template named _desc
+ * if you want to override entry rendering in both your
+ * HTML and RSS weblog output (for support of PagePlugins).
+ * However, backwards compatibility for such use is still included,
+ * or if you have some other need to override entry rendering.
+ * The _desc page is now loaded by ContextLoader as $descPage.</p>
+ *#
+#macro( showEntryDescription $entry )
+ #if( $descPage )
+ #parse($descPage.id)
+ #else
+ #if ( $entry.plugins )
+ #set( $entryText = $pageHelper.renderPlugins( $entry ) )
+ #else
+ #set( $entryText = $entry.text )
+ #end
+ #if( $entryLength == -1 )
+ $utilities.textToXML($entryText)
+ #else
+ #set( $entryText = $stringUtils.left( $entryText, $entryLength ) )
+ #set( $entryText = $utilities.textToXML($utilities.removeHTML($entryText)) )
+ $entryText... [$entryText.length() characters]
+ #end
+ #end
+#end
+
+#**
+ * Display Permalink for Date.
+ * @param day Date object that specifies day (type java.util.Date).
+ *#
+#macro( showDayPermalink $day )
+ <a href="$baseURL/page/$userName/#formatDate($plainFormat $day )"><img
+ class="daypermalink"
+ src="$ctxPath/images/permalink.gif"
+ title="$text.get( "macro.weblog.daypermalink.title" )"
+ alt="#formatDate( $plainFormat $day )" /></a>
+#end
+
+#**
+ * Display the default Date.toString for date using the 'macro.weblog.date.toStringFormat'
+ * format as defined in the resource bundle.
+ * @param toStringFormat Format string (see java.text.SimpleDateFormat).
+ * @param day Date object that specifies day (type java.util.Date).
+ *#
+#macro( showEntryDate $day )
+ #set( $format=$text.get("macro.weblog.date.toStringFormat") )
+ #formatDate( $format $day )
+ ##formatDate( $toStringFormat $day )
+#end
+
+#**
+ * Display the timestamp for the $day using the 'macro.weblog.date.timestampFormat'
+ * format as defined in the resource bundle.
+ *
+ * @param timestampFormat Format string (see java.text.SimpleDateFormat).
+ * @param day Date object that specifies day (type java.util.Date).
+ *#
+#macro( showTimestamp $day )
+ #set( $format = $text.get("macro.weblog.date.timestampFormat") )
+ #formatDate( $format $day )
+ ##formatDate( $timestampFormat $day )
+#end
+
+#**
+ * Display the Permalink for a weblog entry.
+ * @param entry WeblogEntry object.
+ *#
+#macro( showEntryPermalink $entry )
+ <a href="$baseURL$entry.permaLink"
+ title="$text.get( "macro.weblog.entrypermalink.title" )"
+ class="entrypermalink">Permalink</a>
+ #if ($pageHelper.isUserAuthorizedToEdit())
+ [<a href="$pageHelper.getEntryEditUrl($entry)">$text.get( "macro.weblog.entrypermalink.edit" )</a>]
+ #end
+#end
+
+#**
+ * Display the Trackback URL for a weblog entry.
+ * @param entry WeblogEntry object.
+ *#
+#macro( showTrackbackURL $entry )
+$absBaseURL/trackback/$userName/$page.link/$utilities.encode($entry.anchor)#end
+
+#**
+ * Display search form for searching a weblog. This is only a form, no div
+ * or anything around it.
+ *#
+#macro( showSearchForm )
+ <form id="searchForm" method="get" action="$ctxPath/search/$userName"
+ style="margin: 0; padding: 0" onsubmit="return validateSearch(this)">
+ <p>
+ <input type="text" id="q" name="q" size="20"
+ maxlength="255" value="#if($term)$term#end" />
+ #set( $cats = $pageModel.getWeblogCategories("nil") )
+ <select name="c">
+ <option value="">- In Category -</option>
+ #foreach( $cat in $cats )
+ <option #if($cat.name == $req.getParameter('c'))selected="selected"#end>$cat.name</option>
+ #end
+ </select>
+ <input type="submit" value="$text.get( "macro.weblog.searchbutton" )" />
+ </p>
+ </form>
+ <script type="text/javascript">
+ function validateSearch(form) {
+ if (form.q.value == "") {
+ alert("$text.get( "macro.weblog.searchalert" )");
+ form.q.focus();
+ return false;
+ }
+ return true;
+ }
+ </script>
+#end
+
+#**
+ * Display search again form
+ *#
+#macro( showSearchAgainForm )
+ <div id="searchAgain">
+ $text.get( "macro.weblog.searchdictionary", [$term, $term, $term] )
+
+ $text.get( "macro.weblog.searchhits", [$hits])
+
+ <form method="get" action="$ctxPath/search/$userName"
+ style="margin: 5px">
+ <input type="text" id="q" name="q" size="31"
+ maxlength="255" value="$term"
+ style="padding-left: 1px" />
+ #set( $cats = $pageModel.getWeblogCategories("nil") )
+ <select name="c">
+ <option value="">- Restrict By Category -</option>
+ #foreach( $cat in $cats )
+ <option #if($cat.name == $req.getParameter('c'))selected="selected"#end>$cat.name</option>
+ #end
+ </select>
+ <input type="submit" value="$text.get( "macro.weblog.searchagain" )" />
+ </form>
+
+ $text.get( "macro.weblog.searchgoogle", [$term, $absBaseURL, $ctxPath, $userName] )
+ </div>
+ <script type="text/javascript"
+ src="$ctxPath/theme/scripts/searchhi.js"></script>
+#end
+
+#**
+ * Displays header like "1 - 10 of 20 found.".
+**#
+#macro( showSearchSummary )
+ #set( $min = $offset + 1 )
+ #set( $max = $offset + $limit )
+ #if( $max > $hits )#set( $max = $hits )#end
+ <h3>
+ $min - $max of $hits found.
+ </h3>
+#end
+
+#**
+ * Display list of search result pages (for pagination).
+**#
+#macro( showSearchPager )
+ <h3 style="text-align:center;">
+ #set( $numPages = $hits / $limit )
+ #set( $remainder = $hits % $limit )
+ #if( $remainder > 0 )#set( $numPages = $numPages + 1 )#end
+ #if( $numPages > 1 )
+ #foreach( $pageNum in [1..$numPages] )
+ #set( $i = $pageNum - 1 )
+ #set( $start = $limit * $i )
+ <a href="?q=${utilities.encode($term)}&${USERNAME_KEY}=$!{username}&n=${limit}&o=${start}"
+ >$pageNum</a>#if( $pageNum != $numPages) | #end
+ #end
+ #end
+ </h3>
+#end
+
+#**
+ * Display link to chronologically previous entry in the
+ * same category (if specified).
+**#
+#macro( showPreviousEntryLink $category)
+ <span id="previousEntry">
+ #if( $pageModel.previousEntry )
+ #if ( $category != 'nil' )#set( $catPath = $category )#end ## was a category supplied?
+ #set( $previousEntry = $pageModel.previousEntry )
+ <a href="$ctxPath$previousEntry.getPermaLink($catPath)"
+ title="Previous Entries"
+ >« $utilities.truncateNicely($previousEntry.title, 30, 30, "...")</a>
+ #end
+ </span>
+#end
+
+#**
+ * Display link to chronologically next entry in the
+ * same category (if specified).
+**#
+#macro( showNextEntryLink $category)
+ <span id="nextEntry">
+ #if( $pageModel.nextEntry )
+ #if ( $category != 'nil' )#set( $catPath = $category )#end ## was a category supplied?
+ #set( $nextEntry = $pageModel.nextEntry )
+ <a href="$ctxPath$nextEntry.getPermaLink($catPath)"
+ title="Next Entries"
+ >$utilities.truncateNicely($nextEntry.title, 30, 30, "...") »</a>
+ #end
+ </span>
+#end
+
+#**
+ * Shows weblog entries from specified category (and all of it's subcategories)
+ * using specified page as a "day template" for the display of each day.
+ * If a specific weblog entry is specified by the current request (using
+ * the anchor tag), then shows the only the specified entry (using the day
+ * template) along with the comments associated with that entry.
+ *
+ * @param pageName Page name of page to serve as day template.
+ * @param maxEntries Maximum number of entries to be shown.
+ * @param category Only display weblog entries from this category.
+ *#
+#macro( showWeblogEntriesInCategory $pageName $maxEntries $category )
+ #if ( $pageModel.getWeblogEntry() )
+ #set( $entry = $pageModel.getWeblogEntry() )
+ #end
+ #set( $dayTemplateId = $pageModel.getPageIdByName($pageName) )
+ #if ( !$dayTemplateId ) ## if no page name, try Preview space
+ #set ( $dayTemplateId = $pageName )
+ #end
+ #if( $entry )
+ #set( $day = $entry.pubTime )
+ #set( $entries = [ $entry ] )
+ #parse( $dayTemplateId )
+ <div class="trackbackUrl">
+ $text.get( "macro.weblog.trackback" ) #showTrackbackURL($entry)
+ </div>
+ #showComments($entry)
+ #if($website.allowComments && $entry.commentsStillAllowed)
+ #showCommentForm($entry)
+ #else
+ $text.get("comments.disabled")
+ #end
+ #else
+ #if( $searchResults )
+ #set( $map = $searchResults )
+ #showSearchAgainForm()
+ #showSearchSummary()
+ #else
+ #set( $map = $pageModel.getRecentWeblogEntries($maxEntries, $category) )
+ #end
+ #foreach( $day in $map.keySet() )
+ #set( $entries = $map.get($day) )
+ #parse( $dayTemplateId )
+ #end
+ #if( $searchResults )
+ #showSearchPager()
+ #end
+
+ <div class="next-previous">
+ #showPreviousEntryLink($category)
+ #showNextEntryLink($category)
+ </div>
+ #end
+#end
+
+#**
+ * Shows weblog entries using specified page as a "day template" for
+ * the display of each day. If a specific weblog entry is specified
+ * by the current request (using the anchor tag), then shows the only
+ * the specified entry (using the day template) along with the comments
+ * associated with that entry.
+ *
+ * @param pageName Page name of page to serve as day template.
+ * @param maxEntries Maximum number of entries to be shown.
+ *#
+#macro( showWeblogEntries $pageName $maxEntries )
+#showWeblogEntriesInCategory($pageName $maxEntries 'nil')
+#end
+
+#**
+ * Show the last $maxEntries number of weblogentry titles in a category,
+ * as links to the individual posts. Names of fields
+ * must be different than in showWeblogEntries (those
+ * values take precedence for some reason).
+**#
+#macro( showRecentEntriesInCategory $entryCount $catPath )
+ #set( $xmap = $pageModel.getRecentWeblogEntries($entryCount,$catPath) )
+ <ul class="recentposts">
+ #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>
+ #end
+ #end
+ </ul>
+#end
+
+#**
+ * Show the last $maxEntries number of weblogentry titles,
+ * as links to the individual posts. Names of fields
+ * must be different than in showWeblogEntries (those
+ * values take precedence for some reason).
+**#
+#macro( showRecentEntries $entryCount )
+#showRecentEntriesInCategory($entryCount "nil")
+#end
+
+#**
+ * Show the last $maxEntries number of weblogentry titles, as links to
+ * entry links. Names of fields must be different than in showWeblogEntries
+ * (those values take precedence for some reason).
+**#
+#macro( showRecentEntryLinksInCategory $numEntries $cat)
+ #set( $xmap = $pageModel.getRecentWeblogEntries($numEntries, $cat) )
+ <ul class="linkblog">
+ #foreach( $day in $xmap.keySet() )
+ #set( $recentEntries = $xmap.get($day) )
+ #foreach ($var in $recentEntries)
+ <li class="linkblog">
+ #if ($var.link)
+ <a href="$var.link" title="$utilities.removeAndEscapeHTML($var.text)">$var.title</a>
+ #else
+ $var.title
+ #end
+ #if ($pageHelper.isUserAuthorizedToEdit())
+ [<a href="$pageHelper.getEntryEditUrl($var)">$text.get( "macro.weblog.editentry" )</a>]
+ #end
+ </li>
+ #end
+ #end
+ </ul>
+#end
+
+#**
+ * Show the last $maxEntries number of weblogentry titles, as links to
+ * entry links. Names of fields must be different than in showWeblogEntries
+ * (those values take precedence for some reason).
+**#
+#macro( showRecentEntryLinks $numEntries )
+#showRecentEntryLinksInCategory($numEntries "nil")
+#end
+
+#**
+ * Display language form for selection a different language. This is only a form, no div
+ * or anything around it.
+ *#
+#macro( showLanguageForm )
+ ## first check for errors during possible previous langauge change
+ #if ($languageError)
+ <p>$languageError</p>
+ #end
+
+ #set( $locales = $pageHelper.getSupportedLanguages() )
+ #if ($locales)
+ #foreach($locale in $locales)
+ <a class="imageLink" href="$ctxPath/language${pageHelper.getPathInfo()}?language=${locale.getLanguage()}">
+ <img src="$ctxPath/images/flag_${locale.getLanguage()}.gif" alt="${locale.getDisplayLanguage()}" />
+ </a>
+ <br />
+ #end
+ #else
+ <p>$text.get("macro.weblog.nolanguages")</p>
+ #end
+#end
+
+#**
+ * Display links to Previous and/or Next chronological Entry. Also
+ * display link to "main" page if either is present.
+**#
+#macro( showNextPreviousLinks )
+ #set( $catLink = "" )
+ #if ( $catPath ) #set( $catLink = "?catname=$catPath" ) #end
+ <div class="next-previous">
+ #if ($pageModel.previousEntry)
+ #set( $previousEntry = $pageModel.previousEntry )
+ <a href="$ctxPath/page/$userName/$page.link/$utilities.encode($previousEntry.anchor)$catLink"
+ title="$previousEntry.title"
+ >« $utilities.truncateNicely($previousEntry.title, 30, 30, "...")</a> |
+ #end
+
+ #if ( $pageModel.previousEntry || $pageModel.nextEntry)
+ <a href="$ctxPath/page/$userName/$page.link$catLink">$page.name</a>
+ #end
+
+ #if ($pageModel.nextEntry)
+ #set( $nextEntry = $pageModel.nextEntry )
+ | <a href="$ctxPath/page/$userName/$page.link/$utilities.encode($nextEntry.anchor)$catLink"
+ title="$nextEntry.title"
+ >$utilities.truncateNicely($nextEntry.title, 30, 30, "...") »</a>
+ #end
+ </div>
+#end
+
+#**
+ * Method to retrieve a full encoded anchor tag for a WeblogEntry.
+**#
+#macro( showAnchorTag $entry )
+ <a name="$utilities.encode($entry.anchor)" id="$utilities.encode($entry.anchor)"></a>
+#end
\ No newline at end of file
Added: 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=189602&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/website.vm (added)
+++ incubator/roller/trunk/web/WEB-INF/classes/website.vm Wed Jun 8 09:06:16 2005
@@ -0,0 +1,117 @@
+#**
+ * Website and Page macros.
+ * @author Lance Lavandowska (conversion to Velocimacros)
+ *#
+
+#**
+ * Display website title.
+ *#
+#macro( showWebsiteTitle )$website.Name#end
+
+#**
+ * Display website description.
+ *#
+#macro( showWebsiteDescription )$website.Description#end
+
+#**
+ * Include a page and evaluate it as a template.
+ * @param pageName Name of page to be included.
+ *#
+#macro( includePage pageName )
+ #set( $iPageId = $pageModel.getPageIdByName( $pageName ) )
+ #if ( !$iPageId ) ## no page found, parse pageName
+ #set( $iPageId = $pageName )
+ #end
+ #parse( $iPageId )
+#end
+
+#**
+ * Show name of current page.
+ *#
+#macro( showPageName )$page.Name#end
+
+#**
+ * Show current page's description.
+ *#
+#macro( showPageDescription )$page.Description#end
+
+#**
+ * Show current page's update time.
+ *#
+#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.
+ * 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.
+ *#
+#macro( showWeblogSubcategoryChooser2 $parentCategory $divider )
+ #set( $rawUrl = "$ctxPath/page/$userName/$page.link" )
+
+ <div class="rWeblogCategoryChooser">
+ #set( $weblogUrl = $rawUrl )
+ #set( $chosenCat = "" )
+ #if( $req.getParameter( $WEBLOGCATEGORYNAME_KEY ) )
+ #set( $chosenCat = $req.getParameter( $WEBLOGCATEGORYNAME_KEY ) )
+ <span class="rUnchosenCategory"><a href="$weblogUrl">$text.get( "macro.weblog.allcategories" )</a></span>
+ #else
+ <span class="rChosenCategory">$text.get( "macro.weblog.allcategories" )</span>
+ #end
+
+ #if ( $req.getParameter($PAGEID_KEY) )
+ #set( $pageParam = "&$PAGEID_KEY=$req.getParameter($PAGEID_KEY)" )
+ #end
+ #set( $cats = $pageModel.getWeblogCategories($parentCategory) )
+ #foreach( $cat in $cats )
+ ## $pageHelper.strutsUrlHelper() wasn't working, so do it manually
+ #set( $catParam = "?$WEBLOGCATEGORYNAME_KEY=$cat.path" )
+ #set( $weblogUrl = "$rawUrl$catParam$!pageParam" )
+ $divider
+ #if( $chosenCat == $cat.path )
+ <span class="rChosenCategory">$cat.Name</span>
+ #else
+ <span class="rUnchosenCategory"><a href="$weblogUrl">$cat.Name</a></span>
+ #end
+ #end
+ </div>
+#end
+## backwards compatibility
+#macro( showWeblogSubcategoryChooser $parentCategory )
+ #showWeblogSubcategoryChooser2( $parentCategory "|" )
+#end
+
+#**
+ * Shows weblog category chooser.
+ *#
+#macro( showWeblogCategoryChooser )#showWeblogSubcategoryChooser2("nil" "|")#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
+
+#**
+ * Display weblog calandar.
+ *#
+#macro( showWeblogCalendar )
+ #displayWeblogCalendar( false 'nil' )
+#end
+
+#**
+ * Display a BIG weblog calendar, good for an archive page.
+ *#
+#macro( showBigWeblogCalendar )
+ #displayWeblogCalendar( true 'nil' )
+#end
Added: incubator/roller/trunk/web/WEB-INF/database.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/database.xml?rev=189602&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/database.xml (added)
+++ incubator/roller/trunk/web/WEB-INF/database.xml Wed Jun 8 09:06:16 2005
@@ -0,0 +1,9 @@
+<!DOCTYPE database
+ PUBLIC "-//EXOLAB/Castor JDO Configuration DTD Version 1.0//EN"
+ "http://castor.exolab.org/jdo-conf.dtd">
+
+<database name="rollerdb" engine="@CASTOR_DATABASE_ENGINE@">
+ <jndi name="java:comp/env/jdbc/rollerdb" />
+ <mapping href="./mapping.xml" />
+</database>
+
Added: 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=189602&view=auto
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/editor-menu.xml (added)
+++ incubator/roller/trunk/web/WEB-INF/editor-menu.xml Wed Jun 8 09:06:16 2005
@@ -0,0 +1,40 @@
+
+<!-- Defines the Roller Editor GUI menu and roles allowed to use each menu. -->
+
+<menu-bar>
+
+ <menu name="tabbedmenu.main">
+ <menu-item name="tabbedmenu.main" forward="main" />
+ </menu>
+
+ <menu name="tabbedmenu.weblog" roles="editor,admin">
+ <menu-item name="tabbedmenu.weblog.newEntry" forward="weblogCreate" />
+ <menu-item name="tabbedmenu.weblog.archives" forward="weblogQuery" />
+ <menu-item name="tabbedmenu.weblog.categories" forward="categories" />
+ <menu-item name="tabbedmenu.weblog.referers" forward="referers" />
+ <!-- I haven't tested these yet...
+ <menu-item name="tabbedmenu.weblog.export" forward="exportEntries" />
+ <menu-item name="tabbedmenu.weblog.import" forward="importEntries" />
+ -->
+ </menu>
+
+ <menu name="tabbedmenu.bookmarks" roles="editor,admin">
+ <menu-item name="tabbedmenu.bookmarks.allFolders" forward="bookmarks" />
+ <menu-item name="tabbedmenu.bookmarks.import" forward="importBookmarks" />
+ </menu>
+
+ <menu name="tabbedmenu.website" roles="editor,admin">
+ <menu-item name="tabbedmenu.website.settings" forward="editWebsite" />
+ <menu-item name="tabbedmenu.website.themes" forward="editTheme" />
+ <menu-item name="tabbedmenu.website.pages" forward="editPages" />
+ <menu-item name="tabbedmenu.website.files" forward="uploadFiles" />
+ <menu-item name="tabbedmenu.website.user" forward="editUser" />
+ <menu-item name="tabbedmenu.website.maintenance" forward="maintenance" />
+ </menu>
+
+ <menu name="tabbedmenu.admin" roles="admin">
+ <menu-item name="tabbedmenu.admin.config" forward="rollerConfig" />
+ <menu-item name="tabbedmenu.admin.userAdmin" forward="admin" />
+ </menu>
+
+</menu-bar>