Author: snoopdave
Date: Tue Feb 14 05:33:10 2006
New Revision: 377722
URL: http://svn.apache.org/viewcvs?rev=377722&view=rev
Log:
Comments and a small fix in the next/prev control
Modified:
incubator/roller/trunk/web/WEB-INF/classes/weblog.vm
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=377722&r1=377721&r2=377722&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/weblog.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/weblog.vm Tue Feb 14 05:33:10
2006
@@ -9,25 +9,46 @@
#** Display recent entries macros *#
#** ======================================================================== *#
-
#**
* Shows weblog entries from specified category 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 on the Preferences:Settings page.
- *
- * 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)
+ * This macro allows Roller to support five different types of blog displays:
*
- * 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.
- *
+ * Current day page
+ * /page/<handle>/
+ * On the current day page, Roller will show the most recent N blog
+ * entries (not just those for the day).
+ * At the end of the page, a previous link points to day page of entries
+ * before the ones shown (and the link is displayed as the day's date).
+ * This works exactly as before.
+ *
+ * Day page
+ * /page/<handle>/YYYYMMDD
+ * On a day page, Roller will show all of the entries for a specific
+ * day. At the end of the page, a next/previous link allows navigation
+ * to next and previous day of entries (and the links are displayed as
+ * the day's dates). Before, day pages always showed N entries (where
+ * usually N=15), but now they'll show only a day's worth (e.g. 1-3
+ * entries).
+ *
+ * Month page
+ * /page/<handle>/YYYYMM
+ * On a month page, Roller will show the most recent N blog entries in
+ * the month. At the end of the page, a previous link points to day page
+ * of entries before the ones shown. This is new; we didn't have month
+ * pages before.
+ *
+ * Entry page
+ * /page/<handle>?entry=<anchor>
+ * On an entry page, one entry is shown. The next/prev links link to the
+ * next and previous entries (and the links are displayed as the entry
+ * titles, nicely truncated). This one also works exactly as before.
+ *
+ * Search page
+ * /page/<handle>?q=<search terms>
* If there are search results, then this macro will show them using the
* current weblog's day template.
*
@@ -140,7 +161,7 @@
#if ($pageModel.nextEntry)
#showNextWeblogLink($npcat) |
#end
- #if (($pageModel.previousEntry && $pageModel.nextEntry) ||
$pageModel.nextEntry)
+ #if (($pageModel.previousEntry && $pageModel.nextEntry) ||
$pageModel.previousEntry)
<a href="${ctxPath}/page/${website.handle}$catLink">$page.name</a> |
#end
#if ($pageModel.previousEntry)
