Return-Path: Delivered-To: apmail-incubator-roller-commits-archive@www.apache.org Received: (qmail 36825 invoked from network); 23 Mar 2006 05:20:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 23 Mar 2006 05:20:44 -0000 Received: (qmail 21974 invoked by uid 500); 23 Mar 2006 05:20:44 -0000 Delivered-To: apmail-incubator-roller-commits-archive@incubator.apache.org Received: (qmail 21939 invoked by uid 500); 23 Mar 2006 05:20:43 -0000 Mailing-List: contact roller-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: roller-dev@incubator.apache.org Delivered-To: mailing list roller-commits@incubator.apache.org Received: (qmail 21928 invoked by uid 99); 23 Mar 2006 05:20:43 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Mar 2006 21:20:43 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 22 Mar 2006 21:20:42 -0800 Received: (qmail 36761 invoked by uid 65534); 23 Mar 2006 05:20:22 -0000 Message-ID: <20060323052022.36760.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r388043 - in /incubator/roller/trunk: tools/buildtime/velocidoc-templates/roller-overview.vm web/WEB-INF/classes/weblog.vm Date: Thu, 23 Mar 2006 05:20:22 -0000 To: roller-commits@incubator.apache.org From: snoopdave@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: snoopdave Date: Wed Mar 22 21:20:19 2006 New Revision: 388043 URL: http://svn.apache.org/viewcvs?rev=388043&view=rev Log: Fixed formatting, bumped up version number Modified: incubator/roller/trunk/tools/buildtime/velocidoc-templates/roller-overview.vm incubator/roller/trunk/web/WEB-INF/classes/weblog.vm Modified: incubator/roller/trunk/tools/buildtime/velocidoc-templates/roller-overview.vm URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/tools/buildtime/velocidoc-templates/roller-overview.vm?rev=388043&r1=388042&r2=388043&view=diff ============================================================================== --- incubator/roller/trunk/tools/buildtime/velocidoc-templates/roller-overview.vm (original) +++ incubator/roller/trunk/tools/buildtime/velocidoc-templates/roller-overview.vm Wed Mar 22 21:20:19 2006 @@ -37,7 +37,7 @@ -

Velocidocs: Roller Weblogger 2.0

Velocidocs: Roller Weblogger 2.2

Roller users guide to Velocity Macros. Automatically generated by Velocidoc. 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=388043&r1=388042&r2=388043&view=diff ============================================================================== --- incubator/roller/trunk/web/WEB-INF/classes/weblog.vm (original) +++ incubator/roller/trunk/web/WEB-INF/classes/weblog.vm Wed Mar 22 21:20:19 2006 @@ -4,53 +4,49 @@ * @author David M Johnson (comment macros) *# - -#** ======================================================================== *# -#** 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. - * + *

* This macro allows Roller to support five different types of blog displays: - * - * Current day page - * /page// + *

+ * 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//YYYYMMDD - * On a day page, Roller will show all of the entries for a specific + *

+ * 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//YYYYMM - * On a month page, Roller will show the most recent N blog entries in + *

+ * 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/?entry= - * On an entry page, one entry is shown. The next/prev links link to the + *

+ * 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/?q=

- * If there are search results, then this macro will show them using the + *

+ * Search page
+ * /page/?q=

+ *

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) @@ -140,9 +136,9 @@ #end -#** ======================================================================== *# -#** Next / previous links macros *# -#** ======================================================================== *# +## ======================================================================== +## Next / previous links macros +## ======================================================================== #** * Displays next previous links, called by #showWeblogEntries(). @@ -214,9 +210,9 @@ #end -#** ======================================================================== *# -#** Individual weblog entry display macros *# -#** ======================================================================== *# +## ======================================================================== +## Individual weblog entry display macros +## ======================================================================== #** @@ -375,9 +371,9 @@ #end -#** ======================================================================== *# -#** Search form and results macros *# -#** ======================================================================== *# +## ======================================================================== +## Search form and results macros +## ======================================================================== #** @@ -477,9 +473,9 @@ #end -#** ======================================================================== *# -#** Other macros *# -#** ======================================================================== *# +## ======================================================================== +## Other macros +## ======================================================================== #** @@ -534,9 +530,9 @@ #end -#** ======================================================================== *# -#** Deprecated macros *# -#** ======================================================================== *# +## ======================================================================== +## Deprecated macros +## ======================================================================== #**