Index: openacs-4/packages/wp-slim/sql/postgresql/wp-slim-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/sql/postgresql/wp-slim-create.sql,v diff -u -r1.8 -r1.9 --- openacs-4/packages/wp-slim/sql/postgresql/wp-slim-create.sql 28 Aug 2003 09:42:00 -0000 1.8 +++ openacs-4/packages/wp-slim/sql/postgresql/wp-slim-create.sql 22 Sep 2003 18:43:24 -0000 1.9 @@ -741,6 +741,1166 @@ select inline_11 (); drop function inline_11 (); +--jackp: From here on the functions are defined + +--jackp: To p_create each presentation +create function wp_presentation__new ( + timestamp, + integer, + varchar(400), + varchar(400), + varchar(400), + varchar, + integer, + boolean, + boolean, + varchar, + varchar, + integer +) +returns integer as' +declare + p_creation_date alias for $1; + p_creation_user alias for $2; + p_creation_ip alias for $3; + p_pres_title alias for $4; + p_page_signature alias for $5; + p_copyright_notice alias for $6; + p_style alias for $7; + p_public_p alias for $8; + p_show_modified_p alias for $9; + aud alias for $10; + back alias for $11; + p_parent_id alias for $12; + v_item_id cr_items.item_id%TYPE; + v_audience_item_id cr_items.item_id%TYPE; + v_background_item_id cr_items.item_id%TYPE; + v_revision_id cr_revisions.revision_id%TYPE; + v_audience_revision_id cr_revisions.revision_id%TYPE; + v_background_revision_id cr_revisions.revision_id%TYPE; + v_max_id integer; + v_name cr_wp_presentations.pres_title%TYPE; +begin + select coalesce(max(item_id),0) into v_max_id + from cr_items + where content_type = ''cr_wp_presentation'' + and name like p_pres_title || ''%''; + + v_name := p_pres_title || ''_'' || v_max_id; + + v_item_id := content_item__new( + v_name, + p_parent_id, + null, + null, + p_creation_date, + p_creation_user, + null, + p_creation_ip, + ''content_item'', + ''cr_wp_presentation'', + null, + null, + ''text/plain'', + null, + null, + ''text'' + ); + + v_revision_id := content_revision__new( + null, + null, + current_timestamp, + ''text/plain'', + null, + null, + v_item_id, + null, + p_creation_date, + p_creation_user, + p_creation_ip + ); + + PERFORM content_item__set_live_revision(v_revision_id); + +--jackp: Actually place the information entered by the user into the table + insert into cr_wp_presentations + ( + presentation_id, + pres_title, + page_signature, + copyright_notice, + style, + public_p, + show_modified_p + ) values ( + v_revision_id, + p_pres_title, + p_page_signature, + p_copyright_notice, + p_style, + p_public_p, + p_show_modified_p + ); + + v_audience_item_id := content_item__new( + aud, + v_item_id, + null, + null, + p_creation_date, + p_creation_user, + null, + p_creation_ip, + ''content_item'', + ''cr_wp_presentation_aud'', + null, + null, + ''text/plain'', + null, + null, + ''text'' + ); + + v_audience_revision_id := content_revision__new( + null, + null, + current_timestamp, + ''text/plain'', + null, + aud, + v_audience_item_id, + null, + p_creation_date, + p_creation_user, + p_creation_ip + ); + + PERFORM content_item__set_live_revision(v_audience_revision_id); + + insert into cr_wp_presentations_aud + ( + id, + presentation_id + ) values ( + v_audience_revision_id, + v_revision_id + ); + + v_background_item_id := content_item__new( + back, + v_item_id, + null, + null, + p_creation_date, + p_creation_user, + null, + p_creation_ip, + ''content_item'', + ''cr_wp_presentation_back'', + null, + null, + ''text/plain'', + null, + null, + ''text'' + ); + + v_background_revision_id := content_revision__new( + null, + null, + current_timestamp, + ''text/plain'', + null, + back, + v_background_item_id, + null, + p_creation_date, + p_creation_user, + p_creation_ip + ); + + PERFORM content_item__set_live_revision(v_background_revision_id); + + insert into cr_wp_presentations_back + ( + id, + presentation_id + ) values ( + v_background_revision_id, + v_revision_id + ); + + return v_item_id; +end;' language 'plpgsql'; + +create function wp_presentation__delete_audience ( + integer +) +returns integer as' +declare + audience_item_id alias for $1; +begin + delete from cr_wp_presentations_aud + where exists (select 1 from cr_revisions where revision_id = cr_wp_presentations_aud.id and item_id = audience_item_id); + delete from cr_item_publish_audit + where item_id = audience_item_id; + + PERFORM content_item__delete(audience_item_id); +return 0; +end;' language 'plpgsql'; + +create function wp_presentation__delete_background ( + integer +) +returns integer as' +declare + background_item_id alias for $1; +begin + delete from cr_wp_presentations_back + where exists (select 1 from cr_revisions where revision_id = cr_wp_presentations_back.id and item_id = background_item_id); + delete from cr_item_publish_audit + where item_id = background_item_id; + + PERFORM content_item__delete(background_item_id); + return 0; +end;' language 'plpgsql'; + +create function wp_presentation__delete ( + integer +) +returns integer as' +declare + pres_item_id alias for $1; + v_audience_item_id cr_items.item_id%TYPE; + v_background_item_id cr_items.item_id%TYPE; + del_rec record; +begin + for del_rec in select item_id as slide_item_id + from cr_items + where content_type = ''cr_wp_slide'' + and parent_id = pres_item_id + loop + PERFORM wp_slide__delete(del_rec.slide_item_id); + end loop; + + select item_id into v_audience_item_id + from cr_items + where content_type = ''cr_wp_presentation_aud'' + and parent_id = pres_item_id; + + PERFORM wp_presentation__delete_audience(v_audience_item_id); + + select item_id into v_background_item_id + from cr_items + where content_type = ''cr_wp_presentation_back'' + and parent_id = pres_item_id; + + PERFORM wp_presentation__delete_background(v_background_item_id); + + delete from acs_permissions where object_id = pres_item_id; + -- update acs_objects set context_id=null where context_id = pres_item_id; + delete from cr_wp_presentations where exists (select 1 from cr_revisions where cr_revisions.revision_id = cr_wp_presentations.presentation_id and cr_revisions.item_id = pres_item_id); + PERFORM content_item__delete(pres_item_id); +return 0; +end;' language 'plpgsql'; + +-- DRB: All these could've been implemented as a single function with a type argument +-- but I'm not going to rewrite all of wp-slim's queries just to clean this up... + +create function wp_presentation__get_ad_revision (integer) returns text as ' +declare + p_pres_revision_id alias for $1; +begin + return r.content + from cr_revisions r, + cr_wp_presentations_aud pa + where pa.presentation_id = p_pres_revision_id + and r.revision_id = pa.id; +end;' language 'plpgsql'; + +create function wp_presentation__get_audience ( + integer +) returns text as' +declare + p_pres_item_id alias for $1; +begin + return content + from cr_revisions, cr_items + where cr_items.content_type = ''cr_wp_presentation_aud'' + and cr_items.parent_id = p_pres_item_id + and cr_revisions.revision_id = cr_items__live_revision; +end;' language 'plpgsql'; + +create function wp_presentation__get_bg_revision (integer) returns text as ' +declare + p_pres_revision_id alias for $1; +begin + return r.content + from cr_revisions r, + cr_wp_presentations_aud pa + where pa.presentation_id = p_pres_revision_id + and r.revision_id = pa.id; +end;' language 'plpgsql'; + +create function wp_presentation__get_background ( + integer +) returns text as' +declare + pres_item_id alias for $1; +begin + return content + from cr_revisions, cr_items + where cr_items.content_type = ''cr_wp_presentation_bak'' + and cr_items.parent_id = p_pres_item_id + and cr_revisions.revision_id = cr_items__live_revision; +end;' language 'plpgsql'; + + +create function wp_presentation__new_revision ( + timestamp, + integer, + varchar, + integer, + varchar(400), + varchar(200), + varchar(400), + integer, + boolean, + boolean, + varchar, + varchar +) returns integer as' +declare + p_creation_date alias for $1; + p_creation_user alias for $2; + p_creation_ip alias for $3; + p_pres_item_id alias for $4; + p_pres_title alias for $5; + p_page_signature alias for $6; + p_copyright_notice alias for $7; + p_style alias for $8; + p_public_p alias for $9; + p_show_modified_p alias for $10; + p_audience alias for $11; + p_background alias for $12; + v_audience_item_id cr_items.item_id%TYPE; + v_background_item_id cr_items.item_id%TYPE; + v_revision_id cr_revisions.revision_id%TYPE; + v_audience_revision_id cr_revisions.revision_id%TYPE; + v_background_revision_id cr_revisions.revision_id%TYPE; +begin + v_revision_id := content_revision__new( + null, + null, + current_timestamp, + ''text/plain'', + null, + null, + p_pres_item_id, + null, + p_creation_date, + p_creation_user, + p_creation_ip + ); + + PERFORM content_item__set_live_revision(v_revision_id); + + insert into cr_wp_presentations + ( + presentation_id, + pres_title, + page_signature, + copyright_notice, + style, + public_p, + show_modified_p + ) values ( + v_revision_id, + p_pres_title, + p_page_signature, + p_copyright_notice, + p_style, + p_public_p, + p_show_modified_p + ); + + select item_id into v_audience_item_id + from cr_items + where parent_id = p_pres_item_id + and content_type = ''cr_wp_presentation_aud''; + + v_audience_revision_id := content_revision__new( + null, + null, + current_timestamp, + ''text/plain'', + null, + p_audience, + v_audience_item_id, + null, + p_creation_date, + p_creation_user, + p_creation_ip + ); + + PERFORM content_item__set_live_revision(v_audience_revision_id); + + insert into cr_wp_presentations_aud + ( + id, + presentation_id + ) values ( + v_audience_revision_id, + v_revision_id + ); + + select item_id into v_background_item_id + from cr_items + where parent_id = p_pres_item_id + and content_type = ''cr_wp_presentation_back''; + + v_background_revision_id := content_revision__new( + null, + null, + current_timestamp, + ''text/plain'', + null, + p_background, + v_background_item_id, + null, + p_creation_date, + p_creation_user, + p_creation_ip + ); + + PERFORM content_item__set_live_revision(v_background_revision_id); + + insert into cr_wp_presentations_back + ( + id, + presentation_id + ) values ( + v_background_revision_id, + v_revision_id + ); + return 0; +end;' language 'plpgsql'; + +create function wp_slide__new ( + integer, + timestamp, + integer, + varchar, + varchar, + integer, + integer, + integer, + varchar, + varchar, + varchar, + boolean, + boolean, + integer +) returns integer as' +declare + p_pres_item_id alias for $1; + p_creation_date alias for $2; + p_creation_user alias for $3; + p_creation_ip alias for $4; + p_slide_title alias for $5; + p_style alias for $6; + p_original_slide_id alias for $7; + p_sort_key alias for $8; + p_preamble alias for $9; + p_bullet_items alias for $10; + p_postamble alias for $11; + p_include_in_outline_p alias for $12; + p_context_break_after_p alias for $13; + p_context_id alias for $14; + v_item_id cr_items.item_id%TYPE; + v_preamble_item_id cr_items.item_id%TYPE; + v_postamble_item_id cr_items.item_id%TYPE; + v_bullet_items_item_id cr_items.item_id%TYPE; + v_revision_id cr_revisions.revision_id%TYPE; + v_preamble_revision_id cr_revisions.revision_id%TYPE; + v_postamble_revision_id cr_revisions.revision_id%TYPE; + v_bullet_items_revision_id cr_revisions.revision_id%TYPE; + v_max_id integer; + v_name varchar; +begin + select coalesce(max(item_id),0) into v_max_id + from cr_items + where content_type = ''cr_wp_slide'' + and name like p_slide_title || ''%''; + + v_name := p_slide_title || ''_'' || v_max_id; + + v_item_id := content_item__new( + v_name, + p_pres_item_id, + null, + null, + p_creation_date, + p_creation_user, + null, + p_creation_ip, + ''content_item'', + ''cr_wp_slide'', + null, + null, + ''text/plain'', + null, + null, + ''text'' + ); + + v_revision_id := content_revision__new( + null, + null, + current_timestamp, + ''text/plain'', + null, + null, + v_item_id, + null, + p_creation_date, + p_creation_user, + p_creation_ip + ); + + PERFORM content_item__set_live_revision(v_revision_id); + + update cr_wp_slides + set sort_key = sort_key + 1 + where sort_key >= p_sort_key + and exists (select 1 from cr_items, cr_revisions where parent_id = + p_pres_item_id and cr_items.item_id = cr_revisions.item_id + and cr_revisions.revision_id=cr_wp_slides.slide_id); + + insert into cr_wp_slides + ( + slide_id, + original_slide_id, + sort_key, + slide_title, + include_in_outline_p, + context_break_after_p, + style + ) values ( + v_revision_id, + p_original_slide_id, + p_sort_key, + p_slide_title, + p_include_in_outline_p, + p_context_break_after_p, + p_style + ); + + v_preamble_item_id := content_item__new( + ''preamble'', + v_item_id, + null, + null, + p_creation_date, + p_creation_user, + null, + p_creation_ip, + ''content_item'', + ''cr_wp_slide_preamble'', + null, + null, + ''text/plain'', + null, + null, + ''text'' + ); + + v_preamble_revision_id := content_revision__new( + null, + null, + current_timestamp, + ''text/plain'', + null, + p_preamble, + v_preamble_item_id, + null, + p_creation_date, + p_creation_user, + p_creation_ip + ); + + PERFORM content_item__set_live_revision(v_preamble_revision_id); + + insert into cr_wp_slides_preamble + ( + id, + slide_id + ) values ( + v_preamble_revision_id, + v_revision_id + ); + + v_postamble_item_id := content_item__new( + ''postamble'', + v_item_id, + null, + null, + p_creation_date, + p_creation_user, + null, + p_creation_ip, + ''content_item'', + ''cr_wp_slide_postamble'', + null, + null, + ''text/plain'', + null, + null, + ''text'' + ); + + + v_postamble_revision_id := content_revision__new( + null, + null, + current_timestamp, + ''text/plain'', + null, + p_postamble, + v_postamble_item_id, + null, + p_creation_date, + p_creation_user, + p_creation_ip + ); + + PERFORM content_item__set_live_revision(v_postamble_revision_id); + + insert into cr_wp_slides_postamble + ( + id, + slide_id + ) values ( + v_postamble_revision_id, + v_revision_id + ); + + v_bullet_items_item_id := content_item__new( + ''bullet_items'', + v_item_id, + null, + null, + p_creation_date, + p_creation_user, + null, + p_creation_ip, + ''content_item'', + ''cr_wp_slide_bullet_items'', + null, + null, + null, + ''text/plain'', + null, + ''text'' + ); + + + v_bullet_items_revision_id := content_revision__new( + null, + null, + current_timestamp, + ''text/plain'', + null, + p_bullet_items, + v_bullet_items_item_id, + null, + p_creation_date, + p_creation_user, + p_creation_ip + ); + + PERFORM content_item__set_live_revision(v_bullet_items_revision_id); + + insert into cr_wp_slides_bullet_items + ( + id, + slide_id + ) values ( + v_bullet_items_revision_id, + v_revision_id + ); + return v_item_id; +end;' language 'plpgsql'; + +create function wp_slide__delete_preamble ( + integer +) returns integer as' +declare + delete_preamble__preamble_item_id alias for $1; +begin + delete from cr_wp_slides_preamble + where exists (select 1 from cr_revisions where revision_id = + cr_wp_slides_preamble.id + and item_id = delete_preamble__preamble_item_id); + + delete from cr_item_publish_audit + where item_id = delete_preamble__preamble_item_id; + + PERFORM content_item__delete(delete_preamble__preamble_item_id); + return 0; +end;' language 'plpgsql'; + +create function wp_slide__delete_postamble( + integer +) returns integer as' +declare + delete_postamble__postamble_item_id alias for $1; +begin + delete from cr_wp_slides_postamble + where exists (select 1 from cr_revisions where revision_id = + cr_wp_slides_postamble.id + and item_id = delete_postamble__postamble_item_id); + + delete from cr_item_publish_audit + where item_id = delete_postamble__postamble_item_id; + + PERFORM content_item__delete(delete_postamble__postamble_item_id); + return 0; +end;' language 'plpgsql'; + +create function wp_slide__delete_bullet_items( + integer +) returns integer as' +declare + delete_bullet_items__bullet_items_item_id alias for $1; +begin + delete from cr_wp_slides_bullet_items + where exists (select 1 from cr_revisions where revision_id = + cr_wp_slides_bullet_items.id + and item_id = delete_bullet_items__bullet_items_item_id); + + delete from cr_item_publish_audit + where item_id = delete_bullet_items__bullet_items_item_id; + + PERFORM content_item__delete(delete_bullet_items__bullet_items_item_id); + return 0; +end;' language 'plpgsql'; + +create function wp_slide__delete( + integer +) returns integer as' +declare + del_rec record; + slide_item_id alias for $1; + v_sort_key cr_wp_slides.sort_key%TYPE; + v_pres_item_id cr_items.item_id%TYPE; + v_preamble_item_id cr_items.item_id%TYPE; + v_postamble_item_id cr_items.item_id%TYPE; + v_bullet_items_item_id cr_items.item_id%TYPE; +begin + for del_rec in select item_id as attach_item_id + from cr_items + where content_type in (''cr_wp_image_attachment'', ''cr_wp_file_attachment'') + and parent_id = slide_item_id + loop + PERFORM wp_attachment__delete(del_rec.attach_item_id); + end loop; + + select item_id into v_preamble_item_id + from cr_items + where content_type = ''cr_wp_slide_preamble'' + and parent_id = slide_item_id; + + PERFORM wp_slide__delete_preamble(v_preamble_item_id); + + select item_id into v_postamble_item_id + from cr_items + where content_type = ''cr_wp_slide_postamble'' + and parent_id = slide_item_id; + + PERFORM wp_slide__delete_postamble(v_postamble_item_id); + + select item_id into v_bullet_items_item_id + from cr_items + where content_type = ''cr_wp_slide_bullet_items'' + and parent_id = slide_item_id; + + PERFORM wp_slide__delete_bullet_items(v_bullet_items_item_id); + +-- sort_key of all revisions should be the same + select max(s.sort_key), max(i.parent_id) into v_sort_key, + v_pres_item_id + from cr_wp_slides s, cr_revisions r, cr_items i + where r.item_id = slide_item_id + and r.revision_id = s.slide_id + and i.item_id = r.item_id; + + delete from cr_wp_slides where exists (select 1 from cr_revisions + where cr_revisions.revision_id = cr_wp_slides.slide_id + and cr_revisions.item_id = slide_item_id); + + update cr_wp_slides set sort_key = sort_key - 1 + where sort_key > v_sort_key and exists + (select 1 from cr_revisions r, cr_items i + where i.parent_id = v_pres_item_id and i.item_id = r.item_id + and r.revision_id = cr_wp_slides.slide_id); + +-- update acs_objects set context_id=null +-- where context_id = slide_item_id; + + delete from cr_item_publish_audit where item_id = slide_item_id; + + PERFORM content_item__delete(slide_item_id); + return 0; +end;' language 'plpgsql'; + +create function wp_slide__get_preamble_revision ( + integer +) returns text as ' +declare + p_slide_revision_id alias for $1; +begin + return content + from cr_revisions r, cr_wp_slides_preamble sp + where sp.slide_id = p_slide_revision_id + and r.revision_id = sp.id; +end;' language 'plpgsql'; + +create function wp_slide__get_postamble_revision ( + integer +) returns text as ' +declare + p_slide_revision_id alias for $1; +begin + return content + from cr_revisions r, cr_wp_slides_postamble sp + where sp.slide_id = p_slide_revision_id + and r.revision_id = sp.id; +end;' language 'plpgsql'; + +create function wp_slide__get_bullet_items_revision ( + integer +) returns text as ' +declare + p_slide_revision_id alias for $1; +begin + return content + from cr_revisions r, cr_wp_slides_bullet_items sp + where sp.slide_id = p_slide_revision_id + and r.revision_id = sp.id; +end;' language 'plpgsql'; + +create function wp_slide__get_postamble( + integer +) returns text as ' +declare + p_slide_item_id alias for $1; +begin + return content + from cr_revisions, cr_items + where cr_items.content_type = ''cr_wp_slide_postamble'' + and cr_items.parent_id = p_slide_item_id + and cr_revisions.revision_id = cr_items.live_revision; +end;' language 'plpgsql'; + +create function wp_slide__get_preamble( + integer +) returns text as' +declare + p_slide_item_id alias for $1; +begin + return content + from cr_revisions, cr_items + where cr_items.content_type = ''cr_wp_slide_preamble'' + and cr_items.parent_id = p_slide_item_id + and cr_revisions.revision_id = cr_items.live_revision; +end;' language 'plpgsql'; + +create function wp_slide__get_bullet_items( + integer +) returns text as' +declare + p_slide_item_id alias for $1; +begin + return content + from cr_revisions, cr_items + where cr_items.content_type = ''cr_wp_slide_bullet_items'' + and cr_items.parent_id = p_slide_item_id + and cr_revisions.revision_id = cr_items.live_revision; +end;' language 'plpgsql'; + +create function wp_slide__new_revision( + timestamp, + integer, + varchar, + integer, + varchar, + text, + varchar, + varchar, + integer, + integer, + integer, + boolean, + boolean +) returns integer as' +declare + p_creation_date alias for $1; + p_creation_user alias for $2; + p_creation_ip alias for $3; + p_slide_item_id alias for $4; + p_slide_title alias for $5; + p_preamble alias for $6; + p_bullet_items alias for $7; + p_postamble alias for $8; + p_style alias for $9; + p_original_slide_id alias for $10; + p_sort_key alias for $11; + p_include_in_outline_p alias for $12; + p_context_break_after_p alias for $13; + v_preamble_item_id cr_items.item_id%TYPE; + v_postamble_item_id cr_items.item_id%TYPE; + v_bullet_items_item_id cr_items.item_id%TYPE; + v_revision_id cr_revisions.revision_id%TYPE; + v_preamble_revision_id cr_revisions.revision_id%TYPE; + v_postamble_revision_id cr_revisions.revision_id%TYPE; + v_bullet_items_revision_id cr_revisions.revision_id%TYPE; +begin + v_revision_id := content_revision__new( + null, + null, + current_timestamp, + ''text/plain'', + null, + null, + p_slide_item_id, + null, + p_creation_date, + p_creation_user, + p_creation_ip + ); + + PERFORM content_item__set_live_revision(v_revision_id); + + insert into cr_wp_slides + ( + slide_id, + slide_title, + style, + original_slide_id, + sort_key, + include_in_outline_p, + context_break_after_p + ) values ( + v_revision_id, + p_slide_title, + p_style, + p_original_slide_id, + p_sort_key, + p_include_in_outline_p, + p_context_break_after_p + ); + + select item_id into v_preamble_item_id + from cr_items + where parent_id = p_slide_item_id + and content_type = ''cr_wp_slide_preamble''; + + v_preamble_revision_id := content_revision__new( + null, + null, + current_timestamp, + ''text/plain'', + null, + p_preamble, + v_preamble_item_id, + null, + p_creation_date, + p_creation_user, + p_creation_ip + ); + + PERFORM content_item__set_live_revision(v_preamble_revision_id); + + insert into cr_wp_slides_preamble + ( + id, + slide_id + ) values ( + v_preamble_revision_id, + v_revision_id + ); + + select item_id into v_postamble_item_id + from cr_items + where parent_id = p_slide_item_id + and content_type = ''cr_wp_slide_postamble''; + + v_postamble_revision_id := content_revision__new( + null, + null, + current_timestamp, + ''text/plain'', + null, + p_postamble, + v_postamble_item_id, + null, + p_creation_date, + p_creation_user, + p_creation_ip + ); + + PERFORM content_item__set_live_revision(v_postamble_revision_id); + + insert into cr_wp_slides_postamble + ( + id, + slide_id + ) values ( + v_postamble_revision_id, + v_revision_id + ); + + select item_id into v_bullet_items_item_id + from cr_items + where parent_id = p_slide_item_id + and content_type = ''cr_wp_slide_bullet_items''; + + v_bullet_items_revision_id := content_revision__new( + null, + null, + current_timestamp, + ''text/plain'', + null, + p_bullet_items, + v_bullet_items_item_id, + null, + p_creation_date, + p_creation_user, + p_creation_ip + ); + + PERFORM content_item__set_live_revision(v_bullet_items_revision_id); + + insert into cr_wp_slides_bullet_items + ( + id, + slide_id + ) values ( + v_bullet_items_revision_id, + v_revision_id + ); + return 0; +end;' language 'plpgsql'; + +-- bug fixed, delete first an image then a file, roc@ +create function wp_attachment__delete( + integer +) returns integer as' +declare + p_attach_item_id alias for $1; +begin + + delete from cr_wp_image_attachments + where exists (select 1 from cr_revisions where revision_id + = cr_wp_image_attachments.attach_id + and item_id = p_attach_item_id); + + delete from cr_wp_file_attachments + where exists (select 1 from cr_revisions where revision_id + = cr_wp_file_attachments.attach_id + and item_id = p_attach_item_id); + + delete from cr_item_publish_audit + where item_id = p_attach_item_id; + + PERFORM content_item__delete(p_attach_item_id); + return 0; +end;' language 'plpgsql'; + +create function wp_attachment__new_revision ( + integer +) returns integer as' +declare + p_attach_item_id alias for $1; +begin + return 0; +end; 'language 'plpgsql'; + + + + +create function wp_presentation__set_live_revision(integer) returns integer as ' +declare + p_revision_id alias for $1; + v_revision_id integer; +begin + perform content_item__set_live_revision(p_revision_id); + + select id into v_revision_id + from cr_wp_presentations_aud + where presentation_id = p_revision_id; + + perform content_item__set_live_revision(v_revision_id); + + select id into v_revision_id + from cr_wp_presentations_back + where presentation_id = p_revision_id; + + perform content_item__set_live_revision(v_revision_id); + return 0; +end;' language 'plpgsql'; + + +-- style functions roc@ + +create function wp_style__delete( + integer +) returns integer as' +declare + p_style_id alias for $1; + p_item_id integer; + one_image record; +begin + + for one_image in + select * from wp_style_images + where wp_style_images_id = (select background_image from wp_styles where style_id = p_style_id) + loop + delete from wp_style_images where wp_style_images_id = one_image.wp_style_images_id; + select item_id into p_item_id from cr_revisions where revision_id = one_image.wp_style_images_id; + PERFORM content_item__delete(p_item_id); + end loop; + + update cr_wp_slides set style = -1 where style = p_style_id; + update cr_wp_presentations set style = -1 where style = p_style_id; + delete from wp_styles where style_id = p_style_id; + + return 0; +end;' language 'plpgsql'; + +create function wp_style__image_delete( + integer +) returns integer as' +declare + p_revision_id alias for $1; + p_item_id integer; +begin + + update wp_styles set background_image = 0 where background_image = p_revision_id; + + delete from wp_style_images + where wp_style_images_id = p_revision_id; + + select item_id into p_item_id from cr_revisions where revision_id = p_revision_id; + + PERFORM content_item__delete(p_item_id); + + return 0; +end;' language 'plpgsql'; + + -- new permissions roc@ select acs_privilege__add_child('wp_edit_presentation', 'wp_view_presentation'); select acs_privilege__add_child('wp_admin_presentation', 'wp_create_presentation'); Index: openacs-4/packages/wp-slim/sql/postgresql/wp-slim-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/sql/postgresql/wp-slim-drop.sql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/wp-slim/sql/postgresql/wp-slim-drop.sql 28 Aug 2003 09:42:00 -0000 1.5 +++ openacs-4/packages/wp-slim/sql/postgresql/wp-slim-drop.sql 22 Sep 2003 18:43:24 -0000 1.6 @@ -377,7 +377,7 @@ --drop package wp_slide; DROP FUNCTION wp_slide__new( integer, - timestamptz, + timestamp, integer, varchar, varchar, @@ -417,7 +417,7 @@ --drop package wp_presentation; DROP FUNCTION wp_presentation__new( - timestamptz, + timestamp, integer, varchar, varchar, @@ -459,7 +459,7 @@ ); drop function wp_slide__new_revision( - timestamptz, + timestamp, integer, varchar, integer, @@ -474,13 +474,13 @@ boolean); drop function wp_presentation__new_revision ( - timestamptz, + timestamp, integer, varchar, integer, - varchar, - varchar, - varchar, + varchar(400), + varchar(200), + varchar(400), integer, boolean, boolean, Index: openacs-4/packages/wp-slim/tcl/printer-view-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/tcl/printer-view-procs-oracle.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/tcl/printer-view-procs-oracle.xql 28 Aug 2003 09:42:00 -0000 1.2 +++ openacs-4/packages/wp-slim/tcl/printer-view-procs-oracle.xql 22 Sep 2003 18:42:24 -0000 1.3 @@ -1,7 +1,7 @@ oracle8.1.6 - + select live_revision as attach_id, display, name as file_name Index: openacs-4/packages/wp-slim/www/attach-detail.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-detail.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/wp-slim/www/attach-detail.adp 22 May 2003 15:18:55 -0000 1.5 +++ openacs-4/packages/wp-slim/www/attach-detail.adp 22 Sep 2003 18:41:27 -0000 1.6 @@ -1,14 +1,14 @@ -Details -@context;noquote@ +#wp-slim.Details# +@context@ -Revision in red is the current live revision. +#wp-slim.lt_Revision_in_font_colo#
  • -Uploaded from @revisions.creation_ip@ at @revisions.creation_date@ (view) +#wp-slim.lt_Uploaded_from_revisio# (#wp-slim.view#)

    @@ -17,23 +17,24 @@ - +
    -Uploaded from @revisions.creation_ip@ at @revisions.creation_date@ (view | go live) +#wp-slim.lt_Uploaded_from_revisio_1##wp-slim.view# | #wp-slim.go_live#)
