Index: openacs-4/packages/lars-blogger/lars-blogger.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/lars-blogger.info,v
diff -u -r1.35.2.4 -r1.35.2.5
--- openacs-4/packages/lars-blogger/lars-blogger.info 20 Apr 2005 08:23:09 -0000 1.35.2.4
+++ openacs-4/packages/lars-blogger/lars-blogger.info 7 Oct 2005 08:19:53 -0000 1.35.2.5
@@ -7,14 +7,14 @@
<initial-install-p>f</initial-install-p>
<singleton-p>f</singleton-p>
- <version name="2.1.2d1" url="http://openacs.org/repository/download/apm/lars-blogger-2.1.2d1.apm">
+ <version name="2.1.2d2" url="http://openacs.org/repository/download/apm/lars-blogger-2.1.2d2.apm">
<owner url="mailto:lars@pinds.com">Lars Pind</owner>
<summary>Individual or collaborative web logs.</summary>
<release-date>2004-02-11</release-date>
<vendor url="http://www.collaboraid.biz">Collaboraid</vendor>
<description format="text/html">Weblog creation and management with notifications, RSS, trackpack, technorati, blogroll, pings, archives, draft and published entries, includable templates for presenting on other pages, and permissioning for multiple users.</description>
- <provides url="lars-blogger" version="2.1.2d1"/>
+ <provides url="lars-blogger" version="2.1.2d2"/>
<requires url="acs-datetime" version="4.0"/>
<requires url="acs-tcl" version="5.0.1"/>
<requires url="general-comments" version="4.0"/>
@@ -46,6 +46,7 @@
<parameter datatype="string" min_n_values="1" max_n_values="1" name="public_url" description="The public URL for this blog (in case you've put the blog on your front page, for example)"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="rss_file_name" default="rss.xml" description="What name should we advertise the RSS feed under, relative to the blog mount point. Leave blank if no RSS feed." section_name="rss"/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="rss_max_description_length" default="500" description="Maximum length of entry included in the 'description' part of the RSS feed. 0 means no truncation." section_name="rss"/>
+ <parameter datatype="number" min_n_values="1" max_n_values="1" name="ShowArchiveP" default="1" description="Show archive calendar"/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="ShowPosterP" default="1" description="Show who posted the entry and when"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="StylesheetURL" default="/resources/lars-blogger/lars-blogger.css" description="The url to the stylesheet used in conjunction with the weblog instance."/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="TechnoratiApiCosmosNumber" default="40" description="Number of entries to retrieve in Cosmos calls. The includelet can decide to display a different number of entries." section_name="technorati"/>
Index: openacs-4/packages/lars-blogger/www/blog-months.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog-months.tcl,v
diff -u -r1.4 -r1.4.4.1
--- openacs-4/packages/lars-blogger/www/blog-months.tcl 28 Aug 2003 09:41:55 -0000 1.4
+++ openacs-4/packages/lars-blogger/www/blog-months.tcl 7 Oct 2005 08:19:53 -0000 1.4.4.1
@@ -1,12 +1,15 @@
-set package_id [ad_conn package_id]
+if { ![info exist package_id] } {
+ set package_id [ad_conn package_id]
+}
+set package_url [lindex [site_node::get_url_from_object_id -object_id $package_id] 0]
if [empty_string_p $screen_name] {
db_multirow -extend { url } months all_blog_months { *SQL* } {
- set url "[ad_conn package_url]archive/$month_url_stub"
+ set url "${package_url}archive/$month_url_stub"
}
} else {
db_multirow -extend { url } months one_blog_months { *SQL* } {
- set url "[ad_conn package_url]user/$screen_name/archive/$month_url_stub"
+ set url "${package_url}user/$screen_name/archive/$month_url_stub"
}
}
Index: openacs-4/packages/lars-blogger/www/blog-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog-postgresql.xql,v
diff -u -r1.11 -r1.11.2.1
--- openacs-4/packages/lars-blogger/www/blog-postgresql.xql 27 Feb 2004 18:30:59 -0000 1.11
+++ openacs-4/packages/lars-blogger/www/blog-postgresql.xql 7 Oct 2005 08:19:53 -0000 1.11.2.1
@@ -42,7 +42,7 @@
as entry_date_ansi,
to_char(current_timestamp,'YYYY-MM-DD HH24:MI:SS')
as sysdate_ansi,
- title,
+ e.title,
title_url,
e.category_id,
com.category_id as sw_category_id,
@@ -64,7 +64,7 @@
left outer join category_object_map com
on (com.object_id = e.entry_id)
$sw_category_filter_join_clause
- where package_id = :package_id
+ where e.package_id = :package_id
[ad_decode $date_clause "" "" "and $date_clause"]
and draft_p = 'f'
and deleted_p = 'f'
Index: openacs-4/packages/lars-blogger/www/calendar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/calendar.tcl,v
diff -u -r1.5 -r1.5.4.1
--- openacs-4/packages/lars-blogger/www/calendar.tcl 29 Sep 2003 08:05:42 -0000 1.5
+++ openacs-4/packages/lars-blogger/www/calendar.tcl 7 Oct 2005 08:19:53 -0000 1.5.4.1
@@ -14,11 +14,13 @@
set calendar_details [ns_set create calendar_details]
-set package_url [lars_blog_public_package_url]
+if { ![info exist package_id] } {
+ set package_id [ad_conn package_id]
+}
+
+set package_url [lars_blog_public_package_url -package_id $package_id]
set month_number [clock format [clock scan $date] -format %m]
-set package_id [ad_conn package_id]
-
if {[empty_string_p $screen_name]} {
db_foreach all_entry_dates { * SQL * } {
ns_set put $calendar_details $entry_date_julian "1"
Index: openacs-4/packages/lars-blogger/www/entry-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-chunk.tcl,v
diff -u -r1.19.2.2 -r1.19.2.3
--- openacs-4/packages/lars-blogger/www/entry-chunk.tcl 20 Apr 2005 14:27:43 -0000 1.19.2.2
+++ openacs-4/packages/lars-blogger/www/entry-chunk.tcl 7 Oct 2005 08:19:53 -0000 1.19.2.3
@@ -53,7 +53,7 @@
lars_blogger::entry::htmlify \
-max_content_length $max_content_length \
- -more [ad_decode [ad_return_url] $blog(permalink_url) {} "<p><a href=\"[ad_quotehtml $blog(permalink_url)]\">Continued...</a>"] \
+ -more [ad_decode [ad_return_url] $blog(permalink_url) {} " <a href=\"[ad_quotehtml $blog(permalink_url)]\">Continued...</a>"] \
-array blog
Index: openacs-4/packages/lars-blogger/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/index.adp,v
diff -u -r1.34.2.3 -r1.34.2.4
--- openacs-4/packages/lars-blogger/www/index.adp 1 Jun 2005 05:39:57 -0000 1.34.2.3
+++ openacs-4/packages/lars-blogger/www/index.adp 7 Oct 2005 08:19:53 -0000 1.34.2.4
@@ -38,10 +38,11 @@
<div id="lars_blogger_left">
<div class="lars_blogger_content_table">
- <include src="blog" type="@type@" archive_interval="@interval@" archive_date="@archive_date@" screen_name="@screen_name@" category_id="@category_id@" sw_category_id="@sw_category_id@" max_content_length="0">
+ <include src="blog" type="@type@" archive_interval="@interval@" archive_date="@archive_date@" screen_name="@screen_name@" category_id="@category_id@" sw_category_id="@sw_category_id@" max_content_length="">
</div>
</div>
+ <if @show_archive_p@ true>
<div id="lars_blogger_right">
<div class="lars_blogger_portlet">
<h2>#lars-blogger.Archive#</h2>
@@ -114,7 +115,16 @@
</div>
</include-optional>
- </div>
+ </div>
+ </if>
+ <else>
+ <if @notification_chunk@ not nil>
+ <div class="lars_blogger_portlet">
+ <h2>#lars-blogger.Notifications#</h2>
+ @notification_chunk;noquote@
+ </div>
+ </if>
+ </else>
</else>
Index: openacs-4/packages/lars-blogger/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/index.tcl,v
diff -u -r1.22.2.4 -r1.22.2.5
--- openacs-4/packages/lars-blogger/www/index.tcl 20 Apr 2005 14:27:43 -0000 1.22.2.4
+++ openacs-4/packages/lars-blogger/www/index.tcl 7 Oct 2005 08:19:53 -0000 1.22.2.5
@@ -20,6 +20,7 @@
set package_url_with_extras $package_url
set index_page_p 1
+set show_archive_p [parameter::get -parameter "ShowArchiveP"]
set context [list]
set context_base_url $package_url