Index: openacs-4/packages/lars-blogger/lib/last-n-comments.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/lib/last-n-comments.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/lib/last-n-comments.adp 13 Dec 2003 20:06:14 -0000 1.1 +++ openacs-4/packages/lars-blogger/lib/last-n-comments.adp 14 Dec 2003 11:10:43 -0000 1.2 @@ -1,5 +1,5 @@
    - +
  1. @comments.item_author@: @comments.title@
    2. -     +
Index: openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-create.sql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-create.sql 17 Oct 2003 00:39:22 -0000 1.5 +++ openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-create.sql 14 Dec 2003 11:10:43 -0000 1.6 @@ -45,7 +45,6 @@ constraint pinds_blog_entr_cnt_format_nn not null, entry_date date, - posted_date date, draft_p char(1) default 'f' constraint pinds_blog_entries_draft_ck check (draft_p in ('t','f')), @@ -84,7 +83,20 @@ unique (package_id, user_id) ); +create table weblogger_ping_urls ( + package_id integer + constraint weblogger_ping_urls_package_id_fk + references apm_packages(package_id) + on delete cascade, + ping_url varchar2(500) + constraint weblogger_ping_urls_ping_url_nn + not null, + creation_date date default sysdate, + constraint weblogger_ping_urls_pk + primary key(package_id, ping_url) +); + @@ lars-blogger-package-create @@ rss-register @@ notifications-init Index: openacs-4/packages/lars-blogger/sql/oracle/upgrade/upgrade-1.0a3-1.0a4.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/oracle/upgrade/upgrade-1.0a3-1.0a4.sql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/lars-blogger/sql/oracle/upgrade/upgrade-1.0a3-1.0a4.sql 14 Dec 2003 11:10:44 -0000 1.1 @@ -0,0 +1,22 @@ +-- Add a table for ping URLs i.e. services that use the weblogs.com +-- ping interface. +create table weblogger_ping_urls ( + package_id integer + constraint weblogger_ping_urls_package_id_fk + references apm_packages(package_id) + on delete cascade, + ping_url varchar2(500) + constraint weblogger_ping_urls_ping_url_nn + not null, + creation_date date default sysdate, + constraint weblogger_ping_urls_pk + primary key(package_id, ping_url) +); + + +-- Merge entry_date and posted_date column +update pinds_blog_entries +set entry_date = to_date(to_char(entry_date, 'YYYY-MM-DD') || ' ' || to_char(posted_date, 'HH24:MI:SS'), 'YYYY-MM-DD HH24:MI:SS'); + +alter table pinds_blog_entries drop column posted_date; + Index: openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-create.sql,v diff -u -r1.10 -r1.11 --- openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-create.sql 13 Dec 2003 20:02:28 -0000 1.10 +++ openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-create.sql 14 Dec 2003 11:10:44 -0000 1.11 @@ -41,7 +41,6 @@ constraint pinds_blog_entr_cnt_format_nn not null, entry_date timestamptz, - posted_date timestamptz, draft_p char(1) default 'f' constraint pinds_blog_entries_draft_ck check (draft_p in ('t','f')), Index: openacs-4/packages/lars-blogger/sql/postgresql/upgrade/upgrade-1.0a3-1.0a4.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/postgresql/upgrade/Attic/upgrade-1.0a3-1.0a4.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/lars-blogger/sql/postgresql/upgrade/upgrade-1.0a3-1.0a4.sql 13 Dec 2003 20:02:28 -0000 1.2 +++ openacs-4/packages/lars-blogger/sql/postgresql/upgrade/upgrade-1.0a3-1.0a4.sql 14 Dec 2003 11:10:44 -0000 1.3 @@ -13,3 +13,11 @@ constraint weblogger_ping_urls_pk primary key(package_id, ping_url) ); + + +-- Merge entry_date and posted_date column +update pinds_blog_entries +set entry_date = to_timestamp(to_char(entry_date, 'YYYY-MM-DD') || ' ' || to_char(posted_date, 'HH24:MI:SS'), 'YYYY-MM-DD HH24:MI:SS'); + +alter table pinds_blog_entries drop column posted_date; + Index: openacs-4/packages/lars-blogger/tcl/blogger-api-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/blogger-api-procs-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/tcl/blogger-api-procs-oracle.xql 8 Dec 2003 05:55:53 -0000 1.1 +++ openacs-4/packages/lars-blogger/tcl/blogger-api-procs-oracle.xql 14 Dec 2003 11:10:44 -0000 1.2 @@ -6,15 +6,14 @@ select * from - ( select entry_id, - to_char(entry_date, 'YYYY-MM-DD') as entry_date, - content, - to_char(posted_date , 'HH24:MI') as posted_time_pretty - from pinds_blog_entries - and package_id = :package_id - and draft_p = 'f' - and deleted_p = 'f' - order by entry_date desc, posted_date desc + (select entry_id, + to_char(entry_date, 'YYYY-MM-DD HH24:MI:SS') as entry_date_ansi + content, + from pinds_blog_entries + and package_id = :package_id + and draft_p = 'f' + and deleted_p = 'f' + order by entry_date desc ) where rownum <= :numberOfPosts Index: openacs-4/packages/lars-blogger/tcl/blogger-api-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/blogger-api-procs-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/tcl/blogger-api-procs-postgresql.xql 8 Dec 2003 05:55:52 -0000 1.1 +++ openacs-4/packages/lars-blogger/tcl/blogger-api-procs-postgresql.xql 14 Dec 2003 11:10:44 -0000 1.2 @@ -6,14 +6,13 @@ select entry_id, - to_char(entry_date, 'YYYY-MM-DD') as entry_date, + to_char(entry_date, 'YYYY-MM-DD HH24:MI:SS') as entry_date_ansi content, - to_char(posted_date , 'HH24:MI') as posted_time_pretty - from pinds_blog_entries - where package_id = :package_id - and draft_p = 'f' - and deleted_p = 'f' - order by entry_date desc, posted_date desc + from pinds_blog_entries + where package_id = :package_id + and draft_p = 'f' + and deleted_p = 'f' + order by entry_date desc limit $numberOfPosts Index: openacs-4/packages/lars-blogger/tcl/blogger-api-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/blogger-api-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/tcl/blogger-api-procs.tcl 8 Dec 2003 05:55:52 -0000 1.1 +++ openacs-4/packages/lars-blogger/tcl/blogger-api-procs.tcl 14 Dec 2003 11:10:44 -0000 1.2 @@ -272,16 +272,13 @@ array set e [list] - if { ![catch {lars_blogger::entry::get -entry_id $entry_id -array e} errmsg] } { - # put the date in readable format - set posted_date "$e(entry_date) $e(posted_time_pretty)" - + if { ![catch { lars_blogger::entry::get -entry_id $entry_id -array e } errmsg] } { array set struct [list] # note: Blogger has no space for title, so we ignore title set struct(content) [list -string "$e(content)"] set struct(userid) [list -string $user_id] set struct(postid) [list -string $entry_id] - set struct(dateCreated) [list -date $posted_date] + set struct(dateCreated) [list -date $entry_date_ansi] } return [list -struct [array get struct]] @@ -322,12 +319,11 @@ db_foreach get_n_entries {} { # put the date in readable format - set posted_date "${entry_date} ${posted_time_pretty}" array unset struct set struct(content) [list -string $content] set struct(postid) [list -string $entry_id] set struct(userid) [list -string $user_id] - set struct(dateCreated) [list -date $posted_date] + set struct(dateCreated) [list -date $entry_date_ansi] lappend return_array [list -struct [array get struct]] } Index: openacs-4/packages/lars-blogger/tcl/entry-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/entry-procs-oracle.xql,v diff -u -r1.7 -r1.8 --- openacs-4/packages/lars-blogger/tcl/entry-procs-oracle.xql 13 Dec 2003 17:13:34 -0000 1.7 +++ openacs-4/packages/lars-blogger/tcl/entry-procs-oracle.xql 14 Dec 2003 11:10:44 -0000 1.8 @@ -13,7 +13,7 @@ title_url => :title_url, content => :content, content_format => :content_format, - entry_date => nvl(to_date(:entry_date, 'YYYY-MM-DD'), sysdate), + entry_date => nvl(to_date(:entry_date, 'YYYY-MM-DD HH24:MI:SS'), sysdate), draft_p => :draft_p, creation_user => :creation_user, creation_ip => :creation_ip @@ -34,11 +34,9 @@ b.content_format, b.draft_p, o.creation_user as user_id, - to_char(b.entry_date, 'YYYY-MM-DD') as entry_date, - to_char(b.entry_date, 'fmDayfm, fmMonthfm fmDDfm, YYYY') as entry_date_pretty, + to_char(b.entry_date, 'YYYY-MM-DD HH24:MI:SS') as entry_date_ansi, p.first_names as poster_first_names, p.last_name as poster_last_name, - to_char(b.posted_date , 'HH24:MI') as posted_time_pretty, b.package_id, (select count(gc.comment_id) from general_comments gc, cr_revisions cr @@ -59,10 +57,8 @@ update pinds_blog_entries - set entry_date = trunc(sysdate), - draft_p = 'f', - posted_date = sysdate - where entry_id = :entry_id + set draft_p = 'f' + where entry_id = :entry_id @@ -74,8 +70,7 @@ r.mime_type, o.creation_user, acs_object.name(o.creation_user) as author, - to_char(o.creation_date, 'MM-DD-YYYY') as pretty_date, - to_char(o.creation_date, 'Month DD, YYYY HH12:MI PM') as pretty_date2, + to_char(o.creation_date, 'YYYY-MM-DD HH24:MI:SS') as creation_date_ansi, case when tb.comment_id is not null then 't' else 'f' end as trackback_p, tb.tb_url as trackback_url, nvl(tb.name, tb.tb_url) as trackback_name Index: openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql,v diff -u -r1.7 -r1.8 --- openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql 13 Dec 2003 17:13:34 -0000 1.7 +++ openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql 14 Dec 2003 11:10:44 -0000 1.8 @@ -13,7 +13,7 @@ :category_id, :content, :content_format, - coalesce(to_date(:entry_date, 'YYYY-MM-DD'), current_timestamp), + coalesce(to_timestamp(:entry_date, 'YYYY-MM-DD HH24:MI:SS'), current_timestamp), :draft_p, :creation_user, :creation_ip @@ -33,11 +33,9 @@ b.content_format, b.draft_p, o.creation_user as user_id, - to_char(b.entry_date, 'YYYY-MM-DD') as entry_date, - to_char(b.entry_date, 'fmDayfm, fmMonthfm fmDDfm, YYYY') as entry_date_pretty, + to_char(b.entry_date, 'YYYY-MM-DD HH24:MI:SS') as entry_date_ansi, p.first_names as poster_first_names, p.last_name as poster_last_name, - to_char(b.posted_date , 'HH24:MI') as posted_time_pretty, b.package_id, (select count(gc.comment_id) from general_comments gc, cr_revisions cr @@ -57,9 +55,7 @@ update pinds_blog_entries - set entry_date = date_trunc('day', current_timestamp), - draft_p = 'f', - posted_date = current_timestamp + set draft_p = 'f' where entry_id = :entry_id @@ -73,12 +69,11 @@ r.mime_type, o.creation_user, acs_object__name(o.creation_user) as author, - to_char(o.creation_date, 'MM-DD-YYYY') as pretty_date, - to_char(o.creation_date, 'Month DD, YYYY HH12:MI PM') as pretty_date2, + to_char(o.creation_date, 'YYYY-MM-DD HH24:MI:SS') as creation_date_ansi, case when tb.comment_id is not null then 't' else 'f' end as trackback_p, tb.tb_url as trackback_url, coalesce(tb.name, tb.tb_url) as trackback_name - from general_comments g left join trackback_pings tb on g.comment_id=tb.comment_id, + from general_comments g left join trackback_pings tb on g.comment_id = tb.comment_id, cr_revisions r, cr_items ci, acs_objects o Index: openacs-4/packages/lars-blogger/tcl/entry-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/entry-procs.tcl,v diff -u -r1.14 -r1.15 --- openacs-4/packages/lars-blogger/tcl/entry-procs.tcl 13 Dec 2003 20:04:11 -0000 1.14 +++ openacs-4/packages/lars-blogger/tcl/entry-procs.tcl 14 Dec 2003 11:10:44 -0000 1.15 @@ -32,24 +32,78 @@ } # If publish directly, fire off notifications and ping weblogs.com - if { [string equal $draft_p "f"] } { + if { ![template::util::is_true $draft_p] } { lars_blogger::entry::publish \ -entry_id $entry_id \ -package_id $package_id \ -no_update } + lars_blog_flush_cache $package_id + return $entry_id } +ad_proc -public lars_blogger::entry::edit { + {-entry_id:required} + {-title:required} + {-title_url ""} + {-category_id ""} + {-content:required} + {-content_format:required} + {-entry_date:required} + {-draft_p:required} +} { + Edit the blog entry and then optionally perform notifications + and RSS operations if the blog was a draft before and now is + being published. + + @param entry_date Date of the entry in full ANSI format (YYYY-MM-DD HH24:MI:SS) + + @return entry_id of edited entry + + @author Vinod Kurup vinod@kurup.com + @creation-date 2003-10-04 +} { + set set_clauses { + "title = :title" + "title_url = :title_url" + "category_id = :category_id" + "content = :content" + "content_format = :content_format" + "entry_date = to_date(:entry_date, 'YYYY-MM-DD HH24:MI:SS')" + "draft_p = :draft_p" + } + + # Get old values first -- need draft_p and package_id + lars_blogger::entry::get -entry_id $entry_id -array entry + + db_dml update_entry {} + + # Is this a publish? + if { [template::util::is_true $draft_p "t"] && ![template::util::is_true $entry(draft_p)] } { + lars_blogger::entry::publish -entry_id $entry_id -package_id $entry(package_id) + } + + lars_blog_flush_cache $entry(package_id) + + return $entry_id +} + ad_proc -public lars_blogger::entry::get { -entry_id:required -array:required } { + Get a blog entry. Also sets entry_date_pretty, package_url, permalink_url entries. +} { # Select the info into the upvar'ed Tcl Array upvar $array row db_1row select_entry {} -column_array row + + set row(entry_date_pretty) [lc_time_fmt $row(entry_date_ansi) "%q %X"] + set row(package_url) [lars_blog_public_package_url -package_id $row(package_id)] + set row(permalink_url) [export_vars -base "${row(package_url)}one-entry" { entry_id }] } ad_proc -public lars_blogger::entry::publish { @@ -58,6 +112,13 @@ {-no_update:boolean} {-redirect_url ""} } { + if { [empty_string_p $package_id] } { + # can't just use ad_conn package_id since the + # request may be coming via XML-RPC + lars_blogger::entry::get -entry_id $entry_id -array entry + set package_id $entry(package_id) + } + if { !$no_update_p } { # Set draft_p = 'f' db_dml update_entry {} @@ -121,7 +182,7 @@ } { upvar $array row - set row(title) [ad_quotehtml $row(title)] + set row(title) $row(title) # LARS: # Not sure we should do the ns_adp_parse thing here, but heck, why not @@ -130,6 +191,8 @@ set row(content) [ad_html_text_convert -from $row(content_format) -to "text/html" -- $row(content)] + set row(entry_date_pretty) [lc_time_fmt $row(entry_date_ansi) "%q %X"] + # We wrap this in a catch so if it bombs, at least we won't break any pages catch { set row(content) [ns_adp_parse -string $row(content)] @@ -157,14 +220,15 @@ set blog_name [lars_blog_name -package_id $blog(package_id)] set new_content "" - append new_content "$blog(poster_first_names) $blog(poster_last_name) posted to $blog_name at $blog(posted_time_pretty) on $blog(entry_date_pretty):\n\n" append new_content "$blog(title)\n[string repeat "-" [string length $blog(title)]]\n" if { ![empty_string_p $blog(title_url)] } { append new_content "$blog(title_url)\n" } append new_content "\n" append new_content "[ad_convert_to_text -- [ns_adp_parse -string $blog(content)]]\n\n" - append new_content "This entry: $entry_url\n\n" + append new_content "$blog(entry_date_pretty) by $blog(poster_first_names) $blog(poster_last_name)" \n\n + + append new_content "Permalink: $entry_url\n\n" append new_content "$blog_name: $blog_url\n" # Do the notification for the forum @@ -210,6 +274,8 @@ set content_select [db_map content_select] ;# ", r.content" upvar $multirow $multirow - db_multirow $multirow get_comments "" - + db_multirow -extend { pretty_date pretty_date2 } $multirow get_comments {} { + set pretty_date [lc_time_fmt $creation_date_ansi "%x"] + set pretty_date2 [lc_time_fmt $creation_date_ansi "%q %X"] + } } Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/tcl/entry-procs.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl,v diff -u -r1.15 -r1.16 --- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl 11 Dec 2003 21:40:05 -0000 1.15 +++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl 14 Dec 2003 11:10:44 -0000 1.16 @@ -44,6 +44,8 @@ and RSS operations if the blog was a draft before and now is being published. + @param entry_date Date of the entry in full ANSI format (YYYY-MM-DD HH24:MI:SS) + @return entry_id of edited entry @author Vinod Kurup vinod@kurup.com @@ -59,18 +61,12 @@ "category_id = :category_id" "content = :content" "content_format = :content_format" - "entry_date = to_date(:entry_date, 'YYYY-MM-DD')" + "entry_date = to_date(:entry_date, 'YYYY-MM-DD HH24:MI:SS')" "draft_p = :draft_p" } set org_draft_p [db_string org_draft_p {}] - # Is this a publish? - if { [string equal $draft_p "t"] && [string equal $org_draft_p "f"] } { - # set the posted_date to now - lappend set_clauses [db_map now] - } - db_dml update_entry {} # Is this a publish? @@ -120,7 +116,7 @@ # Run it now rss_gen_report $subscr_id - } + } } if { [parameter::get -parameter "user_rss_feed_p" -package_id $package_id -default 0] } { Index: openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.xql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.xql 13 Dec 2003 16:26:33 -0000 1.5 +++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.xql 14 Dec 2003 11:10:44 -0000 1.6 @@ -2,27 +2,6 @@ - - - select package_id from pinds_blog_entries - where entry_id = :entry_id - - - - - - select draft_p from pinds_blog_entries where entry_id = :entry_id - - - - - - update pinds_blog_entries - set [join $set_clauses ", "] - where entry_id = :entry_id - - - select w.channel_id Index: openacs-4/packages/lars-blogger/tcl/metaweblog-api-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/metaweblog-api-procs-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/tcl/metaweblog-api-procs-oracle.xql 8 Dec 2003 05:55:53 -0000 1.1 +++ openacs-4/packages/lars-blogger/tcl/metaweblog-api-procs-oracle.xql 14 Dec 2003 11:10:44 -0000 1.2 @@ -6,18 +6,17 @@ select * from - ( select entry_id, - to_char(entry_date, 'YYYY-MM-DD') as entry_date, - title, - c.name as category, - content, - to_char(posted_date , 'HH24:MI') as posted_time_pretty - from pinds_blog_entries e, pinds_blog_categories c - where e.category_id = c.category_id(+) - and e.package_id = :package_id - and draft_p = 'f' - and deleted_p = 'f' - order by entry_date desc, posted_date desc + (select entry_id, + to_char(entry_date, 'YYYY-MM-DD HH24:MI:SS') as entry_date_ansi, + title, + c.name as category, + content, + from pinds_blog_entries e, pinds_blog_categories c + where e.category_id = c.category_id(+) + and e.package_id = :package_id + and draft_p = 'f' + and deleted_p = 'f' + order by entry_date desc ) where rownum <= $num_posts Index: openacs-4/packages/lars-blogger/tcl/metaweblog-api-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/metaweblog-api-procs-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/tcl/metaweblog-api-procs-postgresql.xql 8 Dec 2003 05:55:53 -0000 1.1 +++ openacs-4/packages/lars-blogger/tcl/metaweblog-api-procs-postgresql.xql 14 Dec 2003 11:10:44 -0000 1.2 @@ -6,18 +6,17 @@ select entry_id, - to_char(entry_date, 'YYYY-MM-DD') as entry_date, + to_char(entry_date, 'YYYY-MM-DD HH24:MI:SS') as entry_date_ansi, title, - c.name as category, + c.name as category, content, - to_char(posted_date , 'HH24:MI') as posted_time_pretty - from pinds_blog_entries e left join pinds_blog_categories c - using (category_id) - where e.package_id = :package_id - and draft_p = 'f' - and deleted_p = 'f' - order by entry_date desc, posted_date desc - limit $num_posts + from pinds_blog_entries e left outer join + pinds_blog_categories c using (category_id) + where e.package_id = :package_id + and draft_p = 'f' + and deleted_p = 'f' + order by entry_date desc + limit $num_posts Index: openacs-4/packages/lars-blogger/tcl/metaweblog-api-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/metaweblog-api-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/lars-blogger/tcl/metaweblog-api-procs.tcl 13 Dec 2003 17:12:57 -0000 1.2 +++ openacs-4/packages/lars-blogger/tcl/metaweblog-api-procs.tcl 14 Dec 2003 11:10:44 -0000 1.3 @@ -188,30 +188,18 @@ array set content [list] lars_blogger::entry::get -entry_id $entry_id -array content - set category [value_if_exists content(category_name)] - - # get the package_id from the entry_id - set package_id [db_string package_id {}] - - # get the permanent URL of this entry - use this as - # the link, guid and comments url - set perm_url "[ad_url][lars_blog_public_package_url -package_id $package_id]one-entry?[export_vars { entry_id }]" - - # put the date in readable format - set posted_date "$content(entry_date) $content(posted_time_pretty)" - return [list -struct \ [list \ title [list -string $content(title)] \ - link [list -string $perm_url] \ + link [list -string $content(permalink_url)] \ postid [list -string $entry_id] \ userid [list -string $user_id] \ description [list -string $content(content)] \ - category [list -string $category] \ + category [list -string $category_name] \ comments [list -string $perm_url] \ guid [list -string $perm_url] \ - pubDate [list -date $posted_date] \ - dateCreated [list -date $posted_date] \ + pubDate [list -date $entry_date_ansi] \ + dateCreated [list -date $entry_date_ansi] \ ]] } @@ -245,21 +233,18 @@ db_foreach get_n_entries {} { set perm_url "${blog_url}[export_vars { entry_id }]" - # put the date in readable format - set posted_date "${entry_date} ${posted_time_pretty}" - set struct [list -struct \ [list \ title [list -string $title] \ link [list -string $perm_url] \ postid [list -string $entry_id] \ userid [list -string $user_id] \ description [list -string $content] \ - category [list -string $category] \ + category [list -string $category_name] \ comments [list -string $perm_url] \ guid [list -string $perm_url] \ - pubDate [list -date $posted_date] \ - dateCreated [list -date $posted_date] \ + pubDate [list -date $entry_date_ansi] \ + dateCreated [list -date $entry_date_ansi] \ ]] lappend result $struct Index: openacs-4/packages/lars-blogger/tcl/rss-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/rss-procs-oracle.xql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/lars-blogger/tcl/rss-procs-oracle.xql 11 Dec 2003 21:40:05 -0000 1.5 +++ openacs-4/packages/lars-blogger/tcl/rss-procs-oracle.xql 14 Dec 2003 11:10:44 -0000 1.6 @@ -15,15 +15,15 @@ from (select entry_id, e.title, e.content, - to_char(e.posted_date, 'YYYY-MM-DD HH24:MI:SS') as posted_time_ansi, + to_char(e.entry_date, 'YYYY-MM-DD HH24:MI:SS') as entry_date_ansi, c.name as category from pinds_blog_entries e, pinds_blog_categories c where e.package_id = :package_id and e.draft_p = 'f' and e.deleted_p = 'f' and c.category_id = e.category_id (+) - order by e.entry_date desc, e.posted_date desc) + order by e.entry_date desc) where rownum < 11 @@ -34,7 +34,7 @@ from (select e.entry_id, e.title, e.content, - to_char(e.posted_date, 'YYYY-MM-DD HH24:MI:SS') as posted_time_ansi, + to_char(e.entry_date, 'YYYY-MM-DD HH24:MI:SS') as entry_date_ansi, c.name as category from pinds_blog_entries e, acs_objects o, @@ -47,14 +47,14 @@ and e.draft_p = 'f' and e.deleted_p = 'f' and c.category_id = e.category_id (+) - order by e.entry_date desc, e.posted_date desc) + order by e.entry_date desc) where rownum < 11 - select nvl ((max(posted_date)-to_date('1970-01-01'))*60*60*24,0) as last_update + select nvl ((max(entry_date)-to_date('1970-01-01'))*60*60*24,0) as last_update from pinds_blog_entries where package_id = :package_id and draft_p = 'f' @@ -64,7 +64,7 @@ - select nvl ((max(posted_date)-to_date('1970-01-01'))*60*60*24,0) as last_update + select nvl ((max(entry_date)-to_date('1970-01-01'))*60*60*24,0) as last_update from pinds_blog_entries e join acs_objects o on (o.object_id = e.entry_id) where e.package_id = :package_id Index: openacs-4/packages/lars-blogger/tcl/rss-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/rss-procs-postgresql.xql,v diff -u -r1.6 -r1.7 --- openacs-4/packages/lars-blogger/tcl/rss-procs-postgresql.xql 11 Dec 2003 21:40:05 -0000 1.6 +++ openacs-4/packages/lars-blogger/tcl/rss-procs-postgresql.xql 14 Dec 2003 11:10:44 -0000 1.7 @@ -14,14 +14,14 @@ select e.entry_id, e.title, e.content, - to_char(e.posted_date, 'YYYY-MM-DD HH24:MI:SS') as posted_time_ansi, + to_char(e.entry_date, 'YYYY-MM-DD HH24:MI:SS') as entry_date_ansi, c.name as category from pinds_blog_entries e left outer join pinds_blog_categories c using (category_id) where e.package_id = :package_id and e.draft_p = 'f' and e.deleted_p = 'f' - order by e.entry_date desc, e.posted_date desc + order by e.entry_date desc limit 10 @@ -31,7 +31,7 @@ select e.entry_id, e.title, e.content, - to_char(e.posted_date, 'YYYY-MM-DD HH24:MI:SS') as posted_time_ansi, + to_char(e.entry_date, 'YYYY-MM-DD HH24:MI:SS') as entry_date_ansi, c.name as category from pinds_blog_entries e join acs_objects o on (o.object_id = e.entry_id) join @@ -41,15 +41,15 @@ and o.creation_user = :user_id and e.draft_p = 'f' and e.deleted_p = 'f' - order by e.entry_date desc, e.posted_date desc + order by e.entry_date desc limit 10 select coalesce (date_part('epoch', - max(posted_date::timestamptz) + max(entry_date::timestamptz) ),0) as last_update from pinds_blog_entries where package_id = :package_id @@ -61,7 +61,7 @@ select coalesce (date_part('epoch', - max(e.posted_date::timestamptz) + max(e.entry_date::timestamptz) ),0) as last_update from pinds_blog_entries e join acs_objects o on (o.object_id = e.entry_id) Index: openacs-4/packages/lars-blogger/tcl/rss-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/rss-procs.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/lars-blogger/tcl/rss-procs.tcl 11 Dec 2003 21:40:05 -0000 1.9 +++ openacs-4/packages/lars-blogger/tcl/rss-procs.tcl 14 Dec 2003 11:10:44 -0000 1.10 @@ -98,8 +98,8 @@ } # Always convert timestamp to GMT - set posted_time_ansi [lc_time_tz_convert -from [lang::system::timezone] -to "Etc/GMT" -time_value $posted_time_ansi] - set entry_timestamp "[clock format [clock scan $posted_time_ansi] -format "%a, %d %b %Y %H:%M:%S"] GMT" + set entry_date_ansi [lc_time_tz_convert -from [lang::system::timezone] -to "Etc/GMT" -time_value $entry_date_ansi] + set entry_timestamp "[clock format [clock scan $entry_date_ansi] -format "%a, %d %b %Y %H:%M:%S"] GMT" lappend items [list \ link $entry_url \ Index: openacs-4/packages/lars-blogger/www/blog-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog-oracle.xql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/lars-blogger/www/blog-oracle.xql 17 Oct 2003 00:39:22 -0000 1.5 +++ openacs-4/packages/lars-blogger/www/blog-oracle.xql 14 Dec 2003 11:10:44 -0000 1.6 @@ -18,9 +18,7 @@ select entry_id, - to_char(entry_date, 'fmDayfm, Month fmDDfm, YYYY') as entry_date_pretty, - to_char(entry_date, 'YYYY/MM/DD/') as entry_archive_url, - to_char(entry_date, 'YYYY-MM-DD') as entry_date, + to_char(entry_date, 'YYYY-MM-DD HH24:MI:SS') as entry_date_ansi, title, title_url, category_id, @@ -30,7 +28,6 @@ p.first_names as poster_first_names, p.last_name as poster_last_name, o.creation_user as user_id, - to_char(posted_date , 'HH24:MI') as posted_time_pretty, (select count(gc.comment_id) from general_comments gc, cr_revisions cr where gc.object_id = entry_id @@ -45,24 +42,21 @@ and draft_p = 'f' and deleted_p = 'f' [ad_decode $limit "" "" "and rownum <= $limit"] - order by entry_date desc, posted_date desc + order by entry_date desc select entry_id, - to_char(entry_date, 'fmDayfm, Month fmDDfm, YYYY') as entry_date_pretty, - to_char(entry_date, 'YYYY/MM/DD/') as entry_archive_url, - to_char(entry_date, 'YYYY-MM-DD') as entry_date, + to_char(entry_date, 'YYYY-MM-DD HH24:MI:SS') as entry_date_ansi, title, content, content_format, draft_p, p.first_names as poster_first_names, p.last_name as poster_last_name, o.creation_user as user_id, - to_char(posted_date , 'HH24:MI') as posted_time_pretty, (select count(gc.comment_id) from general_comments gc, cr_revisions cr where gc.object_id = entry_id @@ -78,7 +72,7 @@ and draft_p = 'f' and deleted_p = 'f' [ad_decode $limit "" "" "and rownum <= $limit"] - order by entry_date desc, posted_date desc + order by entry_date desc 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.7 -r1.8 --- openacs-4/packages/lars-blogger/www/blog-postgresql.xql 29 Sep 2003 08:05:42 -0000 1.7 +++ openacs-4/packages/lars-blogger/www/blog-postgresql.xql 14 Dec 2003 11:10:44 -0000 1.8 @@ -18,9 +18,7 @@ select entry_id, - to_char(entry_date, 'fmDayfm, Month fmDDfm, YYYY') as entry_date_pretty, - to_char(entry_date, 'YYYY/MM/DD/') as entry_archive_url, - to_char(entry_date, 'YYYY-MM-DD') as entry_date, + to_char(entry_date, 'YYYY-MM-DD HH24:MI:SS') as entry_date_ansi, title, title_url, category_id, @@ -30,7 +28,6 @@ p.first_names as poster_first_names, p.last_name as poster_last_name, o.creation_user as user_id, - to_char(posted_date , 'HH24:MI') as posted_time_pretty, (select count(gc.comment_id) from general_comments gc, cr_revisions cr where gc.object_id = entry_id @@ -42,17 +39,15 @@ [ad_decode $date_clause "" "" "and $date_clause"] and draft_p = 'f' and deleted_p = 'f' - order by entry_date desc, posted_date desc + order by entry_date desc [ad_decode $limit "" "" "limit $limit"] select entry_id, - to_char(entry_date, 'fmDayfm, Month fmDDfm, YYYY') as entry_date_pretty, - to_char(entry_date, 'YYYY/MM/DD/') as entry_archive_url, - to_char(entry_date, 'YYYY-MM-DD') as entry_date, + to_char(entry_date, 'YYYY-MM-DD HH24:MI:SS') as entry_date_ansi, title, category_id, content, @@ -61,7 +56,6 @@ p.first_names as poster_first_names, p.last_name as poster_last_name, o.creation_user as user_id, - to_char(posted_date , 'HH24:MI') as posted_time_pretty, (select count(gc.comment_id) from general_comments gc, cr_revisions cr where gc.object_id = entry_id @@ -74,7 +68,7 @@ [ad_decode $date_clause "" "" "and $date_clause"] and draft_p = 'f' and deleted_p = 'f' - order by entry_date desc, posted_date desc + order by entry_date desc [ad_decode $limit "" "" "limit $limit"] Index: openacs-4/packages/lars-blogger/www/blog.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog.adp,v diff -u -r1.15 -r1.16 --- openacs-4/packages/lars-blogger/www/blog.adp 16 Oct 2003 23:10:45 -0000 1.15 +++ openacs-4/packages/lars-blogger/www/blog.adp 14 Dec 2003 11:10:44 -0000 1.16 @@ -1,26 +1,7 @@ - - - - - - -
- @blog.entry_date_pretty@ - - + - - @blog_name@ - -
-
- - - -
+

Index: openacs-4/packages/lars-blogger/www/blog.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog.tcl,v diff -u -r1.16 -r1.17 --- openacs-4/packages/lars-blogger/www/blog.tcl 21 Oct 2003 20:31:07 -0000 1.16 +++ openacs-4/packages/lars-blogger/www/blog.tcl 14 Dec 2003 11:10:44 -0000 1.17 @@ -33,11 +33,6 @@ set blog_user_id [cc_screen_name_user $screen_name] } -# TODO: -# - Upgrade the installed package to get the latest parameters -# - Test on PG and Oracle - - set max_num_entries [parameter::get \ -package_id $package_id \ -parameter MaxNumEntriesOnFrontPage \ @@ -61,7 +56,7 @@ switch -exact $type { archive { - set date_clause "[db_map date_clause_archive]" + set date_clause [db_map date_clause_archive] set limit {} } current { @@ -144,3 +139,4 @@ set header_background_color [lars_blog_header_background_color -package_id $package_id] set stylesheet_url [lars_blog_stylesheet_url] + Index: openacs-4/packages/lars-blogger/www/drafts.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/drafts.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/lars-blogger/www/drafts.xql 11 Dec 2003 21:40:06 -0000 1.4 +++ openacs-4/packages/lars-blogger/www/drafts.xql 14 Dec 2003 11:10:44 -0000 1.5 @@ -20,7 +20,7 @@ and o.object_id = e.entry_id and u.user_id = o.creation_user and o.creation_user = :user_id - order by e.entry_date desc, e.posted_date desc + order by e.entry_date desc @@ -41,7 +41,7 @@ and e.deleted_p = 'f' and o.object_id = e.entry_id and u.user_id = o.creation_user - order by e.entry_date desc, e.posted_date desc + order by e.entry_date desc Index: openacs-4/packages/lars-blogger/www/entry-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-chunk.adp,v diff -u -r1.17 -r1.18 --- openacs-4/packages/lars-blogger/www/entry-chunk.adp 13 Dec 2003 17:58:22 -0000 1.17 +++ openacs-4/packages/lars-blogger/www/entry-chunk.adp 14 Dec 2003 11:10:44 -0000 1.18 @@ -1,57 +1,59 @@ - + +

-
- - @blog.title@@blog.title_url@ +
+ + @blog.title;noquote@@blog.title_url@ - -   [@blog.title_url_base@] + + [@blog.title_url_base@] + -

- - - -

@blog.title;noquote@

- - -
+ + +

@blog.title;noquote@

+ + +
-
- @blog.content;noquote@ -
+
+ @blog.content;noquote@ +
-

- @blog.posted_time_pretty@ - - by @blog.poster_first_names@ @blog.poster_last_name@ - - - in @blog.category_name@ - - | - - Permalink - | Comments (@blog.num_comments@) - - | Edit - - | Publish +

+ @blog.entry_date_pretty@ + + by @blog.poster_first_names@ @blog.poster_last_name@ - - | Draft - - -

+ + in @blog.category_name@ + + | + Permalink + + | Comments (@blog.num_comments@) + + + | Edit + + | Publish + + + | Draft + + +

- - -

@comments.title@

-

@comments.content@

-

by @comments.author@Trackback from @comments.trackback_name@ on @comments.pretty_date@

- + +

@comments.title@

+

@comments.content@

+

by @comments.author@Trackback from @comments.trackback_name@ on @comments.pretty_date@

+
Add comment
 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.12 -r1.13 --- openacs-4/packages/lars-blogger/www/entry-chunk.tcl 13 Dec 2003 17:16:21 -0000 1.12 +++ openacs-4/packages/lars-blogger/www/entry-chunk.tcl 14 Dec 2003 11:10:44 -0000 1.13 @@ -1,14 +1,19 @@ # Expects: # blog:onerow -# show_comments_p:onevalue,optional +# show_comments_p:boolean # retrun_url:onevalue,optional # package_id:optional # screen_name:onevalue,optional +# perma_p: 1/0 (defaults to 0 -- set to 1 if this is the permalink page) +if { ![exists_and_not_null perma_p] } { + set perma_p 0 +} if { ![exists_and_not_null show_comments_p] } { - set show_comments_p "f" + set show_comments_p $perma_p } + # Maybe package_id is supplied, but maybe not if { ![info exists package_id] } { set package_id [ad_conn package_id] @@ -29,10 +34,7 @@ set show_poster_p [ad_parameter "ShowPosterP" "" "1"] -# LARS: -# Not sure we should do the ns_adp_parse thing here, but heck, why not -# It should be safe, given the security checks -set blog(content) [ns_adp_parse -string [ad_html_text_convert -from $blog(content_format) -to "text/html" -- $blog(content)]] +lars_blogger::entry::htmlify -array blog set entry_id $blog(entry_id) @@ -45,23 +47,16 @@ set blog(write_p) [permission::write_permission_p -object_id $blog(entry_id) -creation_user $blog(user_id)] if { [empty_string_p $screen_name] } { - set blog(entry_archive_url) "${package_url}one-entry?[export_vars { entry_id }]" + set blog(permalink_url) "${package_url}one-entry?[export_vars { entry_id }]" } else { - set blog(entry_archive_url) "${package_url}user/$screen_name/one-entry?[export_vars { entry_id }]" + set blog(permalink_url) "${package_url}user/$screen_name/one-entry?[export_vars { entry_id }]" } -set blog(google_url) "http://www.google.com/search?[export_vars { {q $blog(title) } }]" - -if { ![empty_string_p $general_comments_package_url] } { - set blog(comment_add_url) "${general_comments_package_url}comment-add?[export_vars { { object_id $entry_id } { object_name $blog(title) } { return_url "${package_url}flush-cache?[export_vars { return_url }]"} }]" -} - -set blog(comments_view_url) "${package_url}one-entry?[export_vars { entry_id }]" - set display_categories [lars_blog_categories_p -package_id [ad_conn package_id]] -if { [string equal $show_comments_p "t"] } { +if { [template::util::is_true $show_comments_p] } { lars_blogger::entry::get_comments -entry_id $entry_id + set blog(comment_add_url) "${general_comments_package_url}comment-add?[export_vars { { object_id $entry_id } { object_name $blog(title) } { return_url "${package_url}flush-cache?[export_vars { return_url }]"} }]" } if { $blog(category_id) != 0 } { Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/entry-edit-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/entry-edit-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/lars-blogger/www/entry-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-edit.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/lars-blogger/www/entry-edit.adp 21 Sep 2003 22:17:23 -0000 1.3 +++ openacs-4/packages/lars-blogger/www/entry-edit.adp 14 Dec 2003 11:10:44 -0000 1.4 @@ -5,7 +5,7 @@ Index: openacs-4/packages/lars-blogger/www/entry-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-edit.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/lars-blogger/www/entry-edit.tcl 13 Dec 2003 15:42:20 -0000 1.12 +++ openacs-4/packages/lars-blogger/www/entry-edit.tcl 14 Dec 2003 11:10:44 -0000 1.13 @@ -29,7 +29,7 @@ set package_id [ad_conn package_id] -set today [clock format [clock seconds] -format "%Y-%m-%d"] +set now_ansi [clock format [clock seconds] -format "%Y-%m-%d %H:%M:%S"] form create entry -cancel_url [ad_decode $return_url "" "." $return_url] @@ -43,9 +43,11 @@ } element create entry content -label "Content" -datatype richtext -widget richtext -html { cols 80 rows 20 } + element create entry entry_date -label "Entry date" -datatype text \ - -help_text "If you set this to something other than today's date, you must use this form to publish your entry, otherwise the entry date will be set to the date you publish the item." \ - -after_html {(Set to today)} + -help_text "Format: YYYY-MM-DD HH24:MI:SS" \ + -html { size 20 } \ + -after_html {(Set to now)} element create entry draft_p -label "Post Status" -datatype text -widget select -options { { "Draft" "t" } { "Publish" "f" } } @@ -58,7 +60,7 @@ if { [empty_string_p $entry_id] } { set insert_or_update insert set entry_id [db_nextval "acs_object_id_seq"] - element set_properties entry entry_date -value $today + element set_properties entry entry_date -value $now_ansi element set_properties entry draft_p -value "t" # Prefill title and content with supplied values @@ -110,20 +112,20 @@ set insert_or_update [element get_value entry insert_or_update] if { [string equal $insert_or_update "insert"] } { - lars_blog_entry_add \ - -entry_id $entry_id \ - -package_id $package_id \ - -title $title \ - -title_url $title_url \ - -category_id $category_id \ - -content $content \ - -content_format $content_format \ - -entry_date $entry_date \ - -draft_p "$draft_p" + lars_blogger::entry::new \ + -entry_id $entry_id \ + -package_id $package_id \ + -title $title \ + -title_url $title_url \ + -category_id $category_id \ + -content $content \ + -content_format $content_format \ + -entry_date $entry_date \ + -draft_p "$draft_p" } else { permission::require_write_permission -object_id $entry_id - lars_blog_entry_edit \ + lars_blogger::entry::edit \ -entry_id $entry_id \ -title $title \ -title_url $title_url \ @@ -135,7 +137,7 @@ } if { [empty_string_p $return_url] } { - set return_url "[ad_conn package_url]one-entry?[export_vars { entry_id }]" + set return_url "one-entry?[export_vars { entry_id }]" } ad_returnredirect $return_url 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.23 -r1.24 --- openacs-4/packages/lars-blogger/www/index.adp 13 Dec 2003 20:06:14 -0000 1.23 +++ openacs-4/packages/lars-blogger/www/index.adp 14 Dec 2003 11:10:44 -0000 1.24 @@ -45,9 +45,7 @@

Archive

-
- -
+ @@ -82,12 +80,11 @@ XML
+
+

Recent Comments

+ +
-
-

Recent Comments

- -
-
Index: openacs-4/packages/lars-blogger/www/one-entry.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/one-entry.adp,v diff -u -r1.15 -r1.16 --- openacs-4/packages/lars-blogger/www/one-entry.adp 13 Dec 2003 17:58:22 -0000 1.15 +++ openacs-4/packages/lars-blogger/www/one-entry.adp 14 Dec 2003 11:10:44 -0000 1.16 @@ -6,15 +6,5 @@ @context;noquote@
- - - - - -
- @blog.entry_date_pretty@ -
- - - +
Index: openacs-4/packages/lars-blogger/www/one-entry.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/one-entry.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/lars-blogger/www/one-entry.tcl 21 Oct 2003 20:31:07 -0000 1.12 +++ openacs-4/packages/lars-blogger/www/one-entry.tcl 14 Dec 2003 11:10:44 -0000 1.13 @@ -1,14 +1,6 @@ ad_page_contract {} { entry_id:integer {return_url {[ad_return_url]}} -} -properties { - context_bar - title_html - content_html - draft_p_checked - entry_date_html - form_export_vars - return_url } set package_id [ad_conn package_id] Index: openacs-4/packages/lars-blogger/www/resources/lars-blogger.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/resources/lars-blogger.css,v diff -u -r1.4 -r1.5 --- openacs-4/packages/lars-blogger/www/resources/lars-blogger.css 13 Dec 2003 20:06:14 -0000 1.4 +++ openacs-4/packages/lars-blogger/www/resources/lars-blogger.css 14 Dec 2003 11:10:44 -0000 1.5 @@ -37,6 +37,11 @@ text-align: left; font-weight: bold; } +.lars_blogger_title_url { + color: #999; + font-weight: normal; + font-size: 90%; +} .lars_blogger_text { text-align: left; @@ -75,8 +80,7 @@ } .lars_blogger_portlet { - align: center; - text-align: center; + text-align: left; margin-bottom: 24px; font-size: 90%; } @@ -145,10 +149,11 @@ } .lars_blogger_n_comments { - display: inline; + display: inline; + padding: 0px; } .lars_blogger_n_comments_n { - list-style-type: none; + list-style-type: none; }