+ Index: openacs-4/packages/wp-slim/www/attach-detail.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-detail.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/wp-slim/www/attach-detail.tcl 28 Aug 2003 09:42:00 -0000 1.5 +++ openacs-4/packages/wp-slim/www/attach-detail.tcl 22 Sep 2003 18:41:27 -0000 1.6 @@ -35,16 +35,18 @@ permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation -set context [list [list "edit-slide?[export_url_vars slide_item_id pres_item_id]" "Edit Slide"] "Details"] +set context [list [list "edit-slide?[export_url_vars slide_item_id pres_item_id]" "[_ wp-slim.Edit_Slide]"] "[_ wp-slim.Details]"] db_multirow revisions revisions_get { select r.revision_id, - to_char(ao.creation_date, 'HH24:MI:SS Mon DD, YYYY') as creation_date, + ao.creation_date as creation_date, ao.creation_ip from cr_revisions r, acs_objects ao where r.item_id = :attach_item_id and ao.object_id = r.revision_id +} { + set creation_date [lc_time_fmt $creation_date "%X %Q"] } Index: openacs-4/packages/wp-slim/www/attach-list.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-list.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/wp-slim/www/attach-list.adp 28 Aug 2003 09:42:00 -0000 1.5 +++ openacs-4/packages/wp-slim/www/attach-list.adp 22 Sep 2003 18:41:27 -0000 1.6 @@ -1,30 +1,31 @@ -List of Attachments -@context;noquote@ +#wp-slim.List_of_Attachments# +@context@
-
Add an Image or Attachment: +
#wp-slim.lt_Add_an_Image_or_Attac#

