Index: nb =================================================================== RCS file: /cvsroot/nanoblogger/nanoblogger/nb,v retrieving revision 1.279 diff -u -3 -p -r1.279 nb --- nb 6 Aug 2006 01:37:20 -0000 1.279 +++ nb 30 Aug 2006 16:16:41 -0000 @@ -382,6 +382,9 @@ if [ ! -z "${CAT_LIST[*]}" ]; then load_plugins archive/category paginate all "$cat_arch" "$MAX_CATPAGE_ENTRIES" "$CATEGORY_TEMPLATE" \ "$CATENTRY_TEMPLATE" "$BLOG_DIR/$ARCHIVES_DIR/" "$category_file" + # Nijel: generate simple listing + paginate all "$cat_arch" "$MAX_CATPAGE_INC_ENTRIES" "$CATEGORY_INC_TEMPLATE" \ + "$CATENTRY_INC_TEMPLATE" "$BLOG_DIR/$ARCHIVES_DIR/" "$category_inc_file" fi done fi Index: nb.conf =================================================================== RCS file: /cvsroot/nanoblogger/nanoblogger/nb.conf,v retrieving revision 1.12 diff -u -3 -p -r1.12 nb.conf --- nb.conf 30 Jul 2006 04:11:15 -0000 1.12 +++ nb.conf 30 Aug 2006 16:16:41 -0000 @@ -26,3 +26,5 @@ PERMALINKENTRY_TEMPLATE="permalink_entry METADATAFILE_TEMPLATE="file.metadata" METADATAENTRY_TEMPLATE="entry.metadata" +CATENTRY_INC_TEMPLATE="category_inc_entry.htm" +CATEGORY_INC_TEMPLATE="category_inc_archive.htm" Index: lib/config.sh =================================================================== RCS file: /cvsroot/nanoblogger/nanoblogger/lib/config.sh,v retrieving revision 1.29 diff -u -3 -p -r1.29 config.sh --- lib/config.sh 31 Jul 2006 22:32:29 -0000 1.29 +++ lib/config.sh 30 Aug 2006 16:16:42 -0000 @@ -19,12 +19,12 @@ load_globals(){ : ${NB_LANG:=en} } -# loads global and user configurations +# loads global and user configurations load_config(){ # set deprecated BASE_DIR for temporary compatibility BASE_DIR="$NB_BASE_DIR" load_globals -# allow user specified weblog directories +# allow user specified weblog directories [ ! -z "$USR_BLOGDIR" ] && BLOG_DIR="$USR_BLOGDIR" # auto-detect blog.conf from our CWD [ -z "$USR_BLOGDIR" ] && [ -f "$PWD/blog.conf" ] && @@ -127,10 +127,12 @@ fi : ${MAX_ENTRIES:=10} : ${MAX_PAGE_ENTRIES:=$MAX_ENTRIES} : ${MAX_CATPAGE_ENTRIES:=$MAX_PAGE_ENTRIES} +: ${MAX_CATPAGE_INC_ENTRIES:=$MAX_PAGE_ENTRIES} : ${MAX_MONTHPAGE_ENTRIES:=$MAX_PAGE_ENTRIES} : ${MAX_MAINPAGE_ENTRIES:=$MAX_PAGE_ENTRIES} # defaults for index file name : ${NB_INDEXFILE:=index.$NB_FILETYPE} +: ${NB_INC_INDEXFILE:=index-include.$NB_FILETYPE} # check if we need to append directory index file to links if [ "$SHOW_INDEXFILE" = 1 ]; then NB_INDEX=$NB_INDEXFILE --- /dev/null 2006-08-14 10:52:24.904056500 +0200 +++ default/templates/category_inc_entry.htm 2006-05-29 13:59:04.000000000 +0200 @@ -0,0 +1 @@ +