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 2006/02/09 03:58:18 UTC
svn commit: r376160 - in /incubator/roller/trunk: nbproject/
src/org/roller/presentation/velocity/ web/WEB-INF/classes/ web/themes/
web/themes/basic/ web/themes/berkley/ web/themes/brushedmetal/
web/themes/cheb/ web/themes/clean/ web/themes/currency-i1...
Author: snoopdave
Date: Wed Feb 8 18:58:16 2006
New Revision: 376160
URL: http://svn.apache.org/viewcvs?rev=376160&view=rev
Log:
Fixes ROL-473 (page view for date should show all entries for date) and ROL-1041 (fix next/prev links)
Modified:
incubator/roller/trunk/nbproject/project.xml
incubator/roller/trunk/src/org/roller/presentation/velocity/PageModel.java
incubator/roller/trunk/web/WEB-INF/classes/weblog.vm
incubator/roller/trunk/web/themes/base.css
incubator/roller/trunk/web/themes/basic/Weblog.vm
incubator/roller/trunk/web/themes/basic/_decorator.vm
incubator/roller/trunk/web/themes/berkley/Weblog.vm
incubator/roller/trunk/web/themes/brushedmetal/Weblog.vm
incubator/roller/trunk/web/themes/cheb/Weblog.vm
incubator/roller/trunk/web/themes/clean/Weblog.vm
incubator/roller/trunk/web/themes/currency-i18n/Weblog.vm
incubator/roller/trunk/web/themes/currency/Weblog.vm
incubator/roller/trunk/web/themes/grey2/Weblog.vm
incubator/roller/trunk/web/themes/moonshine/Weblog.vm
incubator/roller/trunk/web/themes/movablemanila/Weblog.vm
incubator/roller/trunk/web/themes/pacifica/Weblog.vm
incubator/roller/trunk/web/themes/robot/Weblog.vm
incubator/roller/trunk/web/themes/rolling/Weblog.vm
incubator/roller/trunk/web/themes/sotto/Weblog.vm
incubator/roller/trunk/web/themes/sunsets/Weblog.vm
incubator/roller/trunk/web/themes/werner/Weblog.vm
incubator/roller/trunk/web/themes/x2/Weblog.vm
Modified: incubator/roller/trunk/nbproject/project.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/nbproject/project.xml?rev=376160&r1=376159&r2=376160&view=diff
==============================================================================
--- incubator/roller/trunk/nbproject/project.xml (original)
+++ incubator/roller/trunk/nbproject/project.xml Wed Feb 8 18:58:16 2006
@@ -58,6 +58,11 @@
<type>java</type>
<location>sandbox/atomprotocol/tests</location>
</source-folder>
+ <source-folder>
+ <label>sandbox/atomadminprotocol/src</label>
+ <type>java</type>
+ <location>sandbox/atomadminprotocol/src</location>
+ </source-folder>
</folders>
<ide-actions>
<action name="build">
@@ -102,6 +107,10 @@
</arity>
</context>
</action>
+ <action name="debug">
+ <script>nbproject/ide-targets.xml</script>
+ <target>debug-nb</target>
+ </action>
</ide-actions>
<view>
<items>
@@ -141,6 +150,10 @@
<label>sandbox/atomprotocol/tests</label>
<location>sandbox/atomprotocol/tests</location>
</source-folder>
+ <source-folder style="packages">
+ <label>sandbox/atomadminprotocol/src</label>
+ <location>sandbox/atomadminprotocol/src</location>
+ </source-folder>
<source-file>
<location>build.xml</location>
</source-file>
@@ -151,6 +164,7 @@
<ide-action name="javadoc"/>
<ide-action name="test"/>
<ide-action name="rebuild"/>
+ <ide-action name="debug"/>
</context-menu>
</view>
<subprojects/>
@@ -165,7 +179,7 @@
<package-root>sandbox/atomprotocol/src</package-root>
<package-root>sandbox/atomprotocol/tests</package-root>
<package-root>tests</package-root>
- <classpath mode="compile">tools/buildtime/junit-3.8.1.jar:tools/lib/activation.jar:tools/lib/commons-betwixt-1.0-beta-1.jar:tools/lib/commons-codec-1.1.jar:tools/lib/commons-httpclient-2.0.2.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/ekitapplet.jar:tools/lib/jazzy-core.jar:tools/lib/log4j-1.2.4.jar:tools/lib/lucene-1.4.3.jar:tools/lib/mail.jar:tools/lib/mm.mysql-2.0.14-bin.jar:tools/lib/taglibs-string.jar:tools/lib/velocity-1.4.jar:tools/lib/velocity-dep-1.4.jar:tools/lib/velocity-tools-1.1.jar:tools/lib/xmlrpc-1.2-b1.jar:tools/struts-1.2.4/lib/antlr.jar:tools/struts-1.2.4/lib/commons-beanutils.jar:tools/struts-1.2.4/lib/commons-collections.jar:tools/struts-1.2.4/lib/commons-digester.jar:tools/struts-1.2.4/lib/commons-fileupload.jar:tools/struts-1.2.4/lib/commons-lang-2.0.jar:tools/struts-1.2.4/lib/commons-logging.jar:tools/struts-1.2.4/lib/commons-validator.jar:tools/struts-1.2.4/lib/jakarta-oro.jar:tools/struts-1.2.4/lib/struts-el.jar:tools/struts-1.2.4/l
ib/struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:tools/standard-1.0.3/lib/jaxen-full.jar:tools/standard-1.0.3/lib/jstl.jar:tools/standard-1.0.3/lib/standard.jar:tools/buildtime/tomcat-5.0.28/servlet-api.jar:tools/buildtime/tomcat-5.0.28/jsp-api.jar:sandbox/atomprotocol/lib/rome-0.8.jar:sandbox/atomprotocol/lib/rome-fetcher-0.8.jar:tools/hibernate-3.0/hibernate3.jar:tools/lib/jdom.jar:contrib/lib/ecs.jar:contrib/lib/jrcs-diff.jar:contrib/lib/JSPWiki.jar:contrib/lib/jython.jar:contrib/lib/oscache.jar:contrib/lib/radeox.jar:contrib/lib/textile4j-1.20.jar</classpath>
+ <classpath mode="compile">tools/buildtime/junit-3.8.1.jar:tools/lib/activation.jar:tools/lib/commons-betwixt-1.0-beta-1.jar:tools/lib/commons-httpclient-2.0.2.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/ekitapplet.jar:tools/lib/jazzy-core.jar:tools/lib/log4j-1.2.4.jar:tools/lib/lucene-1.4.3.jar:tools/lib/mail.jar:tools/lib/mm.mysql-2.0.14-bin.jar:tools/lib/taglibs-string.jar:tools/lib/velocity-1.4.jar:tools/lib/velocity-dep-1.4.jar:tools/lib/velocity-tools-1.1.jar:tools/lib/xmlrpc-1.2-b1.jar:tools/struts-1.2.4/lib/antlr.jar:tools/struts-1.2.4/lib/commons-beanutils.jar:tools/struts-1.2.4/lib/commons-collections.jar:tools/struts-1.2.4/lib/commons-digester.jar:tools/struts-1.2.4/lib/commons-fileupload.jar:tools/struts-1.2.4/lib/commons-lang-2.0.jar:tools/struts-1.2.4/lib/commons-logging.jar:tools/struts-1.2.4/lib/commons-validator.jar:tools/struts-1.2.4/lib/jakarta-oro.jar:tools/struts-1.2.4/lib/struts-el.jar:tools/struts-1.2.4/lib/struts.jar:tools/buildtime/mo
ckrunner-0.35/lib/mockrunner-servlet.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:tools/standard-1.0.3/lib/jaxen-full.jar:tools/standard-1.0.3/lib/jstl.jar:tools/standard-1.0.3/lib/standard.jar:tools/buildtime/tomcat-5.0.28/servlet-api.jar:tools/buildtime/tomcat-5.0.28/jsp-api.jar:sandbox/atomprotocol/lib/rome-0.8.jar:sandbox/atomprotocol/lib/rome-fetcher-0.8.jar:tools/hibernate-3.0/hibernate3.jar:tools/lib/jdom.jar:contrib/lib/ecs.jar:contrib/lib/jrcs-diff.jar:contrib/lib/JSPWiki.jar:contrib/lib/jython.jar:contrib/lib/oscache.jar:contrib/lib/radeox.jar:contrib/lib/textile4j-1.20.jar:tools/spring-1.2/acegi-security-0.9.0.jar:tools/spring-1.2/spring.jar:tools/lib/rome-0.8.jar:tools/lib/rome-fetcher-0.8.jar:tools/lib/commons-codec-1.3.jar</classpath>
<source-level>1.4</source-level>
</compilation-unit>
</java-data>
Modified: incubator/roller/trunk/src/org/roller/presentation/velocity/PageModel.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/velocity/PageModel.java?rev=376160&r1=376159&r2=376160&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/velocity/PageModel.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/velocity/PageModel.java Wed Feb 8 18:58:16 2006
@@ -34,6 +34,7 @@
import org.roller.pojos.wrapper.WebsiteDataWrapper;
import org.roller.presentation.RollerRequest;
import org.roller.presentation.RollerSession;
+import org.roller.util.DateUtil;
import org.roller.util.StringUtils;
/**
@@ -303,8 +304,7 @@
if (VELOCITY_NULL.equals(categoryName)) categoryName = null;
Map ret = new HashMap();
try {
- Date day = mRollerReq.getDate();
- if (day == null) day = new Date();
+
// If request specifies a category, then use that
String catParam = null;
@@ -321,13 +321,25 @@
}
}
+ Integer limit = new Integer(maxEntries);
+ Date startDate = null;
+ Date endDate = mRollerReq.getDate();
+ if (endDate == null) endDate = new Date();
+ if (mRollerReq.isDateSpecified()) {
+ // URL specified a specific day
+ // so get entries for that day
+ endDate = DateUtil.getEndOfDay(endDate);
+ startDate = DateUtil.getStartOfDay(endDate);
+ // and get them ALL, no limit
+ limit = null;
+ }
Map mRet = RollerFactory.getRoller().getWeblogManager().getWeblogEntryObjectMap(
mRollerReq.getWebsite(),
- null, // startDate
- day, // endDate
- catParam, // catName
- WeblogEntryData.PUBLISHED, // status
- new Integer(maxEntries)); // maxEntries
+ startDate, // startDate
+ endDate, // endDate
+ catParam, // catName
+ WeblogEntryData.PUBLISHED, // status
+ limit); // maxEntries
// need to wrap pojos
java.util.Date key = null;
Modified: incubator/roller/trunk/web/WEB-INF/classes/weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/weblog.vm?rev=376160&r1=376159&r2=376160&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/weblog.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/weblog.vm Wed Feb 8 18:58:16 2006
@@ -4,30 +4,227 @@
* @author David M Johnson (comment macros)
*#
+
+#** ======================================================================== *#
+#** Display recent entries 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>
+ * Shows weblog entries from specified category 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
+ * entry parameter), this macro will display only that entry and the comments
+ * for that entry (SINGLE ENTRY PAGE)
+ *
+ * If a specific day is specified (in YYYYMMDD form in the URL), then this
+ * macro will only the entries from that day (SINGLE DAY PAGE)
+ *
+ * If no entry or day is specified, the this macro will display the most recent
+ * entries (CURRENT PAGE). The maxEntries argument is ignored because now, the
+ * number of entries to display is controlled by the entryDisplayCount property
+ * under Preferences:Settings.
+ *
+ * If there are search results, then this macro will show them using the
+ * current weblog's day template.
+ *
+ * @param pageName Page name of page to serve as day template.
+ * @param maxEntries (ignored)
+ * @param category Only display weblog entries from this category.
+ *#
+#macro( showWeblogEntriesInCategory $pageName $maxEntries $category)
+ #set($maxEntries = $website.entryDisplayCount)
+ #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)
+ <div class="top-next-prev">#showNextPreviousLinks()</div>
+ #set($day = $entry.pubTime)
+ #set($entries = [$entry])
+ #parse($dayTemplateId )
+ <div class="top-next-prev">#showNextPreviousControl()</div>
+ #if($trackbacksEnabled && $website.allowComments && $entry.commentsStillAllowed)
+ <div class="trackbackUrl">
+ $text.get("macro.weblog.trackback") #showTrackbackURL($entry)
+ </div>
+ #end
+ <div class="bottom-next-prev">#showNextPreviousControl()</div>
+ #showEntryLinkbacks($entry)
+ #showComments($entry)
+ #if($commentsEnabled && $website.allowComments && $entry.commentsStillAllowed)
+ #showCommentForm($entry)
+ #else
+ $text.get("comments.disabled")
+ #end
+ #else
+ #if($searchResults)
+ #set($map = $searchResults.results )
+ #showSearchAgainForm()
+ #showSearchSummary()
+ #foreach($day in $searchResults.results.keySet())
+ #set($entries = $searchResults.results.get($day))
+ #parse($dayTemplateId)
+ #end
+ #showSearchPager()
+ #else
+ #set($map = $pageModel.getRecentWeblogEntries($maxEntries, $category))
+ <div class="top-next-prev">#showNextPreviousControl()</div>
+ #foreach($day in $map.keySet())
+ #set($entries = $map.get($day))
+ #parse($dayTemplateId)
+ #end
+ <div class="bottom-next-prev">#showNextPreviousControl()</div>
+ #end
#end
- #if( $statusMessage )
- <span class="status">$statusMessage</span>
+#end
+
+#**
+ * Shows weblog entries using specified page as a "day template" for the
+ * display of each day. The maxEntries argument is ignored because now, the
+ * number of entries to display is controlled by the entryDisplayCount property
+ * under Preferences:Settings.
+ *
+ * @param pageName Page name of page to serve as day template.
+ * @param maxEntries (ignored)
+ *#
+#macro( showWeblogEntries $pageName $maxEntries )
+#showWeblogEntriesInCategory($pageName $maxEntries 'nil')
+#end
+
+
+#**
+ * Shows weblog entries using the standard "_day" template for the display of
+ * each day. The number of entries to display is controlled by the
+ * entryDisplayCount property under Preferences:Settings.
+ *#
+#macro( displayWeblogEntries )
+#showWeblogEntriesInCategory("_day" 15 'nil')
+#end
+
+
+#**
+ * Shows list of links to recent weblog entries in one category.
+ *
+ * @param entryCount Maximum number of entry links to display
+**#
+#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="${ctxPath}/page/${website.handle}?entry=$utilities.encode($var.anchor)">$var.title</a></li>
+ #end
+ #end
+ </ul>
+#end
+
+#**
+ * Shows list of links to recent weblog entries in one category.
+ *
+ * @param numEntries Maximum number of entries to display
+**#
+#macro( showRecentEntries $entryCount )
+#showRecentEntriesInCategory($entryCount "nil")
+#end
+
+
+#** ======================================================================== *#
+#** Next / previous links macros *#
+#** ======================================================================== *#
+
+#**
+ * Displays next previous links, called by #showWeblogEntries().
+ * On the today page: show prev link day before earliest entry on page.
+ * On an entry page: show next/prev entry links.
+ * On a day page: show next prev day links.
+**#
+#macro( showNextPreviousControl )
+ #set( $npcat = 'nil' )
+ #set( $catLink = "" )
+ #if ( $catPath && $catPath != "")
+ #set( $npcat = $catPath )
+ #set( $catLink = "?catname=$catPath" )
+ #end
+ <div class="next-previous">
+ #if ($pageModel.nextEntry)
+ #showNextWeblogLink($npcat) |
+ #end
+ #if (($pageModel.previousEntry && $pageModel.nextEntry) || $pageModel.nextEntry)
+ <a href="${ctxPath}/page/${website.handle}$catLink">$page.name</a> |
#end
+ #if ($pageModel.previousEntry)
+ #showPrevWeblogLink($npcat)
+ #end
+ </div>
+#end
+
+#macro( showNextPreviousLinks )
+ <!--
+ showNextPreviousLinks() is no longer needed as next/prev links are
+ built-into the #showRecentEntries() macro.
+ -->
#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.
+ * Display link to chronologically previous entry or day in the
+ * same category (if specified).
**#
-#macro( showContentLanguage $lang )
- <meta http-equiv="Content-Language" content="$lang">
+#macro( showPrevWeblogLink $category)
+ <span class="previousEntry">
+ #if( $pageModel.previousEntry )
+ #set( $prev = $pageModel.previousEntry )
+ #if( $entry )
+ #set( $prevURL = "${ctxPath}${prev.permaLink}" )
+ #else
+ #set( $prevURL = "${ctxPath}/page/${website.handle}/#formatDate($plainFormat ${prev.pubTime})" )
+ #end
+ <a href="$prevURL" title="Previous Entries"
+ > $utilities.truncateNicely($prev.title, 20, 20, "...") »</a>
+ #end
+ </span>
+#end
+
+#**
+ * Display link to chronologically next entry or day in the
+ * same category (if specified).
+**#
+#macro( showNextWeblogLink $category)
+ <span class="nextEntry">
+ #if( $pageModel.nextEntry )
+ #set( $next = $pageModel.nextEntry )
+ #if( $entry )
+ #set( $nextURL = "${ctxPath}${next.permaLink}" )
+ #else
+ #set( $nextURL = "${ctxPath}/page/${website.handle}/#formatDate($plainFormat ${next.pubTime})" )
+ #end
+ <a href="$nextURL" title="Next Entries"
+ >« $utilities.truncateNicely($next.title, 20, 20, "...")</a>
+ #end
+ </span>
+#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
+
+#** ======================================================================== *#
+#** Individual weblog entry display macros *#
+#** ======================================================================== *#
+
+
#**
* Use this macro in your day template if you want to override
* entry rendering in both your HTML and RSS weblog output by defining
@@ -58,6 +255,7 @@
#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
@@ -89,6 +287,7 @@
#end
#end
+
#**
* Display Permalink for Date.
* @param day Date object that specifies day (type java.util.Date).
@@ -101,6 +300,7 @@
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.
@@ -113,6 +313,7 @@
##formatDate( $toStringFormat $day )
#end
+
#**
* Display the timestamp for the $day using the 'macro.weblog.date.timestampFormat'
* format as defined in the resource bundle.
@@ -126,6 +327,7 @@
##formatDate( $timestampFormat $day )
#end
+
#**
* Display the Permalink for a weblog entry.
* @param entry WeblogEntry object.
@@ -139,6 +341,7 @@
#end
#end
+
#**
* Display the Trackback URL for a weblog entry.
* @param entry WeblogEntry object.
@@ -149,229 +352,13 @@
#**
- * Shows weblog entries from specified category
- * 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 )
- #set( $maxEntries = $website.entryDisplayCount )
- #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 )
- #if($trackbacksEnabled && $website.allowComments && $entry.commentsStillAllowed)
- <div class="trackbackUrl">
- $text.get( "macro.weblog.trackback" ) #showTrackbackURL($entry)
- </div>
- #end
- #showEntryLinkbacks($entry)
- #showComments($entry)
- #if($commentsEnabled && $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
- #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
-
-#**
- * Shows weblog entries using the standard "_day" template for
- * the display of each day. The number of entries to display is controlled
- * by the entryDisplayCount property under weblog settings.
- *#
-#macro( displayWeblogEntries )
-#showWeblogEntriesInCategory("_day" 15 '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="${ctxPath}/page/${website.handle}?entry=$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}">
- <img src="$ctxPath/images/flag_${locale.toString().toLowerCase()}.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( $npcat = 'nil' )
- #set( $catLink = "" )
- #if ( $catPath && $catPath != "")
- #set( $npcat = $catPath )
- #set( $catLink = "?catname=$catPath" )
- #end
- <div class="next-previous">
- #if ($pageModel.previousEntry)
- #showPrevEntryLink($npcat) |
- #end
- #if ( $pageModel.previousEntry || $pageModel.nextEntry)
- <a href="${ctxPath}/page/${website.handle}$catLink">$page.name</a>
- #end
- #if ($pageModel.nextEntry)
- | #showNextEntryLink($npcat)
- #end
- </div>
-#end
-
-#**
- * Display link to chronologically previous entry in the
- * same category (if specified).
-**#
-#macro( showPrevEntryLink $category)
- <span id="previousEntry">
- #if( $pageModel.previousEntry )
- #set( $prev = $pageModel.previousEntry )
- #set( $prevURL = "${ctxPath}${prev.permaLink}" )
- <a href="$prevURL" title="Previous Entries"
- >« $utilities.truncateNicely($prev.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 )
- #set( $next = $pageModel.nextEntry )
- #set( $nextURL = "${ctxPath}${next.permaLink}" )
- <a href="$nextURL" title="Next Entries"
- >$utilities.truncateNicely($next.title, 30, 30, "...") »</a>
- #end
- </span>
-#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
+
#**
* Display a trackback auto-discovery comment for a WeblogEntry.
**#
@@ -393,6 +380,12 @@
-->
#end
+
+#** ======================================================================== *#
+#** Search form and results macros *#
+#** ======================================================================== *#
+
+
#**
* Display search form for searching a weblog. This is only a form, no div
* or anything around it.
@@ -425,6 +418,7 @@
</script>
#end
+
#**
* Display search again form
*#
@@ -434,11 +428,11 @@
$text.get( "macro.weblog.searchhits", [$searchResults.hits])
- <form method="get" action="${ctxPath}/search/${searchResults.website.handle}"
+ <form method="get" action="${ctxPath}/search/${website.handle}"
style="margin: 5px">
<input type="text" id="q" name="q" size="31"
maxlength="255" value="$searchResults.term"
- style="padding-left: 1px" />
+ style="padding-left: 1px" /><br />
#set( $cats = $pageModel.getWeblogCategories("nil") )
<select name="c">
<option value="">- Restrict By Category -</option>
@@ -449,12 +443,13 @@
<input type="submit" value="$text.get( "macro.weblog.searchagain" )" />
</form>
- $text.get( "macro.weblog.searchgoogle", [$searchResults.term, $absBaseURL, $ctxPath, ${searchResults.website.handle}] )
+ $text.get( "macro.weblog.searchgoogle", [$searchResults.term, $absBaseURL, $ctxPath, ${website.handle}] )
</div>
- <script type="text/javascript"
- src="$ctxPath/theme/scripts/searchhi.js"></script>
+ <!-- searchhi script hangs firefox, commenting it out for now -->
+ <!-- script type="text/javascript" src="$ctxPath/theme/scripts/searchhi.js"></script -->
#end
+
#**
* Displays header like "1 - 10 of 20 found.".
**#
@@ -467,6 +462,7 @@
</h3>
#end
+
#**
* Display list of search result pages (for pagination).
**#
@@ -486,5 +482,95 @@
</h3>
#end
+
+#** ======================================================================== *#
+#** Other 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 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
+
+
+#**
+ * 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}">
+ <img src="$ctxPath/images/flag_${locale.toString().toLowerCase()}.gif" alt="${locale.getDisplayLanguage()}" />
+ </a>
+ <br />
+ #end
+ #else
+ <p>$text.get("macro.weblog.nolanguages")</p>
+ #end
+#end
+
+
+#** ======================================================================== *#
+#** Deprecated macros *#
+#** ======================================================================== *#
+
+
+#**
+ * Shows list of links for recent weblog entries in one category.
+ * DEPRECATED: use showRecentWelobEntries() instead.
+ *
+ * @param numEntries Maximum number of entries to display
+ * @param cat Category to be displayed
+**#
+#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
Modified: incubator/roller/trunk/web/themes/base.css
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/base.css?rev=376160&r1=376159&r2=376160&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/base.css (original)
+++ incubator/roller/trunk/web/themes/base.css Wed Feb 8 18:58:16 2006
@@ -1,6 +1,6 @@
-/**************/
+
/* Common CSS */
-/**************/
+
a {
font-weight: normal;
text-decoration: underline;
@@ -12,18 +12,6 @@
body {
font-family: verdana, sans-serif;
font-size: small;
- color: black;
- background-color: white;
-}
-h1 {
- margin:10px 10px 10px 10px;
- font-weight: bold;
- text-align: center;
-}
-h2 {
- margin:10px 10px 10px 10px;
- font-weight: bolder;
- text-align: center;
}
p {
margin:10px 10px 10px 10px;
@@ -34,9 +22,6 @@
overflow: auto;
}
.code {
- background: #ffffcc;
- color: #000000;
- border: 1px solid #999999;
margin:10px 10px 10px 20px;
padding: 3px 3px;
}
@@ -50,9 +35,8 @@
margin: 0px;
}
-/***************/
/* bookmark.vm */
-/***************/
+
.rFolder {
font-size: small;
font-weight: bold;
@@ -77,10 +61,8 @@
border: 0;
}
-
-/*************/
/* navbar.vm */
-/*************/
+
.rNavigationBar {
margin-left: 0;
padding-left: 0;
@@ -102,12 +84,8 @@
font-weight: normal;
}
-/* navbar-horizontal.vm: no styling */
-/* navbar-vertical.vm: no styling */
-
-/***************/
/* newsfeed.vm */
-/***************/
+
div.rNewsfeedTitle {
font-weight: 600;
}
@@ -124,9 +102,8 @@
font-weight: normal;
}
-/**************/
/* referer.vm */
-/**************/
+
ul.rReferersList {
list-style: none;
margin-left: 0;
@@ -140,17 +117,8 @@
border-style: double;
}
-/*************/
-/* roller.vm */
-/*************/
-
-/***********/
-/* user.vm */
-/***********/
-
-/*************/
/* comments.vm */
-/*************/
+
a.entrycommentslink {
background: transparent;
}
@@ -160,35 +128,27 @@
}
/* Preview / Comments Header */
div.comments-head {
- color: #999;
font-weight:bold;
margin-top:10px;
text-transform:uppercase;
- border-bottom:1px dotted #666;
}
/* actual comment content */
.comment {
- margin: 5px 10px 10px 5px;
- border: 1px solid #ddd;
- background:#eee;
+ margin: 5px 10px 10px 5px;
}
/* commenter info */
p.comment-details {
background: transparent;
- color: #333333;
font-size: .95em;
margin: 10px 0px 10px 10px !important;
}
div.comments-form {
- color:#999;
font-weight:normal;
- background:#FFF;
margin: 15px 15px 15px 15px;
}
span.comments-syntax-indicator {
display: block;
}
-
ul.commentsList {
list-style: none;
margin-left: 0;
@@ -209,7 +169,6 @@
margin-top: 10px;
}
tr.commentFormRow {
- color: #808080;
font-size: 12px;
padding-bottom: 6px;
}
@@ -228,11 +187,9 @@
div.commentAuthor {
border: none;
}
-/* End Hidden Comment Form */
-/*************/
/* weblog.vm */
-/*************/
+
a.daypermalink {
border-style : none;
}
@@ -282,6 +239,7 @@
}
.next-previous {
text-align: center;
+ padding: 1em 0 1em 0;
}
.error {
display: block;
@@ -306,9 +264,8 @@
width: 95%;
}
-/**************/
/* website.vm */
-/**************/
+
div.rWeblogCategoryChooser {
background: transparent;
margin-bottom: 10px;
@@ -322,9 +279,8 @@
font-weight: bolder;
}
-/********************/
/* CalendarTag.java */
-/********************/
+
table.hCalendarTable {
text-align : center;
}
@@ -366,9 +322,8 @@
font-size : x-small;
}
-/**************************/
/* BigWeblogCalendarModel */
-/**************************/
+
div.hCalendarDayTitleBig {
position: relative;
left: 0;
Modified: incubator/roller/trunk/web/themes/basic/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/basic/Weblog.vm?rev=376160&r1=376159&r2=376160&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/basic/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/basic/Weblog.vm Wed Feb 8 18:58:16 2006
@@ -3,8 +3,6 @@
#showWeblogCategoryChooser()
- #showNextPreviousLinks()
-
#displayWeblogEntries()
</div>
<div class="rightbar">
Modified: incubator/roller/trunk/web/themes/basic/_decorator.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/basic/_decorator.vm?rev=376160&r1=376159&r2=376160&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/basic/_decorator.vm (original)
+++ incubator/roller/trunk/web/themes/basic/_decorator.vm Wed Feb 8 18:58:16 2006
@@ -4,6 +4,7 @@
<head>
#showContentType("text/html; charset=utf-8")
#showContentLanguage($locale.language)
+ <link rel="stylesheet" type="text/css" href="$ctxPath/themes/base.css" />
#includePage("_css")
#showRSSAutodiscoveryLink()
#showRSDLink()
Modified: incubator/roller/trunk/web/themes/berkley/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/berkley/Weblog.vm?rev=376160&r1=376159&r2=376160&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/berkley/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/berkley/Weblog.vm Wed Feb 8 18:58:16 2006
@@ -123,7 +123,7 @@
</td>
</tr>
</table>
-#showNextPreviousLinks()
+
#displayWeblogEntries()
<div id="Controls" class="controls"></div>
Modified: incubator/roller/trunk/web/themes/brushedmetal/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/brushedmetal/Weblog.vm?rev=376160&r1=376159&r2=376160&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/brushedmetal/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/brushedmetal/Weblog.vm Wed Feb 8 18:58:16 2006
@@ -6,6 +6,7 @@
#showContentLanguage($locale.language)
#showRSSAutodiscoveryLink()
#showRSDLink()
+ <link rel="stylesheet" type="text/css" href="$ctxPath/themes/base.css" />
<script type="text/javascript" src="$ctxPath/theme/scripts/roller.js"></script>
<title>#showWebsiteTitle() : #showPageName()</title><title>Brushed Metal: It Worked!</title>
<style type="text/css">
@@ -39,7 +40,7 @@
<div id="content">
#displayWeblogEntries()<br/>
- #showNextPreviousLinks()
+
<div id="footer">
Theme Design by <a href="http://www.bryanbell.com">Bryan Bell</a>
</div> <!-- footer -->
Modified: incubator/roller/trunk/web/themes/cheb/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/cheb/Weblog.vm?rev=376160&r1=376159&r2=376160&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/cheb/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/cheb/Weblog.vm Wed Feb 8 18:58:16 2006
@@ -19,7 +19,6 @@
<h1>#showWebsiteTitle()</h1>
#showWeblogCategoryChooser()
- #showNextPreviousLinks()
<div id="entries">
#displayWeblogEntries()
</div>
Modified: incubator/roller/trunk/web/themes/clean/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/clean/Weblog.vm?rev=376160&r1=376159&r2=376160&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/clean/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/clean/Weblog.vm Wed Feb 8 18:58:16 2006
@@ -19,7 +19,6 @@
<h2>#showWebsiteTitle()</h2>
<h3>#showWebsiteDescription()</h3>
#showWeblogCategoryChooser()<br>
- #showNextPreviousLinks()
#displayWeblogEntries()
</td>
<td valign="top" bgcolor="#ffffff" width="20%">
Modified: incubator/roller/trunk/web/themes/currency-i18n/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/currency-i18n/Weblog.vm?rev=376160&r1=376159&r2=376160&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/currency-i18n/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/currency-i18n/Weblog.vm Wed Feb 8 18:58:16 2006
@@ -61,8 +61,6 @@
<td valign="top" width="555" class="body">
#showWeblogCategoryChooser()<br />
- #showNextPreviousLinks()
-
#displayWeblogEntries()
<hr size="1">
Modified: incubator/roller/trunk/web/themes/currency/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/currency/Weblog.vm?rev=376160&r1=376159&r2=376160&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/currency/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/currency/Weblog.vm Wed Feb 8 18:58:16 2006
@@ -61,8 +61,6 @@
<td valign="top" width="555" class="body">
#showWeblogCategoryChooser()<br />
- #showNextPreviousLinks()
-
#displayWeblogEntries()
<hr size="1">
Modified: incubator/roller/trunk/web/themes/grey2/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/grey2/Weblog.vm?rev=376160&r1=376159&r2=376160&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/grey2/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/grey2/Weblog.vm Wed Feb 8 18:58:16 2006
@@ -110,7 +110,6 @@
<p><font style="font-size: 8pt;" face="Verdana" color="#404f64">
#showWeblogCategoryChooser()<br>
- #showNextPreviousLinks()
#displayWeblogEntries()
</font></p>
Modified: incubator/roller/trunk/web/themes/moonshine/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/moonshine/Weblog.vm?rev=376160&r1=376159&r2=376160&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/moonshine/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/moonshine/Weblog.vm Wed Feb 8 18:58:16 2006
@@ -107,8 +107,6 @@
#showWeblogCategoryChooser()
</div>
- #showNextPreviousLinks()
-
#displayWeblogEntries()
</div>
Modified: incubator/roller/trunk/web/themes/movablemanila/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/movablemanila/Weblog.vm?rev=376160&r1=376159&r2=376160&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/movablemanila/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/movablemanila/Weblog.vm Wed Feb 8 18:58:16 2006
@@ -6,6 +6,7 @@
#showContentLanguage($locale.language)
#showRSSAutodiscoveryLink()
#showRSDLink()
+ <link rel="stylesheet" type="text/css" href="$ctxPath/themes/base.css" />
<script type="text/javascript" src="$ctxPath/theme/scripts/roller.js"></script>
<title>#showWebsiteTitle() : #showPageName()</title><title>Brushed Metal: It Worked!</title>
<style type="text/css">
@@ -19,7 +20,6 @@
<div id="content">
<p><center>#showWeblogCategoryChooser()</center></p>
#displayWeblogEntries()
- #showNextPreviousLinks()
<br />
<br />
<br />
Modified: incubator/roller/trunk/web/themes/pacifica/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/pacifica/Weblog.vm?rev=376160&r1=376159&r2=376160&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/pacifica/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/pacifica/Weblog.vm Wed Feb 8 18:58:16 2006
@@ -82,7 +82,6 @@
bordercolor="99ccff" bgcolor="#99ccff">
#showWeblogCategoryChooser()<br>
- #showNextPreviousLinks()
#displayWeblogEntries()
<br>
Modified: incubator/roller/trunk/web/themes/robot/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/robot/Weblog.vm?rev=376160&r1=376159&r2=376160&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/robot/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/robot/Weblog.vm Wed Feb 8 18:58:16 2006
@@ -27,7 +27,6 @@
<p class="descrip">#showWebsiteDescription()</p>
#showWeblogCategoryChooser()<br>
</center>
- #showNextPreviousLinks()
#displayWeblogEntries()
<hr />
#showReferers( 40 25 )
Modified: incubator/roller/trunk/web/themes/rolling/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/rolling/Weblog.vm?rev=376160&r1=376159&r2=376160&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/rolling/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/rolling/Weblog.vm Wed Feb 8 18:58:16 2006
@@ -5,7 +5,6 @@
<h2>#showWebsiteTitle()</h2>
#showWeblogCategoryChooser()
</div>
- #showNextPreviousLinks()
#displayWeblogEntries()<br/>
#includePage("_badges")
</div>
Modified: incubator/roller/trunk/web/themes/sotto/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/sotto/Weblog.vm?rev=376160&r1=376159&r2=376160&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/sotto/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/sotto/Weblog.vm Wed Feb 8 18:58:16 2006
@@ -64,7 +64,6 @@
<div id="midColumn">
<div class="standardSpacer"> </div>
- #showNextPreviousLinks()
#displayWeblogEntries()
</div>
Modified: incubator/roller/trunk/web/themes/sunsets/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/sunsets/Weblog.vm?rev=376160&r1=376159&r2=376160&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/sunsets/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/sunsets/Weblog.vm Wed Feb 8 18:58:16 2006
@@ -77,7 +77,6 @@
#showWeblogCategoryChooser()
- #showNextPreviousLinks()
<div id="entries">
#displayWeblogEntries()
</div>
Modified: incubator/roller/trunk/web/themes/werner/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/werner/Weblog.vm?rev=376160&r1=376159&r2=376160&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/werner/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/werner/Weblog.vm Wed Feb 8 18:58:16 2006
@@ -19,7 +19,6 @@
<h2>#showWebsiteTitle()</h2>
#showWeblogCategoryChooser()
</div>
- #showNextPreviousLinks()
#displayWeblogEntries()<br/>
</div>
Modified: incubator/roller/trunk/web/themes/x2/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/themes/x2/Weblog.vm?rev=376160&r1=376159&r2=376160&view=diff
==============================================================================
--- incubator/roller/trunk/web/themes/x2/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/x2/Weblog.vm Wed Feb 8 18:58:16 2006
@@ -28,7 +28,6 @@
<h1>#showWebsiteTitle()</h1>
#showWeblogCategoryChooser()
- #showNextPreviousLinks()
<div id="entries">
#displayWeblogEntries()
</div>