-

Display as an image +

#wp-slim.Display_as_an_image# -
Display a link the viewer can use to download the file -

+
#wp-slim.lt_Display_a_link_the_vi# +

+ Index: openacs-4/packages/wp-slim/www/attach-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-list.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/attach-list.tcl 28 Aug 2003 09:42:00 -0000 1.4 +++ openacs-4/packages/wp-slim/www/attach-list.tcl 22 Sep 2003 18:41:27 -0000 1.5 @@ -29,7 +29,7 @@ and item_id = :slide_item_id }] -set context [list [list "edit-slide?[export_url_vars slide_item_id pres_item_id]" "Edit Slide"] "List Attachments"] +set context [list [list "edit-slide?[export_url_vars slide_item_id pres_item_id]" "[_ wp-slim.Edit_Slide]"] "[_ wp-slim.List_Attachments]"] db_multirow att attachments_get { select name, item_id Index: openacs-4/packages/wp-slim/www/attach.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/wp-slim/www/attach.tcl 28 Aug 2003 09:42:00 -0000 1.8 +++ openacs-4/packages/wp-slim/www/attach.tcl 22 Sep 2003 18:41:27 -0000 1.9 @@ -31,12 +31,14 @@ set exception_text "" if { $tmp_size == 0 } { - append exception_text "
  • You haven't uploaded a file.\n" + append exception_text "
  • [_ wp-slim.lt_You_havent_uploaded_a]\n" incr exception_count } if { ![empty_string_p [ad_parameter MaxAttachmentSize "comments"]] && $tmp_size > [ad_parameter MaxAttachmentSize "comments"] } { - append exception_text "
  • Your file is too large. The publisher of [ad_system_name] has chosen to limit attachments to [util_commify_number [ad_parameter MaxAttachmentSize "comments"]] bytes.\n" + set system_name [ad_system_name] + set bytes [util_commify_number [ad_parameter MaxAttachmentSize "comments"]] + append exception_text "
  • [_ wp-slim.lt_Your_file_is_too_larg]\n" incr exception_count } @@ -61,11 +63,7 @@ } on_error { # most likely a duplicate name, double click, or non-image file uploaded as an inline image. - ad_return_complaint 1 "There was an error trying to add your content. Most likely causes you've -
    • Tried to upload a non-image file when you've select the \"display image in-line\" option. -
    • Tried to add multiple copies of the same attachment to the slide -
    • Double-clicking the \"Add\" button on the previous page. -

    Here is the actual error message:

    $errmsg
    " + ad_return_complaint 1 "[_ wp-slim.lt_There_was_an_error_tr]
    $errmsg
    " ad_script_abort } Index: openacs-4/packages/wp-slim/www/create-presentation.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/create-presentation.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/wp-slim/www/create-presentation.adp 28 Aug 2003 09:42:00 -0000 1.6 +++ openacs-4/packages/wp-slim/www/create-presentation.adp 22 Sep 2003 18:41:27 -0000 1.7 @@ -1,106 +1,92 @@ -Create Presentation -@context;noquote@ +#wp-slim.Create_Presentation# +@context@
    - - + + - + - + - + - + - + - + +wrap=virtual>#wp-slim.Audience# - + +wrap=virtual>#wp-slim.Background#
    -Give this presentation a title. Pick a title that you've never used -before, otherwise you won't be able to tell this new presentation from -old ones. Also, keep the title reasonably short so that if you choose -a style where the overall presentation title is presented on each slide, -it won't take up too much space. +#wp-slim.lt_Give_this_presentatio#
    Title:#wp-slim.Title#
    -If you want a signature at the bottom of each slide, then enter it here: +#wp-slim.lt_If_you_want_a_signatu#
    Page Signature:#wp-slim.Page_Signature#
    -(Personally, I like to have my email address, hyperlinked to my home -page; remember that HTML is OK here and you can have up to 200 characters.) +#wp-slim.lt_Personally_I_like_to_# -

    If you want a copyright notice somewhere on each slide, enter it here: +

    #wp-slim.lt_If_you_want_a_copyrig#

    Copyright Notice:#wp-slim.Copyright_Notice#
    -WimpyPoint keeps track of the last modification time -of each slide. If you'd like that displayed on each slide, you can -say so here: +#wp-slim.lt_WimpyPoint_keeps_trac#
    Show Modification Date?#wp-slim.lt_Show_Modification_Dat# - Yes - No + #wp-slim.Yes# + #wp-slim.No#
    -If you want to hide this presentation from everyone except yourself -and any collaborators that you add, you should say so. Eventually -you'll probably want to change this and make the presentation public, -unless you are only using WimpyPoint to generate .html -pages and/or hardcopy slides that you will show privately. +#wp-slim.lt_If_you_want_to_hide_t#
    Available to Public?#wp-slim.Available_to_Public# - Yes - No + #wp-slim.Yes# + #wp-slim.No#
    -Suggestion: if you have truly secret information for a presentation, -you'd be best off keeping it on your desktop machine. We try to keep -our database secure but remember that your packets are being sent in -the clear. +#wp-slim.lt_Suggestion_if_you_hav#
    Style:#wp-slim.Style# @available_styles@
    -

    Finally, if you're planning on making the presentation public, you might want to let the -world know whom you gave the presentation to and for what purpose. +

    #wp-slim.lt_Finally_if_youre_plan#


    Audience:
    #wp-slim.Audience#

    Background:
    #wp-slim.Background#
    -
    +
    + Index: openacs-4/packages/wp-slim/www/create-presentation.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/create-presentation.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/create-presentation.tcl 28 Aug 2003 09:42:00 -0000 1.4 +++ openacs-4/packages/wp-slim/www/create-presentation.tcl 22 Sep 2003 18:41:27 -0000 1.5 @@ -30,6 +30,6 @@ set available_styles "\n" -set title "Create Presentation" +set title "[_ wp-slim.Create_Presentation]" set context [list $title] Index: openacs-4/packages/wp-slim/www/create-slide.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/create-slide.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/create-slide.adp 22 May 2003 15:18:55 -0000 1.4 +++ openacs-4/packages/wp-slim/www/create-slide.adp 22 Sep 2003 18:41:27 -0000 1.5 @@ -1,6 +1,6 @@ -Create A Slide -@context;noquote@ +#wp-slim.Create_A_Slide# +@context@
    @@ -21,18 +21,18 @@ - + - + - + - +
    Slide Title: #wp-slim.Slide_Titlenbsp#

    Preamble:
    #wp-slim.Preamble#
    - (optional random text that goes above the bullet list) + #wp-slim.lt_optional_random_text_#
    Bullet Items:#wp-slim.Bullet_Items#
      @@ -42,21 +42,22 @@
    •  
    •   -
      You can add additional bullets later. +
      #wp-slim.lt_You_can_add_additiona#

    Postamble:
    #wp-slim.Postamble#
    - (optional random text that goes after the bullet list) + #wp-slim.lt_optional_random_text__1#

    - +
    + Index: openacs-4/packages/wp-slim/www/delete-presentation-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-presentation-2.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/delete-presentation-2.tcl 28 Aug 2003 09:42:00 -0000 1.3 +++ openacs-4/packages/wp-slim/www/delete-presentation-2.tcl 22 Sep 2003 18:41:27 -0000 1.4 @@ -23,7 +23,7 @@ end; } } else { - ad_return_error "Bad Password" "Wrong password." + ad_return_error "[_ wp-slim.Bad_Password]" "[_ wp-slim.Wrong_password]" ad_script_abort } Index: openacs-4/packages/wp-slim/www/delete-presentation.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-presentation.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/delete-presentation.adp 22 May 2003 15:18:55 -0000 1.4 +++ openacs-4/packages/wp-slim/www/delete-presentation.adp 22 Sep 2003 18:41:27 -0000 1.5 @@ -1,17 +1,17 @@ -Delete Presentation -@context;noquote@ +#wp-slim.Delete_Presentation# +@context@
    -Do you really want to delete @title@? -All slides will be permanently deleted. +#wp-slim.lt_Do_you_really_want_to# -

    If you're really sure, please reenter your password. +

    #wp-slim.lt_If_youre_really_sure_# -

    Password: +

    #wp-slim.Password#

    + Index: openacs-4/packages/wp-slim/www/delete-presentation.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-presentation.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/delete-presentation.tcl 6 Sep 2002 15:32:23 -0000 1.2 +++ openacs-4/packages/wp-slim/www/delete-presentation.tcl 22 Sep 2003 18:41:27 -0000 1.3 @@ -17,6 +17,6 @@ ad_require_permission $pres_item_id wp_delete_presentation -set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] "Delete Presentation"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] "[_ wp-slim.Delete_Presentation]"] -ad_return_template \ No newline at end of file +ad_return_template Index: openacs-4/packages/wp-slim/www/delete-slide.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-slide.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/wp-slim/www/delete-slide.adp 28 Aug 2003 09:42:00 -0000 1.5 +++ openacs-4/packages/wp-slim/www/delete-slide.adp 22 Sep 2003 18:41:27 -0000 1.6 @@ -1,16 +1,17 @@ -Delete a Slide -@context;noquote@ +#wp-slim.Delete_a_Slide# +@context@ -Are you sure that you want to delete this slide? +#wp-slim.lt_Are_you_sure_that_you#
      -
    • Title: @slide_title@ +
    • #wp-slim.Title__slide_title#
    - - + +

    + Index: openacs-4/packages/wp-slim/www/delete-slide.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-slide.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/delete-slide.tcl 28 Aug 2003 09:42:00 -0000 1.4 +++ openacs-4/packages/wp-slim/www/delete-slide.tcl 22 Sep 2003 18:41:27 -0000 1.5 @@ -18,6 +18,6 @@ set user_id [ad_verify_and_get_user_id] permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_delete_presentation -set context [list "Delete a Slide"] +set context [list "[_ wp-slim.Delete_a_Slide]"] ad_return_template Index: openacs-4/packages/wp-slim/www/display-change.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/display-change.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/display-change.tcl 18 Sep 2002 12:07:02 -0000 1.4 +++ openacs-4/packages/wp-slim/www/display-change.tcl 22 Sep 2003 18:41:27 -0000 1.5 @@ -30,7 +30,7 @@ if { ![empty_string_p $display] } { if { [cr_registered_type_for_mime_type $mime_type] != "image" } { - ad_return_complaint 1 "
  • The file is neither a .gif file nor a .jpg file. Therefore we cannot display it as an image." + ad_return_complaint 1 "
  • [_ wp-slim.lt_The_file_is_neither_a]" ad_script_abort } db_dml display_change "" Index: openacs-4/packages/wp-slim/www/edit-presentation.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-presentation.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/wp-slim/www/edit-presentation.adp 28 Aug 2003 09:42:00 -0000 1.5 +++ openacs-4/packages/wp-slim/www/edit-presentation.adp 22 Sep 2003 18:41:27 -0000 1.6 @@ -1,6 +1,6 @@ -Edit Presentation -@context;noquote@ +#wp-slim.Edit_Presentation# +@context@ @@ -12,118 +12,99 @@ - + - + - + - + - + - + - + - +
    -Give this presentation a title. Pick a title that you've never used -before, otherwise you won't be able to tell this new presentation from -old ones. Also, keep the title reasonably short so that if you choose -a style where the overall presentation title is presented on each slide, -it won't take up too much space. +#wp-slim.lt_Give_this_presentatio#
    Title:#wp-slim.Title#
    -If you want a signature at the bottom of each slide, then enter it here: +#wp-slim.lt_If_you_want_a_signatu#
    Page Signature:#wp-slim.Page_Signature#
    -(Personally, I like to have my email address, hyperlinked to my home -page; remember that HTML is OK here and you can have up to 200 characters.) +#wp-slim.lt_Personally_I_like_to_# -

    If you want a copyright notice somewhere on each slide, enter it here: +

    #wp-slim.lt_If_you_want_a_copyrig#

    Copyright Notice:#wp-slim.Copyright_Notice#
    -WimpyPoint keeps track of the last modification time -of each slide. If you'd like that displayed on each slide, you can -say so here: +#wp-slim.lt_WimpyPoint_keeps_trac#
    Show Modification Date?#wp-slim.lt_Show_Modification_Dat# - Yes - No + #wp-slim.Yes# + #wp-slim.No# - Yes - No + #wp-slim.Yes# + #wp-slim.No#
    -If you want to hide this presentation from everyone except yourself -and any collaborators that you add, you should say so. Eventually -you'll probably want to change this and make the presentation public, -unless you are only using WimpyPoint to generate .html -pages and/or hardcopy slides that you will show privately. +#wp-slim.lt_If_you_want_to_hide_t#
    Available to Public?#wp-slim.Available_to_Public# - Yes - No + #wp-slim.Yes# + #wp-slim.No# - Yes - No + #wp-slim.Yes# + #wp-slim.No#
    -Suggestion: if you have truly secret information for a presentation, -you'd be best off keeping it on your desktop machine. We try to keep -our database secure but remember that your packets are being sent in -the clear. +#wp-slim.lt_Suggestion_if_you_hav# -

    Want to make your presentation pretty? Select a style to give your presentation -some pizzazz. If you select "I'll provide my own," once you submit this form -you'll be given the opportunity to create a style, selecting your own color -scheme, background image, etc. -(You can access your personal style repository by clicking the link -entitled Edit one of your styles from WimpyPoint's main page.) +

    #wp-slim.lt_Want_to_make_your_pre# #wp-slim.lt_Edit_one_of_your_styl# #wp-slim.lt_from_WimpyPoints_main#

    Style:#wp-slim.Style# @available_styles@
    -

    Finally, if you're planning on making the presentation public, you might want to let the -world know whom you gave the presentation to and for what purpose. +

    #wp-slim.lt_Finally_if_youre_plan#


    Audience:
    #wp-slim.Audience#

    Background:
    #wp-slim.Background#
    - +
    + Index: openacs-4/packages/wp-slim/www/edit-presentation.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-presentation.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/wp-slim/www/edit-presentation.tcl 28 Aug 2003 09:42:00 -0000 1.6 +++ openacs-4/packages/wp-slim/www/edit-presentation.tcl 22 Sep 2003 18:41:27 -0000 1.7 @@ -23,7 +23,7 @@ set user_id [ad_verify_and_get_user_id] permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation -set header [ad_header "Edit Presentation"] +set header [ad_header "[_ wp-slim.Edit_Presentation]"] db_1row get_presentation_data { *SQL* } @@ -45,7 +45,7 @@ and r.revision_id = i.live_revision } -set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$pres_title"] "Edit Presentation"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$pres_title"] "[_ wp-slim.Edit_Presentation]"] # quote html tags set page_signature [ad_quotehtml $page_signature] Index: openacs-4/packages/wp-slim/www/edit-slide-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-slide-2.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/wp-slim/www/edit-slide-2.tcl 28 Aug 2003 09:42:00 -0000 1.6 +++ openacs-4/packages/wp-slim/www/edit-slide-2.tcl 22 Sep 2003 18:41:27 -0000 1.7 @@ -56,7 +56,7 @@ } if {[regexp {Upload} $button]} { - set context [list [list "presentation-top?[export_url_vars pres_item_id]" "Presentation Top"] [list "edit-slide?[export_url_vars slide_item_id pres_item_id]" "Edit Slide"] "$slide_title"] + set context [list [list "presentation-top?[export_url_vars pres_item_id]" "[_ wp-slim.Presentation_Top]"] [list "edit-slide?[export_url_vars slide_item_id pres_item_id]" "[_ wp-slim.Edit_Slide]"] "$slide_title"] # get the number of attachments set attachment_count [db_string get_number_of_attachments { select count(1) Index: openacs-4/packages/wp-slim/www/edit-slide.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-slide.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/wp-slim/www/edit-slide.adp 28 Aug 2003 09:42:00 -0000 1.6 +++ openacs-4/packages/wp-slim/www/edit-slide.adp 22 Sep 2003 18:41:27 -0000 1.7 @@ -1,6 +1,6 @@ -Edit Slide -@context;noquote@ +#wp-slim.Edit_Slide# +@context@ @@ -23,18 +23,18 @@ - + - + - + - +
    Slide Title: #wp-slim.Slide_Titlenbsp#

    Preamble:
    #wp-slim.Preamble#
    - (optional random text that goes above the bullet list) + #wp-slim.lt_optional_random_text_#
    Bullet Items:#wp-slim.Bullet_Items#
      @@ -52,22 +52,23 @@
    •   -
      You can add additional bullets later. +
      #wp-slim.lt_You_can_add_additiona#

    Postamble:
    #wp-slim.Postamble#
    - (optional random text that goes after the bullet list) + #wp-slim.lt_optional_random_text__1#

    - + - +
    + Index: openacs-4/packages/wp-slim/www/edit-slide.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-slide.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/wp-slim/www/edit-slide.tcl 28 Aug 2003 09:42:00 -0000 1.6 +++ openacs-4/packages/wp-slim/www/edit-slide.tcl 22 Sep 2003 18:41:27 -0000 1.7 @@ -25,7 +25,7 @@ set user_id [ad_verify_and_get_user_id] permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation -set context [list "presentation-top?[export_url_vars pres_item_id] {presentation}" {Edit Slide}] +set context [list "presentation-top?[export_url_vars pres_item_id] {presentation}" "[_ wp-slim.Edit_Slide]"] db_1row get_slide_info { select s.slide_title, Index: openacs-4/packages/wp-slim/www/get-binary-data.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/get-binary-data.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/get-binary-data.tcl 15 Nov 2001 01:47:13 -0000 1.4 +++ openacs-4/packages/wp-slim/www/get-binary-data.tcl 22 Sep 2003 18:41:27 -0000 1.5 @@ -22,7 +22,7 @@ if {![regexp {attach/([0-9]+)/(.*)} $url match attach_id file_name]} { ns_log notice "Could not get a pres_item_id and slide_item_id out of url=$url" - ad_return_error "Wimpy Point" "Could not get a pres_item_id and slide_item_id out of url=$url" + ad_return_error "[_ wp-slim.Wimpy_Point]" "[_ wp-slim.lt_Could_not_get_a_pres_]" } cr_write_content -revision_id $attach_id Index: openacs-4/packages/wp-slim/www/index-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/index-oracle.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/index-oracle.xql 28 Aug 2003 09:42:00 -0000 1.3 +++ openacs-4/packages/wp-slim/www/index-oracle.xql 22 Sep 2003 18:41:27 -0000 1.4 @@ -3,20 +3,12 @@ oracle8.1.6 - - - - and ao.create_date >= (sysdate - $show_age) - - - - select i.item_id as pres_item_id, pres.pres_title, - to_char(ao.creation_date, 'Month DD, YYYY') as creation_date, + ao.creation_date as creation_date, ao.creation_user, p.first_names || ' ' || p.last_name as full_name from cr_items i, cr_wp_presentations pres, persons p, acs_objects ao @@ -36,7 +28,7 @@ select i.item_id as pres_item_id, p.pres_title, - to_char(ao.creation_date, 'Month DD, YYYY') as creation_date + ao.creation_date as creation_date from cr_items i, cr_wp_presentations p, acs_objects ao where i.live_revision = p.presentation_id and ao.object_id = i.item_id @@ -53,7 +45,7 @@ select i.item_id as pres_item_id, pres.pres_title, - to_char(ao.creation_date, 'Month DD, YYYY') as creation_date, + ao.creation_date as creation_date, ao.creation_user, p.first_names || ' ' || p.last_name as full_name, acs_permission.permission_p(i.item_id, :user_id, 'wp_edit_presentation') as edit_p Index: openacs-4/packages/wp-slim/www/index-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/index-postgresql.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/index-postgresql.xql 28 Aug 2003 09:42:00 -0000 1.3 +++ openacs-4/packages/wp-slim/www/index-postgresql.xql 22 Sep 2003 18:41:27 -0000 1.4 @@ -3,20 +3,12 @@ postgresql7.1 - - - - and ao.creation_date >= (current_timestamp - cast('$show_age days' as interval)) - - - - select i.item_id as pres_item_id, pres.pres_title, - to_char(ao.creation_date, 'Month DD, YYYY') as creation_date, + ao.creation_date as creation_date, ao.creation_user, p.first_names || ' ' || p.last_name as full_name from cr_items i, cr_wp_presentations pres, persons p, acs_objects ao @@ -36,7 +28,7 @@ select i.item_id as pres_item_id, p.pres_title, - to_char(ao.creation_date, 'Month DD, YYYY') as creation_date + ao.creation_date as creation_date from cr_items i, cr_wp_presentations p, acs_objects ao where i.live_revision = p.presentation_id and ao.object_id = i.item_id @@ -53,7 +45,7 @@ select i.item_id as pres_item_id, pres.pres_title, - to_char(ao.creation_date, 'Month DD, YYYY') as creation_date, + ao.creation_date as creation_date, ao.creation_user, p.first_names || ' ' || p.last_name as full_name, acs_permission__permission_p(i.item_id, :user_id, 'wp_edit_presentation') as edit_p Index: openacs-4/packages/wp-slim/www/index-unregistered.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/index-unregistered.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/index-unregistered.adp 28 Aug 2003 09:42:00 -0000 1.4 +++ openacs-4/packages/wp-slim/www/index-unregistered.adp 22 Sep 2003 18:41:27 -0000 1.5 @@ -1,55 +1,56 @@ -WimpyPoint +#wp-slim.WimpyPoint#
    [ -Last Week +#wp-slim.Last_Week# -Last Week +#wp-slim.Last_Week# | -Last Two Weeks +#wp-slim.Last_Two_Weeks# -Last Two Weeks +#wp-slim.Last_Two_Weeks# | -Last Month +#wp-slim.Last_Month# -Last Month +#wp-slim.Last_Month# | -All +#wp-slim.All# -All +#wp-slim.All# ] -

    Options

    +

    #wp-slim.Options#

    -

    Everyone's Presentations

    +

    #wp-slim.lt_Everyones_Presentatio#

    + Index: openacs-4/packages/wp-slim/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/index.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/wp-slim/www/index.adp 28 Aug 2003 09:42:00 -0000 1.6 +++ openacs-4/packages/wp-slim/www/index.adp 22 Sep 2003 18:41:27 -0000 1.7 @@ -1,36 +1,36 @@ -WimpyPoint -@context;noquote@ +#wp-slim.WimpyPoint# +@context@ @@ -39,47 +39,48 @@
    [ -Last Week +#wp-slim.Last_Week# -Last Week +#wp-slim.Last_Week# | -Last Two Weeks +#wp-slim.Last_Two_Weeks# -Last Two Weeks +#wp-slim.Last_Two_Weeks# | -Last Month +#wp-slim.Last_Month# -Last Month +#wp-slim.Last_Month# | -All +#wp-slim.All# -All +#wp-slim.All# ] [ -Yours +#wp-slim.Yours# | -Everyone's +#wp-slim.Everyones# -Yours +#wp-slim.Yours# | -Everyone's +#wp-slim.Everyones# ]
    -

    My Presentations

    +

    #wp-slim.My_Presentations#

    -

    Options

    +

    #wp-slim.Options#

    -

    Everyone's Presentations

    +

    #wp-slim.lt_Everyones_Presentatio#

     + Index: openacs-4/packages/wp-slim/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/index.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/wp-slim/www/index.tcl 28 Aug 2003 09:42:00 -0000 1.5 +++ openacs-4/packages/wp-slim/www/index.tcl 22 Sep 2003 18:41:27 -0000 1.6 @@ -8,7 +8,7 @@ @author Rocael Hernandez (roc@viaro.net) openacs package owner @author Paul Konigsberg (paul@arsdigita.com, original) @creation-date Wed Nov 8 17:33:21 2000 - @cvs-id index.tcl,v 1.4.2.1 2003/05/21 15:31:03 rocaelh Exp + @cvs-id $Id$ } { {show_age:integer "14"} {show_user "yours"} @@ -24,21 +24,28 @@ set show_age_value "show_age=$show_age" if {$show_age != 0} { - set extra_where_clauses [db_map extra_where_clauses] + if {[db_type] == "oracle"} { set date sysdate } else { set date "now()" } + set extra_where_clauses "and ao.creation_date >= ($date - $show_age)" } else { set extra_where_clauses "" } if {$user_id == 0} { - db_multirow allpresentations get_all_public_presentations { *SQL* } + db_multirow allpresentations get_all_public_presentations { *SQL* } { + set creation_date [lc_time_fmt $creation_date "%Q"] + } set return_url [ns_urlencode [ad_conn url]] ad_return_template index-unregistered } else { - db_multirow presentations get_my_presentations { *SQL* } + db_multirow presentations get_my_presentations { *SQL* } { + set creation_date [lc_time_fmt $creation_date "%Q"] + } if {$show_user == "all"} { - db_multirow allpresentations get_all_visible_presentations { *SQL* } + db_multirow allpresentations get_all_visible_presentations { *SQL* } { + set creation_date [lc_time_fmt $creation_date "%Q"] + } } ad_return_template index Index: openacs-4/packages/wp-slim/www/invite-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/invite-2.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/invite-2.adp 22 May 2003 15:18:55 -0000 1.4 +++ openacs-4/packages/wp-slim/www/invite-2.adp 22 Sep 2003 18:41:27 -0000 1.5 @@ -1,13 +1,14 @@ -Email Sent -@context;noquote@ +#wp-slim.Email_Sent# +@context@ -@name@ (@email@) has been invited to work on the presentation test. The following E-mail was sent: +#wp-slim.lt_name_email_has_been_i# 
     @email_content@
    -

    Return to test +

    #wp-slim.Return_to_test#

    + Index: openacs-4/packages/wp-slim/www/invite-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/invite-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/invite-2.tcl 6 Sep 2002 15:32:23 -0000 1.2 +++ openacs-4/packages/wp-slim/www/invite-2.tcl 22 Sep 2003 18:41:27 -0000 1.3 @@ -22,7 +22,7 @@ ad_require_permission $pres_item_id wp_admin_presentation -set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] [list "invite?[export_url_vars pres_item_id role title]" "Invite User"] "Email Sent"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "[_ wp-slim.Authorization]"] [list "invite?[export_url_vars pres_item_id role title]" "[_ wp-slim.Invite_User]"] "[_ wp-slim.Email_Sent]"] set user_id [ad_verify_and_get_user_id] @@ -34,20 +34,12 @@ and parties.party_id = :user_id } +set server [ad_conn server] +set location [ad_conn location] set email_content [ad_convert_to_html -html_p t " -From: $user_name $user_email -To: $name $email - -Hello! I have invited you to work on the WimpyPoint presentation named - - $title - -on [ad_conn server]. To do so, you'll need to register for an account on -[ad_conn server]. Please visit [ad_conn location] and follow the instructions. - -$message +[_ wp-slim.lt_From_user_name_user_e] "] -ns_sendmail $email $user_email "WimpyPoint Invitation" "$email_content" +ns_sendmail $email $user_email "[_ wp-slim.lt_WimpyPoint_Invitation]" "$email_content" -ad_return_template \ No newline at end of file +ad_return_template Index: openacs-4/packages/wp-slim/www/invite.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/invite.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/invite.adp 22 May 2003 15:18:55 -0000 1.4 +++ openacs-4/packages/wp-slim/www/invite.adp 22 Sep 2003 18:41:27 -0000 1.5 @@ -1,6 +1,6 @@ -Invite User -@context;noquote@ +#wp-slim.Invite_User# +@context@
    @@ -12,13 +12,14 @@
    - - - - + + + +
    - Please provide the name and E-mail address of the person whom you want to invite to @role@ the presentation, and we'll send an E-mail inviting him or her to do so, and describing how to register with ArsDigita. The E-mail will appear to come from you, and you'll receive a copy.

    + #wp-slim.lt_Please_provide_the_na#

    Name: 
    E-mail: 

    Message: 
    If you like, you can provide a brief message to include in the invitation E-mail.
    #wp-slim.Namenbsp#
    #wp-slim.E-mailnbsp#

    #wp-slim.Messagenbsp#
    #wp-slim.lt_If_you_like_you_can_p#

    + Index: openacs-4/packages/wp-slim/www/invite.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/invite.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/invite.tcl 6 Sep 2002 15:32:23 -0000 1.2 +++ openacs-4/packages/wp-slim/www/invite.tcl 22 Sep 2003 18:41:27 -0000 1.3 @@ -20,7 +20,7 @@ ad_require_permission $pres_item_id wp_admin_presentation -set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Invite User"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "[_ wp-slim.Authorization]"] "[_ wp-slim.Invite_User]"] set encoded_title [ad_urlencode $title] -ad_return_template \ No newline at end of file +ad_return_template Index: openacs-4/packages/wp-slim/www/presentation-acl-add-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-2.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/presentation-acl-add-2.adp 22 May 2003 15:18:55 -0000 1.4 +++ openacs-4/packages/wp-slim/www/presentation-acl-add-2.adp 22 Sep 2003 18:41:27 -0000 1.5 @@ -1,6 +1,6 @@ -Confirm Add User -@context;noquote@ +#wp-slim.Confirm_Add_User# +@context@ @@ -12,20 +12,19 @@ -

    Are you sure you want to give @first_names_from_search@ @last_name_from_search@ permission to view the presentation test? +

    #wp-slim.lt_Are_you_sure_you_want#

    -
     Send an E-mail message to @first_names_from_search@ with a link to the presentation.
    Include -the following message (optional): +    		#wp-slim.lt_Send_an_E-mail_messag#
    #wp-slim.lt_Includethe_following_#

    - + - -

    \ No newline at end of file + +

    Index: openacs-4/packages/wp-slim/www/presentation-acl-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/presentation-acl-add-2.tcl 6 Sep 2002 15:32:23 -0000 1.2 +++ openacs-4/packages/wp-slim/www/presentation-acl-add-2.tcl 22 Sep 2003 18:41:27 -0000 1.3 @@ -23,7 +23,7 @@ ad_require_permission $pres_item_id wp_admin_presentation -set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Confirm Add User"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "[_ wp-slim.Authorization]"] "[_ wp-slim.Confirm_Add_User]"] set privilege [ad_decode $role "read" "wp_view_presentation" "write" "wp_edit_presentation" "admin" "wp_admin_presentation" ""] @@ -35,11 +35,12 @@ and grantee_id = :user_id_from_search and privilege = :privilege }] { - ad_return_error "User Already Had That Privilege" "That user can already $role the presentation. Maybe you want to try again" + set vars [export_url_vars pres_item_id] + ad_return_error "[_ wp-slim.lt_User_Already_Had_That]" "[_ wp-slim.lt_That_user_can_already]" db_release_unused_handles return } db_release_unused_handles -ad_return_template \ No newline at end of file +ad_return_template Index: openacs-4/packages/wp-slim/www/presentation-acl-add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-3.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/presentation-acl-add-3.tcl 19 Jun 2002 11:37:28 -0000 1.2 +++ openacs-4/packages/wp-slim/www/presentation-acl-add-3.tcl 22 Sep 2003 18:41:27 -0000 1.3 @@ -27,7 +27,7 @@ from parties where party_id = :user_id } - ns_sendmail $email_from_search $sender_email "WimpyPoint Authorization" "$message" + ns_sendmail $email_from_search $sender_email "[_ wp-slim.lt_WimpyPoint_Authorizat]" "$message" } set privilege_list "wp_view_presentation" @@ -60,4 +60,4 @@ } } -ad_returnredirect presentation-acl?[export_vars -url { pres_item_id }] \ No newline at end of file +ad_returnredirect presentation-acl?[export_vars -url { pres_item_id }] Index: openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.adp 22 May 2003 15:18:55 -0000 1.4 +++ openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.adp 22 Sep 2003 18:41:27 -0000 1.5 @@ -1,14 +1,14 @@ -Confirm Add Users -@context;noquote@ +#wp-slim.Confirm_Add_Users# +@context@ -

    Are you sure you want to give the following users permission to @role@ the presentation @title@? +

    #wp-slim.lt_Are_you_sure_you_want_1#

      @@ -17,7 +17,7 @@

    - + - -

    \ No newline at end of file + +

    Index: openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.tcl 6 Sep 2002 15:32:23 -0000 1.2 +++ openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.tcl 22 Sep 2003 18:41:27 -0000 1.3 @@ -22,7 +22,7 @@ ad_require_permission $pres_item_id wp_admin_presentation -set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Confirm Add Users"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "[_ wp-slim.Authorization]"] "[_ wp-slim.Confirm_Add_Users]"] db_multirow group users_get { select p.first_names, @@ -34,4 +34,4 @@ order by p.last_name } -ad_return_template \ No newline at end of file +ad_return_template Index: openacs-4/packages/wp-slim/www/presentation-acl-add-group.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-group.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/wp-slim/www/presentation-acl-add-group.adp 22 May 2003 15:18:55 -0000 1.5 +++ openacs-4/packages/wp-slim/www/presentation-acl-add-group.adp 22 Sep 2003 18:41:27 -0000 1.6 @@ -1,6 +1,6 @@ -Add Group -@context;noquote@ +#wp-slim.Add_Group# +@context@ @@ -13,8 +13,7 @@

    -
    Please select the name of the group -you wish to give permission to @role@ thee presentation test. +
    #wp-slim.lt_Please_select_the_nam#
    - +

    + Index: openacs-4/packages/wp-slim/www/presentation-acl-add-group.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-group.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/presentation-acl-add-group.tcl 6 Sep 2002 15:32:23 -0000 1.2 +++ openacs-4/packages/wp-slim/www/presentation-acl-add-group.tcl 22 Sep 2003 18:41:27 -0000 1.3 @@ -21,12 +21,12 @@ ad_require_permission $pres_item_id wp_admin_presentation -set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Add Group"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "[_ wp-slim.Authorization]"] "[_ wp-slim.Add_Group]"] db_multirow groups groups_get { select group_id, group_name from groups order by group_name } -ad_return_template \ No newline at end of file +ad_return_template Index: openacs-4/packages/wp-slim/www/presentation-acl-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/wp-slim/www/presentation-acl-add.adp 22 May 2003 15:18:55 -0000 1.6 +++ openacs-4/packages/wp-slim/www/presentation-acl-add.adp 22 Sep 2003 18:41:27 -0000 1.7 @@ -1,6 +1,6 @@ -Add User -@context;noquote@ +#wp-slim.Add_User# +@context@ @params@ @@ -9,16 +9,13 @@

    - - - + +
    Please enter part of the E-mail address or last name of the user -you wish to give permission to view the presentation test.

    If you can't find the person you're looking for, -he or she probably hasn't yet registered on ArsDigita, but you can invite him or her to -view your presentation.

    +
    #wp-slim.lt_Please_enter_part_of_#

    #wp-slim.lt_If_you_cant_find_the_#

    Last Name: 
    or E-mail: 
    #wp-slim.Last_Namenbsp#
    #wp-slim.or# #wp-slim.E-mailnbsp#
    - +

    - \ No newline at end of file + Index: openacs-4/packages/wp-slim/www/presentation-acl-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/presentation-acl-add.tcl 6 Sep 2002 15:32:23 -0000 1.3 +++ openacs-4/packages/wp-slim/www/presentation-acl-add.tcl 22 Sep 2003 18:41:27 -0000 1.4 @@ -20,12 +20,12 @@ ad_require_permission $pres_item_id wp_admin_presentation -set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Add User"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "[_ wp-slim.Authorization]"] "[_ wp-slim.Add_User]"] set encoded_title [ns_urlencode $title] set target "[ad_conn package_url]/presentation-acl-add-2" set passthrough [list pres_item_id role title] set params [export_form_vars pres_item_id role title target passthrough] -ad_return_template \ No newline at end of file +ad_return_template Index: openacs-4/packages/wp-slim/www/presentation-acl.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/wp-slim/www/presentation-acl.adp 22 May 2003 15:18:55 -0000 1.5 +++ openacs-4/packages/wp-slim/www/presentation-acl.adp 22 Sep 2003 18:41:27 -0000 1.6 @@ -1,20 +1,20 @@ -Authorization -@context;noquote@ +#wp-slim.Authorization# +@context@

    -The presentation is public, so anyone is allowed to view it. You can make the presentation private if you want only certain users to be able to view it. +#wp-slim.lt_The_presentation_is_p# #wp-slim.lt_You_can_nobra_hrefpre#

    @@ -24,24 +24,24 @@
    -
    The following users may view the presentation:

    (or you can make the presentation public so everyone can view it) +
    #wp-slim.lt_The_following_users_m#

    (#wp-slim.lt_or_you_can_a_hrefpres#)

    		  - +
    No users.
    #wp-slim.No_users#
    @read_users.first_names@ @read_users.last_name@ - (creator) + #wp-slim.creator# - [remove] + [#wp-slim.remove#]
    - - + +
    @@ -53,7 +53,7 @@ -
    The following users may view and make changes to the presentation: +
    #wp-slim.lt_The_following_users_m_1#   @@ -62,24 +62,24 @@ - +
    No users.
    #wp-slim.No_users#
    @write_users.first_names@ @write_users.last_name@ - (creator) + #wp-slim.creator# - [remove] + [#wp-slim.remove#]

    - - + + @@ -90,7 +90,7 @@ -
    The following users may view and make changes to the presentation, and decide who gets to view/edit it: +
    #wp-slim.lt_The_following_users_m_2#   @@ -99,24 +99,24 @@ - +
    No users.
    #wp-slim.No_users#
    @admin_users.first_names@ @admin_users.last_name@ - (creator) + #wp-slim.creator# - [remove] + [#wp-slim.remove#]
    - - + + @@ -128,3 +128,4 @@

    + Index: openacs-4/packages/wp-slim/www/presentation-acl.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/presentation-acl.tcl 28 Aug 2003 09:42:00 -0000 1.3 +++ openacs-4/packages/wp-slim/www/presentation-acl.tcl 22 Sep 2003 18:41:27 -0000 1.4 @@ -34,7 +34,7 @@ set encoded_title [ns_urlencode $title] -set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] "Authorization"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] "[_ wp-slim.Authorization]"] Index: openacs-4/packages/wp-slim/www/presentation-print-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-print-view.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/presentation-print-view.adp 28 Aug 2003 09:42:00 -0000 1.3 +++ openacs-4/packages/wp-slim/www/presentation-print-view.adp 22 Sep 2003 18:41:27 -0000 1.4 @@ -1,9 +1,9 @@ -@pres_title;noquote@ -@context;noquote@ +@pres_title@ +@context@

    @pres_title@

    -a Wimpy Point Presentation owned by @owner_name@ +#wp-slim.lt_a_Wimpy_Point_Present# @owner_name@ @copyright_notice@ @@ -95,3 +95,4 @@
    @page_signature@ + Index: openacs-4/packages/wp-slim/www/presentation-print-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-print-view.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/presentation-print-view.tcl 28 Aug 2003 09:42:00 -0000 1.2 +++ openacs-4/packages/wp-slim/www/presentation-print-view.tcl 22 Sep 2003 18:41:27 -0000 1.3 @@ -20,7 +20,7 @@ owner_id : onevalue } -set context [list "Print View"] +set context [list "[_ wp-slim.Print_View]"] set user_id [ad_verify_and_get_user_id] ## permission checking roc@ permission::require_permission -party_id $user_id -object_id $item_id -privilege wp_view_presentation Index: openacs-4/packages/wp-slim/www/presentation-revisions-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-revisions-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/presentation-revisions-oracle.xql 4 Oct 2001 04:23:13 -0000 1.1 +++ openacs-4/packages/wp-slim/www/presentation-revisions-oracle.xql 22 Sep 2003 18:41:27 -0000 1.2 @@ -7,7 +7,7 @@ select r.revision_id, - to_char(ao.creation_date, 'HH24:MI:SS Mon DD, YYYY') as creation_date, + ao.creation_date as creation_date, ao.creation_ip, i.live_revision, p.first_names || ' ' || p.last_name as full_name Index: openacs-4/packages/wp-slim/www/presentation-revisions-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-revisions-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/presentation-revisions-postgresql.xql 4 Oct 2001 04:23:13 -0000 1.1 +++ openacs-4/packages/wp-slim/www/presentation-revisions-postgresql.xql 22 Sep 2003 18:41:27 -0000 1.2 @@ -7,7 +7,7 @@ select r.revision_id, - to_char(ao.creation_date, 'HH24:MI:SS Mon DD, YYYY') as creation_date, + ao.creation_date as creation_date, ao.creation_ip, i.live_revision, p.first_names || ' ' || p.last_name as full_name Index: openacs-4/packages/wp-slim/www/presentation-revisions.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-revisions.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/wp-slim/www/presentation-revisions.adp 22 May 2003 15:18:55 -0000 1.5 +++ openacs-4/packages/wp-slim/www/presentation-revisions.adp 22 Sep 2003 18:41:27 -0000 1.6 @@ -1,27 +1,26 @@ -All Revisions of This Presentation -@context;noquote@ +#wp-slim.lt_All_Revisions_of_This# +@context@ -Revision in red is the current live revision. +#wp-slim.lt_Revision_in_font_colo#
    • -Created by @revisions.full_name@ from -@revisions.creation_ip@ at @revisions.creation_date@ (view) +#wp-slim.lt_Created_by_revisionsf# (#wp-slim.view#) -Created by @revisions.full_name@ from @revisions.creation_ip@ at -@revisions.creation_date@ (view | go live) +#wp-slim.lt_Created_by_revisionsf_1# (#wp-slim.view# | #wp-slim.go_live#)
    -

    Create a new revision +

    #wp-slim.lt_Create_a_new_revision# + Index: openacs-4/packages/wp-slim/www/presentation-revisions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-revisions.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/presentation-revisions.tcl 28 Aug 2003 09:42:00 -0000 1.4 +++ openacs-4/packages/wp-slim/www/presentation-revisions.tcl 22 Sep 2003 18:41:27 -0000 1.5 @@ -22,7 +22,7 @@ db_multirow revisions revisions_get { select r.revision_id, - to_char(ao.creation_date, 'HH24:MI:SS Mon DD, YYYY') as creation_date, + ao.creation_date as creation_date, ao.creation_ip, i.live_revision, p.first_names || ' ' || p.last_name as full_name @@ -35,9 +35,11 @@ and i.item_id = r.item_id and p.person_id = ao.creation_user order by creation_date +} { + set creation_date [lc_time_fmt $creation_date "%X %Q"] } -set context [list [list "presentation-top?[export_url_vars pres_item_id]" "Presentation"] "All Revisions"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "[_ wp-slim.Presentation]"] "[_ wp-slim.All_Revisions]"] set return_url [ns_urlencode "presentation-revisions?[export_url_vars pres_item_id]"] Index: openacs-4/packages/wp-slim/www/presentation-top.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-top.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/wp-slim/www/presentation-top.adp 28 Aug 2003 09:42:00 -0000 1.6 +++ openacs-4/packages/wp-slim/www/presentation-top.adp 22 Sep 2003 18:41:27 -0000 1.7 @@ -1,10 +1,10 @@ -@presentation_title;noquote@ -@context;noquote@ +@presentation_title@ +@context@ -

    The Slides

    +

    #wp-slim.The_Slides#

    - Create the first slide. + #wp-slim.lt_Create_the_first_slid# @@ -13,75 +13,76 @@ - + - + - +
    @slides.sort_key@. @slides.slide_title@ -[ edit | +[ #wp-slim.edit# | - delete | + #wp-slim.delete# | -attach | -view revisions] +#wp-slim.attach# | +#wp-slim.view_revisions#] arrow Insert #wp-slim.arrow# #wp-slim.Insert#
    Change order of slides #wp-slim.lt_Change_order_of_slide# arrow Add #wp-slim.arrow# #wp-slim.Add#
    -

    Options

    +

    #wp-slim.Options#

    -

    Viewers / Collaborators

    +

    #wp-slim.lt_Viewers__Collaborator#

    -

    Versioning

    +

    #wp-slim.Versioning#

    + Index: openacs-4/packages/wp-slim/www/search.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/search.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/wp-slim/www/search.adp 22 May 2003 15:18:55 -0000 1.5 +++ openacs-4/packages/wp-slim/www/search.adp 22 Sep 2003 18:41:27 -0000 1.6 @@ -1,15 +1,15 @@ -User Search in @group_name;noquote@ -"User search" +#wp-slim.User_Search# #wp-slim.in_group_name# +#wp-slim.User_search# -Search +#wp-slim.Search# - for name or email matching "@keyword@" + #wp-slim.lt_for_name_or_email_mat# - for email "@email@" + #wp-slim.for_email_email# - for last name "@last_name@" + #wp-slim.lt_for_last_name_last_na#
      @@ -24,7 +24,8 @@ -
    • No users found. +
    • #wp-slim.No_users_found#
    + Index: openacs-4/packages/wp-slim/www/search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/search.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/search.tcl 18 Jun 2002 15:13:23 -0000 1.1 +++ openacs-4/packages/wp-slim/www/search.tcl 22 Sep 2003 18:41:27 -0000 1.2 @@ -40,27 +40,26 @@ # this is an administrator if { [empty_string_p $keyword] } { incr exception_count - append exception_text "
  • You forgot to type a search string!\n" + append exception_text "
  • [_ wp-slim.lt_You_forgot_to_type_a_]\n" } } else { # from one of the user pages if { (![info exists email] || [empty_string_p $email]) && \ (![info exists last_name] || [empty_string_p $last_name]) } { incr exception_count - append exception_text "
  • You must specify either an email address or last name to search for.\n" + append exception_text "
  • [_ wp-slim.lt_You_must_specify_eith]\n" } if { [info exists email] && [info exists last_name] && \ ![empty_string_p $email] && ![empty_string_p $last_name] } { incr exception_count - append exception_text "
  • You can only specify either email or last name, not both.\n" + append exception_text "
  • [_ wp-slim.lt_You_can_only_specify_]\n" } if { ![info exists target] || [empty_string_p $target] } { incr exception_count - append exception_text "
  • Target was not specified. This shouldn't have happened, -please contact the administrator -and let them know what happened.\n" + set host_administrator [ad_host_administrator] + append exception_text "
  • [_ wp-slim.lt_Target_was_not_specif]\n" } } Index: openacs-4/packages/wp-slim/www/serve-presentation-revision.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation-revision.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/wp-slim/www/serve-presentation-revision.adp 28 Aug 2003 09:42:00 -0000 1.7 +++ openacs-4/packages/wp-slim/www/serve-presentation-revision.adp 22 Sep 2003 18:41:27 -0000 1.8 @@ -1,48 +1,49 @@ -@pres_title;noquote@ -@context;noquote@ -@style;noquote@ -@page_signature;noquote@ -@copyright_notice;noquote@ +@pres_title@ +@context@ +@style@ +@page_signature@ +@copyright_notice@ -

    One Revision

    +

    #wp-slim.One_Revision#

    - + - + - + - + - + -wp + - + - +
    Title#wp-slim.Title_1# @pres_title@
    Page Signature#wp-slim.Page_Signature_1# @page_signature@
    Copyright Notice#wp-slim.Copyright_Notice_1# @copyright_notice@
    Public?#wp-slim.Public# @public_p@
    Show Modified Date?#wp-slim.Show_Modified_Date# @show_modified_p@
    Audience#wp-slim.Audience_1# @audience@
    Background#wp-slim.Background_1# @background@
    + Index: openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl 28 Aug 2003 09:42:00 -0000 1.5 +++ openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl 22 Sep 2003 18:41:27 -0000 1.6 @@ -22,7 +22,7 @@ if {![regexp {presentation_revision/([0-9]+)/([0-9]+)} $url match pres_item_id pres_revision_id]} { ns_log notice "Could not get a pres_item_id and a pres_revision_id out of url=$url" - ad_return_error "Wimpy Point" "Could not get a pres_item_id and a pres_revision_id out of url=$url" + ad_return_error "[_ wp-slim.Wimpy_Point]" "[_ wp-slim.lt_Could_not_get_a_pres__1]" } #added permission checking roc@ @@ -57,6 +57,6 @@ and r.revision_id = pb.id } -set context [list [list "$subsite_name/presentation-top?[export_url_vars pres_item_id]" "$pres_title"] "One Revision"] +set context [list [list "$subsite_name/presentation-top?[export_url_vars pres_item_id]" "$pres_title"] "[_ wp-slim.One_Revision]"] ad_return_template Index: openacs-4/packages/wp-slim/www/serve-presentation.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation.adp,v diff -u -r1.8 -r1.9 --- openacs-4/packages/wp-slim/www/serve-presentation.adp 28 Aug 2003 09:42:00 -0000 1.8 +++ openacs-4/packages/wp-slim/www/serve-presentation.adp 22 Sep 2003 18:41:27 -0000 1.9 @@ -1,24 +1,24 @@ -@pres_title;noquote@ -"one presentation" +@pres_title@ +#wp-slim.one_presentation# @style@ @page_signature@ @copyright_notice@ -
    done + #wp-slim.done# - | next + | #wp-slim.next#

    @pres_title@

    -a Wimpy Point Presentation owned by @owner_name@ +#wp-slim.lt_a_Wimpy_Point_Present# @owner_name@ -
    in collaboration with +
    #wp-slim.lt_in_collaboration_with# @collaborators.full_name@ ,  @@ -33,3 +33,4 @@ + Index: openacs-4/packages/wp-slim/www/serve-presentation.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/serve-presentation.tcl 28 Aug 2003 09:42:00 -0000 1.4 +++ openacs-4/packages/wp-slim/www/serve-presentation.tcl 22 Sep 2003 18:41:27 -0000 1.5 @@ -21,7 +21,7 @@ if {![regexp {display/([0-9]+)/?$} $url match pres_item_id]} { ns_log notice "Could not get a pres_item_id and slide_item_id out of url=$url" - ad_return_error "Wimpy Point" "Could not get a pres_item_id and slide_item_id out of url=$url" + ad_return_error "[_ wp-slim.Wimpy_Point]" "[_ wp-slim.lt_Could_not_get_a_pres__2]" } #added permission checking roc@ Index: openacs-4/packages/wp-slim/www/serve-slide-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide-oracle.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/serve-slide-oracle.xql 15 Nov 2001 01:47:13 -0000 1.2 +++ openacs-4/packages/wp-slim/www/serve-slide-oracle.xql 22 Sep 2003 18:41:27 -0000 1.3 @@ -11,7 +11,7 @@ wp_slide.get_preamble(:slide_item_id) as preamble, wp_slide.get_postamble(:slide_item_id) as postamble, wp_slide.get_bullet_items(:slide_item_id) as bullet_items, - to_char(ao.creation_date, 'HH24:MI, Mon DD, YYYY') as modified_date + ao.creation_date as modified_date from cr_wp_slides s, cr_items i, acs_objects ao where i.item_id = :slide_item_id and i.live_revision = s.slide_id Index: openacs-4/packages/wp-slim/www/serve-slide-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide-postgresql.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/serve-slide-postgresql.xql 15 Nov 2001 01:47:13 -0000 1.2 +++ openacs-4/packages/wp-slim/www/serve-slide-postgresql.xql 22 Sep 2003 18:41:27 -0000 1.3 @@ -11,7 +11,7 @@ wp_slide__get_preamble(:slide_item_id) as preamble, wp_slide__get_postamble(:slide_item_id) as postamble, wp_slide__get_bullet_items(:slide_item_id) as bullet_items, - to_char(ao.creation_date, 'HH24:MI, Mon DD, YYYY') as modified_date + ao.creation_date as modified_date from cr_wp_slides s, cr_items i, acs_objects ao where i.item_id = :slide_item_id and i.live_revision = s.slide_id Index: openacs-4/packages/wp-slim/www/serve-slide-revision-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide-revision-oracle.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/serve-slide-revision-oracle.xql 23 Feb 2002 21:21:07 -0000 1.3 +++ openacs-4/packages/wp-slim/www/serve-slide-revision-oracle.xql 22 Sep 2003 18:41:27 -0000 1.4 @@ -11,7 +11,7 @@ wp_slide.get_preamble_revision(:slide_revision_id) as preamble, wp_slide.get_postamble_revision(:slide_revision_id) as postamble, wp_slide.get_bullet_items_revision(:slide_revision_id) as bullet_items, - to_char(ao.creation_date, 'HH24:MI, Mon DD, YYYY') as modified_date + ao.creation_date as modified_date from cr_wp_slides s, cr_items i, acs_objects ao Index: openacs-4/packages/wp-slim/www/serve-slide-revision-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide-revision-postgresql.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/serve-slide-revision-postgresql.xql 15 Nov 2001 01:47:13 -0000 1.2 +++ openacs-4/packages/wp-slim/www/serve-slide-revision-postgresql.xql 22 Sep 2003 18:41:27 -0000 1.3 @@ -11,7 +11,7 @@ wp_slide__get_preamble_revision(:slide_revision_id) as preamble, wp_slide__get_postamble_revision(:slide_revision_id) as postamble, wp_slide__get_bullet_items_revision(:slide_revision_id) as bullet_items, - to_char(ao.creation_date, 'HH24:MI, Mon DD, YYYY') as modified_date + ao.creation_date as modified_date from cr_wp_slides s, cr_items i, acs_objects ao Index: openacs-4/packages/wp-slim/www/serve-slide-revision.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide-revision.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/wp-slim/www/serve-slide-revision.adp 28 Aug 2003 09:42:00 -0000 1.6 +++ openacs-4/packages/wp-slim/www/serve-slide-revision.adp 22 Sep 2003 18:41:27 -0000 1.7 @@ -1,12 +1,12 @@ -@slide_title;noquote@ -@context;noquote@ -@style;noquote@ -@page_signature;noquote@ -@copyright_notice;noquote@ +@slide_title@ +@context@ +@style@ +@page_signature@ +@copyright_notice@ -Last modified @modified_date@ +#wp-slim.lt_Last_modified_modifie# @@ -88,3 +88,4 @@ @page_signature@ + Index: openacs-4/packages/wp-slim/www/serve-slide-revision.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide-revision.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/serve-slide-revision.tcl 28 Aug 2003 09:42:00 -0000 1.4 +++ openacs-4/packages/wp-slim/www/serve-slide-revision.tcl 22 Sep 2003 18:41:27 -0000 1.5 @@ -28,7 +28,7 @@ if {![regexp {slide_revision/([0-9]+)/([0-9]+)/([0-9]+)\.wimpy} $url match pres_item_id slide_item_id slide_revision_id]} { ns_log notice "Could not get a pres_item_id, slide_item_id and slide_revision_id out of url=$url" - ad_return_error "Wimpy Point" "Could not get a pres_item_id, slide_item_id and slide_revision_id out of url=$url" + ad_return_error "[_ wp-slim.Wimpy_Point]" "[_ wp-slim.lt_Could_not_get_a_pres__3]" } #added permission checking roc@ @@ -45,7 +45,7 @@ wp_slide.get_preamble_revision(:slide_revision_id) as preamble, wp_slide.get_postamble_revision(:slide_revision_id) as postamble, wp_slide.get_bullet_items_revision(:slide_revision_id) as bullet_items, - to_char(ao.creation_date, 'HH24:MI, Mon DD, YYYY') as modified_date + ao.creation_date as modified_date from cr_wp_slides s, cr_items i, acs_objects ao @@ -54,8 +54,10 @@ and ao.object_id = s.slide_id } -set context [list [list "$subsite_name/display/$pres_item_id" "one presentation"] "one slide"] +set modified_date [lc_time_fmt $modified_date "%X %Q"] +set context [list [list "$subsite_name/display/$pres_item_id" "one presentation"] "[_ wp-slim.one_slide]"] + db_1row get_presentation_page_signature { select p.page_signature, p.show_modified_p Index: openacs-4/packages/wp-slim/www/serve-slide.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide.adp,v diff -u -r1.9 -r1.10 --- openacs-4/packages/wp-slim/www/serve-slide.adp 28 Aug 2003 09:42:00 -0000 1.9 +++ openacs-4/packages/wp-slim/www/serve-slide.adp 22 Sep 2003 18:41:27 -0000 1.10 @@ -1,9 +1,9 @@ -@slide_title;noquote@ -@context;noquote@ -@style;noquote@ -@page_signature;noquote@ -@copyright_notice;noquote@ +@slide_title@ +@context@ +@style@ +@page_signature@ +@copyright_notice@ @@ -13,7 +13,7 @@

    @slide_title@

    -Last modified @modified_date@ +#wp-slim.lt_Last_modified_modifie#
    @@ -100,7 +100,7 @@ -

    Slide Comments

    +

    #wp-slim.Slide_Comments#

    @comments@     @@ -117,3 +117,4 @@     + Index: openacs-4/packages/wp-slim/www/serve-slide.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/wp-slim/www/serve-slide.tcl 28 Aug 2003 09:42:00 -0000 1.6 +++ openacs-4/packages/wp-slim/www/serve-slide.tcl 22 Sep 2003 18:41:27 -0000 1.7 @@ -26,7 +26,7 @@ if {![regexp {display/([0-9]+)/([0-9]+)\.wimpy} $url match pres_item_id slide_item_id]} { ns_log notice "Could not get a pres_item_id and slide_item_id out of url=$url" - ad_return_error "Wimpy Point" "Could not get a pres_item_id and slide_item_id out of url=$url" + ad_return_error "[_ wp-slim.Wimpy_Point]" "[_ wp-slim.lt_Could_not_get_a_pres_]" } #added permission checking roc@ @@ -53,20 +53,22 @@ wp_slide.get_preamble(:slide_item_id) as preamble, wp_slide.get_postamble(:slide_item_id) as postamble, wp_slide.get_bullet_items(:slide_item_id) as bullet_items, - to_char(ao.creation_date, 'HH24:MI, Mon DD, YYYY') as modified_date + ao.creation_date as modified_date from cr_wp_slides s, cr_items i, acs_objects ao where i.item_id = :slide_item_id and i.live_revision = s.slide_id and ao.object_id = s.slide_id } +set modified_date [lc_time_fmt $modified_date "%Q"] + db_1row get_presentation_page_signature { *SQL* } -set context [list [list "$subsite_name/display/$pres_item_id" "one presentation"] "one slide"] +set context [list [list "$subsite_name/display/$pres_item_id" "one presentation"] "[_ wp-slim.one_slide]"] # Figure out what the previous slide link should be. if {$sort_key == 1} { - set href_back "top | " + set href_back "[_ wp-slim.top] | " } else { set previous_slide_item_id [db_string get_previous_slide_item_id { select i.item_id @@ -76,7 +78,7 @@ and s.sort_key = (:sort_key - 1) } ] - set href_back "previous | " + set href_back "[_ wp-slim.previous] | " } # Figure out what the next slide link should be. @@ -97,9 +99,9 @@ # this is the only slide. set href_back "" } - set href_forward "top" + set href_forward "[_ wp-slim.top]" } else { - set href_forward "next" + set href_forward "[_ wp-slim.next]" } @@ -113,10 +115,10 @@ set extra "" if {$edit_p == 1} { - append extra "edit | " + append extra "[_ wp-slim.edit] | " } if {$delete_p == 1} { - append extra "delete |" + append extra "[_ wp-slim.delete] |" } set href_back_forward "$href_back $extra $href_forward" Index: openacs-4/packages/wp-slim/www/slide-revisions-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slide-revisions-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/slide-revisions-oracle.xql 4 Oct 2001 04:23:13 -0000 1.1 +++ openacs-4/packages/wp-slim/www/slide-revisions-oracle.xql 22 Sep 2003 18:41:27 -0000 1.2 @@ -7,7 +7,7 @@ select r.revision_id, - to_char(ao.creation_date, 'HH24:MI:SS Mon DD, YYYY') as creation_date, + ao.creation_date as creation_date, ao.creation_ip, i.live_revision, p.first_names || ' ' || p.last_name as full_name Index: openacs-4/packages/wp-slim/www/slide-revisions-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slide-revisions-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/slide-revisions-postgresql.xql 4 Oct 2001 04:23:13 -0000 1.1 +++ openacs-4/packages/wp-slim/www/slide-revisions-postgresql.xql 22 Sep 2003 18:41:27 -0000 1.2 @@ -7,7 +7,7 @@ select r.revision_id, - to_char(ao.creation_date, 'HH24:MI:SS Mon DD, YYYY') as creation_date, + ao.creation_date as creation_date, ao.creation_ip, i.live_revision, p.first_names || ' ' || p.last_name as full_name Index: openacs-4/packages/wp-slim/www/slide-revisions.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slide-revisions.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/wp-slim/www/slide-revisions.adp 28 Aug 2003 09:42:00 -0000 1.5 +++ openacs-4/packages/wp-slim/www/slide-revisions.adp 22 Sep 2003 18:41:27 -0000 1.6 @@ -1,24 +1,25 @@ -All Revisions of This Slide -@context;noquote@ +#wp-slim.lt_All_Revisions_of_This_1# +@context@
    -Revision in red is the current live revision. +#wp-slim.lt_Revision_in_font_colo#
    • -Created by @revisions.full_name@ from @revisions.creation_ip@ at @revisions.creation_date@ (view) +#wp-slim.lt_Created_by_revisionsf_2# (#wp-slim.view#) -Created by @revisions.full_name@ from @revisions.creation_ip@ at @revisions.creation_date@ (view | go live) +#wp-slim.lt_Created_by_revisionsf_2# (#wp-slim.view# | #wp-slim.go_live#)
    -

    Create a new revision +

    #wp-slim.lt_Create_a_new_revision#

    + Index: openacs-4/packages/wp-slim/www/slide-revisions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slide-revisions.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/slide-revisions.tcl 28 Aug 2003 09:42:00 -0000 1.4 +++ openacs-4/packages/wp-slim/www/slide-revisions.tcl 22 Sep 2003 18:41:27 -0000 1.5 @@ -23,12 +23,12 @@ set subsite_name [ad_conn package_url] -set context [list [list "presentation-top?[export_url_vars pres_item_id]" "Presentation"] "Slide Revisions"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "[_ wp-slim.Presentation]"] "[_ wp-slim.Slide_Revisions]"] db_multirow revisions revisions_get { select r.revision_id, - to_char(ao.creation_date, 'HH24:MI:SS Mon DD, YYYY') as creation_date, + ao.creation_date as creation_date, ao.creation_ip, i.live_revision, p.first_names || ' ' || p.last_name as full_name @@ -41,6 +41,8 @@ and i.item_id = r.item_id and p.person_id = ao.creation_user order by creation_date +} { + set creation_date [lc_time_fmt $creation_date "%X %Q"] } set return_url [ns_urlencode "slide-revisions?[export_url_vars slide_item_id pres_item_id]"] Index: openacs-4/packages/wp-slim/www/slides-reorder.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slides-reorder.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/slides-reorder.adp 22 May 2003 15:18:55 -0000 1.4 +++ openacs-4/packages/wp-slim/www/slides-reorder.adp 22 Sep 2003 18:41:27 -0000 1.5 @@ -1,10 +1,9 @@ -Reorder Slides -@context;noquote@ +#wp-slim.Reorder_Slides# +@context@ -To move a slide in your presentation, select its title and click the Up or Down arrow. -When you're done, click Save Changes. +#wp-slim.lt_To_move_a_slide_in_yo# #wp-slim.Save_Changes#.