Index: openacs-4/readme.txt
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/readme.txt,v
diff -u -r1.11 -r1.12
--- openacs-4/readme.txt 26 Feb 2004 15:03:08 -0000 1.11
+++ openacs-4/readme.txt 12 Mar 2004 13:44:34 -0000 1.12
@@ -1,6 +1,6 @@
This is the OpenACS - the Open Architecture Community System.
-Version 5.0.2 Final
+Version 5.0.4 Final
--------------
Index: openacs-4/contrib/packages/project-manager/project-manager.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/Attic/project-manager.info,v
diff -u -r1.15 -r1.16
--- openacs-4/contrib/packages/project-manager/project-manager.info 26 Feb 2004 15:15:39 -0000 1.15
+++ openacs-4/contrib/packages/project-manager/project-manager.info 12 Mar 2004 13:44:41 -0000 1.16
@@ -8,25 +8,27 @@
<singleton-p>f</singleton-p>
<auto-mount>project-manager</auto-mount>
- <version name="0.7d" url="http://openacs.org/repository/download/apm/project-manager-0.7d.apm">
+ <version name="1.0a" url="http://openacs.org/repository/download/apm/project-manager-1.0a.apm">
<owner url="mailto:jader@bread.com">Jade Rubick</owner>
<summary>Project management tool for OpenACS</summary>
- <release-date>2004-02-04</release-date>
+ <release-date>2004-03-05</release-date>
<description format="text/plain">Track tasks, estimates and actual progress for a project. See the <a href="http://openacs.org/projects/dotwrk/project_management/">project page</a> for more information.</description>
- <provides url="project-manager" version="0.7d"/>
+ <provides url="project-manager" version="1.0a"/>
+ <requires url="acs-datetime" version="4.0"/>
<requires url="acs-templating" version="4.6.4"/>
<requires url="categories" version="0.1d"/>
<requires url="general-comments" version="4.0"/>
+ <requires url="logger" version="1.0b3"/>
<requires url="notifications" version="5.0.0a5"/>
<requires url="organizations" version="0.2d"/>
- <requires url="acs-datetime" version="4.0"/>
<callbacks>
- <callback type="after-instantiate" proc="project_manager::install::package_instantiate"/>
- <callback type="before-uninstantiate" proc="project_manager::install::package_uninstantiate"/>
+ <callback type="after-instantiate" proc="pm::install::package_instantiate"/>
+ <callback type="before-uninstantiate" proc="pm::install::package_uninstantiate"/>
</callbacks>
<parameters>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="OngoingByDefaultP" default="f" description="If set to t, then projects are by default ongoing (no deadline), unless the user selects otherwise. If set to f, then projects by default have a deadline." section_name="projects"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="ProjectName" default="Project" description="What projects should be refered to as" section_name="terminology"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="TaskName" default="Task" description="What tasks should be refered to as" section_name="terminology"/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="UseGoalP" default="1" description="If set to 1, then shows the option of including project goals" section_name="projects"/>
Index: openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-custom-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/sql/postgresql/Attic/project-manager-custom-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-custom-create.sql 26 Feb 2004 15:15:40 -0000 1.3
+++ openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-custom-create.sql 12 Mar 2004 13:44:41 -0000 1.4
@@ -24,6 +24,7 @@
-- the custom columns are added in. I put this here as a reminder
-- that other columns can be added in as well. These custom items
-- are in the custom-create.sql script
+
select content_type__create_attribute(
'pm_project',
'customer_id',
Index: openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/sql/postgresql/Attic/project-manager-drop.sql,v
diff -u -r1.13 -r1.14
--- openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-drop.sql 26 Feb 2004 15:15:40 -0000 1.13
+++ openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-drop.sql 12 Mar 2004 13:44:41 -0000 1.14
@@ -13,54 +13,8 @@
\i project-manager-custom-drop.sql
\i project-manager-notifications-drop.sql
--- task dependency types
-drop table pm_task_dependency_types cascade;
-drop table pm_task_dependency cascade;
-drop sequence pm_task_dependency_seq;
-drop sequence pm_tasks_number_seq;
+drop table pm_task_logger_proj_map;
-select content_type__drop_attribute ('pm_task', 'end_date', 't');
-select content_type__drop_attribute ('pm_task', 'percent_complete', 't');
-select content_type__drop_attribute ('pm_task', 'estimated_hours_work', 't');
-select content_type__drop_attribute ('pm_task', 'estimated_hours_work_min', 't');
-select content_type__drop_attribute ('pm_task', 'estimated_hours_work_max', 't');
-select content_type__drop_attribute ('pm_task', 'actual_hours_worked', 't');
-select content_type__drop_attribute ('pm_task', 'earliest_start', 't');
-select content_type__drop_attribute ('pm_task', 'earliest_finish', 't');
-select content_type__drop_attribute ('pm_task', 'latest_start', 't');
-select content_type__drop_attribute ('pm_task', 'latest_finish', 't');
-
--------------
--- WORKGROUPS
--------------
-
-drop sequence pm_workgroup_seq;
-drop table pm_workgroup_parties;
-drop table pm_workgroup;
-
-------------
--- PROCESSES
-------------
-
-drop sequence pm_process_seq;
-drop sequence pm_process_task_seq;
-drop sequence pm_process_task_dependency_seq;
-
-drop table pm_process_task_assignment;
-drop table pm_process_task_dependency;
-drop table pm_process_task;
-drop table pm_process;
-
----------
--- OTHERS
----------
-drop table pm_default_roles;
-drop table pm_project_assignment;
-drop table pm_task_assignment;
-drop table pm_roles;
-drop sequence pm_role_seq;
-
-
create function inline_0 ()
returns integer as '
declare
@@ -84,16 +38,6 @@
select inline_0();
drop function inline_0();
-select drop_package('pm_task');
-
-
------------
--- PROJECTS
------------
-
---drop permissions
-delete from acs_permissions where object_id in (select project_id from pm_projects);
-
-- unregister content_types from folder
create function inline_0 ()
returns integer as '
@@ -110,53 +54,21 @@
from
cr_items
where
- content_type = ''pm_project''
+ content_type = ''pm_task''
LOOP
- PERFORM pm_project__delete_project_item(v_item_cursor.item_id);
+ PERFORM pm_project__delete_task_item(v_item_cursor.item_id);
END LOOP;
- select content_item__get_id(''projects'', null, ''f'') into v_folder_id from dual;
+ -- this table must not hold reference to ''pm_tasks'' type
+ delete from cr_folder_type_map where content_type = ''pm_tasks'';
- -- unregister_content_types
- PERFORM content_folder__unregister_content_type (
- v_folder_id, -- folder_id
- ''pm_project'', -- content_type
- ''t'' -- include_subtypes
- );
-
- -- this table must not hold reference to ''pm_project'' type
- delete from cr_folder_type_map where content_type = ''pm_project'';
-
- -- delete projects folder
- PERFORM content_folder__delete(v_folder_id);
-
- -- delete the content folders
- FOR v_item_cursor IN
- select f.folder_id
- from cr_folders f,
- cr_items i
- where f.folder_id = i.item_id and
- description = ''Project Repository''
- LOOP
- PERFORM content_item__delete(v_item_cursor.folder_id);
- END LOOP;
-
return 0;
end;
' language 'plpgsql';
select inline_0();
drop function inline_0();
--- drop package, which drops all functions created with define_function_args
-select drop_package('pm_project');
-
---drop table
-drop table pm_projects cascade;
-
-drop sequence pm_project_status_seq;
-drop table pm_project_status;
-
-- unregister content_types from folder
create function inline_0 ()
returns integer as '
@@ -173,26 +85,41 @@
from
cr_items
where
- content_type = ''pm_task''
+ content_type = ''pm_project''
LOOP
- PERFORM pm_project__delete_task_item(v_item_cursor.item_id);
+ PERFORM pm_project__delete_project_item(v_item_cursor.item_id);
END LOOP;
- --select content_item__get_id(''tasks'', null, ''f'') into v_folder_id from dual;
+ return 0;
+end;
+' language 'plpgsql';
- -- unregister_content_types
- --PERFORM content_folder__unregister_content_type (
- -- v_folder_id, -- folder_id
- -- ''pm_tasks'', -- content_type
- -- ''t'' -- include_subtypes
- --);
+select inline_0();
+drop function inline_0();
- -- this table must not hold reference to ''pm_project'' type
- delete from cr_folder_type_map where content_type = ''pm_tasks'';
+-- unregister content_types from folder
+create function inline_0 ()
+returns integer as '
+declare
+ v_folder_id cr_folders.folder_id%TYPE;
+ v_item_id cr_items.item_id%TYPE;
+ v_item_cursor RECORD;
+begin
- -- delete projects folder
- --PERFORM content_folder__delete(v_folder_id);
+ FOR v_item_cursor IN
+ select folder_id from cr_folders where description=''Project Repository''
+ LOOP
+ PERFORM content_folder__unregister_content_type (
+ v_item_cursor.folder_id, -- folder_id
+ ''pm_project'', -- content_type
+ ''t'' -- include_subtypes
+ );
+ PERFORM content_folder__delete(v_item_cursor.folder_id);
+ END LOOP;
+ -- this table must not hold reference to ''pm_project'' type
+ delete from cr_folder_type_map where content_type = ''pm_project'';
+
return 0;
end;
' language 'plpgsql';
@@ -201,8 +128,78 @@
drop function inline_0();
+-- task dependency types
+drop table pm_task_dependency_types cascade;
+drop table pm_task_dependency cascade;
+drop sequence pm_task_dependency_seq;
+drop sequence pm_tasks_number_seq;
+
+select content_type__drop_attribute ('pm_task', 'end_date', 't');
+select content_type__drop_attribute ('pm_task', 'percent_complete', 't');
+select content_type__drop_attribute ('pm_task', 'estimated_hours_work', 't');
+select content_type__drop_attribute ('pm_task', 'estimated_hours_work_min', 't');
+select content_type__drop_attribute ('pm_task', 'estimated_hours_work_max', 't');
+select content_type__drop_attribute ('pm_task', 'actual_hours_worked', 't');
+select content_type__drop_attribute ('pm_task', 'earliest_start', 't');
+select content_type__drop_attribute ('pm_task', 'earliest_finish', 't');
+select content_type__drop_attribute ('pm_task', 'latest_start', 't');
+select content_type__drop_attribute ('pm_task', 'latest_finish', 't');
+
+-------------
+-- WORKGROUPS
+-------------
+
+drop sequence pm_workgroup_seq;
+drop table pm_workgroup_parties;
+drop table pm_workgroup;
+
+------------
+-- PROCESSES
+------------
+
+drop sequence pm_process_seq;
+drop sequence pm_process_task_seq;
+drop sequence pm_process_task_dependency_seq;
+
+drop table pm_process_task_assignment;
+drop table pm_process_task_dependency;
+drop table pm_process_task;
+drop table pm_process;
+
+---------
+-- OTHERS
+---------
+drop table pm_default_roles;
+drop table pm_project_assignment;
+drop table pm_task_assignment;
+drop table pm_roles;
+drop sequence pm_role_seq;
+
+
+select drop_package('pm_task');
+
+
+-----------
+-- PROJECTS
+-----------
+
+--drop permissions
+delete from acs_permissions where object_id in (select project_id from pm_projects);
+
+
+-- drop package, which drops all functions created with define_function_args
+select drop_package('pm_project');
+
+--drop table
+drop table pm_projects cascade;
+
+drop sequence pm_project_status_seq;
+drop table pm_project_status cascade;
+
+
+
drop sequence pm_task_status_seq;
-drop table pm_task_status;
+drop table pm_task_status cascade;
drop table pm_tasks cascade;
drop table pm_tasks_revisions cascade;
Index: openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-functions-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/sql/postgresql/Attic/project-manager-functions-create.sql,v
diff -u -r1.12 -r1.13
--- openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-functions-create.sql 26 Feb 2004 15:15:40 -0000 1.12
+++ openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-functions-create.sql 12 Mar 2004 13:44:42 -0000 1.13
@@ -130,9 +130,9 @@
-- is null. Otherwise a project folder will be created as a sub-folder
-- of an existing project folder.
-select define_function_args('pm_project__new_project_item', 'project_name, project_code, parent_id, goal, description, planned_start_date, planned_end_date, actual_start_date, actual_end_date, ongoing_p, status_id, customer_id, creation_date, creation_user, creation_ip, package_id');
+select define_function_args('pm_project__new_project_item', 'project_name, project_code, parent_id, goal, description, planned_start_date, planned_end_date, actual_start_date, actual_end_date, logger_project, ongoing_p, status_id, customer_id, creation_date, creation_user, creation_ip, package_id');
-create function pm_project__new_project_item (
+create or replace function pm_project__new_project_item (
varchar, -- project_name
varchar, -- project_code
integer, -- parent_id
@@ -142,6 +142,7 @@
timestamptz, -- planned_end_date
timestamptz, -- actual_start_date
timestamptz, -- actual_end_date
+ integer, -- logger_project
char(1), -- ongoing_p
integer, -- status_id
integer, -- customer_id (organization_id)
@@ -161,13 +162,14 @@
p_planned_end_date alias for $7;
p_actual_start_date alias for $8;
p_actual_end_date alias for $9;
- p_ongoing_p alias for $10;
- p_status_id alias for $11;
- p_customer_id alias for $12;
- p_creation_date alias for $13;
- p_creation_user alias for $14;
- p_creation_ip alias for $15;
- p_package_id alias for $16;
+ p_logger_project alias for $10;
+ p_ongoing_p alias for $11;
+ p_status_id alias for $12;
+ p_customer_id alias for $13;
+ p_creation_date alias for $14;
+ p_creation_user alias for $15;
+ p_creation_ip alias for $16;
+ p_package_id alias for $17;
v_item_id cr_items.item_id%TYPE;
v_revision_id cr_revisions.revision_id%TYPE;
@@ -225,15 +227,16 @@
project_id, project_code,
goal, planned_start_date,
planned_end_date, actual_start_date, actual_end_date,
- ongoing_p, estimated_finish_date,
+ logger_project, ongoing_p, estimated_finish_date,
earliest_finish_date, latest_finish_date,
actual_hours_completed,
estimated_hours_total, status_id, customer_id)
values (
v_revision_id, p_project_code,
p_goal, p_planned_start_date,
p_planned_end_date, p_actual_start_date,
- p_actual_end_date, p_ongoing_p, p_planned_end_date,
+ p_actual_end_date, p_logger_project, p_ongoing_p,
+ p_planned_end_date,
p_planned_end_date, p_planned_end_date, ''0'',
''0'', p_status_id, p_customer_id
);
@@ -278,9 +281,9 @@
end;' language 'plpgsql';
-select define_function_args('pm_project__new_project_revision', 'item_id, project_name, project_code, parent_id, goal, description, planned_start_date, planned_end_date, actual_start_date, actual_end_date, ongoing_p, status_id, organization_id, creation_date, creation_user, creation_ip, package_id');
+select define_function_args('pm_project__new_project_revision', 'item_id, project_name, project_code, parent_id, goal, description, planned_start_date, planned_end_date, actual_start_date, actual_end_date, logger_project, ongoing_p, status_id, organization_id, creation_date, creation_user, creation_ip, package_id');
-create or replace function pm_project__new_project_revision (
+create function pm_project__new_project_revision (
integer, -- item_id
varchar, -- project_name
varchar, -- project_code
@@ -291,6 +294,7 @@
timestamptz, -- planned_end_date
timestamptz, -- actual_start_date
timestamptz, -- actual_end_date
+ integer, -- logger_project
char(1), -- ongoing_p
integer, -- status_id
integer, -- organization_id (customer)
@@ -311,13 +315,14 @@
p_planned_end_date alias for $8;
p_actual_start_date alias for $9;
p_actual_end_date alias for $10;
- p_ongoing_p alias for $11;
- p_status_id alias for $12;
- p_organization_id alias for $13;
- p_creation_date alias for $14;
- p_creation_user alias for $15;
- p_creation_ip alias for $16;
- p_package_id alias for $17;
+ p_logger_project alias for $11;
+ p_ongoing_p alias for $12;
+ p_status_id alias for $13;
+ p_customer_id alias for $14;
+ p_creation_date alias for $15;
+ p_creation_user alias for $16;
+ p_creation_ip alias for $17;
+ p_package_id alias for $18;
v_revision_id cr_revisions.revision_id%TYPE;
begin
@@ -344,15 +349,15 @@
project_id, project_code,
goal, planned_start_date,
planned_end_date, actual_start_date, actual_end_date,
+ logger_project,
ongoing_p, status_id, customer_id)
values (
v_revision_id, p_project_code,
p_goal, p_planned_start_date,
p_planned_end_date, p_actual_start_date,
- p_actual_end_date, p_ongoing_p, p_status_id, p_organization_id);
+ p_actual_end_date,
+ p_logger_project, p_ongoing_p, p_status_id, p_customer_id);
- -- make sure organizations are in as well
-
PERFORM acs_permission__grant_permission(
v_revision_id,
p_creation_user,
@@ -408,7 +413,7 @@
p_pm_task_id alias for $1;
v_pm_task_name cr_items.name%TYPE;
begin
- select i.name || ''_'' || p_pm_task_id into v_pm_project_name
+ select i.name || ''_'' || p_pm_task_id into v_pm_task_name
from cr_items i
where i.item_id = p_pm_task_id;
return v_pm_task_name;
@@ -553,7 +558,7 @@
p_actual_hours_worked alias for $10;
p_status_id alias for $11;
p_creation_date alias for $12;
- p_creation_user alias for $13
+ p_creation_user alias for $13;
p_creation_ip alias for $14;
p_package_id alias for $15;
Index: openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-notifications-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/sql/postgresql/Attic/project-manager-notifications-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-notifications-create.sql 26 Jan 2004 15:39:40 -0000 1.2
+++ openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-notifications-create.sql 12 Mar 2004 13:44:42 -0000 1.3
@@ -1,3 +1,9 @@
+-- Following directions at
+-- http://openacs.org/doc/openacs-HEAD/tutorial-notifications.html
+
+-- using pm_task_notif_type instead of lars_blogger_notif_type
+-- using project-manager instead of lars-blogger
+
create function inline_0() returns integer as '
declare
impl_id integer;
@@ -7,22 +13,22 @@
impl_id := acs_sc_impl__new (
''NotificationType'',
''pm_task_notif_type'',
- ''task''
+ ''project-manager''
);
v_foo := acs_sc_impl_alias__new (
''NotificationType'',
''pm_task_notif_type'',
''GetURL'',
- ''project_manager::task::get_url'',
+ ''pm::task::get_url'',
''TCL''
);
v_foo := acs_sc_impl_alias__new (
''NotificationType'',
''pm_task_notif_type'',
''ProcessReply'',
- ''project_manager::task::process_reply'',
+ ''pm::task::process_reply'',
''TCL''
);
@@ -55,7 +61,7 @@
from notification_delivery_methods where short_name in (''email'');
-return (0);
+ return (0);
end;
' language 'plpgsql';
Index: openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-table-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/sql/postgresql/Attic/project-manager-table-create.sql,v
diff -u -r1.18 -r1.19
--- openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-table-create.sql 26 Feb 2004 15:15:40 -0000 1.18
+++ openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-table-create.sql 12 Mar 2004 13:44:42 -0000 1.19
@@ -1,8 +1,3 @@
--- TODO:
---
--- need to add in workflow (for status among other things)
-
---
-- packages/project-manager/sql/postgresql/project-manager-table-create.sql
--
-- @author jader@bread.com
@@ -52,17 +47,22 @@
not null
constraint pm_projects_status_id_fk
references pm_project_status,
+ -- if ongoing_p is true, then actual_end_date must be null
ongoing_p char(1) default 'f'
constraint pm_projects_ongoing_p_ck
check (ongoing_p in ('t','f')),
- -- denormalized, computed values
- -- these are computed but stored in projects table for efficient
- -- access.
- estimated_finish_date timestamptz,
- earliest_finish_date timestamptz,
- latest_finish_date timestamptz,
- actual_hours_completed numeric,
- estimated_hours_total numeric
+ estimated_finish_date timestamptz,
+ earliest_finish_date timestamptz,
+ latest_finish_date timestamptz,
+ -- denormalized, taken from logger
+ actual_hours_completed numeric,
+ estimated_hours_total numeric,
+ -- The logger package keeps its own projects table
+ logger_project integer
+ constraint pm_projects_logger_pj_nn
+ not null
+ constraint pm_projects_logger_pj_fk
+ references logger_projects
);
@@ -352,6 +352,25 @@
);
+
+create table pm_task_logger_proj_map (
+ task_item_id integer
+ constraint pm_task_log_proj_map_t_nn
+ not null
+ constraint pm_task_log_proj_map_t_fk
+ references pm_tasks
+ on delete cascade,
+ logger_entry integer
+ constraint pm_task_log_proj_map_l_nn
+ not null
+ constraint pm_task_log_proj_map_l_fk
+ references logger_entries
+ on delete cascade,
+ constraint pm_task_logger_proj_map_uq
+ unique (task_item_id, logger_entry)
+);
+
+
-- DEPENDENCIES
-- dependency types
Index: openacs-4/contrib/packages/project-manager/tcl/install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/install-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/project-manager/tcl/install-procs.tcl 8 Oct 2003 16:55:29 -0000 1.2
+++ openacs-4/contrib/packages/project-manager/tcl/install-procs.tcl 12 Mar 2004 13:44:43 -0000 1.3
@@ -11,10 +11,10 @@
}
-namespace eval project_manager::install {}
+namespace eval pm::install {}
-ad_proc -private project_manager::install::package_instantiate {
+ad_proc -private pm::install::package_instantiate {
{-package_id:required}
} {
Package instantiation callback proc.
@@ -24,15 +24,15 @@
# db_exec_plsql create_project { }
}
-ad_proc -private project_manager::install::package_uninstantiate {
+ad_proc -private pm::install::package_uninstantiate {
{-package_id:required}
} {
Package un-instantiation callback proc
} {
# Delete the project repository
- # ns_log Debug "project_manager::install::package_uninstantiate getting folder_id for package_id: $package_id"
+ # ns_log Debug "pm::install::package_uninstantiate getting folder_id for package_id: $package_id"
# set folder_id [db_exec_plsql get_folder_id { }]
- # ns_log Debug "project_manager::install::package_uninstantiate delete folder_id: $folder_id"
+ # ns_log Debug "pm::install::package_uninstantiate delete folder_id: $folder_id"
# db_exec_plsql delete_root_folder { }
}
Index: openacs-4/contrib/packages/project-manager/tcl/project-manager-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/project-manager-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/project-manager/tcl/project-manager-procs.tcl 29 Aug 2003 00:35:35 -0000 1.1
+++ openacs-4/contrib/packages/project-manager/tcl/project-manager-procs.tcl 12 Mar 2004 13:44:43 -0000 1.2
@@ -2,18 +2,18 @@
Project Manager Projects Library
- Procedures that deal with projects
+ Utility procedures for project manager
@creation-date 2003-08-25
@author Jade Rubick <jader@bread.com>
@cvs-id $Id$
}
-namespace eval project_manager::project::util {}
+namespace eval pm::util {}
-ad_proc -public project_manager::project::util::datenvl {
+ad_proc -public pm::util::datenvl {
-value
-value_if_null
-value_if_not_null
Index: openacs-4/contrib/packages/project-manager/tcl/project-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/project-procs-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/project-manager/tcl/project-procs-postgresql.xql 26 Feb 2004 15:15:41 -0000 1.3
+++ openacs-4/contrib/packages/project-manager/tcl/project-procs-postgresql.xql 12 Mar 2004 13:44:43 -0000 1.4
@@ -3,16 +3,40 @@
<queryset>
<rdbms><type>postgresql</type><version>7.3</version></rdbms>
- <fullquery name="project_manager::project::default_status_open.get_default_status_open">
+ <fullquery name="pm::project::get_project_id.get_project_id">
<querytext>
+ SELECT
+ live_revision
+ FROM
+ cr_items
+ WHERE
+ item_id = :project_item_id
+ </querytext>
+ </fullquery>
+
+ <fullquery name="pm::project::get_project_item_id.get_project_item">
+ <querytext>
+ SELECT
+ i.item_id
+ FROM
+ cr_items i,
+ cr_revisions r
+ WHERE
+ i.item_id = r.item_id and
+ r.revision_id = :project_id
+ </querytext>
+ </fullquery>
+
+ <fullquery name="pm::project::default_status_open.get_default_status_open">
+ <querytext>
select status_id
from pm_project_status
where status_type = 'o'
limit 1
</querytext>
</fullquery>
- <fullquery name="project_manager::project::default_status_closed.get_default_status_closed">
+ <fullquery name="pm::project::default_status_closed.get_default_status_closed">
<querytext>
select status_id
from pm_project_status
@@ -21,7 +45,7 @@
</querytext>
</fullquery>
- <fullquery name="project_manager::project::new.new_project_item">
+ <fullquery name="pm::project::new.new_project_item">
<querytext>
select pm_project__new_project_item (
:project_name,
@@ -33,6 +57,7 @@
to_timestamp(:planned_end_date,'YYYY MM DD HH24 MI SS'),
null,
null,
+ :logger_project,
:ongoing_p,
:status_id,
:organization_id,
@@ -44,7 +69,7 @@
</querytext>
</fullquery>
- <fullquery name="project_manager::project::compute_status.select_project_children">
+ <fullquery name="pm::project::compute_status.select_project_children">
<querytext>
select
item_id,
@@ -55,7 +80,7 @@
</querytext>
</fullquery>
- <fullquery name="project_manager::project::compute_status.tasks_group_query">
+ <fullquery name="pm::project::compute_status.tasks_group_query">
<querytext>
select
sum(t.actual_hours_worked) as actual_hours_completed,
@@ -69,10 +94,11 @@
</querytext>
</fullquery>
- <fullquery name="project_manager::project::compute_status.tasks_query">
+ <fullquery name="pm::project::compute_status.tasks_query">
<querytext>
- select
- t.actual_hours_worked as worked,
+ SELECT
+ case when t.actual_hours_worked is null then 0
+ else t.actual_hours_worked end as worked,
t.estimated_hours_work as to_work,
t.item_id as my_iid,
to_char(end_date,'J') as task_deadline_j
@@ -84,7 +110,7 @@
</querytext>
</fullquery>
- <fullquery name="project_manager::project::compute_status.dependency_query">
+ <fullquery name="pm::project::compute_status.dependency_query">
<querytext>
select
d.dependency_id,
@@ -98,33 +124,34 @@
</querytext>
</fullquery>
- <fullquery name="project_manager::project::compute_status.project_info">
+ <fullquery name="pm::project::compute_status.project_info">
<querytext>
select
to_char(planned_start_date,'J') as start_date_j,
- to_char(planned_end_date,'J') as end_date_j
+ to_char(planned_end_date,'J') as end_date_j,
+ ongoing_p
from
pm_projects
where
project_id = (select live_revision from cr_items where item_id = :project_item_id)
</querytext>
</fullquery>
- <fullquery name="project_manager::project::compute_status.update_project">
+ <fullquery name="pm::project::compute_status.update_project">
<querytext>
update
pm_projects
set
actual_hours_completed = :actual_hours_completed,
estimated_hours_total = :estimated_hours_total,
- earliest_finish_date = 'J[expr floor([set max_earliest_finish])]',
- latest_finish_date = 'J[expr ceil([set min_latest_start])]'
+ earliest_finish_date = :max_earliest_finish,
+ latest_finish_date = :min_latest_start
where
project_id = (select live_revision from cr_items where item_id = :project_item_id)
</querytext>
</fullquery>
- <fullquery name="project_manager::project::compute_parent_status.get_parent_id">
+ <fullquery name="pm::project::compute_parent_status.get_parent_id">
<querytext>
select
parent_id
@@ -135,21 +162,21 @@
</querytext>
</fullquery>
- <fullquery name="project_manager::project::compute_parent_status.get_root_folder">
+ <fullquery name="pm::project::compute_parent_status.get_root_folder">
<querytext>
select pm_project__get_root_folder (:package_id, 'f')
</querytext>
</fullquery>
- <fullquery name="project_manager::project::compute_status.update_task">
+ <fullquery name="pm::project::compute_status.update_task">
<querytext>
update
pm_tasks_revisions
set
- earliest_start = 'J[expr ceil( [set earliest_start($task_item)])]',
- earliest_finish = 'J[expr ceil( [set earliest_finish($task_item)])]',
- latest_start = 'J[expr floor([set latest_start($task_item)])]',
- latest_finish = 'J[expr floor([set latest_finish($task_item)])]'
+ earliest_start = :es,
+ earliest_finish = :ef,
+ latest_start = :ls,
+ latest_finish = :lf
where
task_revision_id = (select live_revision from cr_items where item_id = :task_item)
</querytext>
Index: openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/project-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl 26 Feb 2004 15:15:41 -0000 1.5
+++ openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl 12 Mar 2004 13:44:43 -0000 1.6
@@ -10,27 +10,164 @@
}
-namespace eval project_manager::project {}
+namespace eval pm::project {}
-ad_proc -public project_manager::project::default_status_open {
+
+ad_proc -public pm::project::get_project_id {
+ -project_item_id:required
} {
+ Returns the live project_id when give the project_item_id
+
+ @author Jade Rubick (jader@bread.com)
+ @creation-date 2004-02-19
+
+ @param project_item_id The item_id for the project
+
+ @return project_id
+
+ @error
+} {
+ set return_val [db_string get_project_id { }]
+
+ return $return_val
+}
+
+
+
+ad_proc -public pm::project::get_project_item_id {
+ -project_id:required
+} {
+ Returns the item_id for a project when given the project_id
+ (a revision id)
+
+ @author Jade Rubick (jader@bread.com)
+ @creation-date 2004-02-19
+
+ @param project_id
+
+ @return project_item_id
+
+ @error
+} {
+ set return_val [db_string get_project_item { }]
+
+ return $return_val
+}
+
+
+
+ad_proc -public pm::project::default_status_open {} {
Returns the default status value for open projects
} {
set return_val [db_string get_default_status_open { }]
return $return_val
}
-ad_proc -public project_manager::project::default_status_closed {
-} {
+
+
+ad_proc -public pm::project::default_status_closed {} {
Returns the default status value for closed projects
} {
set return_val [db_string get_default_status_closed { }]
return $return_val
}
-ad_proc -public project_manager::project::new {
+
+
+ad_proc -private pm::project::log_hours {
+ {-entry_id ""}
+ -logger_project_id:required
+ -variable_id:required
+ -value:required
+ -timestamp_ansi:required
+ {-description ""}
+ {-task_item_id ""}
+ {-project_item_id ""}
+ {-update_status_p "t"}
+} {
+ Adds a logger entry to a project. If task_item_id is passed
+ in, also links it up with that task, and updates the task
+ hours.
+
+ @author Jade Rubick (jader@bread.com)
+ @creation-date 2004-03-05
+
+ @param entry_id If passed in, determines the entry_id for the
+ newly logged entry
+
+ @param logger_project_id
+
+ @param variable_id
+
+ @param value
+
+ @param timestamp_ansi Timestamp in ANSI format YYYY-MM-DD
+
+ @param description
+
+ @param task_item_id
+
+ @param project_item_id If the task_item_id is passed in, the
+ project_item_id needs to be passed in as well
+
+ @param update_status_p If t, then updates the database for the
+ task and project so that the denormalized values are updated.
+ This can be set to f when editing a task, because these things
+ are done later anyway.
+
+ @return 0 if there no task it is logged against, otherwise returns
+ the total number of hours logged to that task
+
+ @error returns -1 if there is an error in pm::task::update_hours
+ If a task_id is passed in, essentially passes along any errors
+ from pm::task::update_hours
+} {
+ set returnval 0
+
+ # get a new entry_id if it's not passed in (like it would be from
+ # a page that was using ad_form)
+ if {[empty_string_p $entry_id]} {
+ set entry_id [db_nextval acs_object_id_seq]
+ }
+
+ # add in the new entry
+ logger::entry::new -entry_id $entry_id \
+ -project_id $logger_project_id \
+ -variable_id $variable_id \
+ -value $value \
+ -time_stamp $timestamp_ansi \
+ -description $description
+
+ # if we have a pm_task_id, then we need to note that this
+ # entry is logged to a particular task.
+ if {[exists_and_not_null task_item_id]} {
+ db_dml add_logger_map "
+ INSERT INTO
+ pm_task_logger_proj_map
+ (task_item_id,
+ logger_entry)
+ VALUES
+ (:task_item_id,
+ :entry_id)
+ "
+
+ set returnval [pm::task::update_hours \
+ -task_item_id $task_item_id \
+ -update_tasks_p $update_status_p]
+
+ if {[string equal $update_status_p "t"]} {
+ pm::project::compute_status $project_item_id
+ }
+ }
+
+ return $returnval
+}
+
+
+
+ad_proc -public pm::project::new {
-project_name:required
{-project_code ""}
{-parent_id ""}
@@ -48,24 +185,176 @@
-creation_ip:required
-package_id:required
} {
+ Creates a new project
- set return_val [db_exec_plsql new_project_item { *SQL }]
+ @author Jade Rubick (jader@bread.com)
+
+ @param project_name
- return $return_val
+ @error
+} {
+
+ # if the project is ongoing, there is no end date
+ # we set it to null to signify that. Technically, this
+ # is bad data model design -- we should just get rid of
+ # ongoing_p
+ if {[string equal $ongoing_p t]} {
+ set actual_end_date ""
+ set planned_end_date ""
+ }
+
+ # create a logger project
+ set logger_project [logger::project::new \
+ -name $project_name \
+ -description $description \
+ -project_lead $creation_user \
+ ]
+
+ # create a project manager project (associating the logger project
+ # with the logger project)
+ set project_revision [db_exec_plsql new_project_item { *SQL }]
+
+ # add in the default variable (hopefully hours)
+ logger::project::map_variable \
+ -project_id $logger_project \
+ -variable_id [logger::variable::get_default_variable_id]
+
+ return $project_revision
}
-ad_proc -public project_manager::project::latest_start {
- end_date_j
- hours_to_complete
- hours_day
+
+ad_proc -public pm::project::delete {
+ -project_item_id:required
} {
+ Stub for project deletion
+
+ @author Jade Rubick (jader@bread.com)
+ @creation-date 2004-03-03
+
+ @param project_item_id
- # set latest_start($my_iid) [expr $task_deadline_j - [expr $activity_time($my_iid) / double($hours_day)]]
+ @return
+
+ @error
+} {
+
+ # should we delete the logger project as well?
- # we now set the latest start. This is equal to the
- # latest finish date minus the amount of time it will
- # take to accomplish the job. We need to disregard holidays!
+}
+
+ad_proc -public pm::project::edit {
+ -project_item_id:required
+ -project_name:required
+ {-project_code ""}
+ {-parent_id ""}
+ {-goal ""}
+ {-description ""}
+ {-planned_start_date ""}
+ {-planned_end_date ""}
+ {-actual_start_date ""}
+ {-actual_end_date ""}
+ -logger_project:required
+ {-ongoing_p "f"}
+ -status_id:required
+ -organization_id:required
+ {-creation_date ""}
+ -creation_user:required
+ -creation_ip:required
+ -package_id:required
+} {
+ Stub for project edit
+
+ <fullquery name="new_project_revision">
+ <querytext>
+ select pm_project__new_project_revision (
+ :project_item_id,
+ :project_name,
+ :project_code,
+ :parent_id,
+ :goal,
+ :description,
+ to_timestamp(:planned_start_date,'YYYY MM DD HH24 MI SS'),
+ to_timestamp(:planned_end_date,'YYYY MM DD HH24 MI SS'),
+ null,
+ null,
+ :ongoing_p,
+ :status_id,
+ :customer_id,
+ now(),
+ :user_id,
+ :peeraddr,
+ :package_id
+ );
+ </querytext>
+ </fullquery>
+
+ @author Jade Rubick (jader@bread.com)
+ @creation-date 2004-03-03
+
+ @param project_item_id
+
+ @param project_name
+
+ @return
+
+ @error
+} {
+
+}
+
+
+ad_proc -public pm::project::get {
+ -project_item_id:required
+ -array:required
+} {
+ Stub for get function
+
+ @author Jade Rubick (jader@bread.com)
+ @creation-date 2004-03-03
+
+ @param project_item_id
+
+ @param array
+
+ @return values for this project identified by project_item_id, in
+ an array named array
+
+ @error
+} {
+
+}
+
+
+
+ad_proc -private pm::project::latest_start {
+ {-end_date_j:required}
+ {-hours_to_complete:required}
+ {-hours_day:required}
+} {
+ Returns the latest_start date. This is equal to the
+ latest finish date minus the amount of time it will
+ take to accomplish the job. Also takes into
+ account weekdays.
+ <p />
+ Someday, it should disregard holidays!
+
+ @author Jade Rubick (jader@bread.com)
+ @creation-date 2004-02-20
+
+ @param end_date_j
+
+ @param hours_to_complete Estimated number of hours it will take
+ to complete this task
+
+ @param hours_day Number of hours in a day
+
+ @return the latest start date, as a Julian number
+
+ @error
+} {
+
+
set t_end_date $end_date_j
set t_today $t_end_date
@@ -91,7 +380,7 @@
}
-ad_proc -public project_manager::project::earliest_finish {
+ad_proc -private pm::project::earliest_finish {
earliest_start_j
hours_to_complete
hours_day
@@ -128,7 +417,7 @@
}
-ad_proc -public project_manager::project::my_earliest_start {
+ad_proc -private pm::project::my_earliest_start {
earliest_start_j
hours_to_complete
hours_day
@@ -164,7 +453,7 @@
}
-ad_proc -public project_manager::project::my_latest_finish {
+ad_proc -private pm::project::my_latest_finish {
latest_start_j
hours_to_complete
hours_day
@@ -199,7 +488,7 @@
}
-ad_proc -public project_manager::project::julian_to_day_of_week {
+ad_proc -private pm::project::julian_to_day_of_week {
julian_date
} {
Computes the day of the week. 0=Sunday
@@ -218,11 +507,14 @@
return $day_of_week
}
-ad_proc -public project_manager::project::is_workday_p {
+
+
+ad_proc -private pm::project::is_workday_p {
date_j
} {
- Figures out whether or not a given date is a workday or not
+ Figures out whether or not a given date is a workday or not.
+ Assumes Saturday and Sunday are not workdays
} {
@@ -238,11 +530,15 @@
}
-ad_proc -public project_manager::project::compute_status {project_item_id} {
- Looks at tasks and subprojects, and computes the current status of a project.
- These are the items we'd like to compute
+ad_proc -public pm::project::compute_status {project_item_id} {
+
+ Looks at tasks and subprojects, and computes the current status of a project.
+ <p />
+ These are the items we'd like to compute
+
+ <pre>
PROJECTS:
estimated_completion_date timestamptz,
earliest_completion_date timestamptz,
@@ -254,22 +550,45 @@
earliest_finish(i) = earliest_start(i) + activity_time(i)
latest_start(i) = min(last_start(i+1) - activity_time(i)
latest_finish(i) = latest_start(i) + activity_time(i)
+ </pre>
+ Tasks in ongoing projects are given null completion dates.
+
+ <p />
+
The statistics are computed based on:
+ <p />
- project statistics are based on that project + subproject statistics
+ Project statistics are based on that project + subproject statistics
+ <p />
- that means if a project has a subproject, then the tasks for both of those projects are put together in one list, and computed together.
-
- so for a project with no subprojects, the values are computed for the tasks in that project
+ That means if a project has a subproject, then the tasks for
+ both of those projects are put together in one list, and computed
+ together.
- for a project with subprojects, the statistics are based on the tasks of both of those projects.
+ <p />
- this function returns a list of task_item_ids of all tasks under
- a project, plus all subproject tasks.
+ So for a project with no subprojects, the values are computed
+ for the tasks in that project
+ <p />
+ For a project with subprojects, the statistics are based on the
+ tasks of both of those projects.
+
+ @author Jade Rubick (jader@bread.com)
+ @creation-date 2004-02-19
+
+ @param project_item_id The item_id for the project
+
+ @return a list of task_item_ids of all tasks under a project, plus all subproject tasks. This is done so that the function can be recursive
+
+ @error No error codes
+
} {
+ # Before hacking on this, you might want to look at:
+ # http://www.joelonsoftware.com/articles/fog0000000069.html
+
# TODO:
#
# -------------------------------------------------------------------------
@@ -288,7 +607,7 @@
# should look at:
# http://mscmga.ms.ic.ac.uk/jeb/or/netaon.html
- ns_log Notice "-----------------------------------------"
+ # ns_log Notice "-----------------------------------------"
# --------------------------------------------------------------------
# for now, hardcode in a day is 8 hours. Later, we want to set this by
@@ -312,7 +631,7 @@
# ---------------------------------------------
# gets all tasks that are a part of subprojects
# ---------------------------------------------
- set project_return [project_manager::project::compute_status $my_id]
+ set project_return [pm::project::compute_status $my_id]
set task_list_project [concat $task_list_project $project_return]
} elseif {[string equal $my_type "pm_task"]} {
@@ -322,7 +641,7 @@
set task_list [concat $task_list $task_list_project]
- ns_log Notice "task_list: $task_list"
+ # ns_log Notice "task_list: $task_list"
# -------------------------
# no tasks for this project
@@ -339,7 +658,7 @@
# today_j (julian date for today)
db_1row tasks_group_query { }
- ns_log notice "Julian today: $today_j"
+ # ns_log notice "Julian today: $today_j"
# --------------------------------------------------------------
# Set up activity_time for all tasks
@@ -352,7 +671,7 @@
if {[exists_and_not_null task_deadline_j]} {
- ns_log notice "$my_iid has a deadline $task_jdeadline_j"
+ # ns_log notice "$my_iid has a deadline $task_jdeadline_j"
set latest_finish($my_iid) $task_deadline_j
@@ -376,7 +695,7 @@
set dependency_types($task_item_id-$parent_task_id) $dependency_type
- ns_log Notice "dependency (id: $dependency_id) task: $task_item_id parent: $parent_task_id type: $dependency_type"
+ # ns_log Notice "dependency (id: $dependency_id) task: $task_item_id parent: $parent_task_id type: $dependency_type"
}
@@ -385,9 +704,16 @@
# task information off of them
# --------------------------------------------------------------
- # gives up planned_start_date and planned_end_date
+ # gives up end_date_j, start_date_j, and ongoing_p
+ # if ongoing_p is t, then end_date_j should be null
db_1row project_info { }
+ if {[string equal $ongoing_p t] && ![empty_string_p end_date_j]} {
+ ns_log Error "Project cannot be ongoing and have a non-null end-date"
+ set end_date_j ""
+ }
+
+
# --------------------------------------------------------------
# task_list contains all the tasks
# a subset of those do not depend on any other tasks
@@ -426,19 +752,19 @@
lappend present_tasks $task_item
- ns_log Notice "Begin earliest_start($task_item): $earliest_start($task_item)"
+ # ns_log Notice "Begin earliest_start($task_item): $earliest_start($task_item)"
}
}
# -------------------------------
# stop if we have no dependencies
# -------------------------------
if {[llength $present_tasks] == 0} {
- ns_log Notice "No tasks with dependencies"
+ # ns_log Notice "No tasks with dependencies"
return [list]
}
- ns_log Notice "present_tasks: $present_tasks"
+ # ns_log Notice "present_tasks: $present_tasks"
# ------------------------------------------------------
# figure out the earliest start and finish times
@@ -450,7 +776,7 @@
foreach task_item $present_tasks {
- ns_log Notice "this task_item: $task_item"
+ # ns_log Notice "this task_item: $task_item"
# -----------------------------------------------------
# some tasks may already have earliest_start filled in
@@ -460,7 +786,7 @@
if {![exists_and_not_null earliest_start($task_item)]} {
- ns_log Notice " !info exists for $task_item"
+ # ns_log Notice " !info exists for $task_item"
# ---------------------------------------------
# set the earliest_start for this task =
@@ -484,10 +810,10 @@
# set earliest_finish($task_item) [expr $max_earliest_start + [expr $activity_time($task_item) / double($hours_day)]]
set earliest_finish($task_item) [earliest_finish $max_earliest_start $activity_time($task_item) $hours_day]
- ns_log Notice \
- " earliest_start ($task_item): $earliest_start($task_item)"
- ns_log Notice \
- " earliest_finish($task_item): $earliest_finish($task_item)"
+ # ns_log Notice \
+ # " earliest_start ($task_item): $earliest_start($task_item)"
+ # ns_log Notice \
+ # " earliest_finish($task_item): $earliest_finish($task_item)"
}
@@ -500,7 +826,7 @@
}
}
- ns_log Notice "future tasks: $future_tasks"
+ # ns_log Notice "future tasks: $future_tasks"
set present_tasks $future_tasks
}
@@ -513,7 +839,7 @@
foreach task_item $task_list {
- ns_log Notice "*Earliest start ($task_item): $earliest_start($task_item)"
+ # ns_log Notice "*Earliest start ($task_item): $earliest_start($task_item)"
if {$max_earliest_finish < $earliest_finish($task_item)} {
set max_earliest_finish $earliest_finish($task_item)
}
@@ -523,8 +849,16 @@
# -----------------------------------------------------------------
# Now compute latest_start and latest_finish dates.
# Note the latest_finish dates may be set to an arbitrary deadline.
+ # Also note that it is possible for a project to be ongoing.
+ # In that case, the latest_start and latest_finish dates should
+ # be set to null.
# -----------------------------------------------------------------
-
+ # If these represent the dependency hierarchy:
+ # 2155
+ # / | \
+ # 2161 2173 2179
+ # | |
+ # 2167 2195
# ----------------------------------------------------------------------
# we want to go through and fill in all the values for latest start
# and latest_finish.
@@ -538,13 +872,42 @@
# add latest_finish values for. We call these lists
# present_tasks and future_tasks
# ----------------------------------------------------------------------
+ # Here's a description of the algorithm.
+ # 1. The algorithm starts with those tasks that don't have other
+ # tasks depending on them.
+ #
+ # So in the example above, we'll start with
+ # present_tasks: 2167 2173 2195
+ # future tasks:
+ #
+ # 2. While we make the present_tasks list, we store latest_start
+ # and latest_finish information for each of those tasks. If the
+ # project is ongoing, then we also keep track of tasks that have
+ # no latest_start or latest_finish. We keep this in the
+ # ongoing_task(task_id) array. If is exists, then we know that
+ # that task is an ongoing task, so no deadline will exist for it.
+ #
+ # 3. Stop if we don't have any dependencies
+ #
+ # 4. Then we get into a loop.
+ # While there are present_tasks:
+ # Create the future_tasks list
+ # For each present task:
+ # If the task has a dependent task:
+ # Go through these dependent tasks:
+ # If the dependent task is ongoing don't defer
+ # If the dependent task doesn't have LS set,
+ # then defer, and add to future_tasks list
+ # Otherwise set the LS value for that task
+ # If there are no deferals, get the minimum LS of
+ # dependents, set LF
+ # Add the dependent tasks to the future_tasks
+ # Set present_tasks equal to future_tasks, clear future_tasks
+
+ # ----------------------------------------------------------------------
# The biggest problem with this algorithm is that you can have items at
- # two different levels in the hierarchy. For example,
- # 2155
- # / | \
- # 2161 2173 2179
- # | |
- # 2167 2195
+ # two different levels in the hierarchy.
+ #
# if you trace through this algorithm, you'll see that we'll get to 2155
# before 2161's values have been set, which can cause an error. The
# solution we arrive at is to defer to the future_tasks list any item
@@ -560,41 +923,67 @@
# info for these items
# -----------------------------------------------------
- ns_log Notice "Starting foreach task-item $task_list"
+ # ns_log Notice "Starting foreach task-item $task_list"
foreach task_item $task_list {
if {![info exists dependent($task_item)]} {
- ns_log Notice " !info exists dependent($task_item)"
+ # ns_log Notice " !info exists dependent($task_item)"
# we check this because some tasks already have
# hard deadlines set.
if {[info exists latest_finish($task_item)]} {
- if {$end_date_j < $latest_finish($task_item)} {
- set latest_finish($task_item) $end_date_j
+ # if the project needs to be completed before the
+ # actual hard deadline, then the project deadline
+ # has precedence. However, sometimes the project is
+ # ongoing, so we have to make sure that there actually
+ # is an end_date_j
+ if {![empty_string_p end_date_j]} {
+ if {$end_date_j < $latest_finish($task_item)} {
+ set latest_finish($task_item) $end_date_j
+ }
}
- #set late_start_temp [expr $latest_finish($task_item) - [expr $activity_time($task_item) / double($hours_day)]]
- set late_start_temp [latest_start $latest_finish($task_item) $activity_time($task_item) $hours_day]
+ # we also set the latest_start date
+ set late_start_temp \
+ [latest_start \
+ -end_date_j $latest_finish($task_item) \
+ -hours_to_complete $activity_time($task_item) \
+ -hours_day $hours_day]
+
if {$late_start_temp < $latest_start($task_item)} {
set latest_start($task_item) $late_start_temp
}
} else {
- set latest_finish($task_item) $end_date_j
- #set latest_start($task_item) [expr $latest_finish($task_item) - [expr $activity_time($task_item) / double($hours_day)]]
- set latest_start($task_item) [latest_start $latest_finish($task_item) $activity_time($task_item) $hours_day]
- }
+ # this section is for items that have no solid
+ # deadline, but also have no items dependent on them
+ # we either set the latest start and finish of the item or
+ # we specify that the task is an ongoing task
+ if {[empty_string_p $end_date_j]} {
+ set ongoing_task($task_item) true
+ # ns_log Notice "NSDBAHNITD: end_date_j was empty ti:$task_item"
+ } else {
+ set latest_finish($task_item) $end_date_j
+
+ set latest_start($task_item) \
+ [latest_start \
+ -end_date_j $latest_finish($task_item) \
+ -hours_to_complete $activity_time($task_item) \
+ -hours_day $hours_day]
+
+ }
+ }
lappend present_tasks $task_item
- ns_log Notice "Begin latest_start($task_item): $latest_start($task_item) latest_finish: $latest_finish($task_item)"
+ # ns_log Notice "Begin latest_start($task_item): $latest_start($task_item) latest_finish: $latest_finish($task_item)"
} else {
- ns_log Notice " info exists dependent($task_item)"
+ #ns_log Notice " info exists dependent($task_item)"
}
}
@@ -603,11 +992,11 @@
# stop if we have no dependencies
# -------------------------------
if {[llength $present_tasks] == 0} {
- ns_log Notice "No tasks with dependencies"
+ # ns_log Notice "No tasks with dependencies"
return [list]
}
- ns_log Notice "LATEST present_tasks: $present_tasks"
+ # ns_log Notice "LATEST present_tasks: $present_tasks"
# ------------------------------------------------------
# figure out the latest start and finish times
@@ -619,7 +1008,7 @@
foreach task_item $present_tasks {
- ns_log Notice "this task_item: $task_item"
+ # ns_log Notice "this task_item: $task_item"
# -----------------------------------------------------
# some tasks may already have latest_start filled in.
@@ -629,74 +1018,135 @@
if {[info exists dependent($task_item)]} {
- ns_log Notice " info exists for dependent($task_item)"
+ # ns_log Notice " info exists for dependent($task_item)"
# ---------------------------------------------
# set the latest_start for this task =
- # min(latest_start(i+1) - activity_time(i)
+ # min(latest_start(i+1) - activity_time(i))
#
# (i+1 means an item that depends on this task)
# (i means this task)
# ---------------------------------------------
+ # we set this to the end date, and then move it back
+ # as we find dependent items that have earlier
+ # latest_start dates. The problem is that the
+ # end_date_j is empty when there is no deadline.
+ # So we need to remember that min_latest_start can
+ # be an empty value
set min_latest_start $end_date_j
-
+
foreach dependent_item $dependent($task_item) {
+
+ if {[exists_and_not_null ongoing_task($dependent_item)]} {
+ set defer_p f
+ set my_latest_start ""
+ # ns_log Notice "ongoing_task, no defer"
+
+ } elseif {![exists_and_not_null latest_start($dependent_item)]} {
+ # we defer the task if the dependent item has no
+ # latest_start date set
- if {![exists_and_not_null latest_start($dependent_item)]} {
- # let's not do this task_item yet
- lappend future_tasks $task_item
- ns_log Notice " defer"
- set defer_p t
- } else {
+ if {[info exists defer_count($task_item)]} {
+ incr defer_count($task_item)
+ } else {
+ set defer_count($task_item) 1
+ }
- #set my_latest_start [expr $latest_start($dependent_item) - [expr $activity_time($dependent_item) / double($hours_day)]]
+ # we use a magic number here.
+ # basically, we don't want to defer the
+ # item forever. Ideally, this should
+ # be cleaned up better. Defering is necessary
+ # given this algorithm, but there are
+ # times when you don't want to defer.
+ # This is hackish, and I'm embarrased, but on
+ # a deadline. :(
+ if {$defer_count($task_item) > 5} {
+ set defer_p f
+ # ns_log Notice " no defer because defer count exceeded"
+ } else {
+ lappend future_tasks $task_item
+ # ns_log Notice " defer"
+ set defer_p t
+ }
+
- set my_latest_start [latest_start $latest_start($dependent_item) $activity_time($task_item) $hours_day]
- ns_log Notice " my_latest_start: $my_latest_start"
+ } else {
+
+ # the dependent item has a deadline
+
+ set my_latest_start \
+ [latest_start \
+ -end_date_j $latest_start($dependent_item) \
+ -hours_to_complete $activity_time($task_item) \
+ -hours_day $hours_day]
+
+ # ns_log Notice " my_latest_start: $my_latest_start"
+
if {$my_latest_start < $min_latest_start} {
set min_latest_start $my_latest_start
}
-
+
set defer_p f
}
+
}
-
+
if {[string equal $defer_p f]} {
-
+
# we check that latest_start doesn't already exist
# which it might for hard-deadlines
if {[exists_and_not_null latest_start($task_item)]} {
if {$min_latest_start < $latest_start($task_item)} {
set latest_start($task_item) $min_latest_start
}
} else {
+
+ # so this task has no hard deadline.
+ # We now set the value to the minimum of the
+ # dependent tasks. Note that if the dependent
+ # tasks all have no hard deadlines, and the
+ # project is ongoing, then the value will be
+ # set to ""
+
set latest_start($task_item) $min_latest_start
}
- ns_log Notice " min_latest_start: $min_latest_start"
+ # ns_log Notice " min_latest_start: $min_latest_start"
- # temp is temporary latest_finish
- #set temp [expr $min_latest_start + [expr $activity_time($task_item) / double($hours_day)]]
- set temp [my_latest_finish $min_latest_start $activity_time($task_item) $hours_day]
-
- if {[exists_and_not_null latest_finish($task_item)]} {
- if {$temp < $latest_finish($task_item)} {
- set latest_finish($task_item)
- }
+ # we now set the latest finish. Ongoing tasks set
+ # the latest finish to empty
+ if {[empty_string_p $latest_start($task_item)]} {
+ set temp_lf ""
} else {
- set latest_finish($task_item) $temp
+ set temp_lf [my_latest_finish $min_latest_start $activity_time($task_item) $hours_day]
}
- ns_log Notice \
- " latest_start ($task_item): $latest_start($task_item)"
- ns_log Notice \
- " latest_finish($task_item): $latest_finish($task_item)"
+ # if there is already a hard deadline for this
+ # task, then we check whether temp_lf is earlier,
+ # and set it to temp_lf if so
+
+ if {[empty_string_p $temp_lf]} {
+ set latest_finish($task_item) ""
+ } else {
+ if {[exists_and_not_null latest_finish($task_item)]} {
+ if {$temp_lf < $latest_finish($task_item)} {
+ set latest_finish($task_item) $temp_lf
+ }
+ } else {
+ set latest_finish($task_item) $temp_lf
+ }
+ }
+
+ #ns_log Notice \
+ # " latest_start ($task_item): $latest_start($task_item)"
+ #ns_log Notice \
+ # " latest_finish($task_item): $latest_finish($task_item)"
} else {
- ns_log Notice "Deferring $task_item"
+ # ns_log Notice "Deferring $task_item"
}
- }
+ }
# -------------------------------
# add to list of tasks to process
@@ -707,7 +1157,7 @@
}
}
- ns_log Notice "future tasks: $future_tasks"
+ # ns_log Notice "future tasks: $future_tasks"
set present_tasks $future_tasks
}
@@ -716,14 +1166,22 @@
# set up latest start date for project
# ----------------------------------------------
- set min_latest_start $end_date_j
+ if {[empty_string_p $end_date_j]} {
+ set min_latest_start ""
+ set max_earliest_finish ""
+ } else {
+ set min_latest_start $end_date_j
+
+ foreach task_item $task_list {
- foreach task_item $task_list {
-
- ns_log Notice "*Latest start ($task_item): $latest_start($task_item)"
- if {$min_latest_start > $latest_start($task_item)} {
- set max_earliest_finish $earliest_finish($task_item)
+ # ns_log Notice "*Latest start ($task_item): $latest_start($task_item)"
+ if {$min_latest_start > $latest_start($task_item)} {
+ set max_earliest_finish $earliest_finish($task_item)
+ }
}
+
+ set max_earliest_finish "J[expr floor([set max_earliest_finish])]"
+ set min_latest_start "J[expr floor([set min_latest_start])]"
}
@@ -736,11 +1194,26 @@
# this is very inefficient and stupid
foreach task_item $task_list {
+ set es "J[expr ceil( [set earliest_start($task_item)])]"
+ set ef "J[expr ceil( [set earliest_finish($task_item)])]"
+
+ if {[exists_and_not_null latest_start($task_item)]} {
+ set ls "J[expr floor([set latest_start($task_item)])]"
+ } else {
+ set ls ""
+ }
+
+ if {[exists_and_not_null latest_finish($task_item)]} {
+ set lf "J[expr floor($latest_finish($task_item))]"
+ } else {
+ set lf ""
+ }
+
db_dml update_task { }
}
- ns_log Notice "*******************"
+ # ns_log Notice "*******************"
return $task_list
@@ -749,12 +1222,12 @@
-ad_proc -public project_manager::project::compute_parent_status {project_item_id} {
+ad_proc -public pm::project::compute_parent_status {project_item_id} {
When a project is updated, or a task updated within a project, we need to
update all the projects higher in the hierarchy.
} {
- ns_log Notice "computing parents for $project_item_id"
+ # ns_log Notice "computing parents for $project_item_id"
set package_id [ad_conn package_id]
@@ -772,10 +1245,36 @@
set my_item_id $parent_id
}
- ns_log Notice "root: $root_folder , last_item_id $last_item_id"
+ # ns_log Notice "root: $root_folder , last_item_id $last_item_id"
set return_code [compute_status $last_item_id]
return $return_code
}
+
+
+ad_proc -public pm::project::get_logger_project {
+ -project_item_id:required
+} {
+ Returns logger's project ID when given project manager's project ID
+
+ @author Jade Rubick (jader@bread.com)
+ @creation-date 2004-03-04
+
+ @param project_item_id
+
+ @return logger's project_id
+
+ @error returns no_project if no such project_item_id exists
+} {
+ return [db_string get_logger_project "
+ SELECT
+ logger_project
+ FROM
+ pm_projects
+ WHERE
+ project_id =
+ (select live_revision from cr_items where item_id = :project_item_id)
+ " -default "no_project"]
+}
Index: openacs-4/contrib/packages/project-manager/tcl/task-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/task-procs-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/project-manager/tcl/task-procs-postgresql.xql 26 Feb 2004 15:15:41 -0000 1.3
+++ openacs-4/contrib/packages/project-manager/tcl/task-procs-postgresql.xql 12 Mar 2004 13:44:43 -0000 1.4
@@ -3,16 +3,40 @@
<queryset>
<rdbms><type>postgresql</type><version>7.3</version></rdbms>
- <fullquery name="project_manager::task::default_status_open.get_default_status_open">
+ <fullquery name="pm::task::get_item_id.get_item_id">
<querytext>
+ SELECT
+ i.item_id
+ FROM
+ cr_items i,
+ cr_revisions r
+ WHERE
+ i.item_id = r.item_id and
+ r.revision_id = :task_id
+ </querytext>
+ </fullquery>
+
+ <fullquery name="pm::task::get_revision_id.get_revision_id">
+ <querytext>
+ SELECT
+ live_revision
+ FROM
+ cr_items i
+ WHERE
+ i.item_id = :task_item_id
+ </querytext>
+ </fullquery>
+
+ <fullquery name="pm::task::default_status_open.get_default_status_open">
+ <querytext>
select status_id
from pm_task_status
where status_type = 'o'
limit 1
</querytext>
</fullquery>
- <fullquery name="project_manager::task::default_status_closed.get_default_status_closed">
+ <fullquery name="pm::task::default_status_closed.get_default_status_closed">
<querytext>
select status_id
from pm_task_status
@@ -21,16 +45,37 @@
</querytext>
</fullquery>
- <fullquery name="project_manager::task::get_url.get_package_id">
+ <fullquery name="pm::task::get_url.get_package_id">
<querytext>
obviously broken
select package_id from surveys
where survey_id=:object_id
</querytext>
</fullquery>
- <fullquery name="project_manager::task::new.new_task_item">
+ <fullquery name="pm::task::edit.new_task_revision">
<querytext>
+ select pm_task__new_task_revision (
+ :task_item_id,
+ :project_item_id,
+ :title,
+ :description,
+ [pm::util::datenvl -value $end_date -value_if_null "null" -value_if_not_null "to_timestamp('$end_date','YYYY MM DD HH24 MI SS')"],
+ :percent_complete,
+ :estimated_hours_work,
+ :estimated_hours_work_min,
+ :estimated_hours_work_max,
+ :actual_hours_worked,
+ :status_id,
+ current_timestamp,
+ :update_user,
+ :update_ip,
+ :package_id)
+ </querytext>
+ </fullquery>
+
+ <fullquery name="pm::task::new.new_task_item">
+ <querytext>
select pm_task__new_task_item (
:project_id,
:title,
Index: openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/task-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl 26 Feb 2004 15:15:41 -0000 1.3
+++ openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl 12 Mar 2004 13:44:43 -0000 1.4
@@ -10,25 +10,339 @@
}
-namespace eval project_manager::task {}
+namespace eval pm::task {}
-ad_proc -public project_manager::task::default_status_open {} {
+
+
+ad_proc -public pm::task::dependency_delete_all {
+ -task_item_id:required
+
+} {
+ Deletes all the dependencies of a task
+
+ @author Jade Rubick (jader@bread.com)
+ @creation-date 2004-02-23
+
+ @param task_item_id The task we wish to remove the dependencies from
+
+ @return
+
+ @error
+} {
+ db_dml delete_deps "delete from pm_task_dependency where task_id = :task_item_id"
+ return 1
+}
+
+
+ad_proc -public pm::task::dependency_add {
+ -task_item_id:required
+ -parent_id:required
+ -dependency_type:required
+ -project_item_id:required
+} {
+
+ Adds a dependency to a task, checking for loops in the process
+
+ <p />
+
+ We make the assumption that the following is true:
+
+ <ul>
+ <li>no loop is created if you depend on a task already present</li>
+ <li>therefore, if you add a task without creating a loop in the
+ newly created tasks, you are safe.</li>
+ </ul>
+
+ We check that the new items don't depend on each other by
+ following them if they loop more than the number of tasks in the
+ project, then we have a loop
+
+ <p />
+ The way we check for a loop is to follow the dependencies
+ until we get to a task that has already been created.
+
+ @author Jade Rubick (jader@bread.com)
+ @creation-date 2004-02-23
+
+ @param task_item_id The task that is trying to create a
+ dependency. Of course this means that the task has already been
+ created.
+
+ @param parent_id The task that we would like to create a
+ dependency on. (item_id for task, of course)
+
+ @param dependency_type Type of dependency, from pm_dependency_types
+
+ @param project_item_id The project's item_id. All dependencies are
+ created within this project
+
+ @return
+
+ @error
+} {
+
+ set project_tasks [db_list get_tasks "
+ SELECT
+ task.item_id as t_item_id
+ FROM
+ cr_items task,
+ cr_items project
+ WHERE
+ task.parent_id = project.item_id and
+ project.item_id = :project_item_id
+ "]
+
+ set loop_limit [llength $project_tasks]
+
+ if {$loop_limit > 0} {
+
+ set dep_list [list]
+ db_foreach get_dependencies "
+ SElECT
+ d.task_id as dep_task,
+ d.parent_task_id as dep_task_parent
+ FROM
+ pm_task_dependency d
+ WHERE
+ d.task_id in ([join $project_tasks ", "])
+ " {
+ lappend dep_list d-$dep_task-$dep_task_parent
+ }
+
+ # are there any loops?
+ lappend dep_list d-$task_item_id-$parent_id
+
+ foreach ti $project_tasks {
+ set task_state($ti) 0
+ }
+ nsv_array set task_node_status [array get task_state]
+
+
+ set valid_p [pm::task::verify_no_loops \
+ -current_task $task_item_id \
+ -dependency_list $dep_list]
+
+ }
+
+
+ if {[string equal $valid_p "TRUE"]} {
+ # after it passes
+ set dependency_id [db_nextval pm_task_dependency_seq]
+
+ db_dml insert_dep "insert into pm_task_dependency (dependency_id, task_id, parent_task_id, dependency_type) values (:dependency_id, :task_item_id, :parent_id, 'finish_before_start')"
+
+ } else {
+ ns_log Notice "Task $task_item_id was not added due to looping"
+ }
+
+}
+
+
+ad_proc -private pm::task::verify_no_loops {
+ {-current_task:required}
+ {-dependency_list:required}
+} {
+ Based on the dag_dfs algorithm at http://wiki.tcl.tk/3716
+
+ <p />
+
+ Determines if adding in the additional dependency would create
+ an cyclical graph or not
+
+ @author Jade Rubick (jader@bread.com)
+ @creation-date 2004-02-25
+
+ @param project_task_list
+
+ @param current_task
+
+ @param dependency_list a list of dependencies, each of the form
+ d-n1-n2 where n1 is the child and n2 is the parent. The initial
+ call to this function should include the proposed addition in
+ this list.
+
+ @return TRUE if no loops, FALSE if the proposed additon would add loops
+
+ @error
+} {
+
+ set return_val ""
+
+ array set task_state [nsv_array get task_node_status]
+
+ set task_state($current_task) 1
+
+ nsv_array set task_node_status [array get task_state]
+
+ foreach arc $dependency_list {
+ regexp {d-(.*)-(.*)} $arc match child parent
+
+ # only walk to dependencies from the current task
+ if {[string equal $child $current_task]} {
+
+ set tNode $parent
+
+ array set task_state [nsv_array get task_node_status]
+
+ set used $task_state($tNode)
+
+ if {[string equal $used 1]} {
+ return FALSE
+ }
+
+ set return_val [pm::task::verify_no_loops \
+ -current_task $parent \
+ -dependency_list $dependency_list
+ ]
+
+ if {[string equal $return_val FALSE]} {
+ return FALSE
+ }
+ }
+
+ }
+
+ array set task_state [nsv_array get task_node_status]
+
+ set task_state($current_task) 2
+
+ nsv_array set task_node_status [array get task_state]
+
+ return TRUE
+}
+
+
+
+ad_proc -public pm::task::get_item_id {
+ -task_id:required
+} {
+ Returns the task_item_id (item_id) when given the task_id (revision_id)
+
+ @author Jade Rubick (jader@bread.com)
+ @creation-date 2004-02-19
+
+ @param task_id The revision item
+
+ @return task_item_id
+
+ @error
+} {
+ set return_val [db_string get_item_id { }]
+
+ return $return_val
+}
+
+
+
+ad_proc -public pm::task::get_revision_id {
+ -task_item_id:required
+} {
+ Returns task_id (revision_id) when given the task_item_id (item_id)
+
+ @author Jade Rubick (jader@bread.com)
+ @creation-date 2004-02-19
+
+ @param task_item_id The revision item
+
+ @return task_item_id
+
+ @error
+} {
+ set return_val [db_string get_revision_id { }]
+
+ return $return_val
+}
+
+
+
+ad_proc -public pm::task::default_status_open {} {
Returns the default status value for open tasks
} {
set return_val [db_string get_default_status_open { }]
return $return_val
}
-ad_proc -public project_manager::task::default_status_closed {} {
+
+ad_proc -public pm::task::default_status_closed {} {
Returns the default status value for closed tasks
} {
set return_val [db_string get_default_status_closed { }]
return $return_val
}
-ad_proc -public project_manager::task::new {
+
+
+ad_proc -public pm::task::edit {
+ -task_item_id:required
+ -project_item_id:required
+ -title:required
+ -description:required
+ -end_date:required
+ -percent_complete:required
+ -estimated_hours_work:required
+ -estimated_hours_work_min:required
+ -estimated_hours_work_max:required
+ -actual_hours_worked:required
+ {-status_id}
+ -update_user:required
+ -update_ip:required
+ -package_id:required
+} {
+
+
+ @author Jade Rubick (jader@bread.com)
+ @creation-date 2004-02-23
+
+ @param task_item_id
+
+ @param project_item_id
+
+ @param title
+
+ @param description
+
+ @param end_date
+
+ @param percent_complete
+
+ @param estimated_hours_work
+
+ @param estimated_hours_work_min
+
+ @param estimated_hours_work_max
+
+ @param actual_hours_worked The number of hours worked to date
+
+ @param status_id The code representing the status
+
+ @param update_user The user updating the task
+
+ @param update_ip The IP address of the request
+
+ @param package_id
+
+ @return new revision_id for the task
+
+ @error
+} {
+ if {$percent_complete >= 100} {
+ set status_id [pm::task::default_status_closed]
+ }
+
+ if {![exists_and_not_null status_id]} {
+ set status_id [pm::task::default_status_open]
+ }
+
+ set return_val [db_exec_plsql new_task_revision { *SQL }]
+
+ return $return_val
+}
+
+
+
+ad_proc -public pm::task::new {
-project_id:required
-title:required
{-description ""}
@@ -44,7 +358,7 @@
-package_id:required
} {
if {![exists_and_not_null status_id]} {
- set status_id [project_manager::task::default_status_open]
+ set status_id [pm::task::default_status_open]
}
set return_val [db_exec_plsql new_task_item { *SQL }]
@@ -53,19 +367,132 @@
}
-ad_proc -public project_manager::task::get_url {
+
+ad_proc -public pm::task::get_url {
object_id
} {
# set package_id [db_string get_package_id {}]
# set package_url [site_node::get_url_from_object_id -object_id $package_id]
# set package_url [site_node::get_url_from_object_id -object_id $object_id]
#return "${package_url}task-one?task_id=$object_id"
- return "/project-manager/task-one?task_id=$object_id"
+ return {}
+ # "/project-manager/task-one?task_id=$object_id"
}
-ad_proc -public project_manager::task::process_reply {
+
+
+ad_proc -public pm::task::process_reply {
reply_id
} {
+ # return successful_p = "f"
+ return "f"
+}
+
+
+ad_proc -public pm::task::slack_time {
+ -earliest_start_j:required
+ -today_j:required
+ -latest_start_j:required
+} {
+ Return the amount of slack time
+
+ @author Jade Rubick (jader@bread.com)
+ @creation-date 2004-02-20
+
+ @param earliest_start_j Earliest start date, Julian
+
+ @param today_j today's date, in Julian
+
+ @param latest_start_j Latest start date, in Julian
+
+ @return Slack days
+
+ @error
+} {
+ if { \
+ [exists_and_not_null earliest_start_j] && \
+ [exists_and_not_null latest_start_j]} {
+
+ if {$earliest_start_j < $today_j} {
+ set slack_time "[expr $latest_start_j - $today_j] days"
+ } else {
+ set slack_time "[expr $latest_start_j - $earliest_start_j] days"
+ }
+
+ } else {
+ set slack_time "n/a"
+ }
+
}
+
+
+ad_proc -private pm::task::update_hours {
+ {-task_item_id ""}
+ {-task_revision_id ""}
+ {-update_tasks_p "t"}
+} {
+ The pm_tasks_revisions table contains a denormalized cache of the
+ total number of hours logged to it. Updates the cache from the
+ hours logged in logger and the pm_task_logger_proj_map table
+
+ @author Jade Rubick (jader@bread.com)
+ @creation-date 2004-03-04
+
+ @param task_item_id
+
+ @param task_revision_id
+
+ @param update_tasks_p If t, updates the current pm_tasks_revision
+ table in the database.
+
+ @return total logged hours
+
+ @error if neither task_item_id or task_revision_id is defined,
+ returns -1
+} {
+ if { \
+ ![info exists task_item_id] && \
+ ![info exists task_revision_id]} {
+
+ ns_log Error "Illegal parameters in pm::task::update_hours"
+ return -1
+ }
+
+ if { \
+ [exists_and_not_null task_item_id] && \
+ ![exists_and_not_null task_revision_id]} {
+
+ set task_revision_id [pm::task::get_revision_id \
+ -task_item_id $task_item_id]
+ }
+
+ if { \
+ ![exists_and_not_null task_item_id] && \
+ [exists_and_not_null task_revision_id]} {
+
+ set task_item_id [pm::task::get_item_id \
+ -task_id $task_revision_id]
+ }
+
+
+ set total_logged_hours [db_string total_hours "
+ select sum(le.value) from logger_entries le where entry_id in (select logger_entry from pm_task_logger_proj_map where task_item_id = :task_item_id) and le.variable_id = '[logger::variable::get_default_variable_id]'
+ " -default "0"]
+
+ if {[string equal $update_tasks_p "t"]} {
+
+ db_dml update_current_task "
+ UPDATE
+ pm_tasks_revisions
+ SET
+ actual_hours_worked = :total_logged_hours
+ WHERE
+ task_revision_id = :task_revision_id
+ "
+ }
+
+ return $total_logged_hours
+
+}
Index: openacs-4/contrib/packages/project-manager/www/add-edit-2-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/add-edit-2-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/project-manager/www/add-edit-2-postgresql.xql 26 Feb 2004 15:15:41 -0000 1.3
+++ openacs-4/contrib/packages/project-manager/www/add-edit-2-postgresql.xql 12 Mar 2004 13:44:44 -0000 1.4
@@ -4,21 +4,19 @@
<querytext>
SELECT
p.item_id as project_item_id,
- p.project_id,
p.title as project_name,
p.description
FROM
pm_projectsx p
WHERE
- p.project_id = :project_id
+ p.project_id = :old_project_id
</querytext>
</fullquery>
<fullquery name="update_project">
<querytext>
UPDATE
pm_projects set
-
WHERE
project_id = :project_id
</querytext>
Index: openacs-4/contrib/packages/project-manager/www/add-edit-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/add-edit-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/project-manager/www/add-edit-2.adp 26 Jan 2004 15:39:40 -0000 1.2
+++ openacs-4/contrib/packages/project-manager/www/add-edit-2.adp 12 Mar 2004 13:44:44 -0000 1.3
@@ -3,5 +3,5 @@
<property name="title">@title@</property>
<center>
-<formtemplate id="add_edit" style="standard-lars"></formtemplate>
+<formtemplate id="add_edit"></formtemplate>
</center>
Index: openacs-4/contrib/packages/project-manager/www/add-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/add-edit-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/project-manager/www/add-edit-2.tcl 26 Feb 2004 15:15:41 -0000 1.3
+++ openacs-4/contrib/packages/project-manager/www/add-edit-2.tcl 12 Mar 2004 13:44:44 -0000 1.4
@@ -17,6 +17,7 @@
} {
project_id:integer,optional
+ {old_project_id ""}
{project_item_id ""}
{project_name ""}
{description ""}
@@ -28,6 +29,12 @@
}
+
+# this is necessary for new projects
+if {![exists_and_not_null old_project_id]} {
+ set old_project_id $project_id
+}
+
# --------------------------------------------------------------- #
# the unique identifier for this package
set package_id [ad_conn package_id]
@@ -69,6 +76,8 @@
}
} \
+ -validate {
+ } \
-select_query_name project_query \
-on_submit {
@@ -78,16 +87,16 @@
} \
-new_data {
- ad_returnredirect "one?[export_url_vars project_item_id project_id]"
+ ad_returnredirect "one?[export_url_vars project_item_id]"
ad_script_abort
} -edit_data {
-
+
db_dml update_project { *SQL* }
} -after_submit {
- ad_returnredirect "one?[export_url_vars project_id]"
+ ad_returnredirect "one?[export_url_vars project_item_id]"
ad_script_abort
}
Index: openacs-4/contrib/packages/project-manager/www/add-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/add-edit-postgresql.xql,v
diff -u -r1.11 -r1.12
--- openacs-4/contrib/packages/project-manager/www/add-edit-postgresql.xql 26 Feb 2004 15:15:41 -0000 1.11
+++ openacs-4/contrib/packages/project-manager/www/add-edit-postgresql.xql 12 Mar 2004 13:44:44 -0000 1.12
@@ -2,92 +2,35 @@
<queryset>
<fullquery name="project_query">
<querytext>
- SELECT
- p.item_id as project_item_id,
- p.parent_id,
- p.project_id,
- p.title as project_name,
- p.project_code,
- p.goal,
- p.description,
- p.status_id,
- to_char(p.planned_start_date,'YYYY MM DD') as planned_start_date,
- to_char(p.planned_end_date,'YYYY MM DD') as planned_end_date,
- p.ongoing_p
- FROM
- pm_projectsx p
- WHERE
- p.item_id = :project_item_id and
- p.project_id = :project_id
+ SELECT
+ p.item_id as project_item_id,
+ p.parent_id,
+ p.project_id,
+ p.title as project_name,
+ p.project_code,
+ p.goal,
+ p.description,
+ p.customer_id,
+ p.status_id,
+ p.logger_project,
+ to_char(p.planned_start_date,'YYYY MM DD') as planned_start_date,
+ to_char(p.planned_end_date,'YYYY MM DD') as planned_end_date,
+ p.ongoing_p
+ FROM
+ pm_projectsx p
+ WHERE
+ p.item_id = :project_item_id and
+ p.project_id = :project_id
</querytext>
</fullquery>
<fullquery name="do_nothing">
<querytext>
SELECT
current_timestamp
- FROM
- pm_projects
</querytext>
</fullquery>
- <fullquery name="new_project_item">
- <querytext>
- select pm_project__new_project_item (
- :project_name,
- :project_code,
- :parent_id,
- :goal,
- :description,
- to_timestamp(:planned_start_date,'YYYY MM DD HH24 MI SS'),
- to_timestamp(:planned_end_date,'YYYY MM DD HH24 MI SS'),
- null,
- null,
- :ongoing_p,
- :status_id,
- now(),
- :user_id,
- :peeraddr,
- :package_id
- );
- </querytext>
- </fullquery>
-
- <fullquery name="new_project_revision">
- <querytext>
- select pm_project__new_project_revision (
- :project_item_id,
- :project_name,
- :project_code,
- :parent_id,
- :goal,
- :description,
- to_timestamp(:planned_start_date,'YYYY MM DD HH24 MI SS'),
- to_timestamp(:planned_end_date,'YYYY MM DD HH24 MI SS'),
- null,
- null,
- :ongoing_p,
- :status_id,
- :customer_id,
- now(),
- :user_id,
- :peeraddr,
- :package_id
- );
- </querytext>
- </fullquery>
-
- <fullquery name="get_item_id">
- <querytext>
- SELECT
- p.item_id as project_item_id
- FROM
- pm_projectsx p
- WHERE
- p.project_id = :project_id
- </querytext>
- </fullquery>
-
<fullquery name="get_status_codes">
<querytext>
SELECT
Index: openacs-4/contrib/packages/project-manager/www/add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/add-edit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/project-manager/www/add-edit.adp 10 Nov 2003 19:34:54 -0000 1.4
+++ openacs-4/contrib/packages/project-manager/www/add-edit.adp 12 Mar 2004 13:44:44 -0000 1.5
@@ -1,7 +1,8 @@
<master>
+
<property name="context_bar">@context_bar;noquote@</property>
<property name="title">@title@</property>
<center>
-<formtemplate id="add_edit" style="standard-lars"></formtemplate>
+<formtemplate id="add_edit"></formtemplate>
</center>
Index: openacs-4/contrib/packages/project-manager/www/add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/add-edit.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/contrib/packages/project-manager/www/add-edit.tcl 26 Feb 2004 15:15:41 -0000 1.15
+++ openacs-4/contrib/packages/project-manager/www/add-edit.tcl 12 Mar 2004 13:44:44 -0000 1.16
@@ -24,6 +24,7 @@
{deadline_scheduling ""}
{ongoing_p ""}
{status_id ""}
+ {logger_project ""}
} -properties {
@@ -45,13 +46,21 @@
set use_project_customizations_p [parameter::get -parameter "UseProjectCustomizationsP" -default "0"]
+set ongoing_by_default_p [parameter::get -parameter "OngoingByDefaultP" -default "f"]
+
+if {[exists_and_not_null project_item_id] && ![exists_and_not_null project_id]} {
+ set project_id [pm::project::get_project_id -project_item_id $project_item_id]
+}
+
+
if {[exists_and_not_null project_id]} {
set title "Edit a $project_term_lower"
set context_bar [ad_context_bar "Edit $project_term"]
# permissions
permission::require_permission -party_id $user_id -object_id $package_id -privilege write
+
} else {
set title "Add a $project_term_lower"
set context_bar [ad_context_bar "New $project_term"]
@@ -73,6 +82,10 @@
{value $project_item_id}
}
+ {logger_project:text(hidden)
+ {value $logger_project}
+ }
+
{project_name:text
{label "[set project_term] name"}
{value $project_name}
@@ -91,23 +104,22 @@
{planned_start_date:date,to_sql(linear_date)
{label "Starts"}
- {format "MONTH DD YYYY"}
- {value {[util::date acquire clock [clock scan $planned_start_date]]}}
+ {value $planned_start_date}
{today}
{help}
}
{planned_end_date:date,to_sql(linear_date)
{label "Deadline"}
- {format "MONTH DD YYYY"}
- {value {[util::date acquire clock [clock scan $planned_end_date]]}}
+ {value $planned_end_date}
{today}
{help}
}
{ongoing_p:text(select)
{label "Project is ongoing?"}
- {options {{"No" "f"} {"Yes" "t"}} {value $ongoing_p}}
+ {options {{"No" f} {"Yes" t}}}
+ {value $ongoing_p}
{help_text "If yes, then this project has no deadline"}
}
@@ -116,7 +128,7 @@
{options {[db_list_of_lists get_status_codes { }]}}
}
- }
+ }
if {[exists_and_not_null project_id]} {
@@ -168,31 +180,42 @@
set user_id [ad_conn user_id]
set peeraddr [ad_conn peeraddr]
+
+ } \
+ -new_request {
- } -new_data {
+ if {[string equal $ongoing_by_default_p t]} {
+ set ongoing_p t
+ }
+ set planned_end_date [util::date acquire clock [clock scan $planned_end_date]]
- set project_id [project_manager::project::new \
- -project_name $project_name \
- -project_code $project_code \
- -parent_id $parent_id \
- -goal $goal \
- -description $description \
- -planned_start_date $planned_start_date \
- -planned_end_date $planned_end_date \
- -actual_start_date "" \
- -actual_end_date "" \
- -ongoing_p $ongoing_p \
- -status_id $status_id \
- -organization_id $customer_id \
- -creation_date "" \
- -creation_user $user_id \
- -creation_ip $peeraddr \
- -package_id $package_id
- ]
+ set planned_start_date [util::date acquire clock [clock scan $planned_start_date]]
+
+ } \
+ -new_data {
- set project_item_id [db_string get_item_id { }]
+ set project_id [pm::project::new \
+ -project_name $project_name \
+ -project_code $project_code \
+ -parent_id $parent_id \
+ -goal $goal \
+ -description $description \
+ -planned_start_date $planned_start_date \
+ -planned_end_date $planned_end_date \
+ -actual_start_date "" \
+ -actual_end_date "" \
+ -ongoing_p $ongoing_p \
+ -status_id $status_id \
+ -organization_id $customer_id \
+ -creation_date "" \
+ -creation_user $user_id \
+ -creation_ip $peeraddr \
+ -package_id $package_id
+ ]
+ set project_item_id [pm::project::get_project_item_id -project_id $project_id]
+
if {[exists_and_not_null category_ids]} {
category::map_object -remove_old -object_id $project_item_id $category_ids
}
@@ -206,23 +229,47 @@
}
} -edit_data {
+
+ # we need to pass the old_project_id to add-edit-2.tcl because
+ # the new revision will not have any of the custom values in
+ # it until it is edited. So we need to pull in these values
+ set old_project_id $project_id
-ns_log Notice "edit"
- set project_id [db_exec_plsql new_project_revision { *SQL* }]
- project_manager::project::compute_parent_status $project_item_id
+ set project_id [pm::project::edit \
+ -project_item_id $project_item_id \
+ -project_name $project_name \
+ -project_code $project_code \
+ -parent_id $parent_id \
+ -goal $goal \
+ -description $description \
+ -planned_start_date $planned_start_date \
+ -planned_end_date $planned_end_date \
+ -actual_start_date "" \
+ -actual_end_date "" \
+ -logger_project $logger_project \
+ -ongoing_p $ongoing_p \
+ -status_id $status_id \
+ -organization_id $customer_id \
+ -creation_user $user_id \
+ -creation_ip $peeraddr \
+ -package_id $package_id]
+
+ set project_item_id [pm::project::get_project_item_id \
+ -project_id $project_id]
+ pm::project::compute_parent_status $project_item_id
- category::map_object -remove_old -object_id $project_item_id $category_ids
-
+
+ if {[exists_and_not_null category_ids]} {
+ category::map_object -remove_old -object_id $project_item_id $category_ids
+ }
} -after_submit {
-ns_log Notice "after_submit"
if {$use_project_customizations_p} {
- ad_returnredirect "add-edit-2?[export_url_vars project_id]"
+ ad_returnredirect "add-edit-2?[export_url_vars project_id old_project_id]"
ad_script_abort
} else {
ad_returnredirect "one?[export_url_vars project_id]"
ad_script_abort
}
}
-ns_log Notice "end of it all"
Index: openacs-4/contrib/packages/project-manager/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/index-postgresql.xql,v
diff -u -r1.11 -r1.12
--- openacs-4/contrib/packages/project-manager/www/index-postgresql.xql 26 Feb 2004 15:15:41 -0000 1.11
+++ openacs-4/contrib/packages/project-manager/www/index-postgresql.xql 12 Mar 2004 13:44:44 -0000 1.12
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<queryset>
-<rdbms><type>postgresql</type><version>7.2</version></rdbms>
+ <rdbms><type>postgresql</type><version>7.3</version></rdbms>
-<fullquery name="project_folders">
+ <fullquery name="project_folders">
<querytext>
SELECT
p.item_id as project_item_id,
@@ -23,10 +23,12 @@
to_char(p.estimated_finish_date, 'MM/DD/YY') as estimated_finish_date,
to_char(p.earliest_finish_date, 'MM/DD/YY') as earliest_finish_date,
to_char(p.latest_finish_date, 'MM/DD/YY') as latest_finish_date,
- case when o.name is null then '--no customer--' else o.name end as customer_name,
- o.organization_id
+ case when o.name is null then '--no customer--' else o.name
+ end as customer_name,
+ o.organization_id as customer_id
FROM pm_projectsx p
- LEFT JOIN organizations o ON p.customer_id = o.organization_id
+ LEFT JOIN organizations o ON p.customer_id =
+ o.organization_id
LEFT JOIN (
select
om.category_id,
Index: openacs-4/contrib/packages/project-manager/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/index.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/contrib/packages/project-manager/www/index.adp 26 Jan 2004 15:39:40 -0000 1.19
+++ openacs-4/contrib/packages/project-manager/www/index.adp 12 Mar 2004 13:44:44 -0000 1.20
@@ -1,4 +1,4 @@
-<master>
+<master src="lib/master">
<link rel="stylesheet" href="style.css" type="text/css">
@@ -9,7 +9,7 @@
<tr>
- <td class="list-filter-pane" valign="top" width="200">
+ <td class="list-filter-pane" valign="top">
@category_select;noquote@
Index: openacs-4/contrib/packages/project-manager/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/index.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/contrib/packages/project-manager/www/index.tcl 26 Feb 2004 15:15:41 -0000 1.12
+++ openacs-4/contrib/packages/project-manager/www/index.tcl 12 Mar 2004 13:44:44 -0000 1.13
@@ -1,7 +1,7 @@
ad_page_contract {
Main view page for projects.
-
+
@author jader@bread.com
@author ncarroll@ee.usyd.edu.au (on first version that used CR)
@creation-date 2003-05-15
@@ -19,6 +19,7 @@
orderby_project:optional
{status_id:integer,optional}
category_id:multiple,optional
+ {format "normal"}
} -properties {
context:onevalue
@@ -61,28 +62,29 @@
# set default values
if {![exists_and_not_null status_id]} {
- set status_id [project_manager::project::default_status_open]
+ set status_id [pm::project::default_status_open]
}
# Categories are arranges into category trees.
# Set up an array for each tree. The array contains the category for each tree
-db_foreach get_choices "
-select
-t.name as cat_name,
-t.category_id as cat_id,
-tm.tree_id
-from
-category_tree_map tm,
-categories c,
-category_translations t
-where
-c.tree_id = tm.tree_id and
-c.category_id = t.category_id and
-tm.object_id = :package_id and
-c.deprecated_p = 'f'
-order
-by t.name" {
+db_foreach get_choices {
+ select
+ t.name as cat_name,
+ t.category_id as cat_id,
+ tm.tree_id
+ from
+ category_tree_map tm,
+ categories c,
+ category_translations t
+ where
+ c.tree_id = tm.tree_id and
+ c.category_id = t.category_id and
+ tm.object_id = :package_id and
+ c.deprecated_p = 'f'
+ order
+ by t.name
+} {
lappend category_choices($tree_id) [list $cat_name $cat_id]
}
@@ -92,17 +94,18 @@
set category_select ""
-foreach tree_list [db_list_of_lists get_category_trees "
-select
-tt.name as tree_name,
-tt.tree_id
-from
-category_tree_map tm,
-category_tree_translations tt
-where
-tm.object_id = :package_id and
-tm.tree_id = tt.tree_id"] {
-
+foreach tree_list [db_list_of_lists get_category_trees {
+ select
+ tt.name as tree_name,
+ tt.tree_id
+ from
+ category_tree_map tm,
+ category_tree_translations tt
+ where
+ tm.object_id = :package_id and
+ tm.tree_id = tt.tree_id
+}] {
+
set tree_name [lindex $tree_list 0]
set tree_id [lindex $tree_list 1]
@@ -139,8 +142,8 @@
customer_name {
label "Customer"
display_template "
- <if @projects.organization_id@ not nil><a href=\"/organization/one?organization_id=@projects.organization_id@\">@projects.customer_name@</a></if><else>@projects.customer_name@</else>
- "
+<if @projects.organization_id@ not nil><a href=\"/organization/one?organization_id=@projects.organization_id@\">@projects.customer_name@</a></if><else>@projects.customer_name@</else>
+"
}
project_name {
label "Project name"
@@ -149,7 +152,7 @@
}
earliest_finish_date {
label "Earliest finish"
- display_template "<if @projects.days_to_earliest_finish@ gt 1>@projects.earliest_finish_date@</if><else><font color=\"red\">@projects.earliest_finish_date@</font></else>"
+ display_template "<if @projects.days_to_earliest_finish@ gt 1>@projects.earliest_finish_date@</if><else><font color=\"green\">@projects.earliest_finish_date@</font></else>"
}
latest_finish_date {
label "Latest Finish"
@@ -164,14 +167,8 @@
display_template "<group column=\"project_item_id\"><li>@projects.category_name@</group>"
}
} \
- -actions {
- "Tasks" "tasks" "View list of tasks"
- "Processes" "processes" "View and use processes"
- "Add project" "add-edit" "Add project"
- "Customers" "/organization" "View customers"
- "Admin" "admin/" "Administration pages"
- } \
- -main_class {
+ -actions [list "Add project" "add-edit" "Add project" "Customers" "[site_node::get_package_url -package_key organizations]" "View customers"] \
+ -sub_class {
narrow
} \
-filters {
@@ -186,7 +183,7 @@
}
} \
-orderby {
- default_value customer_name,asc
+ default_value project_name,asc
project_name {
label "Project name"
orderby_desc "upper(p.title) desc"
@@ -224,6 +221,33 @@
default_direction asc
}
} \
+ -formats {
+ normal {
+ label "Table"
+ layout table
+ row {
+ project_name {}
+ customer_name {}
+ category_id {}
+ earliest_finish_date {}
+ latest_finish_date {}
+ actual_hours_completed {}
+ }
+ }
+ csv {
+ label "CSV"
+ output csv
+ page_size 0
+ row {
+ project_name {}
+ customer_name {}
+ category_id {}
+ earliest_finish_date {}
+ latest_finish_date {}
+ actual_hours_completed {}
+ }
+ }
+ } \
-orderby_name orderby_project \
-html {
width 100%
@@ -236,4 +260,27 @@
}
+# This spits out the CSV if we happen to be in CSV layout
+
+if {[string equal $format csv]} {
+ #set csv [list::write_output -name pan]
+ #set outputheaders [ns_conn outputheaders]
+ #ns_set cput $outputheaders "Content-Disposition" "attachment; filename=pan.csv"
+ #doc_return 200 "application/text" "$csv"
+
+ # set csv [list::write_output -name projects]
+
+ set outputheaders [ns_conn outputheaders]
+ ns_set cput $outputheaders "Content-Disposition" "attachment; filename=projects.xls"
+
+ # ns_log Notice "csv: $csv"
+
+ list::write_output -name projects
+
+ # doc_return 200 application/vnd.ms-excel $csv
+ # ns_return 200 application/vnd.ms-excel $csv
+
+}
+
+
# ------------------------- END OF FILE ------------------------- #
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/www/log.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/www/log.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/www/log.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/contrib/packages/project-manager/www/one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one-postgresql.xql,v
diff -u -r1.22 -r1.23
--- openacs-4/contrib/packages/project-manager/www/one-postgresql.xql 26 Feb 2004 15:15:41 -0000 1.22
+++ openacs-4/contrib/packages/project-manager/www/one-postgresql.xql 12 Mar 2004 13:44:45 -0000 1.23
@@ -1,29 +1,6 @@
<?xml version="1.0"?>
<queryset>
- <fullquery name="get_item_id">
- <querytext>
- SELECT
- p.item_id as project_item_id
- FROM
- pm_projectsx p
- WHERE
- p.project_id = :project_id
- </querytext>
- </fullquery>
-
- <fullquery name="get_project_id">
- <querytext>
- SELECT
- p.project_id
- FROM
- pm_projectsx p, cr_items i
- WHERE
- p.item_id = :project_item_id and
- p.revision_id = i.live_revision
- </querytext>
- </fullquery>
-
<fullquery name="project_query">
<querytext>
SELECT
@@ -35,6 +12,7 @@
p.description,
to_char(p.planned_start_date,'YYYY-MM-DD HH24:MI') as planned_start_date,
to_char(p.planned_end_date,'YYYY-MM-DD HH24:MI') as planned_end_date,
+ p.logger_project,
p.ongoing_p,
i.live_revision,
to_char(p.estimated_finish_date,'YYYY-MM-DD HH24:MI') as estimated_finish_date,
@@ -155,7 +133,8 @@
<fullquery name="custom_query">
<querytext>
SELECT
- p.customer_id
+ p.customer_id,
+ c.name as customer_name
FROM
pm_projectsx p
LEFT JOIN organizations c ON p.customer_id = c.organization_id
Index: openacs-4/contrib/packages/project-manager/www/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.adp,v
diff -u -r1.30 -r1.31
--- openacs-4/contrib/packages/project-manager/www/one.adp 26 Feb 2004 15:15:41 -0000 1.30
+++ openacs-4/contrib/packages/project-manager/www/one.adp 12 Mar 2004 13:44:45 -0000 1.31
@@ -1,215 +1,265 @@
-<master />
+<master src="lib/master" />
+
+ <link rel="stylesheet" href="style.css" type="text/css" />
-<link rel="stylesheet" href="style.css" type="text/css" />
-
-<property name="title">@project_term@ #@project_item_id@: @project.project_name;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
-
-<if @project.live_revision@ ne @project.project_id@>
+ <property name="title">@project_term@ #@project_item_id@: @project.project_name;noquote@</property>
+ <property name="context">@context@</property>
+
+ <if @project.live_revision@ ne @project.project_id@>
<h4>(not current, select live version below)</h4>
-</if>
-
-<div id="topcontent">
-
-<div id="leftcontent">
-
- <!-- PROJECT INFO-->
-
- <table border="1" cellpadding="0" cellspacing="0" width="100%">
- <tr>
- <th><a href="add-edit?project_id=@project.project_id@&project_item_id=@project.item_id@">
- <img border="0" src="/shared/images/Edit16.gif" alt="Edit"></a>
- </th>
-
- <th>@project_term@</th>
-
- <th align="right"><img border="0" src="/shared/images/Delete16.gif"></th>
-
- </tr>
- <tr>
- <td bgcolor="#eeeeee" colspan="3">
-
- <table border="0" width="100%" bgcolor="#ffffff" cellspacing="1">
-
+ </if>
+
+ <div id="topcontent">
+
+ <div id="leftcontent">
+
+ <table border="1" cellpadding="0" cellspacing="0" width="100%" class="list">
<tr>
- <td class="highlight" valign="top">Name</td>
- <td>@project.project_name@</td>
- </tr>
+ <th>
+ <a href="@edit_url@">
+ <img border="0" src="/shared/images/Edit16.gif"
+ alt="Edit" />
+ </a>
+
+ @project_term@
- <if @use_project_code_p@ eq 1>
- <tr>
- <td class="highlight">Code</td>
- <td>@project.project_code@</td>
- </tr>
- </if>
-
- <if @use_goal_p@ eq 1>
- <tr>
- <td class="highlight">Goal</td>
- <td>@project.goal@</td>
- </tr>
- </if>
-
- <tr>
- <td class="highlight" valign="top">Description</td>
- <td>@project.description@</td>
+ </th>
+
</tr>
-
- </table>
-
- </table>
-
- <p />
-
- <table border="1" cellpadding="0" cellspacing="0" width="100%">
- <tr>
- <th colspan="2">Dates</th>
- </tr>
-
- <tr>
- <td>
- <table border="0" cellpadding="1" cellspacing="1" width="100%">
+
<tr>
- <td class="highlight">Start</td>
- <td>@project.planned_start_date@</td>
+ <td bgcolor="#eeeeee" colspan="3">
+
+ <table border="0" width="100%" bgcolor="#ffffff" cellspacing="1">
+
+ <tr>
+ <td class="highlight" valign="top">Name</td>
+ <td>@project.project_name@</td>
+ </tr>
+
+ <if @use_project_code_p@ eq 1>
+ <tr>
+ <td class="highlight">Code</td>
+ <td>@project.project_code@</td>
+ </tr>
+ </if>
+
+ <if @use_goal_p@ eq 1>
+ <tr>
+ <td class="highlight">Goal</td>
+ <td>@project.goal@</td>
+ </tr>
+ </if>
+
+ <tr>
+ <td class="highlight" valign="top">Description</td>
+ <td>@project.description@</td>
+ </tr>
+
+ </table>
+ </td>
</tr>
-
+ </table>
+
+ <p />
+
+ <table border="1" cellpadding="0" cellspacing="0" width="100%" class="list">
<tr>
- <td class="highlight">Earliest finish</td>
- <if @project.ongoing_p@ eq f>
- <td>@project.earliest_finish_date@</td>
- </if>
- <else>
- <td>Ongoing</td>
- </else>
+ <th colspan="2">Dates</th>
</tr>
-
+
<tr>
- <td class="highlight">Deadline</td>
- <if @project.ongoing_p@ eq f>
- <td><B>@project.planned_end_date@</B></td>
- </if>
- <else>
- <td>Ongoing</td>
- </else>
+ <td>
+ <table border="0" cellpadding="1" cellspacing="1" width="100%">
+ <tr>
+ <td class="highlight">Start</td>
+ <td>@project.planned_start_date@</td>
+ </tr>
+
+ <tr>
+ <td class="highlight">Earliest finish</td>
+ <if @project.ongoing_p@ eq f>
+ <td>@project.earliest_finish_date@</td>
+ </if>
+ <else>
+ <td>Ongoing</td>
+ </else>
+ </tr>
+
+ <tr>
+ <td class="highlight">Deadline</td>
+ <if @project.ongoing_p@ eq f>
+ <td><B>@project.planned_end_date@</B></td>
+ </if>
+ <else>
+ <td>Ongoing</td>
+ </else>
+ </tr>
+
+ <tr>
+ <td class="highlight">Latest finish</td>
+ <if @project.ongoing_p@ eq f>
+ <td>@project.latest_finish_date@</td>
+ </if>
+ <else>
+ <td>Ongoing</td>
+ </else>
+ </tr>
+
+ <tr>
+ <td class="highlight">Task hours completed</td>
+ <td>@project.actual_hours_completed@ of @project.estimated_hours_total@</td>
+ </tr>
+
+ </table>
+ </td>
</tr>
+ </table>
+
+ <p />
+
+ <if @use_project_customizations_p@>
+ <p />
+ <table border="1" cellpadding="0" cellspacing="0" width="100%" class="list">
+ <tr>
+ <th colspan="2">Project information</th>
+ </tr>
+ <tr>
+ <td>
+ <table border="0" cellpadding="1" cellspacing="1" width="100%">
+ <tr>
+ <td class="highlight">Customer</td>
+ <td><a href="/organization/one?organization_id=@custom.customer_id@">@custom.customer_name@</a></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </if>
+
+ <p />
+
+ <table border="1" cellpadding="0" cellspacing="0" width="100%" class="list">
<tr>
- <td class="highlight">Latest finish</td>
- <if @project.ongoing_p@ eq f>
- <td>@project.latest_finish_date@</td>
- </if>
- <else>
- <td>Ongoing</td>
- </else>
+ <th colspan="2">Categories</th>
</tr>
-
+
<tr>
- <td class="highlight">Hours completed</td>
- <td>@project.actual_hours_completed@ of @project.estimated_hours_total@</td>
+ <td>
+ <table border="0" cellpadding="1" cellspacing="1" width="100%">
+ <tr>
+ <td class="highlight">
+
+ <ul>
+ <list name="categories">
+ <if @categories:rowcount@ gt 0>
+ <li> @categories:item@
+ </if>
+ </list>
+ </ul>
+
+ </td>
+
+ </table>
+ </td>
</tr>
-
</table>
- </table>
-
- <p>
-
- <if @use_project_customizations_p@>
- <p />
- <table border="1" cellpadding="0" cellspacing="0" width="100%">
- <tr>
- <th colspan="2">Project information</th>
- </tr>
-
- <tr>
- <td>
- <table border="0" cellpadding="1" cellspacing="1" width="100%">
+ <p />
+
+ <table class="list" cellpadding="3" cellspacing="1" width="100%" border="1">
<tr>
- <td class="highlight">Customer</td>
- <td><a href="/organization/one?organization_id=@custom.customer_id@">@custom.customer_name@</a></td>
+ <th colspan="2">Subprojects</th>
</tr>
- </table>
- </table>
- </if>
+
+ <tr class="list-button-bar">
+ <td><span class="list-button-header"><a
+ href="add-edit?parent_id=@project_item_id@" class="list-button"
+ title="Add a subproject to this project">Add subproject</a></span>
+
+ <listtemplate name="subproject"></listtemplate>
+
+ </td>
+ </tr>
+ </table>
- <p />
+ </div>
- <table border="1" cellpadding="0" cellspacing="0" width="100%">
- <tr>
- <th colspan="2">Categories</th>
- </tr>
+ <!--
+ TASKS
+ -->
- <tr>
- <td>
- <table border="0" cellpadding="1" cellspacing="1" width="100%">
- <tr>
- <td class="highlight">
-
+ <table border="1" cellpadding="0" cellspacing="1" width="100%"
+ id="rightcontent" class="list">
+ <tr>
+ <th>@task_term@</th>
+ </tr>
+
+ <tr>
+ <td>
+ <listtemplate name="tasks"></listtemplate>
+ </td>
+ </tr>
+ <tr class="list-button-bar">
+ <td class="list-button-bar">
<ul>
- <list name="categories">
- <if @categories:rowcount@ gt 0>
- <li> @categories:item@
- </if>
- </list>
+ <li>
+ <form action="task-add-edit" method="post">
+ Add
+ <input type="hidden" name="project_item_id" value="@project_item_id@" />
+ <input type="hidden" name="project_id" value="@project_id@" />
+ <input type="text" name="number" size="3" value="1" />
+ Tasks
+ <input type="submit" name="submit" value="Go" />
+ </form>
+ </li>
</ul>
+ </td>
+ </tr>
- </td>
-
- </table>
</table>
<p />
- <a class="button" href="add-edit?parent_id=@project_item_id@">Add subproject</a>
- </p>
-
- Subprojects:
- <listtemplate name="subproject"></listtemplate>
-
- <!--People:
- <listtemplate name="people"></listtemplate>-->
-
+
+ <table border="1" cellpadding="3" cellspacing="1" id="rightcontent" class="list">
+ <tr>
+ <th colspan="2">Logged hours</th>
+ </tr>
+
+ <tr class="list-button-bar">
+ <td class="list-button-bar">
+ <span class="list-button-header">
+ <a href="@log_url@" class="list-button" title="Log hours for this project">Log hours</a>
+ </span>
+ </td>
+ <td class="list-button-bar" align="right">
+ @log_note@
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <include src="lib/entries-table"
+ selected_project_id="@project.logger_project@"
+ selected_variable_id="@project.logger_variable_id@"
+ start_date_ansi="@then_ansi@"
+ pm_project_id="@project_item_id@" />
+ </td>
+ </tr>
+ </table>
</div>
-
- <!--
- TASKS
- -->
-
- <table border="1" cellpadding="0" cellspacing="1" width="100%" id="rightcontent">
- <tr>
- <th>Tasks</th>
- </tr>
-
- <tr>
- <td>
- <listtemplate name="tasks"></listtemplate>
-
-<ul>
- <li>
- <form action="task-add-edit" method="post">
- Add
- <input type="hidden" name="project_item_id" value="@project_item_id@" />
- <input type="hidden" name="project_id" value="@project_id@" />
- <input type="text" name="number" size="3" value="1" />
- Tasks
- <input type="submit" name="submit" value="Go" />
- </form>
- </li>
-</ul>
-</td>
-
-</table>
-
-</div>
-
-
<div id="bottomcontent">
<!-- REVISIONS -->
-
+
<p />
-
+
<listtemplate name="versions"></listtemplate>
-
+ <p />
+ <h3>Comments</h3>
+ @comments;noquote@
+ <P />
+ @comments_link;noquote@
+
</div>
-
Index: openacs-4/contrib/packages/project-manager/www/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.tcl,v
diff -u -r1.29 -r1.30
--- openacs-4/contrib/packages/project-manager/www/one.tcl 26 Feb 2004 15:15:41 -0000 1.29
+++ openacs-4/contrib/packages/project-manager/www/one.tcl 12 Mar 2004 13:44:45 -0000 1.30
@@ -1,11 +1,12 @@
ad_page_contract {
- Main view page for one project.
+ Main view page for one project. Also shows logged time, and allows a
+ user to log time
@author jader@bread.com, ncarroll@ee.usyd.edu.au
@creation-date 2003-05-15
@cvs-id $Id$
- @return context_bar Context bar.
+ @return context Context bar.
@return versions a multirow holding versions of the project
@return live_revision the project_id of the live_revision
@@ -30,7 +31,7 @@
} -properties {
categories:onelist
- context_bar:onevalue
+ context:onevalue
project:multirow
tasks:multirow
people:multirow
@@ -45,15 +46,22 @@
use_project_code_p:onevalue
use_uncertain_completion_times_P:onevalue
use_project_customizations_p:onevalue
+ task_term:onevalue
+ then_ansi:onevalue
+ edit_url:onevalue
+ comments:onevalue
+ comments_link:onevalue
} -validate {
project_item_id_exists {
if {![exists_and_not_null project_item_id]} {
- set project_item_id [db_string get_item_id { }]
+ set project_item_id [pm::project::get_project_item_id \
+ -project_id $project_id]
}
}
project_id_exists {
if {![exists_and_not_null project_id]} {
- set project_id [db_string get_project_id { }]
+ set project_id [pm::project::get_project_id \
+ -project_item_id $project_item_id]
}
}
}
@@ -66,11 +74,20 @@
set package_id [ad_conn package_id]
set user_id [ad_maybe_redirect_for_registration]
+# ----------------
+# general comments
+# ----------------
+set comments [general_comments_get_comments -print_content_p 1 -print_attachments_p 1 $project_item_id "[ad_conn url]?project_item_id=$project_item_id"]
+
+set comments_link [general_comments_create_link -object_name cr_items -link_text "Add a comment" -context_id $package_id $project_item_id "[ad_conn url]?project_item_id=$project_item_id"]
+
+
# terminology
set project_term [parameter::get -parameter "ProjectName" -default "Project"]
set project_term_lower [parameter::get -parameter "projectname" -default "project"]
-set use_goal_p [parameter::get -parameter "UseGoalP" -default "1"]
-set use_project_code_p [parameter::get -parameter "UseUserProjectCodesP" -default "1"]
+set task_term [parameter::get -parameter "TaskName" -default "Task"]
+set use_goal_p [parameter::get -parameter "UseGoalP" -default "1"]
+set use_project_code_p [parameter::get -parameter "UseUserProjectCodesP" -default "1"]
set use_uncertain_completion_times_p [parameter::get -parameter "UseUncertainCompletionTimesP" -default "1"]
set use_project_customizations_p [parameter::get -parameter "UseProjectCustomizationsP" -default "0"]
@@ -80,9 +97,9 @@
set write_p [permission::permission_p -object_id $package_id -privilege write]
set create_p [permission::permission_p -object_id $package_id -privilege create]
+
# categories
-
set categories [list]
set cat_list [category::get_mapped_categories $project_item_id]
foreach cat $cat_list {
@@ -97,13 +114,25 @@
set project(estimated_finish_date) [lc_time_fmt $project(estimated_finish_date) "%x"]
set project(earliest_finish_date) [lc_time_fmt $project(earliest_finish_date) "%x"]
set project(latest_finish_date) [lc_time_fmt $project(latest_finish_date) "%x"]
+set project(logger_variable_id) [logger::variable::get_default_variable_id]
+set log_url "[ad_conn package_url]log?project_id=$project(logger_project)&pm_project_id=$project_item_id"
+
+set then_ansi [db_string get_now_julian "select to_char(current_timestamp - '30 days'::INTERVAL,'YYYY-MM-DD')"]
+
+
+set log_note "Last 30 days"
+
+
+
+set edit_url "[ad_conn package_url]add-edit?[export_url_vars project_item_id]"
+
# set up context bar, needs parent_id
if {[string equal $project(parent_id) $project_root]} {
- set context_bar [ad_context_bar "View"]
+ set context [list "View"]
} else {
- set context_bar [ad_context_bar [list "one?project_item_id=$project(parent_id)" "Parent"] "View"]
+ set context [list [list "one?project_item_id=$project(parent_id)" "Parent"] "View"]
}
# Tasks, using list-builder ---------------------------------
@@ -165,7 +194,7 @@
}
} \
- -actions [list "Use process" $process_link "Use a process" "Projects" "index" "View list of tasks" "Tasks" "tasks" "View tasks for all projects" "Processes" "processes" "View and use processes" "Admin" "admin/" "Administration pages"]\
+ -actions [list "Use process" $process_link "Use a process"] \
-bulk_actions {
"Edit" "task-add-edit" "Edit tasks"
} \
@@ -174,7 +203,7 @@
project_id
{my_key 1}
} \
- -main_class {
+ -sub_class {
narrow
} \
-filters {
@@ -205,16 +234,11 @@
set latest_start_pretty [lc_time_fmt $latest_start "%x"]
set latest_finish_pretty [lc_time_fmt $latest_finish "%x"]
- if {[exists_and_not_null earliest_start_j]} {
- if {$earliest_start_j < $today_j} {
- set slack_time "[expr $latest_start_j - $today_j] days"
- } else {
- set slack_time "[expr $latest_start_j - $earliest_start_j] days"
- }
- } else {
- set slack_time "n/a"
- }
-
+ set slack_time [pm::task::slack_time \
+ -earliest_start_j $earliest_start_j \
+ -today_j $today_j \
+ -latest_start_j $latest_start_j]
+
}
@@ -237,7 +261,7 @@
label "Hours completed"
}
} \
- -main_class {
+ -sub_class {
narrow
} \
-filters {
@@ -280,7 +304,7 @@
label "Role"
}
} \
- -main_class {
+ -sub_class {
narrow
} \
-filters {
@@ -316,16 +340,19 @@
-multirow versions \
-key item_id \
-elements {
- project_name {
- label "Subject"
+ project_id {
+ label "Version"
link_url_col item_url
link_html { title "View this project version" }
}
+ project_name {
+ label "Subject"
+ }
planned_end_date {
label "Deadline"
}
} \
- -main_class {
+ -sub_class {
narrow
} \
-filters {
@@ -346,7 +373,7 @@
db_multirow -extend { item_url } versions project_versions {
} {
- set item_url [export_vars -base "one" -override {{project_item_id $item_id}} {project_item_id}]
+ set item_url [export_vars -base "one" -override {{project_item_id $item_id}} {project_id}]
}
@@ -359,10 +386,15 @@
db_1row custom_query { } -column_array custom
-
# end of customizations
+# -----------------------------------------------------------------
+# Logger forms and so on - shows time logged, and allows you to log
+# other time
+# -----------------------------------------------------------------
+
+
ad_return_template
# ------------------------- END OF FILE ------------------------- #
Index: openacs-4/contrib/packages/project-manager/www/process-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-add-edit.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/project-manager/www/process-add-edit.tcl 26 Feb 2004 15:15:41 -0000 1.3
+++ openacs-4/contrib/packages/project-manager/www/process-add-edit.tcl 12 Mar 2004 13:44:45 -0000 1.4
@@ -92,11 +92,3 @@
}
-ns_log notice end of my page!
-set mypage [ns_getform]
-if {[string equal "" $mypage]} {
- ns_log notice no form was submitted on my page
-} else {
- ns_log notice the following form was submitted on my page
- ns_set print $mypage
-}
Index: openacs-4/contrib/packages/project-manager/www/process-dependency-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-dependency-add-edit.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/contrib/packages/project-manager/www/process-dependency-add-edit.tcl 26 Jan 2004 15:39:40 -0000 1.5
+++ openacs-4/contrib/packages/project-manager/www/process-dependency-add-edit.tcl 12 Mar 2004 13:44:45 -0000 1.6
@@ -1,4 +1,4 @@
-ns_log notice depedency page
+ns_log notice it's my page!
set mypage [ns_getform]
if {[string equal "" $mypage]} {
ns_log notice no form was submitted on my page
@@ -8,7 +8,6 @@
}
-
ad_page_contract {
Form to add task dependencies
@@ -60,7 +59,6 @@
if {![exists_and_not_null use_dependency]} {
- ns_log Notice "Redirecting"
ad_returnredirect "process-one?[export_url_vars process_id]"
ad_script_abort
}
@@ -108,15 +106,16 @@
} -new_data {
- set process_task_id_pass $process_task_id
- set process_task_id_pass [string map {"-" " "} $process_task_id_pass]
- set process_task_id $process_task_id_pass
+ # convert from our hack back to a list
+ set process_task_id [string map {"-" " "} $process_task_id]
foreach tsk_id $process_task_id {
- ns_log Notice "new: deleting dependency for task $tsk_id"
db_dml delete_dependency { }
}
+ # convert from our hack back to a list
+ set use_dependency [string map {"-" " "} $use_dependency]
+
foreach tr $use_dependency {
set type_id $dependency_type($tr)
@@ -135,7 +134,6 @@
set process_task_id $process_task_id_pass
foreach tsk_id $process_task_id {
- ns_log Notice "edit: deleting dependency for task $tsk_id"
db_dml delete_dependency { }
}
@@ -193,8 +191,6 @@
}
}
- ns_log Notice "parent: $tasks(parent_task_id)"
-
append add_edit_definition "
{task_id.$tasks(task_id):text(hidden)
{value {$tasks(task_id)}}
Index: openacs-4/contrib/packages/project-manager/www/process-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-one.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/contrib/packages/project-manager/www/process-one.tcl 26 Jan 2004 15:39:40 -0000 1.8
+++ openacs-4/contrib/packages/project-manager/www/process-one.tcl 12 Mar 2004 13:44:45 -0000 1.9
@@ -96,7 +96,7 @@
process_id
project_id
} \
- -main_class {
+ -sub_class {
narrow
} \
-filters {
Index: openacs-4/contrib/packages/project-manager/www/process-task-add-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-task-add-edit-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/contrib/packages/project-manager/www/process-task-add-edit-2.tcl 26 Jan 2004 15:39:40 -0000 1.5
+++ openacs-4/contrib/packages/project-manager/www/process-task-add-edit-2.tcl 12 Mar 2004 13:44:45 -0000 1.6
@@ -1,12 +1,3 @@
-ns_log notice process-task-add-edit-2
-set mypage [ns_getform]
-if {[string equal "" $mypage]} {
- ns_log notice no form was submitted on my page
-} else {
- ns_log notice the following form was submitted on my page
- ns_set print $mypage
-}
-
ad_page_contract {
Add/edit form for process tasks, page 2
@@ -94,8 +85,6 @@
set edit_p [db_string editing_process_tasks_p { } -default "0"]
-ns_log Notice "edit_p: $edit_p"
-
if {[string equal $edit_p "0"]} {
# -----------------------------
@@ -180,8 +169,6 @@
# do the actual edit
db_dml edit_task { }
- ns_log Notice "edited process task"
-
if {[info exists use_dependency_p($i)] && [string equal $use_dependency_p($i) "t"]} {
lappend revision_has_dependencies $this_revision_id
} else {
Index: openacs-4/contrib/packages/project-manager/www/process-task-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-task-add-edit.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/contrib/packages/project-manager/www/process-task-add-edit.tcl 26 Jan 2004 15:39:40 -0000 1.7
+++ openacs-4/contrib/packages/project-manager/www/process-task-add-edit.tcl 12 Mar 2004 13:44:45 -0000 1.8
@@ -1,12 +1,3 @@
-ns_log notice process-task-add-edit
-set mypage [ns_getform]
-if {[string equal "" $mypage]} {
- ns_log notice no form was submitted on my page
-} else {
- ns_log notice the following form was submitted on my page
- ns_set print $mypage
-}
-
ad_page_contract {
Add/edit form for process tasks
@@ -97,8 +88,6 @@
set estimated_hours_work_min_v($i) $estimated_hours_work_min
set estimated_hours_work_max_v($i) $estimated_hours_work_max
- ns_log Notice "Dt: $dependency_type"
-
if {[exists_and_not_null dependency_type]} {
set checked_v($i) "checked"
} else {
@@ -139,8 +128,6 @@
set process_task_id_tmp [lindex $process_task_id [expr $i-1]]
}
- ns_log Notice "process_task_id_tmp $process_task_id_tmp ($process_task_id)"
-
template::multirow append num $process_task_id_tmp $one_line_v($i) $description_v($i) $estimated_hours_work_v($i) $estimated_hours_work_min_v($i) $estimated_hours_work_max_v($i) $checked_v($i)
}
Index: openacs-4/contrib/packages/project-manager/www/process-task-assign-add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-task-assign-add-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/project-manager/www/process-task-assign-add-edit.adp 10 Nov 2003 19:34:54 -0000 1.2
+++ openacs-4/contrib/packages/project-manager/www/process-task-assign-add-edit.adp 12 Mar 2004 13:44:45 -0000 1.3
@@ -1,40 +1,52 @@
<master>
-<property name="context_bar">@context_bar;noquote@</property>
-<property name="title">@title@</property>
+ <property name="context_bar">@context_bar;noquote@</property>
+ <property name="title">@title@</property>
-<center>
+ <center>
-<formtemplate id="add_edit" style="standard-lars">
+ <formtemplate id="add_edit" style="standard-lars">
-<multiple name="tasks">
+ <multiple name="tasks">
-<table width="100%" border="0" cellpadding="3" cellspacing="0">
- <tr>
- <th colspan="2" bgcolor="lavender">@tasks.one_line@</th>
- </tr>
+ <table width="100%" border="0" cellpadding="3" cellspacing="0">
+ <tr>
+ <th colspan="2" bgcolor="lavender">@tasks.one_line@</th>
+ </tr>
+
+ <tr>
+ <td>
+ <multiple name="num">
+ <formwidget
+ id="party_id.@tasks.process_task_id@.@num.number@">
+ <formerror
+ id="party_id.@tasks.process_task_id@.@num.number@">
+ <font color="red">
+ Error
+ </formerror>
+ </formwidget>
- <tr>
- <td width="40%">@tasks.description@</td>
+ <formwidget
+ id="role_id.@tasks.process_task_id@.@num.number@">
+ <formerror
+ id="role_id.@tasks.process_task_id@.@num.number@">
+ </formerror>
+ </formwidget>
+ <br />
+ </multiple>
+ </td>
+ </tr>
- <td>
- <multiple name="num">
- <formwidget id="party_id.@tasks.process_task_id@.@num.number@">
- <formwidget id="role_id.@tasks.process_task_id@.@num.number@"><br>
+ </table>
+
</multiple>
- </td>
- </tr>
-</table>
+ <P />
-</multiple>
+ <input type="submit" name="formbutton:ok" value = " OK ">
-<P>
+ </formtemplate>
+ </table>
+ </center>
-<input type="submit" name="formbutton:ok" value = " OK ">
-</formtemplate>
-</table>
-</center>
-
-
Index: openacs-4/contrib/packages/project-manager/www/process-task-assign-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-task-assign-add-edit.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/contrib/packages/project-manager/www/process-task-assign-add-edit.tcl 26 Jan 2004 15:39:40 -0000 1.7
+++ openacs-4/contrib/packages/project-manager/www/process-task-assign-add-edit.tcl 12 Mar 2004 13:44:45 -0000 1.8
@@ -1,12 +1,3 @@
-ns_log notice process-task-add-edit
-set mypage [ns_getform]
-if {[string equal "" $mypage]} {
- ns_log notice no form was submitted on my page
-} else {
- ns_log notice the following form was submitted on my page
- ns_set print $mypage
-}
-
ad_page_contract {
Form to add in assignments to process tasks
@@ -91,7 +82,7 @@
# currently hardcoded the number of assignments
-for {set i 0} {$i <= 10} {incr i} {
+for {set i 0} {$i <= 5} {incr i} {
template::multirow append num $i
}
@@ -192,7 +183,6 @@
set process_task_id_pass [string map {"-" " "} $process_task_id_pass]
set process_task_id $process_task_id_pass
- ns_log Notice "deleting assignments process_task_id: $process_task_id"
db_dml delete_assignments { }
foreach pl $party_list {
@@ -203,8 +193,6 @@
set r_id $assignment_role($pl)
set p_id $assignment_party($pl)
- ns_log Notice "add tid: $t_id rid: $r_id pid: $p_id"
-
db_dml add_assignment { }
}
@@ -281,8 +269,6 @@
set r_id $assignment_role($pl)
set p_id $assignment_party($pl)
- ns_log Notice "edit tid: $t_id rid: $r_id pid: $p_id"
-
db_dml add_assignment { }
}
@@ -343,11 +329,3 @@
}
-ns_log notice it's my page, but later!
-set mypage [ns_getform]
-if {[string equal "" $mypage]} {
- ns_log notice no form was submitted on my page
-} else {
- ns_log notice the following form was submitted on my page
- ns_set print $mypage
-}
Index: openacs-4/contrib/packages/project-manager/www/process-task-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-task-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/project-manager/www/process-task-delete.adp 10 Nov 2003 19:34:54 -0000 1.2
+++ openacs-4/contrib/packages/project-manager/www/process-task-delete.adp 12 Mar 2004 13:44:45 -0000 1.3
@@ -10,7 +10,7 @@
Are you sure you'd like to delete these @task_term_lower@s?
<input type="submit" name="submit" value="Yes" />
-@hidden_vars@
+@hidden_vars;noquote@
</form>
Index: openacs-4/contrib/packages/project-manager/www/processes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/processes.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/contrib/packages/project-manager/www/processes.adp 11 Dec 2003 21:39:44 -0000 1.5
+++ openacs-4/contrib/packages/project-manager/www/processes.adp 12 Mar 2004 13:44:45 -0000 1.6
@@ -1,9 +1,9 @@
-<master>
+<master src="lib/master">
<link rel="stylesheet" href="style.css" type="text/css">
<property name="title">Processes</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context_bar@</property>
<listtemplate name="processes"></listtemplate>
Index: openacs-4/contrib/packages/project-manager/www/processes.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/processes.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/contrib/packages/project-manager/www/processes.tcl 26 Jan 2004 15:39:40 -0000 1.6
+++ openacs-4/contrib/packages/project-manager/www/processes.tcl 12 Mar 2004 13:44:45 -0000 1.7
@@ -16,7 +16,7 @@
} -properties {
- context_bar:onevalue
+ context:onevalue
processes:multirow
write_p:onevalue
create_p:onevalue
@@ -36,7 +36,7 @@
set project_term_lower [parameter::get -parameter "projectname" -default "project"]
# set up context bar
-set context_bar [ad_context_bar "Processes"]
+set context_bar [list "Processes"]
# the unique identifier for this package
set package_id [ad_conn package_id]
@@ -81,9 +81,7 @@
narrow
} \
-actions {
- "Projects" "index" "View projects"
"Add process" "process-add-edit" "Add a process"
- "Admin" "admin/" "Administration pages"
} \
-filters {
orderby_process {}
Index: openacs-4/contrib/packages/project-manager/www/style.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/style.css,v
diff -u -r1.8 -r1.9
--- openacs-4/contrib/packages/project-manager/www/style.css 10 Oct 2003 22:51:04 -0000 1.8
+++ openacs-4/contrib/packages/project-manager/www/style.css 12 Mar 2004 13:44:45 -0000 1.9
@@ -1,94 +1 @@
-body {
- margin:5px 5px 0px 5px;
- padding:0;
-}
-
-#root {
-}
-
-#topcontent {
- width:100%;
-}
-
-#leftcontent {
- float:left;
- width:30%;
- margin-right:15px;
-}
-
-#rightcontent {
- width:68%;
-}
-
-#bottomcontent {
- width:100%;
- margin-left:0px;
- float:left;
-}
-
-#master-top {
-}
-
-#master-bottom {
- float:left;
-}
-
-#slave {
-}
-
-TABLE {
- border:1px;
- border-color:#eeeeee;
-}
-TD {
- font-size: 9pt;
-}
-TD.highlight {
- font-size: 9pt;
- background-color:#ffffee;
-}
-TH { font-size: 9pt;
- background-color:#ccccff;
-}
-
-A:link.button {
- padding: 2px;
- text-decoration: none;
- font-size: 8pt;
- border-width: thin;
- border-color: #CCCCEE;
- border-style: outset;
- white-space: nowrap;
-}
-
-A:active.button {
- padding: 2px;
- text-decoration: none;
- font-size: 8pt;
- border-width: thin;
- background-color: #FFFF88;
- border-color: #CCCCEE;
- border-style: outset;
- white-space: nowrap;
-}
-
-A:visited.button {
- padding: 2px;
- text-decoration: none;
- font-size: 8pt;
- border-width: thin;
- border-color: #CCCCEE;
- border-style: outset;
- white-space: nowrap;
-}
-
-A:hover.button {
- padding: 2px;
- text-decoration: none;
- font-size: 8pt;
- border-width: thin;
- background-color: #FFFF88;
- border-color: #CCCCEE;
- border-style: outset;
- white-space: nowrap;
-}
Index: openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-add-edit-postgresql.xql,v
diff -u -r1.14 -r1.15
--- openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql 26 Feb 2004 15:15:41 -0000 1.14
+++ openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql 12 Mar 2004 13:44:45 -0000 1.15
@@ -9,7 +9,8 @@
t.estimated_hours_work,
t.estimated_hours_work_min,
t.estimated_hours_work_max,
- d.dependency_id
+ d.dependency_id,
+ d.parent_task_id as process_parent_task
FROM
pm_process_task t LEFT JOIN pm_process_task_dependency d ON t.process_task_id = d.process_task_id
WHERE
@@ -26,7 +27,7 @@
:project_item_id,
:p_task_title,
:p_description,
- [project_manager::project::util::datenvl -value [set end_date_$i] -value_if_null "null," -value_if_not_null "to_timestamp('[set end_date_$i]','YYYY MM DD HH24 MI SS'),"]
+ [pm::util::datenvl -value [set end_date_$i] -value_if_null "null," -value_if_not_null "to_timestamp('[set end_date_$i]','YYYY MM DD HH24 MI SS'),"]
:p_percent,
:p_work,
:p_work_min,
@@ -44,26 +45,22 @@
<querytext>
select
current_timestamp
- FROM
- dual
</querytext>
</fullquery>
<fullquery name="get_old_tasks">
<querytext>
select
t.task_revision_id,
- t.title as task_title,
- t.item_id,
- t.description,
- t.name,
- to_char(t.end_date,'YYYY MM DD') as end_date,
- t.percent_complete,
- t.estimated_hours_work,
- t.estimated_hours_work_min,
- t.estimated_hours_work_max,
- d.parent_task_id,
- t.actual_hours_worked
+ t.title as my_task_title,
+ t.description as my_description,
+ to_char(t.end_date,'YYYY MM DD') as my_end_date,
+ t.percent_complete as my_percent_complete,
+ t.estimated_hours_work as my_estimated_work,
+ t.estimated_hours_work_min as my_estimated_work_min,
+ t.estimated_hours_work_max as my_estimated_work_max,
+ t.actual_hours_worked as my_actual_hours_worked,
+ d.parent_task_id as my_dependency
FROM
pm_tasks_revisionsx t,
cr_items i LEFT JOIN pm_task_dependency d ON i.item_id = d.task_id
@@ -113,15 +110,6 @@
</querytext>
</fullquery>
- <fullquery name="new_dependency">
- <querytext>
- INSERT INTO pm_task_dependency
- (dependency_id, task_id, parent_task_id, dependency_type)
- VALUES
- (:dependency_id, :this_task_id, :parent_task_id, :p_dep_type)
- </querytext>
- </fullquery>
-
<fullquery name="get_task_item_id">
<querytext>
select
Index: openacs-4/contrib/packages/project-manager/www/task-add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-add-edit.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/contrib/packages/project-manager/www/task-add-edit.adp 26 Jan 2004 15:39:40 -0000 1.11
+++ openacs-4/contrib/packages/project-manager/www/task-add-edit.adp 12 Mar 2004 13:44:45 -0000 1.12
@@ -1,141 +1,237 @@
-<master>
-<property name="title">@title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<master src="lib/master">
+ <property name="title">@title;noquote@</property>
+ <property name="context">@context@</property>
-<center>
+ <center>
-<table border="0" cellpadding="5" cellspacing="0">
+ <table border="0" cellpadding="5" cellspacing="0" class="list">
-<formtemplate id="add_edit" style="standard-lars">
+ <formtemplate id="add_edit" style="standard-lars">
-<multiple name="num">
+ <multiple name="num">
-<if @num.rownum@ odd>
-<tr bgcolor="lavender">
-</if>
-<else>
-<tr bgcolor="#ddffdd">
-</else>
+ <if @num.rownum@ odd>
+ <tr bgcolor="lavender">
+ </if>
+ <else>
+ <tr bgcolor="#ddffdd">
+ </else>
-<td align="center"> #@num.rownum@ </td>
+ <td align="center" rowspan="2" bgcolor="#ffffdd"> #@num.rownum@ </td>
-<td valign="top">Subject:<font color="red">*</font><br><formwidget id="task_title.@num.rownum@">
-<formerror id="task_title.@num.rownum@">
-<br /><font color="red">Error</font>
-</formerror>
- <p>
+ <td valign="top"><b>Subject:</b><font color="red">*</font><br />
+ <formwidget id="task_title.@num.rownum@">
+ <formerror id="task_title.@num.rownum@">
+ <br />
+ <font color="red">Error</font>
+ </formerror>
+ </formwidget>
+ <p />
- Description:<br><formwidget id="description.@num.rownum@">
- <formerror id="description.@num.rownum@">
- <br /><font color="red">Error</font>
- </formerror>
- </td>
+ <if @using_process_p@ eq "t">
+ Skip this task?<br />
+ </if>
-</td>
-
-<td>
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
- <tr>
- <td>Work required:<font color="red">*</font></td>
- </tr>
-
- <if @use_uncertain_completion_times_p@ eq 1>
- <tr><td>Min:</td>
- <td><formwidget id="estimated_hours_work_min.@num.rownum@"> hrs
-
- <formerror id="estimated_hours_work_min.@num.rownum@">
- <br /><font color="red">Error</font>
+ <formwidget id="skip_task_p.@num.rownum@">
+ <formerror id="skip_task_p.@num.rownum@">
+ <br />
+ <font color="red">Error</font>
</formerror>
- </td>
- </tr>
- <tr><td>Max:</td>
- <td><formwidget id="estimated_hours_work_max.@num.rownum@"> hrs
+ </formwidget>
- <formerror id="estimated_hours_work_max.@num.rownum@">
- <br /><font color="red">Error</font>
+ Description:<br />
+ <formwidget id="description.@num.rownum@">
+ <formerror id="description.@num.rownum@">
+ <br />
+ <font color="red">Error</font>
</formerror>
+ </formwidget>
+ <p />
</td>
- </tr>
- </if>
- <else>
- <tr><td><formwidget id="estimated_hours_work.@num.rownum@"> hrs
- <formerror id="estimated_hours_work.@num.rownum@">
- <br /><font color="red">Error</font>
- </formerror>
+ <td valign="top">
- </td>
- </tr>
- </else>
+ <table border="0" cellpadding="0" cellspacing="0" width="100%">
+ <tr class="form-element">
+ <td align="left" colspan="2">Work required:
+ <font color="red">*</font><p />
+ </td>
+ </tr>
- <tr><td colspan="2">
- <p style="margin-top: 4px; margin-bottom: 2px; color: #666666; font-family: tahoma,verdana,arial,helvetica,sans-serif; font-size: 75%;">
- <img src="/shared/images/info.gif" width="12" height="9" alt="[i]" title="Help text" border="0">
- You must enter a number here (make your best guess)</p></td>
+ <if @use_uncertain_completion_times_p@ eq 1>
+ <tr class="form-element">
+ <td class="form-label" width="40%">Min:</td>
+ <td class="form-widget">
+ <formwidget id="estimated_hours_work_min.@num.rownum@"> hrs
- </table>
+ <formerror id="estimated_hours_work_min.@num.rownum@">
+ <br />
+ <font color="red">Error</font>
+ </formerror>
+ </formwidget>
+ </td>
+ </tr>
- <p />
+ <tr class="form-element">
+ <td class="form-label" width="40%">Max:</td>
+ <td class="form-widget">
+ <formwidget id="estimated_hours_work_max.@num.rownum@"> hrs
- <table bgcolor="#dddddd">
+ <formerror id="estimated_hours_work_max.@num.rownum@">
+ <br />
+ <font color="red">Error</font>
+ </formerror>
+ </formwidget>
+
+ </td>
+ </tr>
+ </if>
- <tr><td>
- Deadline: <br />
+ <else>
+ <tr>
+ <td>
+ <formwidget id="estimated_hours_work.@num.rownum@"> hrs
- <formwidget id="end_date.@num.rownum@">
- <formerror id="end_date.@num.rownum@"><font color="red">Error</font></formerror>
+ <formerror id="estimated_hours_work.@num.rownum@">
+ <br />
+ <font color="red">Error</font>
+ </formerror>
+ </formwidget>
+ </td>
+ </tr>
+ </else>
- <p style="margin-top: 4px; margin-bottom: 2px; color: #666666; font-family: tahoma,verdana,arial,helvetica,sans-serif; font-size: 75%;">
- <img src="/shared/images/info.gif" width="12" height="9" alt="[i]" title="Help text" border="0">
- You may optionally enter a hard deadline</p>
- </td></tr>
- <tr><td>
- Dependency: <br />
+ <tr class="form-element">
+ <td colspan="2" class="form-widget" align="center">
+ <p style="margin-top: 4px; margin-bottom: 2px; color: #666666; font-family: tahoma,verdana,arial,helvetica,sans-serif; font-size: 75%;">
+ <img src="/shared/images/info.gif" width="12" height="9" alt="[i]" title="Help text" border="0">
+ You must enter a number here (make your best
+ guess)
+ </p>
+ </td>
+ </tr>
- <formwidget id="dependency_task_id.@num.rownum@">
- <formerror id="dependency_task_id.@num.rownum@"><font color="red">Error</font></formerror>
+ <if @edit_p@ eq t>
+ <tr class="form-element">
+ <td colspan="2" align="left"><p />Log entry<p />
+ </td>
+ </tr>
+ <tr class="form-element">
+ <td class="form-label">Complete:</td>
+ <td class="form-widget">
+ <formwidget id="percent_complete.@num.rownum@">
+ <formerror id="percent_complete.@num.rownum@">
+ <font color="red">Error</font>
+ </formerror>
+ </formwidget> %
+ </td>
+ </tr>
+ <tr class="form-element">
+ <td class="form-label">Time:</td>
+ <td class="form-widget">
+ <formwidget id="new_hours_logged.@num.rownum@">
+ <formerror id="new_hours_logged.@num.rownum@">
+ <font color="red">Error</font>
+ </formerror>
+ </formwidget> hours
+ </td>
+ </tr>
+ <tr class="form-element">
+ <td class="form-label">Description:</td>
+ <td class="form-widget">
+ <formwidget id="new_description_logged.@num.rownum@">
+ <formerror id="new_description_logged.@num.rownum@">
+ <font color="red">Error</font>
+ </formerror>
+ </formwidget>
+ </td>
+ </tr>
+ </table>
+ </if>
+ <else>
+ <formwidget id="percent_complete.@num.rownum@">
+ <formerror id="percent_complete.@num.rownum@">
+ <font color="red">Error</font>
+ </formerror>
+ </formwidget>
+ </table>
+ </else>
- <formwidget id="dependency_type.@num.rownum@">
- <formerror id="dependency_type.@num.rownum@"><font color="red">Error</font></formerror>
+ </td>
+ </tr>
+
+ <tr bgcolor="#dddddd">
+ <td>
+
+ <table bgcolor="#dddddd" width="100%" cellpadding="0" cellspacing="0">
- <p style="margin-top: 4px; margin-bottom: 2px; color: #666666; font-family: tahoma,verdana,arial,helvetica,sans-serif; font-size: 75%;">
- <img src="/shared/images/info.gif" width="12" height="9" alt="[i]" title="Help text" border="0">
- You may enter a @task_term_lower@ that needs to be completed before this @task_term_lower@</p>
- </td></tr>
+ <tr>
+ <td valign="top">
+ Deadline:
+ </td>
+ <td>
+ <formwidget id="end_date.@num.rownum@">
+ <formerror id="end_date.@num.rownum@">
+ <font color="red">Error</font>
+ </formerror>
+ </formwidget>
- </table>
+ <p style="margin-top: 4px; margin-bottom: 2px; color: #666666; font-family: tahoma,verdana,arial,helvetica,sans-serif; font-size: 75%;">
+ <img src="/shared/images/info.gif" width="12" height="9" alt="[i]" title="Help text" border="0">
+ You may optionally enter a hard deadline
+ </p>
+ </td>
+ </tr>
- <br>
- <if @edit_p@ eq t>
- <table border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td>Percent complete:</td>
- <td><formwidget id="percent_complete.@num.rownum@"></td>
- </tr>
- <tr>
- <td>Hours worked:</td>
- <td><formwidget id="actual_hours_worked.@num.rownum@"></td>
- </tr>
- </table>
- </if>
- <else>
- <formwidget id="percent_complete.@num.rownum@">
- <formwidget id="actual_hours_worked.@num.rownum@">
- </else>
+ </table>
- <formwidget id="task_item_id.@num.rownum@">
-</td>
-</tr>
+ </td>
+ <td bgcolor="#dddddd">
-</multiple>
+ <table bgcolor="#dddddd" width="100%">
-<tr><td colspan="99" align="center"><input type="submit" name="formbutton:ok" value = " OK "></td>
+ <tr>
+ <td valign="top">
+ Dependency:
-<% ns_log Notice error: [export_vars formerror]%>
+ <formwidget id="dependency_task_id.@num.rownum@">
+ <formerror id="dependency_task_id.@num.rownum@">
+ <font color="red">Error</font>
+ </formerror>
+ </formwidget>
-</formtemplate>
-</table>
-</center>
+ <formwidget id="dependency_type.@num.rownum@">
+ <formerror id="dependency_type.@num.rownum@">
+ <font color="red">Error</font>
+ </formerror>
+ </formwidget>
+
+ <p style="margin-top: 4px; margin-bottom: 2px; color: #666666; font-family: tahoma,verdana,arial,helvetica,sans-serif; font-size: 75%;">
+ <img src="/shared/images/info.gif" width="12" height="9" alt="[i]" title="Help text" border="0">
+ You may enter a @task_term_lower@ that needs to
+ be completed before this @task_term_lower@
+ </p>
+ </td>
+ </tr>
+
+ </table>
+
+ <formwidget id="task_item_id.@num.rownum@">
+ <formerror id="task_item_id.@num.rownum@">
+ <font color="red">Error</font>
+ </formerror>
+ </formwidget>
+
+ </td>
+ </tr>
+
+ </multiple>
+
+ <tr><td colspan="99" align="center"><input type="submit" name="formbutton:ok" value = " OK "></td></tr>
+
+ </formtemplate>
+ </table>
+ </center>
Index: openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-add-edit.tcl,v
diff -u -r1.26 -r1.27
--- openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl 26 Feb 2004 15:15:41 -0000 1.26
+++ openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl 12 Mar 2004 13:44:45 -0000 1.27
@@ -1,16 +1,3 @@
-set debug 0
-
-if {[string equal $debug 1]} {
- ns_log notice task add edit page
- set mypage [ns_getform]
- if {[string equal "" $mypage]} {
- ns_log notice no form was submitted on my page
- } else {
- ns_log notice the following form was submitted on my page
- ns_set print $mypage
- }
-}
-
ad_page_contract {
Add/edit form for tasks
@@ -19,9 +6,9 @@
@creation-date 2003-07-28
@cvs-id $Id$
- @return context_bar Context bar.
+ @return context Context bar
@return title Page title.
- @return num num is used as a multirow datasource to iterate over the ad_form elements
+ @return num A multirow datasource to iterate over the ad_form elements
@return edit_p if t then we are editing. Used to show different portions of the form
@param process_task_ids Specifies what process task ids were used if a process were used. We pass this on to future pages to determine things such as assignments
@@ -33,8 +20,10 @@
@param task_id Specifies the item for the task (every revision of a task shares the same task_id) Also used as the key for the ad_form. For this reason, when editing, we have to pass in task_iid instead
@param my_key if set, then ad_form knows that this is an edit
@param task_title
+ @param skip_task_p Whether or not to skip this particular task. Used by processes, if t, then the task is not created
@param process_id The process we're using to create this task
@param use_uncertain_completion_times_p Whether or not to use PERT-style completion time uncertainty 1 = yes
+ @return using_process_p Lets the UI know if there is a process being used (t if so)
} {
my_key:integer,optional
@@ -52,21 +41,32 @@
end_date:array,optional
percent_complete:array,optional
actual_hours_worked:array,optional
+ new_hours_logged:array,optional
+ new_description_logged:array,optional
estimated_hours_work:array,optional
estimated_hours_work_min:array,optional
estimated_hours_work_max:array,optional
dependency_type:array,optional
dependency_task_id:array,optional
+ skip_task_p:array,optional
+ {using_process_p "f"}
} -properties {
- context_bar:onevalue
+ context:onevalue
title:onevalue
num:multirow
use_uncertain_completion_times_p:onevalue
edit_p:onevalue
+ using_process_p:onevalue
} -validate {
+ project_exists {
+ if {![exists_and_not_null project_item_id] && \
+ ![exists_and_not_null project_id]} {
+ ad_complain
+ }
+ }
number_is_in_range -requires {number:integer} {
# todo: make 100 a parameter
if {$number < 1 || $number > 100} {
@@ -79,6 +79,7 @@
}
}
} -errors {
+ project_exists {You must enter a project}
number_is_in_range {Number must be between 1 and 100}
percent_is_in_range {Percent completed must be between 0 and 100}
}
@@ -88,11 +89,15 @@
set user_id [ad_maybe_redirect_for_registration]
set package_id [ad_conn package_id]
+
+# --------------------------------------------------------------- #
# terminology
+# --------------------------------------------------------------- #
set project_term [parameter::get -parameter "ProjectName" -default "Project"]
set task_term [parameter::get -parameter "TaskName" -default "Task"]
set task_term_lower [parameter::get -parameter "taskname" -default "task"]
set use_uncertain_completion_times_p [parameter::get -parameter "UseUncertainCompletionTimesP" -default "1"]
+# --------------------------------------------------------------- #
if {![exists_and_not_null project_id]} {
@@ -110,35 +115,47 @@
set process_tasks [list]
if {[exists_and_not_null process_id]} {
+
+ # we need the ADP page to know we're using processes, so we can
+ # modify the interface a little bit
+ set using_process_p t
+
db_foreach get_process_tasks { } {
set one_line_v($process_tid) $one_line
set description_v($process_tid) $description
set estimated_hours_work_v($process_tid) $estimated_hours_work
set estimated_hours_work_min_v($process_tid) $estimated_hours_work_min
set estimated_hours_work_max_v($process_tid) $estimated_hours_work_max
- set dependency_v($process_tid) $dependency_id
+ set dependency_v($process_tid) $process_parent_task
lappend process_tasks $process_tid
}
set number [llength $process_tasks]
}
+# --------------------------------------------------------------- #
+
+
+
# we use this to get around the lack of a hidden multiple in ad_form
set task_id_pass [string map {"-" " "} $task_id]
set task_id $task_id_pass
+
+# --------------------------------------------------------------- #
+# Create a multirow: num
+# --------------------------------------------------------------- #
+
if {![ad_form_new_p -key task_id]} {
+ # -----------------------------------------------------
# Editing!
# -----------------------------------------------------
# create a multirow we can use to iterate
# we also set the number variable for future use
# -----------------------------------------------------
template::multirow create num number
- # TODO:get task IDS
- #
-
set i 1
set number 0
foreach tid $task_id {
@@ -160,8 +177,8 @@
set edit_p f
}
-ns_log Notice "Edit_p: $edit_p number: $number "
+# ------------------------------------------------------- #
# The evilest hack of all time.
# -------------------------------------------------------
# This is a workaround the fact that using multiple dates
@@ -177,6 +194,7 @@
# the SQL function that creates the new tasks. This works. I'm
# sure there must be a better way to do it, but my posting on
# the forums didn't result in any other suggestions.
+# ------------------------------------------------------- #
if {[info exists end_date]} {
@@ -197,25 +215,46 @@
for {set i 1} {$i <= $number} {incr i} {
# set up date variable names
set end_date_$i [list $end_date_year($i) $end_date_month($i) $end_date_day($i) {} {} {}]
- ns_log Notice "End date $i: [set end_date_$i]"
}
}
-# permissions and more
+# --------------------------------------------------------------- #
+# permissions and title setup, etc
+# we should update the permissions to not just use package_id, so
+# users can have permissions on particular tasks but not others.
+# Right now it's an open system. If you have write permissions on
+# the package_id, you have permissions to write anywhere
+# --------------------------------------------------------------- #
if {[exists_and_not_null task_id]} {
+
set title "Edit a $task_term_lower"
- set context_bar [ad_context_bar [list "one?item_id=$project_item_id&project_id=$project_id" "One $project_term"] "Edit $task_term"]
- permission::require_permission -party_id $user_id -object_id $package_id -privilege write
+ set context [list [list "one?item_id=$project_item_id&project_id=$project_id" "One $project_term"] "Edit $task_term"]
+ permission::require_permission \
+ -party_id $user_id \
+ -object_id $package_id \
+ -privilege write
+
} else {
+
set title "Add a $task_term_lower"
- set context_bar [ad_context_bar [list "one?item_id=$project_item_id&project_id=$project_id" "One $project_term"] "New $task_term"]
- permission::require_permission -party_id $user_id -object_id $package_id -privilege create
+ set context [list [list "one?item_id=$project_item_id&project_id=$project_id" "One $project_term"] "New $task_term"]
+ permission::require_permission \
+ -party_id $user_id \
+ -object_id $package_id \
+ -privilege create
+
}
# we use this to pass through the task_ids
set task_id_pass [string map {" " "-"} $task_id]
+
+
+# --------------------------------------------------------------- #
+# Begin our form
+# --------------------------------------------------------------- #
+
ad_form -name add_edit -form {
my_key:key(acs_object_id_seq)
@@ -246,24 +285,26 @@
set i 1
- db_foreach get_old_tasks { } {
+ db_foreach get_old_tasks { *SQL* } {
- set task_title_arr($i) $task_title
- set description_arr($i) $description
- set estimated_hours_arr($i) $estimated_hours_work
- set estimated_hours_min_arr($i) $estimated_hours_work_min
- set estimated_hours_max_arr($i) $estimated_hours_work_max
- set end_date_arr($i) $end_date
- set percent_complete_arr($i) $percent_complete
- set actual_hours_worked_arr($i) $actual_hours_worked
+ set task_title_arr($i) $my_task_title
+ set description_arr($i) $my_description
+ set estimated_hours_arr($i) $my_estimated_work
+ set estimated_hours_min_arr($i) $my_estimated_work_min
+ set estimated_hours_max_arr($i) $my_estimated_work_max
+ set end_date_arr($i) $my_end_date
+ set percent_complete_arr($i) $my_percent_complete
+ set actual_hours_worked_arr($i) $my_actual_hours_worked
set task_item_id_arr($i) [lindex $task_id [expr $i - 1]]
+ set dependency_arr($i) $my_dependency
# we are not using a process
set process_task_id_arr($i) ""
# -----------------------------------------------------
# if we are editing the tasks, then we want to show the
- # percent_complete
+ # percent_complete, and give the users the chance to
+ # log hours as well.
# -----------------------------------------------------
ad_form -extend \
@@ -274,13 +315,29 @@
{html {size 4}} \
{value {$percent_complete_arr($i)}} \
] \
- [list actual_hours_worked.$i:text \
- {label "Hours worked"} \
+ [list new_hours_logged.$i:text,optional \
+ {label "Hours logged"} \
{html {size 4}} \
- {value {$actual_hours_worked_arr($i)}} \
- ]
- ]
+ ] \
+ [list new_description_logged.$i:text,optional \
+ {label "Description"} \
+ {html {size 30}} \
+ ] \
+ ]
+ # --------------------------------------
+ # we don't skip tasks when we're editing
+ # --------------------------------------
+ ad_form -extend \
+ -name add_edit \
+ -form \
+ [list [list \
+ skip_task_p.$i:text(hidden) \
+ {value {f}} \
+ ] \
+ ]
+
+
incr i
}
} else {
@@ -304,6 +361,7 @@
set actual_hours_worked_arr($i) 0
set task_item_id_arr($i) ""
set process_task_id_arr($i) ""
+ set dependency_arr($i) ""
if {[exists_and_not_null process_id]} {
@@ -315,11 +373,43 @@
set estimated_hours_min_arr($i) $estimated_hours_work_min_v($ptask_id)
set estimated_hours_max_arr($i) $estimated_hours_work_max_v($ptask_id)
+
# keeps track of what process_task_id this was based on
# so we can later get info on what assignments the process
# task had, and what dependencies as well
set process_task_id_arr($i) $ptask_id
+
+ # We also want to make it optional for the user whether or
+ # not they use any given task when they are using a
+ # process. Often, they will want to skips some of the
+ # tasks, and this gives them that option
+
+ ad_form -extend \
+ -name add_edit \
+ -form \
+ [list [list \
+ skip_task_p.$i:text(select) \
+ {label \"Skip this task?\"} \
+ {options {{No f} {Yes t}}} \
+ {value {f}} \
+ {help_text {If you skip this task, it will not be created}} \
+ ] \
+ ]
+
+ } else {
+
+ # we never skip when there is no process being used
+
+ ad_form -extend \
+ -name add_edit \
+ -form \
+ [list [list \
+ skip_task_p.$i:text(hidden) \
+ {value {f}} \
+ ] \
+ ]
+
}
# -----------------------------------------------------
@@ -334,12 +424,7 @@
{html {size 4}} \
{value {$percent_complete_arr($i)}} \
] \
- [list actual_hours_worked.$i:text(hidden) \
- {label "Hours worked"} \
- {html {size 6}} \
- {value {$actual_hours_worked_arr($i)}} \
- ]
- ]
+ ]
}
}
@@ -379,18 +464,83 @@
# ----------------------------------------------------------------
# set up the tasks that can be viewed. Take out the current task.
- # TODO: add in process defaults
+
+ # ---------------------------------------------------
+ # set up the tasks that this task can be dependent on
+ # For new tasks, that includes the other new tasks
+ # We have to check later that the user doesn't enter
+ # any loops!
+ # ---------------------------------------------------
+
set dependency_options_full ""
append dependency_options_full "{\"--None--\" \"\"} "
- # adds in the NEW tasks as options. We have to check later to make sure
- # the user doesn't enter any loops!
- for {set j 1} {$j <= $number} {incr j} {
- if {![string equal $i $j]} {
- append dependency_options_full "{\"New Task \#$j\" \"num$j\"} "
+
+ if {[string equal $edit_p f]} {
+
+ # if we have a process, we need to bring in the dependencies
+ # from the process.
+ #
+ # We have the following:
+ # process_tasks: a list of all the process task ids, which act
+ # as keys for the other information.
+ # dependency_v(process_task_id) which process these tasks rely on.
+ #
+
+ if {[exists_and_not_null process_id]} {
+
+ # what is the task that the process says this task
+ # depends on?
+ set process_index [expr $i - 1]
+
+ if {[exists_and_not_null dependency_v([lindex $process_tasks $process_index])]} {
+ set process_depend $dependency_v([lindex $process_tasks $process_index])
+ } else {
+ set process_depend "XXX"
+ }
+
+ # lsearch gives us the index value inside the
+ # process_tasks list. That corresponds to the task minus
+ # one. So we add one to this index, as long as the value
+ # is not -1 (which indicates that process_depend is not in
+ # the process_tasks list)
+
+ set which_dep_task [lsearch $process_tasks $process_depend]
+
+ if {$which_dep_task >= 0} {
+ incr which_dep_task
+ }
+
+ if {$which_dep_task == $process_index} {
+ set dependency_arr($i) "num$which_dep_task"
+ }
+
}
+
+ # now set up dependency options
+
+ for {set j 1} {$j <= $number} {incr j} {
+ if {![string equal $i $j]} {
+ append dependency_options_full "{\"New Task \#$j\" \"num$j\"} "
+ }
+ }
+
}
- foreach key $dependency_keys {
- append dependency_options_full "{\"$key\" $dependency_options($key)} "
+ # for editing tasks, we skip ourselves (because depending on
+ # ourselves just sometimes isn't an option)
+
+ if {[string equal $edit_p t]} {
+ foreach key $dependency_keys {
+
+ # make sure we're not dependent on ourselves
+
+ if {![string equal $task_item_id_arr($i) $dependency_options($key)]} {
+ append dependency_options_full "{\"$key\" $dependency_options($key)} "
+ }
+ }
+ } else {
+ foreach key $dependency_keys {
+ append dependency_options_full "{\"$key\" $dependency_options($key)} "
+ }
}
ad_form -extend \
@@ -400,7 +550,7 @@
[list \
task_title.$i:text \
{label "Subject \#$i"} \
- {html {size 39}} \
+ {html {size 40}} \
{value {$task_title_arr($i)}}
] \
[list task_item_id.$i:text(hidden) \
@@ -434,6 +584,7 @@
dependency_task_id.$i:text(select),optional \
{label \"Dependency\"} \
{options {$dependency_options_full}} \
+ {value {$dependency_arr($i)}} \
{help_text {$task_term the dependency is based on}} \
] \
]
@@ -479,8 +630,6 @@
} -new_data {
- ns_log Notice "new data"
-
# --------------------------------------------------------------
# each task we add in returns a task_revision_id
# --------------------------------------------------------------
@@ -512,138 +661,120 @@
set p_work $estimated_hours_work($i)
set p_work_min $estimated_hours_work_min($i)
set p_work_max $estimated_hours_work_max($i)
+ set p_end_date [set end_date_$i]
set p_dep_type $dependency_type($i)
- set p_dep_id $dependency_task_id($i)
- set parent_task_id $p_dep_id
+ set p_parent_task_id $dependency_task_id($i)
+ set p_skip_p $skip_task_p($i)
- ns_log Notice "adding task: pii: $project_item_id tt:$p_task_title d:$p_description ed: end_date($i) w:$p_work m:$p_work_min mx:$p_work_max dep_type:$p_dep_type dep_id:$p_dep_id"
+ ns_log Notice "end date: $p_end_date"
# add in the new task
- set this_revision_id [project_manager::task::new \
- -project_id $project_item_id \
- -title $p_task_title \
- -description $p_description \
- -end_date [project_manager::project::util::datenvl -value [set end_date_$i] -value_if_null "" -value_if_not_null "to_timestamp('[set end_date_$i]','YYYY MM DD HH24 MI SS')"] \
- -percent_complete "0" \
- -estimated_hours_work $p_work \
- -estimated_hours_work_min $p_work_min \
- -estimated_hours_work_max $p_work_max \
- -creation_user $user_id \
- -creation_ip $peeraddr \
- -package_id $package_id
- ]
- set this_task_id [db_string get_task_item_id {}]
- set dep_task_id($i) $this_task_id
+ if {[string equal $p_skip_p "f"]} {
+ set this_revision_id [pm::task::new \
+ -project_id $project_item_id \
+ -title $p_task_title \
+ -description $p_description \
+ -end_date $p_end_date \
+ -percent_complete "0" \
+ -estimated_hours_work $p_work \
+ -estimated_hours_work_min $p_work_min \
+ -estimated_hours_work_max $p_work_max \
+ -creation_user $user_id \
+ -creation_ip $peeraddr \
+ -package_id $package_id]
+
+ set this_task_id [db_string get_task_item_id {}]
+
+
+
+ set dependent_task_id($i) $this_task_id
- if {[exists_and_not_null p_dep_id]} {
-
- # if the p_dep_id contains num at the beginning, then
- # the task is supposed to depend on other tasks that
- # are currently being created. We have to do all sorts of
- # things like make sure there are no loops, etc..
- if {[regexp {num.*} $p_dep_id]} {
- regexp {num(.*)} $p_dep_id match d_parent
-
- # dep_parent tracks who is parent of what
- set dep_parent($i) $d_parent
- set dep_type($i) $p_dep_type
- lappend parent_new_task $i
- # we wait until after all the tasks have been created to create these
- # dependencies
- } else {
-
- # add in the new dependency
- set dependency_id [db_nextval pm_task_dependency_seq]
- db_dml new_dependency { *SQL* }
+ if {[exists_and_not_null p_parent_task_id]} {
+
+ # if the p_parent_task_id contains num at the beginning, then
+ # the task is supposed to depend on other tasks that
+ # are currently being created. We have to wait until
+ # the tasks have been created
+ if {[regexp {num.*} $p_parent_task_id]} {
+ regexp {num(.*)} $p_parent_task_id match d_parent
+
+ # dep_parent tracks who is parent of what
+ set dep_parent($i) $d_parent
+ set dep_type($i) $p_dep_type
+ lappend parent_new_task $i
+ # we wait until after all the tasks have been created to create these
+ # dependencies
+ } else {
+
+ # add in the new dependency
+ pm::task::dependency_add \
+ -task_item_id $this_task_id \
+ -parent_id $p_parent_task_id \
+ -dependency_type $p_dep_type \
+ -project_item_id $project_item_id
+ }
}
- }
- lappend process_task_id $process_task_ids($i)
- lappend revisions $this_revision_id
- lappend task_id $this_task_id
+ lappend process_task_id $process_task_ids($i)
+ lappend revisions $this_revision_id
+ lappend task_id $this_task_id
+ }
}
if {[exists_and_not_null parent_new_task]} {
# there are tasks that depend on newly created tasks.
# 1. check for loops
# 2. if no loops, create dependencies
- # the way we check for a loop is to follow the dependencies
- # until we get to a task that has already been created.
- # we make the assumption that the following is true:
- # starting condition: no tasks are created
- # when adding a task: no loop is created if you depend on a task already present
- # therefore, if you add a task without creating a loop in the newly
- # created tasks, you are safe.
-
- # we check that the new items don't depend on each other by following them
- # if they loop more than $number times, then we have a loop
- set loop_limit $number
-
foreach dep_task $parent_new_task {
- set passes_p f
+ set this_task_id $dependent_task_id($dep_task)
+ if {[info exists dependent_task_id($dep_parent($dep_task))]} {
+ set parent_task_id $dependent_task_id($dep_parent($dep_task))
+ set p_dep_type $dep_type($dep_task)
- set my_task $dep_task
- while {$loop_limit >= 0} {
-
- if {[exists_and_not_null dep_parent($my_task)]} {
- set my_task $dep_parent($my_task)
- } else {
- set passes_p t
- break
- }
-
- set loop_limit [expr $loop_limit - 1]
+ pm::task::dependency_add \
+ -task_item_id $this_task_id \
+ -parent_id $parent_task_id \
+ -dependency_type $p_dep_type \
+ -project_item_id $project_item_id
}
- if {[string equal $passes_p t]} {
- # add in the new dependency
- set dependency_id [db_nextval pm_task_dependency_seq]
- set this_task_id $dep_task_id($dep_task)
- set parent_task_id $dep_task_id($dep_parent($dep_task))
- set p_dep_type $dep_type($dep_task)
- db_dml new_dependency { *SQL* }
- } else {
- ns_log Notice "PM: Adding in dependency failed for $dep_task_id($dep_task) due to looping"
- }
-
}
-
-
}
- ns_log Notice "Project_item_id $project_item_id"
- project_manager::project::compute_parent_status $project_item_id
+ pm::project::compute_parent_status $project_item_id
} -edit_data {
- ns_log Notice "edit_data"
+ set timestamp_ansi [db_string get_today "
+ SELECT
+ to_char(current_date, 'YYYY-MM-DD')"]
# --------------------------------------------------------------
# each task we edit returns a task_revision_id
# --------------------------------------------------------------
for {set i 1} {$i <= $number} {incr i} {
+ if {![exists_and_not_null end_date_$i]} {
+ set end_date_$i "{} {} {} {} {} {}"
+ }
+
if {![exists_and_not_null estimated_hours_work($i)]} {
set estimated_hours_work($i) [expr .5 * ($estimated_hours_work_max($i) - $estimated_hours_work_min($i)) + $estimated_hours_work_min($i)]
}
-
+
if {![exists_and_not_null estimated_hours_work_min($i)]} {
- set estimated_hours_work_min($i) $estimated_hours_work($i)
+ set estimated_hours_work_min($i) $estimated_hours_work($i)
}
-
+
if {![exists_and_not_null estimated_hours_work_max($i)]} {
set estimated_hours_work_max($i) $estimated_hours_work($i)
}
- if {![exists_and_not_null end_date_$i]} {
- set end_date_$i "{} {} {} {} {} {}"
- }
-
# set up variables, pulling from arrays
set p_task_item_id $task_item_id($i)
set p_task_title $task_title($i)
@@ -652,30 +783,76 @@
set p_work $estimated_hours_work($i)
set p_work_min $estimated_hours_work_min($i)
set p_work_max $estimated_hours_work_max($i)
- set p_hours $actual_hours_worked($i)
+ set p_parent_task_id $dependency_task_id($i)
- # do the actual edit
- set this_revision_id [db_exec_plsql new_task_revision { }]
+ set p_new_hours $new_hours_logged($i)
+ set p_new_description $new_description_logged($i)
- ns_log Notice "Added in $this_revision_id"
+ if {![empty_string_p $p_new_hours] && \
+ $p_new_hours > 0} {
+
+ set logger_project [pm::project::get_logger_project \
+ -project_item_id $project_item_id]
+ set variable_id [logger::variable::get_default_variable_id]
+
+ # add in the new log entry
+ set p_hours [pm::project::log_hours \
+ -logger_project_id $logger_project \
+ -variable_id $variable_id \
+ -value $p_new_hours \
+ -description $p_new_description \
+ -timestamp_ansi $timestamp_ansi \
+ -task_item_id $p_task_item_id \
+ -project_item_id $project_item_id \
+ -update_status_p f]
+ if {[string equal p_hours -1]} {
+ ns_log Error "Error in logging hours in task-add-edit"
+ set p_hours 0
+ }
+ } else {
+ set p_hours [pm::task::update_hours \
+ -task_item_id $p_task_item_id \
+ -update_tasks_p f]
+ }
+
+ # do the actual edit
+ set this_revision_id [pm::task::edit \
+ -task_item_id $p_task_item_id \
+ -project_item_id $project_item_id \
+ -title $p_task_title \
+ -description $p_description \
+ -end_date "[set end_date_[set i]]" \
+ -percent_complete $p_percent \
+ -estimated_hours_work $p_work \
+ -estimated_hours_work_min $p_work_min \
+ -estimated_hours_work_max $p_work_max \
+ -actual_hours_worked $p_hours \
+ -update_user $user_id \
+ -update_ip $peeraddr \
+ -package_id $package_id]
+
+
lappend revisions $this_revision_id
- ns_log Notice "in new: task_id $task_id"
+ pm::task::dependency_delete_all \
+ -task_item_id $p_task_item_id
- # BUG: we need to make sure we take care of deleting dependencies
- # if unchecked, adding dependencies, etc..
+ if {![empty_string_p $p_parent_task_id]} {
+ pm::task::dependency_add \
+ -task_item_id $p_task_item_id \
+ -parent_id $p_parent_task_id \
+ -dependency_type jfdsafesa\
+ -project_item_id $project_item_id
+ }
+
}
- project_manager::project::compute_parent_status $project_item_id
+ pm::project::compute_parent_status $project_item_id
- ns_log Notice "computed parent pre redirect"
-
} -after_submit {
- ns_log Notice "TASK_ID: $task_id"
-
ad_returnredirect "task-assign-add-edit?[export_vars -url {project_item_id process_task_id:multiple revisions:multiple task_id:multiple}]"
ad_script_abort
Index: openacs-4/contrib/packages/project-manager/www/task-assign-add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-assign-add-edit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/project-manager/www/task-assign-add-edit.adp 10 Nov 2003 19:34:54 -0000 1.4
+++ openacs-4/contrib/packages/project-manager/www/task-assign-add-edit.adp 12 Mar 2004 13:44:45 -0000 1.5
@@ -1,40 +1,49 @@
<master>
-<property name="context_bar">@context_bar;noquote@</property>
-<property name="title">@title@</property>
+ <property name="context_bar">@context_bar;noquote@</property>
+ <property name="title">@title@</property>
+
+ <center>
-<center>
+ <formtemplate id="add_edit" style="standard-lars">
-<formtemplate id="add_edit" style="standard-lars">
+ <multiple name="tasks">
-<multiple name="tasks">
+ <table width="100%" border="0" cellpadding="3" cellspacing="0">
+ <tr>
+ <th colspan="2" bgcolor="lavender">@tasks.one_line@</th>
+ </tr>
-<table width="100%" border="0" cellpadding="3" cellspacing="0">
- <tr>
- <th colspan="2" bgcolor="lavender">@tasks.one_line@</th>
- </tr>
+ <tr>
- <tr>
- <td width="40%">@tasks.description@</td>
+ <td>
+ <multiple name="num">
+ <formwidget id="party_id.@tasks.item_id@.@num.number@">
+ <formerror id="party_id.@tasks.item_id@.@num.number@">
+ </formerror>
+ </formwidget>
- <td>
- <multiple name="num">
- <formwidget id="party_id.@tasks.item_id@.@num.number@">
- <formwidget id="role_id.@tasks.item_id@.@num.number@"><br>
- </multiple>
- </td>
- </tr>
+ <formwidget id="role_id.@tasks.item_id@.@num.number@">
+ <formerror
+ id="role_id.@tasks.item_id@.@num.number@">
+ </formerror>
+ </formwidget>
-</table>
+ <br />
+ </multiple>
+ </td>
+ </tr>
-</multiple>
+ </table>
-<P>
+ </multiple>
+
+ <P />
-<input type="submit" name="formbutton:ok" value = " OK ">
+ <input type="submit" name="formbutton:ok" value = " OK ">
+
+ </formtemplate>
+ </table>
+ </center>
-</formtemplate>
-</table>
-</center>
-
Index: openacs-4/contrib/packages/project-manager/www/task-assign-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-assign-add-edit.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/contrib/packages/project-manager/www/task-assign-add-edit.tcl 26 Jan 2004 15:39:40 -0000 1.7
+++ openacs-4/contrib/packages/project-manager/www/task-assign-add-edit.tcl 12 Mar 2004 13:44:45 -0000 1.8
@@ -1,13 +1,3 @@
-ns_log notice task assign add edit page
-set mypage [ns_getform]
-if {[string equal "" $mypage]} {
- ns_log notice no form was submitted on my page
-} else {
- ns_log notice the following form was submitted on my page
- ns_set print $mypage
-}
-
-
ad_page_contract {
Form to add and edit assignments to a task
@@ -119,7 +109,6 @@
} -new_data {
- ns_log Notice "new_data"
#role_id
#party_id
@@ -212,8 +201,6 @@
set r_id $assignment_role($pl)
set p_id $assignment_party($pl)
- ns_log Notice "tid: $t_id rid: $r_id pid: $p_id"
-
set subject "New Task \#$t_id: $one_lines($t_id)"
if {[string equal $use_uncertain_completion_times_p 1]} {
@@ -251,17 +238,17 @@
-----------
$descriptions($t_id)"
- notification::request::new \
- -type_id [notification::type::get_type_id -short_name pm_task_notif] \
- -object_id $t_id \
- -user_id $p_id \
- -interval_id [notification::interval::get_id_from_name -name instant] \
- -delivery_method_id [notification::delivery::get_id -short_name email]
+ #notification::request::new \
+ # -type_id "[notification::type::get_type_id -short_name pm_task_notif]" \
+ # -object_id $t_id \
+ # -user_id $p_id \
+ # -interval_id [notification::interval::get_id_from_name -name instant] \
+ # -delivery_method_id [notification::delivery::get_id -short_name email]
notification::new \
-type_id [notification::type::get_type_id -short_name pm_task_notif] \
-object_id $t_id \
- -response_id $user_id \
+ -response_id $t_id \
-notif_subject $subject \
-notif_text $notification_text
@@ -271,7 +258,6 @@
} -edit_data {
- ns_log Notice "edit_data"
# do something
#role_id
#party_id
@@ -313,7 +299,7 @@
# keyname looks like 2308.1 - 2308.10
# first element is task_id, second is 1-10
- # if keyvalu is not empty, then we pay attention to it.
+ # if keyvalu is not empty, then we pay attention to it.
if {[exists_and_not_null keyvalu]} {
@@ -338,8 +324,6 @@
set r_id $assignment_role($pl)
set p_id $assignment_party($pl)
- ns_log Notice "tid: $t_id rid: $r_id pid: $p_id"
-
db_dml add_assignment { }
}
@@ -353,8 +337,6 @@
# we create a terrible monster array
-ns_log Notice "process_task_id: $process_task_id "
-
set index 0
foreach tiid $task_id {
@@ -373,8 +355,6 @@
lappend users_values $pid
}
- ns_log Notice "roles_values: $roles_values"
- ns_log Notice "users_values: $users_values"
}
set users_length [string length $users_values]
@@ -412,11 +392,3 @@
}
-ns_log notice it's my page, but later!
-set mypage [ns_getform]
-if {[string equal "" $mypage]} {
- ns_log notice no form was submitted on my page
-} else {
- ns_log notice the following form was submitted on my page
- ns_set print $mypage
-}
Index: openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one-postgresql.xql,v
diff -u -r1.18 -r1.19
--- openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql 26 Feb 2004 15:15:41 -0000 1.18
+++ openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql 12 Mar 2004 13:44:45 -0000 1.19
@@ -1,28 +1,5 @@
<?xml version="1.0"?>
<queryset>
- <fullquery name="get_task_id">
- <querytext>
- SELECT
- t.item_id
- FROM
- pm_tasks_revisionsx t
- WHERE
- t.revision_id = :task_revision_id
- </querytext>
- </fullquery>
-
- <fullquery name="get_revision_id">
- <querytext>
- SELECT
- t.revision_id as task_revision_id
- FROM
- pm_tasks_revisionsx t, cr_items i
- WHERE
- t.item_id = :task_id and
- i.live_revision = t.revision_id
- </querytext>
- </fullquery>
-
<fullquery name="get_project_ids">
<querytext>
SELECT
@@ -119,7 +96,7 @@
i.live_revision,
d.parent_task_id,
d.dependency_type,
- d.task_id
+ d.task_id as d_task_id
FROM
pm_tasks_revisionsx t, cr_items i, pm_task_dependency d
WHERE
@@ -148,4 +125,50 @@
</querytext>
</fullquery>
+ <fullquery name="xrefs_query">
+ <querytext>
+ SELECT
+ x.task_id_1 as x_task_id,
+ r.title,
+ to_char(r.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start,
+ r.earliest_start - current_date as days_to_earliest_start,
+ to_char(r.earliest_start,'J') as earliest_start_j,
+ to_char(r.earliest_finish,'YYYY-MM-DD HH24:MI') as earliest_finish,
+ r.earliest_finish - current_date as days_to_earliest_finish,
+ to_char(r.latest_start,'YYYY-MM-DD HH24:MI') as latest_start,
+ r.latest_start - current_date as days_to_latest_start,
+ to_char(r.latest_start,'J') as latest_start_j,
+ to_char(current_date,'J') as today_j,
+ to_char(r.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish,
+ r.latest_finish - current_date as days_to_latest_finish
+ FROM
+ pm_task_xref x, pm_tasks_revisionsx r, cr_items i
+ WHERE
+ x.task_id_2 = :task_id and
+ x.task_id_2 = r.item_id and
+ r.revision_id = i.live_revision
+ UNION
+ SELECT
+ x2.task_id_2 as x_task_id,
+ r2.title,
+ to_char(r2.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start,
+ r2.earliest_start - current_date as days_to_earliest_start,
+ to_char(r2.earliest_start,'J') as earliest_start_j,
+ to_char(r2.earliest_finish,'YYYY-MM-DD HH24:MI') as earliest_finish,
+ r2.earliest_finish - current_date as days_to_earliest_finish,
+ to_char(r2.latest_start,'YYYY-MM-DD HH24:MI') as latest_start,
+ r2.latest_start - current_date as days_to_latest_start,
+ to_char(r2.latest_start,'J') as latest_start_j,
+ to_char(current_date,'J') as today_j,
+ to_char(r2.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish,
+ r2.latest_finish - current_date as days_to_latest_finish
+ FROM
+ pm_task_xref x2, pm_tasks_revisionsx r2, cr_items i2
+ WHERE
+ x2.task_id_1 = :task_id and
+ x2.task_id_1 = r2.item_id and
+ i2.live_revision = r2.revision_id
+ </querytext>
+ </fullquery>
+
</queryset>
Index: openacs-4/contrib/packages/project-manager/www/task-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one.adp,v
diff -u -r1.22 -r1.23
--- openacs-4/contrib/packages/project-manager/www/task-one.adp 26 Feb 2004 15:15:41 -0000 1.22
+++ openacs-4/contrib/packages/project-manager/www/task-one.adp 12 Mar 2004 13:44:45 -0000 1.23
@@ -1,114 +1,227 @@
-<master>
+<master src="lib/master">
-<link rel="stylesheet" href="style.css" type="text/css">
+ <link rel="stylesheet" href="style.css" type="text/css" />
-<property name="title">@task_term@ #@item_id@: @task_info.task_title@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+ <property name="title">@task_term@ #@item_id@: @task_info.task_title@</property>
+ <property name="context">@context@</property>
+
+ <div id="topcontent">
+
+ <div id="leftcontent">
+
+ <table border="1" cellpadding="0" cellspacing="0" width="100%"
+ class="list">
+
+ <tr>
+ <th>
+ <a href="task-add-edit?my_key=1&task_id=@task_id@&project_item_id=@project_item_id@">
+ <img border="0" src="/shared/images/Edit16.gif"
+ alt="Edit">
+ </a>
+ <a href="task-print?&task_id=@task_id@&project_item_id=@project_item_id@">
+ <img border="0" src="resources/print-16.png"
+ alt="Print">
+ </a>
+ </th>
+
+ <th>@task_term@ #@item_id@: @task_info.task_title@
+ </th>
+
+ <th align="right"><img border="0"
+ src="/shared/images/Delete16.gif">
+ </th>
+
+ </tr>
+
+ <tr>
+ <td colspan="3">
+
+ <table border=0 cellpadding=3 cellspacing=1 width="100%"
+ class="list">
+
+ <tr>
+ <th colspan="2">Description</th>
+ </tr>
+
+ <tr>
+ <td colspan="2">@task_info.description;noquote@</td>
+ </tr>
+
+ <tr>
+ <td></td>
+ <td align="right">-- @task_info.creation_user@</td>
+ </tr>
+
+ <tr>
+ <td colspan="2"></td>
+ </tr>
+
+ <tr>
+ <td colspan="2"></td>
+ </tr>
+
+ <tr>
+ <th colspan="2">Dates</th>
+ </tr>
+
+ <tr>
+ <td>Deadline</td>
+ <td>@task_info.end_date@</td>
+ </tr>
+
+ <tr>
+ <td>Earliest start</td>
+ <td>@task_info.earliest_start@</td>
+ </tr>
+
+ <tr>
+ <td>Earliest finish</td>
+ <td>@task_info.earliest_finish@</td>
+ </tr>
+
+ <tr>
+ <td>Latest start</td>
+ <td>@task_info.latest_start@</td>
+ </tr>
+
+ <tr>
+ <td>Latest finish</td>
+ <td>@task_info.latest_start@</td>
+ </tr>
+
+ </table>
+ </table>
+
+ <P />
+
+ <if @notification_chunk@ not nil>
+ @notification_chunk;noquote@
+ </if>
+
+ </div>
+
+ <div id="rightcontent">
+
+ <table border="1" class="list" width="100%">
+ <tr>
+ <th>Assignees</th>
+ </tr>
+ <tr>
+ <td>
+ <listtemplate name="people"></listtemplate>
+ </td>
+ </tr>
+ </table>
+
+ <P />
+
+ <table border="1" class="list" width="100%">
+ <tr>
+ <th>@task_term@s this depends on.</th>
+ </tr>
+ <tr>
+ <td>
+ <listtemplate name="dependency"></listtemplate>
+ </td>
+ </tr>
+ </table>
+
+ <P />
+
+ <table border="1" class="list" width="100%">
+ <tr>
+ <th>@task_term@s depending on this @task_term@</th>
+ </tr>
+ <tr>
+ <td>
+ <listtemplate name="dependency2"></listtemplate>
+ </td>
+ </tr>
+ </table>
-<div id="topcontent">
+ <p />
-<div id="leftcontent">
+ <table border="1" class="list" width="100%">
+ <tr>
+ <th>Related @task_term@s</th>
+ </tr>
+ <tr>
+ <td>
+ <listtemplate name="xrefs"></listtemplate>
+ </td>
+ </tr>
+ </table>
-<table border="1" cellpadding="0" cellspacing="0" width="100%">
+ <p />
+
+ <table border="1" cellpadding="3" cellspacing="1" id="rightcontent" class="list">
+ <tr>
+ <th colspan="3">Logged hours</th>
+ </tr>
+
+ <tr class="list-filter-header">
+ <td class="list-button-bar" align="center" colspan="2">
+ Total work:
+ <if @use_uncertain_completion_times_p@ eq 1>
+ @task_info.estimated_hours_work_min@ -
+ @task_info.estimated_hours_work_max@ hrs estimated
+ </if>
+ <else>
+ @task_info.estimated_hours_work@ hrs estimated
+ </else>
+ </td>
- <tr>
- <th>
- <a href="task-add-edit?my_key=1&task_id=@task_id@&project_item_id=@project_item_id@"><img border="0" src="/shared/images/Edit16.gif" alt="Edit"></a>
- <a href="task-print?&task_id=@task_id@&project_item_id=@project_item_id@"><img border="0" src="resources/print-16.png" alt="Print"></a></th>
+ <td rowspan="2" class="list-button-bar" align="right">
+ @task_info.percent_complete@% complete<br />
+ <if @task_info.slack_time@ not nil>
+ Slack: @task_info.slack_time@<br />
+ </if>
+ <else>
+ Slack: n/a
+ </else>
+ </td>
- <th>@task_term@ #@item_id@: @task_info.task_title@</th>
+ </tr>
- <th align="right"><img border="0" src="/shared/images/Delete16.gif"></th>
-<tr>
-<td colspan="3">
+ <tr class="list-button-bar">
+ <td class="list-button-bar">
+ <span class="list-button-header">
+ <a href="@log_url@" class="list-button" title="Log hours for this project">Log hours</a>
+ </span>
+ </td>
-<table border=0 cellpadding=3 cellspacing=1 width="100%">
+ <td class="list-filter-header" align="center">
+ @log_note@
+ </td>
+
+ </tr>
-<tr>
-<th colspan="2">Description</th>
-<tr>
-<td colspan="2">@task_info.description;noquote@
-<tr>
-<td><td align="right">-- @task_info.creation_user@</td>
-</tr>
+
+ <tr>
+ <td colspan="3">
+ <include src="lib/entries-table"
+ selected_project_id="@logger_project@"
+ selected_variable_id="@logger_variable_id@"
+ pm_project_id="@project_item_id@"
+ pm_task_id="@task_id@" />
+ </td>
+ </tr>
+ </table>
+
+ </div>
+
+ </div>
+
+ <div id="bottomcontent">
+ <!-- REVISIONS -->
+
+ <p />
-<tr>
-<th colspan="2">Work</th>
-</tr>
-
-<tr>
-<td colspan="2">@task_info.percent_complete@% complete</td>
-</tr>
-
-<tr>
-<td colspan="2">@task_info.estimated_hours_work_min@ - @task_info.estimated_hours_work_max@ hrs estimated</td>
-</tr>
-
-<tr>
-<td colspan="2">@task_info.slack_time@ slack</td>
-</tr>
-
-<tr>
-<th colspan="2">Dates</th>
-
-<tr>
-<td>Deadline</th>
-<td>@task_info.end_date@</td>
-</tr>
-
-<tr>
-<td>Earliest start</th>
-<td>@task_info.earliest_start@</td>
-</tr>
-
-<tr>
-<td>Earliest finish</th>
-<td>@task_info.earliest_finish@</td>
-</tr>
-
-<tr>
-<td>Latest start</th>
-<td>@task_info.latest_start@</td>
-</tr>
-
-<tr>
-<td>Latest finish</th>
-<td>@task_info.latest_start@</td>
-</tr>
-
-</table>
-</table>
-
-<P>
-
-<a class="button" href="">Breakdown</a>
-
-</div>
-
-<div id="rightcontent">
-
-<listtemplate name="people"></listtemplate>
-
-<P />
-
-<center><B>@task_term@(s) this depends on.</B></center>
-<listtemplate name="dependency"></listtemplate>
-<P>
-
-<center><B>@task_term@(s) depending on this @task_term@</B></center>
-<listtemplate name="dependency2"></listtemplate>
-
-</div>
-
-</div>
-
-<div id="bottomcontent">
-<!-- REVISIONS -->
-
-<listtemplate name="revisions"></listtemplate>
-
-@comments;noquote@
-<P>
-@comments_link;noquote@
-
-</div>
+ <listtemplate name="revisions"></listtemplate>
+
+ @comments;noquote@
+ <P />
+ @comments_link;noquote@
+
+ </div>
+
Index: openacs-4/contrib/packages/project-manager/www/task-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one.tcl,v
diff -u -r1.23 -r1.24
--- openacs-4/contrib/packages/project-manager/www/task-one.tcl 26 Jan 2004 15:39:40 -0000 1.23
+++ openacs-4/contrib/packages/project-manager/www/task-one.tcl 12 Mar 2004 13:44:45 -0000 1.24
@@ -25,12 +25,12 @@
orderby_revisions:optional
orderby_dependency:optional
orderby_dependency2:optional
-
} -properties {
+ notification_chunk:onevalue
task_info:onerow
project_item_id:onevalue
project_id:onevalue
- context_bar:onevalue
+ context:onevalue
write_p:onevalue
create_p:onevalue
revisions:multirow
@@ -43,17 +43,29 @@
watcher_term:onevalue
comments:onevalue
comments_link:onevalue
+ use_uncertain_completion_times_p:onevalue
} -validate {
task_id_exists {
if {![info exists task_id]} {
- set task_id [db_string get_task_id { }]
+ set task_id [pm::task::get_item_id \
+ -task_id $task_revision_id]
+ if {[string equal $task_id -1]} {
+ ad_complain
+ }
}
}
revision_id_exists {
if {![info exists task_revision_id]} {
- set task_revision_id [db_string get_revision_id { }]
+ set task_revision_id [pm::task::get_revision_id \
+ -task_item_id $task_id]
+ if {[string equal $task_revision_id -1]} {
+ ad_complain
+ }
}
}
+} -errors {
+ task_id_exists {That task does not exist}
+ revision_id_exists {That task does not exist}
}
@@ -65,10 +77,11 @@
set assignee_term [parameter::get -parameter "AssigneeName" -default "Assignee"]
set watcher_term [parameter::get -parameter "WatcherName" -default "Watcher"]
set project_term [parameter::get -parameter "ProjectName" -default "Project"]
+set use_uncertain_completion_times_p [parameter::get -parameter "UseUncertainCompletionTimesP" -default "1"]
db_1row get_project_ids { }
-set context_bar [ad_context_bar "one?project_item_id=$project_item_id $project_term" "View"]
+set context [list "one?project_item_id=$project_item_id $project_term" "View"]
# the unique identifier for this package
@@ -87,21 +100,39 @@
set write_p [permission::permission_p -object_id $package_id -privilege write]
set create_p [permission::permission_p -object_id $package_id -privilege create]
+
+
# Task info ----------------------------------------------------------
db_1row task_query { } -column_array task_info
set task_info(description) [ad_text_to_html -- $task_info(description)]
if {[exists_and_not_null task_info(earliest_start_j)]} {
- if {$task_info(earliest_start_j) < $task_info(today_j)} {
- set task_info(slack_time) "[expr $task_info(latest_start_j) - $task_info(today_j)] days"
- } else {
- set task_info(slack_time) "[expr $task_info(latest_start_j) - $task_info(earliest_start_j)] days"
- }
-} else {
- set task_info(slack_time) "n/a"
+ set task_info(slack_time) [pm::task::slack_time \
+ -earliest_start_j $task_info(earliest_start_j) \
+ -today_j $task_info(today_j) \
+ -latest_start_j $task_info(latest_start_j)]
}
+set logger_project [pm::project::get_logger_project \
+ -project_item_id $project_item_id]
+set logger_variable_id [logger::variable::get_default_variable_id]
+
+set log_url "[ad_conn package_url]log?project_id=$logger_project&pm_project_id=$project_item_id&pm_task_id=$task_id"
+
+set log_note "Task logged time listed below"
+
+# ------------------
+# Notifications info
+# ------------------
+set notification_chunk [notification::display::request_widget \
+ -type pm_task_notif \
+ -object_id $task_id \
+ -pretty_name "$task_info(task_title)" \
+ -url "[ad_conn url]?[ad_conn query]" \
+ ]
+
+
# Task Revisions, using list-builder ---------------------------------
template::list::create \
@@ -142,7 +173,7 @@
default_value revision_id,desc
} \
-orderby_name orderby_revisions \
- -main_class {
+ -sub_class {
narrow
} \
-filters {
@@ -165,7 +196,7 @@
template::list::create \
-name dependency \
-multirow dependency \
- -key task_id \
+ -key d_task_id \
-elements {
dependency_type {
label "Type"
@@ -184,7 +215,7 @@
</if>
}
}
- task_id {
+ d_task_id {
label "Task"
display_col task_title
link_url_col item_url
@@ -203,7 +234,7 @@
end_date {orderby end_date}
} \
-orderby_name orderby_dependency \
- -main_class {
+ -sub_class {
narrow
} \
-filters {
@@ -217,15 +248,15 @@
db_multirow -extend { item_url } dependency dependency_query {
} {
- set item_url [export_vars -base "task-one" -override {{task_id $parent_task_id}} { task_id }]
+ set item_url [export_vars -base "task-one" -override {{task_id $parent_task_id}} { task_id $d_task_id }]
}
# Dependency info (dependency other task have on this task) ------
template::list::create \
-name dependency2 \
-multirow dependency2 \
- -key task_id \
+ -key d_task_id \
-elements {
dependency_type {
label "Type"
@@ -244,10 +275,10 @@
</if>
}
}
- task_id {
+ d_task_id {
label "Task"
display_col task_title
- link_url_eval {task-one?task_id=$task_id}
+ link_url_eval {task-one?task_id=$d_task_id}
link_html { title "View this task" }
}
percent_complete {
@@ -263,7 +294,7 @@
end_date {orderby end_date}
} \
-orderby_name orderby_dependency2 \
- -main_class {
+ -sub_class {
narrow
} \
-filters {
@@ -303,7 +334,7 @@
display_template "@people.one_line@"
}
} \
- -main_class {
+ -sub_class {
narrow
} \
-filters {
@@ -319,17 +350,77 @@
} \
-orderby_name orderby_people \
-html {
+ width 100%
}
-
db_multirow -extend { item_url } subproject task_people_query {
} {
}
+# Xrefs ------------------------------------------------
+template::list::create \
+ -name xrefs \
+ -multirow xrefs \
+ -key x_task_id \
+ -elements {
+ x_task_id {
+ label "ID"
+ }
+ title {
+ label "Task"
+ link_url_col item_url
+ link_html { title "View this task" }
+ }
+ slack_time {
+ label "Slack"
+ }
+ earliest_start_pretty {
+ label "ES"
+ }
+ earliest_finish_pretty {
+ label "EF"
+ }
+ latest_start_pretty {
+ label "LS"
+ }
+ latest_finish_pretty {
+ label "ES"
+ }
+ } \
+ -sub_class {
+ narrow
+ } \
+ -filters {
+ task_revision_id {}
+ orderby_revision {}
+ orderby_dependency {}
+ orderby_dependency2 {}
+ } \
+ -html {
+ width 100%
+ }
+
+db_multirow -extend { item_url earliest_start_pretty earliest_finish_pretty latest_start_pretty latest_finish_pretty slack_time } xrefs xrefs_query {
+} {
+ set item_url [export_vars -base "task-one" -override {{task_id $x_task_id}}]
+
+ set earliest_start_pretty [lc_time_fmt $earliest_start "%x"]
+ set earliest_finish_pretty [lc_time_fmt $earliest_finish "%x"]
+ set latest_start_pretty [lc_time_fmt $latest_start "%x"]
+ set latest_finish_pretty [lc_time_fmt $latest_finish "%x"]
+
+ set slack_time [pm::task::slack_time \
+ -earliest_start_j $earliest_start_j \
+ -today_j $today_j \
+ -latest_start_j $latest_start_j]
+
+}
+
+
ad_return_template
# ------------------------- END OF FILE ------------------------- #
Index: openacs-4/contrib/packages/project-manager/www/task-print-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-print-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/project-manager/www/task-print-postgresql.xql 26 Feb 2004 15:28:34 -0000 1.2
+++ openacs-4/contrib/packages/project-manager/www/task-print-postgresql.xql 12 Mar 2004 13:44:45 -0000 1.3
@@ -3,48 +3,50 @@
<fullquery name="get_revision_id">
<querytext>
- SELECT
+ SELECT
t.revision_id as task_revision_id
- FROM
- pm_tasks_revisionsx t, cr_items i
- WHERE
+ FROM
+ pm_tasks_revisionsx t, cr_items i
+ WHERE
t.item_id = :task_id and
i.live_revision = t.revision_id
</querytext>
</fullquery>
<fullquery name="get_project_ids">
<querytext>
- SELECT
+ SELECT
t.parent_id as project_item_id
- FROM
- pm_tasks_revisionsx t, cr_items i
- WHERE
+ FROM
+ pm_tasks_revisionsx t, cr_items i
+ WHERE
i.item_id = t.item_id and
t.revision_id = :task_revision_id
</querytext>
</fullquery>
<fullquery name="task_query">
<querytext>
- SELECT
+ SELECT
t.item_id,
t.title as task_title,
t.description,
- to_char(t.end_date,'Mon DD ''YY') as end_date,
- to_char(t.earliest_start,'Mon DD ''YY') as earliest_start,
- to_char(t.earliest_finish,'Mon DD ''YY') as earliest_finish,
- to_char(t.latest_start,'Mon DD ''YY') as latest_start,
- to_char(t.latest_finish,'Mon DD ''YY') as latest_finish,
- to_char(t.latest_start-t.earliest_start,'DD') || ' days' as slack_time,
+ to_char(t.end_date,'Mon DD ''YY') as end_date,
+ to_char(t.earliest_start,'Mon DD ''YY') as earliest_start,
+ to_char(t.earliest_start,'J') as earliest_start_j,
+ to_char(t.earliest_finish,'Mon DD ''YY') as earliest_finish,
+ to_char(t.latest_start,'Mon DD ''YY') as latest_start,
+ to_char(t.latest_start,'J') as latest_start_j,
+ to_char(t.latest_finish,'Mon DD ''YY') as latest_finish,
+ to_char(current_date,'J') as today_j,
t.estimated_hours_work,
t.estimated_hours_work_min,
t.estimated_hours_work_max,
t.percent_complete,
i.live_revision
- FROM
- pm_tasks_revisionsx t, cr_items i
- WHERE
+ FROM
+ pm_tasks_revisionsx t, cr_items i
+ WHERE
t.item_id = :task_id and
t.revision_id = :task_revision_id and
t.item_id = i.item_id
@@ -54,16 +56,16 @@
<fullquery name="dependency_query">
<querytext>
- SELECT
+ SELECT
t.title as task_title,
- to_char(t.end_date,'MM/DD/YYYY') as end_date,
+ to_char(t.end_date,'MM/DD/YYYY') as end_date,
t.percent_complete,
i.live_revision,
d.parent_task_id,
d.dependency_type
- FROM
- pm_tasks_revisionsx t, cr_items i, pm_task_dependency d
- WHERE
+ FROM
+ pm_tasks_revisionsx t, cr_items i, pm_task_dependency d
+ WHERE
d.task_id = :task_id and
d.parent_task_id = t.item_id and
t.revision_id = i.live_revision and
@@ -74,17 +76,17 @@
<fullquery name="dependency2_query">
<querytext>
- SELECT
+ SELECT
t.title as task_title,
- to_char(t.end_date,'MM/DD/YYYY') as end_date,
+ to_char(t.end_date,'MM/DD/YYYY') as end_date,
t.percent_complete,
i.live_revision,
d.parent_task_id,
d.dependency_type,
d.task_id
- FROM
- pm_tasks_revisionsx t, cr_items i, pm_task_dependency d
- WHERE
+ FROM
+ pm_tasks_revisionsx t, cr_items i, pm_task_dependency d
+ WHERE
d.task_id = t.item_id and
d.parent_task_id = :task_id and
t.revision_id = i.live_revision and
Index: openacs-4/contrib/packages/project-manager/www/task-print.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-print.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/project-manager/www/task-print.adp 26 Feb 2004 15:28:34 -0000 1.2
+++ openacs-4/contrib/packages/project-manager/www/task-print.adp 12 Mar 2004 13:44:45 -0000 1.3
@@ -36,7 +36,7 @@
</tr>
<tr>
-<td colspan="2">@task_info.slack_time@ slack</td>
+<td colspan="2">Slack time: @task_info.slack_time@</td>
</tr>
<tr>
Index: openacs-4/contrib/packages/project-manager/www/task-print.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-print.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/project-manager/www/task-print.tcl 26 Feb 2004 15:28:34 -0000 1.2
+++ openacs-4/contrib/packages/project-manager/www/task-print.tcl 12 Mar 2004 13:44:45 -0000 1.3
@@ -91,8 +91,11 @@
db_1row task_query { } -column_array task_info
set task_info(description) [ad_text_to_html -- $task_info(description)]
+set task_info(slack_time) [pm::task::slack_time \
+ -earliest_start_j $task_info(earliest_start_j) \
+ -today_j $task_info(today_j) \
+ -latest_start_j $task_info(latest_start_j)]
-
# Dependency info ------------------------------------------------
template::list::create \
@@ -136,7 +139,7 @@
end_date {orderby end_date}
} \
-orderby_name orderby_dependency \
- -main_class {
+ -sub_class {
narrow
} \
-filters {
@@ -196,7 +199,7 @@
end_date {orderby end_date}
} \
-orderby_name orderby_dependency2 \
- -main_class {
+ -sub_class {
narrow
} \
-filters {
@@ -236,7 +239,7 @@
display_template "@people.one_line@"
}
} \
- -main_class {
+ -sub_class {
narrow
} \
-filters {
Index: openacs-4/contrib/packages/project-manager/www/task-select-project-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-select-project-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/project-manager/www/task-select-project-postgresql.xql 6 Oct 2003 22:57:28 -0000 1.1
+++ openacs-4/contrib/packages/project-manager/www/task-select-project-postgresql.xql 12 Mar 2004 13:44:45 -0000 1.2
@@ -6,9 +6,11 @@
SELECT
p.item_id as project_item_id,
p.title as project_name
- FROM pm_projectsx p, cr_items i
+ FROM pm_projectsx p, cr_items i, pm_project_status s
WHERE p.project_id = i.live_revision and
- p.parent_id = :root_folder
+ p.parent_id = :root_folder and
+ p.status_id = s.status_id and
+ s.status_type = 'o'
ORDER BY p.title
</querytext>
</fullquery>
Index: openacs-4/contrib/packages/project-manager/www/tasks-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/tasks-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/project-manager/www/tasks-postgresql.xql 26 Feb 2004 15:28:34 -0000 1.4
+++ openacs-4/contrib/packages/project-manager/www/tasks-postgresql.xql 12 Mar 2004 13:44:45 -0000 1.5
@@ -19,7 +19,8 @@
t.estimated_hours_work,
t.estimated_hours_work_min,
t.estimated_hours_work_max,
- t.actual_hours_worked,
+ case when t.actual_hours_worked is null then 0
+ else t.actual_hours_worked end as actual_hours_worked,
to_char(t.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start,
to_char(t.earliest_finish,'YYYY-MM-DD HH24:MI') as earliest_finish,
to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start,
Index: openacs-4/contrib/packages/project-manager/www/tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/tasks.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/project-manager/www/tasks.adp 26 Feb 2004 15:28:34 -0000 1.4
+++ openacs-4/contrib/packages/project-manager/www/tasks.adp 12 Mar 2004 13:44:45 -0000 1.5
@@ -1,29 +1,21 @@
-<master>
+<master src="lib/master">
-<link rel="stylesheet" href="style.css" type="text/css">
+ <link rel="stylesheet" href="style.css" type="text/css" />
-<property name="title">@task_term@s</property>
-<property name="context_bar">@context_bar;noquote@</property>
+ <property name="title">@task_term@s</property>
+ <property name="context">@context@</property>
+
+
+ <table cellpadding="3" cellspacing="3">
+
+ <tr>
+
+ <td class="list-filter-pane" valign="top" width="200">
-<div id="subnavbar-div">
-<div id="subnavbar-container">
- <div id="subnavbar">
- <div class="tab">
- <a href="tasks?mine_p=t">My tasks</a>
- </div>
- <div class="tab">
- <a href="tasks?mine_p=f">Other tasks</a>
- </div>
- </div>
-</div>
-</div>
+ <a href="tasks?mine_p=t">My tasks</a><br />
+ <a href="tasks?mine_p=f">Other tasks</a>
+ <p />
-<table cellpadding="3" cellspacing="3">
-
- <tr>
-
- <td class="list-filter-pane" valign="top" width="200">
-
<form method=post name=search action=tasks>
Search:<br />
<input type=text name=searchterm value="@searchterm@" size="15" />
Index: openacs-4/contrib/packages/project-manager/www/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/tasks.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/project-manager/www/tasks.tcl 26 Feb 2004 15:28:34 -0000 1.4
+++ openacs-4/contrib/packages/project-manager/www/tasks.tcl 12 Mar 2004 13:44:45 -0000 1.5
@@ -22,7 +22,7 @@
{status_id ""}
} -properties {
task_term:onevalue
- context_bar:onevalue
+ context:onevalue
tasks:multirow
}
@@ -35,7 +35,7 @@
set project_term_lower [parameter::get -parameter "projectname" -default "project"]
# set up context bar
-set context_bar [ad_context_bar "Tasks"]
+set context [list "Tasks"]
# the unique identifier for this package
set package_id [ad_conn package_id]
@@ -48,7 +48,7 @@
# status defaults to open
if {![exists_and_not_null status_id]} {
- set status_id [project_manager::task::default_status_open]
+ set status_id [pm::task::default_status_open]
}
# permissions
@@ -78,9 +78,6 @@
label "Who"
display_template "<if @tasks.full_name@ nil><font color=\"red\">unassigned</font></if><else>@tasks.full_name@ (@tasks.role@)</else>"
}
- description {
- label "Description"
- }
slack_time {
label "Slack time"
display_template "<if @tasks.slack_time@ gt 1>@tasks.slack_time@</if><else><font color=\"red\">@tasks.slack_time@</font></else>"
@@ -97,18 +94,16 @@
}
} \
-actions {
- "Projects" "index" "View list of tasks"
- "Processes" "processes" "View and use processes"
"Add task" "task-select-project" "Add a task"
- "Admin" "admin/" "Administration pages"
} \
- -main_class {
+ -sub_class {
narrow
} \
-filters {
searchterm {
label "Search"
}
+
party_id {
label "People"
values {[db_list_of_lists get_people "select distinct(first_names || ' ' || last_name) as fullname, u.person_id from persons u, pm_task_assignment a where u.person_id = a.party_id order by fullname"]}
@@ -121,9 +116,13 @@
values {[db_list_of_lists get_status_values "select description, status_id from pm_task_status order by status_type desc, description"]}
where_clause {ts.status = :status_id}
}
+
+ mine_p {
+ label "Show others' tasks"
+ }
} \
-orderby {
- default_value task_number,asc
+ default_value latest_start_pretty,asc
task_number {
label "Task \#"
orderby_desc "ts.task_number desc"
@@ -187,11 +186,10 @@
set latest_finish_pretty [lc_time_fmt $latest_finish "%x"]
if {[exists_and_not_null earliest_start_j]} {
- if {$earliest_start_j < $today_j} {
- set slack_time "[expr $latest_start_j - $today_j] days"
- } else {
- set slack_time "[expr $latest_start_j - $earliest_start_j] days"
- }
+ set slack_time [pm::task::slack_time \
+ -earliest_start_j $earliest_start_j \
+ -today_j $today_j \
+ -latest_start_j $latest_start_j]
} else {
set slack_time "n/a"
}
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/www/lib/entries-table-postgresql.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/www/lib/entries-table.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/www/lib/entries-table.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/www/lib/entries-table.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/www/lib/master.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/www/lib/master.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/www/lib/nav-bar.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/www/lib/nav-bar.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/users-selection/catalog/users-selection.de_DE.ISO-8859-1.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/users-selection/catalog/users-selection.en_US.ISO-8859-1.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/contrib/packages/users-selection/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/users-selection/www/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/users-selection/www/index.adp 1 Oct 2003 04:48:55 -0000 1.1
+++ openacs-4/contrib/packages/users-selection/www/index.adp 12 Mar 2004 13:44:50 -0000 1.2
@@ -1,29 +1,30 @@
<master src="master">
-<property name="title">Users Selections</property>
+<property name="title">#users-selection.Users_Selections#</property>
<property name="context_bar">@context_bar;noquote@</property>
<if @admin_p@ eq 1>
- <a href="admin/">Administer Users Selections</a><p>
+ <a href="admin/">#users-selection.lt_Administer_Users_Sele#</a><p>
</if>
<if @selections:rowcount@ eq 0>
- <i>(no selections)</i>
+ <i>#users-selection.no_selections#</i>
</if>
<else>
<table>
<tr>
- <th>Title</th>
- <th>Created by</th>
- <th>Date</th>
+ <th>#users-selection.Title#</th>
+ <th>#users-selection.Created_by#</th>
+ <th>#users-selection.Date#</th>
<th></th>
</tr>
<multiple name="selections">
<tr>
<td>@selections.title@</td>
<td>@selections.owner@</td>
<td>@selections.creation_date@</td>
- <td>[<a href="@selections.details_url@">details</a>]</td>
+ <td>[<a href="@selections.details_url@">#users-selection.details#</a>]</td>
</tr>
</multiple>
</table>
</else>
+
Index: openacs-4/contrib/packages/users-selection/www/selection-execute.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/users-selection/www/selection-execute.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/users-selection/www/selection-execute.adp 1 Oct 2003 04:48:55 -0000 1.1
+++ openacs-4/contrib/packages/users-selection/www/selection-execute.adp 12 Mar 2004 13:44:50 -0000 1.2
@@ -1,5 +1,5 @@
<master src="master">
-<property name="title">Execute Users Selection</property>
+<property name="title">#users-selection.lt_Execute_Users_Selecti#</property>
<property name="context_bar">@context_bar;noquote@</property>
<h3>@title@</h3>
@@ -16,9 +16,10 @@
</if>
<if @show_result_p@ true>
- Count: @count@
+ #users-selection.Count_count#
<p>
- Fields: @fields@
+ #users-selection.Fields_fields#
<p>
- <a href="@csv_url@">results as csv file</a>
+ <a href="@csv_url@">#users-selection.results_as_csv_file#</a>
</if>
+
Index: openacs-4/contrib/packages/users-selection/www/selection-execute.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/users-selection/www/selection-execute.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/users-selection/www/selection-execute.tcl 1 Oct 2003 04:48:55 -0000 1.1
+++ openacs-4/contrib/packages/users-selection/www/selection-execute.tcl 12 Mar 2004 13:44:50 -0000 1.2
@@ -13,7 +13,7 @@
set bind_vars_values [db_list_of_lists get_bind_vars {}]
-set context_bar [list [list "selection?[export_vars selection_id]" "Detail"] "Execute"]
+set context_bar [list [list "selection?[export_vars selection_id]" "[_ users-selection.Detail]"] "[_ users-selection.Execute]"]
if {[empty_string_p $bind_vars]} {
set show_form_p 0
@@ -41,7 +41,7 @@
if {$show_form_p} {
if { [array size bind_var] != [llength $bind_vars_values] } {
- ad_return_complaint 1 "The number of submitted bind vars doesn't seem right."
+ ad_return_complaint 1 "[_ users-selection.lt_The_number_of_submitt]"
ad_script_abort
}
# try to execute the query with the user submitted values for
@@ -69,7 +69,7 @@
# set resultlist "(no rows returned)"
#}
} err] } {
- set query_error "The query returned an error: $err"
+ set query_error "[_ users-selection.lt_The_query_returned_an]"
}
set csv_url "selection-csv?[export_vars [list selection_id bind_var:array]]"
Index: openacs-4/contrib/packages/users-selection/www/selection.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/users-selection/www/selection.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/users-selection/www/selection.adp 1 Oct 2003 04:48:55 -0000 1.1
+++ openacs-4/contrib/packages/users-selection/www/selection.adp 12 Mar 2004 13:44:50 -0000 1.2
@@ -1,21 +1,21 @@
<master src="master">
-<property name="title">Users Selection Detail</property>
+<property name="title">#users-selection.lt_Users_Selection_Detai#</property>
<property name="context_bar">@context_bar;noquote@</property>
<h3>@title@</h3>
@description@
<p>
-[<a href="@execute_url@">execute</a>]
+[<a href="@execute_url@">#users-selection.execute#</a>]
<p>
-Current count of matching users: @count@
+#users-selection.lt_Current_count_of_matc#
<p>
<if @bind_vars@ not nil>
- Bind Variables:
+ #users-selection.Bind_Variables#
<ul>
<multiple name=vars>
- <li><b>:@vars.name@</b> @vars.descr@ (default: "@vars.default_value@")</li>
+ <li><b>:@vars.name@</b> #users-selection.lt_varsdescr_default_var#</li>
</multiple>
</ul>
</if>
@@ -24,3 +24,4 @@
@comments;noquote@
@comment_link;noquote@
<p>
+
Index: openacs-4/contrib/packages/users-selection/www/selection.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/users-selection/www/selection.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/users-selection/www/selection.tcl 1 Oct 2003 04:48:55 -0000 1.1
+++ openacs-4/contrib/packages/users-selection/www/selection.tcl 12 Mar 2004 13:44:50 -0000 1.2
@@ -15,7 +15,7 @@
}
set execute_url "selection-execute?[export_vars selection_id]"
-set context_bar [list "Detail"]
+set context_bar [list "[_ users-selection.Detail]"]
if { ![empty_string_p $bind_vars] } {
set query_string [db_bind_var_substitution $full_sql $subs_list]
Index: openacs-4/contrib/packages/users-selection/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/users-selection/www/admin/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/users-selection/www/admin/index.adp 1 Oct 2003 04:48:55 -0000 1.1
+++ openacs-4/contrib/packages/users-selection/www/admin/index.adp 12 Mar 2004 13:44:50 -0000 1.2
@@ -1,28 +1,29 @@
<master src="master">
-<property name="title">Users Selections</property>
+<property name="title">#users-selection.Users_Selections#</property>
<property name="context_bar">@context_bar;noquote@</property>
<if @selections:rowcount@ eq 0>
- <i>(no selections)</i>
+ <i>#users-selection.no_selections#</i>
</if>
<else>
<table>
<tr>
- <th>Title</th>
- <th>Created by</th>
- <th>Date</th>
+ <th>#users-selection.Title#</th>
+ <th>#users-selection.Created_by#</th>
+ <th>#users-selection.Date#</th>
<th></th>
</tr>
<multiple name="selections">
<tr>
<td><a href="@selections.edit_url@">@selections.title@</a></td>
<td>@selections.owner@</td>
<td>@selections.creation_date@</td>
- <td>[<a href="@selections.details_url@">details</a> | [<a href="@selections.copy_url@">copy</a> | <a href="@selections.delete_url@">delete</a>]</td>
+ <td>[<a href="@selections.details_url@">#users-selection.details#</a> | [<a href="@selections.copy_url@">#users-selection.copy#</a> | <a href="@selections.delete_url@">#users-selection.delete#</a>]</td>
</tr>
</multiple>
</table>
</else>
<p>
-[<a href="@new_url@">add new</a>]
+[<a href="@new_url@">#users-selection.add_new#</a>]
+
Index: openacs-4/contrib/packages/users-selection/www/admin/selection-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/users-selection/www/admin/selection-ae.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/users-selection/www/admin/selection-ae.adp 1 Oct 2003 04:48:55 -0000 1.1
+++ openacs-4/contrib/packages/users-selection/www/admin/selection-ae.adp 12 Mar 2004 13:44:50 -0000 1.2
@@ -1,7 +1,8 @@
<master src="master">
-<property name="title">Add/Edit Users Selection</property>
+<property name="title">#users-selection.lt_AddEdit_Users_Selecti#</property>
<property name="context_bar">@context_bar;noquote@</property>
<formtemplate id="selection_form"></formtemplate>
<p>
-Please note that the sql-query must contain the columns user_id and user_email.
+#users-selection.lt_Please_note_that_the_#
+
Index: openacs-4/contrib/packages/users-selection/www/admin/selection-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/users-selection/www/admin/selection-ae.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/users-selection/www/admin/selection-ae.tcl 1 Oct 2003 04:48:55 -0000 1.1
+++ openacs-4/contrib/packages/users-selection/www/admin/selection-ae.tcl 12 Mar 2004 13:44:50 -0000 1.2
@@ -11,7 +11,7 @@
set package_id [ad_conn package_id]
set user_id [ad_conn user_id]
-set context_bar [list "Add/Edit"]
+set context_bar [list "[_ users-selection.AddEdit]"]
# If the user is site wide admin then he may edit the sql
# directly. We must not allow this to anyone else since it enables
@@ -20,9 +20,9 @@
ad_form -name selection_form -action selection-ae -form {
{selection_id:key}
- {title:text {label "Title"} {html {size 20}}}
- {description:text(textarea) {label "Description"} {html {rows 10 cols 40 wrap soft}}}
- {full_sql:text(textarea) {label "Full SQL"} {html {rows 10 cols 40 wrap soft}}}
+ {title:text {label "[_ users-selection.Title]"} {html {size 20}}}
+ {description:text(textarea) {label "[_ users-selection.Description]"} {html {rows 10 cols 40 wrap soft}}}
+ {full_sql:text(textarea) {label "[_ users-selection.Full_SQL]"} {html {rows 10 cols 40 wrap soft}}}
} -new_request {
if {[exists_and_not_null copy_id]} {
db_1row get_copied_selection {}
@@ -39,7 +39,7 @@
} -edit_request {
db_1row get_selection {}
} -validate {
- {full_sql {[regexp {user_id} $full_sql] && [regexp {user_email} $full_sql] && [regexp {user_first_names} $full_sql] && [regexp {user_last_name} $full_sql]} "The SQL Query must contain the columns user_id, user_email, user_first_names and user_last_name"}
+ {full_sql {[regexp {user_id} $full_sql] && [regexp {user_email} $full_sql] && [regexp {user_first_names} $full_sql] && [regexp {user_last_name} $full_sql]} "[_ users-selection.lt_The_SQL_Query_must_co]"}
} -on_submit {
# extract bind variables
set bind_vars [list]
Index: openacs-4/contrib/packages/users-selection/www/admin/selection-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/users-selection/www/admin/selection-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/users-selection/www/admin/selection-delete.adp 1 Oct 2003 04:48:55 -0000 1.1
+++ openacs-4/contrib/packages/users-selection/www/admin/selection-delete.adp 12 Mar 2004 13:44:50 -0000 1.2
@@ -1,8 +1,8 @@
<master src="master">
-<property name="title">Confirm deletion of users selection</property>
+<property name="title">#users-selection.lt_Confirm_deletion_of_u#</property>
<property name="context_bar">@context_bar;noquote@</property>
-<h3>Confirm deletion of the users selection "@title@":</h3>
+<h3>#users-selection.lt_Confirm_deletion_of_t#</h3>
<p>
<center>
<form method="POST" action="selection-delete-2">
@@ -13,3 +13,4 @@
<input type=submit value=Cancel>
</form>
</center>
+
Index: openacs-4/contrib/packages/users-selection/www/admin/selection-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/users-selection/www/admin/selection-delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/users-selection/www/admin/selection-delete.tcl 1 Oct 2003 04:48:55 -0000 1.1
+++ openacs-4/contrib/packages/users-selection/www/admin/selection-delete.tcl 12 Mar 2004 13:44:50 -0000 1.2
@@ -8,7 +8,7 @@
db_1row get_users_selection_info {}
-set context_bar [list "Delete Users Selection"]
+set context_bar [list "[_ users-selection.lt_Delete_Users_Selectio]"]
set export_vars [export_form_vars selection_id]
ad_return_template
Index: openacs-4/contrib/packages/users-selection/www/admin/selection-execute.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/users-selection/www/admin/selection-execute.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/users-selection/www/admin/selection-execute.adp 1 Oct 2003 04:48:55 -0000 1.1
+++ openacs-4/contrib/packages/users-selection/www/admin/selection-execute.adp 12 Mar 2004 13:44:50 -0000 1.2
@@ -1,5 +1,5 @@
<master src="master">
-<property name="title">Execute Users Selection</property>
+<property name="title">#users-selection.lt_Execute_Users_Selecti#</property>
<property name="context_bar">@context_bar;noquote@</property>
<h3>@title@</h3>
@@ -19,9 +19,10 @@
</if>
<if @show_result_p@ true>
- Count: @count@
+ #users-selection.Count_count#
<p>
- Fields: @fields@
+ #users-selection.Fields_fields#
<p>
- <a href="@csv_url@">results as csv file</a>
+ <a href="@csv_url@">#users-selection.results_as_csv_file#</a>
</if>
+
Index: openacs-4/contrib/packages/users-selection/www/admin/selection-execute.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/users-selection/www/admin/selection-execute.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/users-selection/www/admin/selection-execute.tcl 1 Oct 2003 04:48:55 -0000 1.1
+++ openacs-4/contrib/packages/users-selection/www/admin/selection-execute.tcl 12 Mar 2004 13:44:50 -0000 1.2
@@ -13,7 +13,7 @@
set bind_vars_values [db_list_of_lists get_bind_vars {}]
-set context_bar [list [list "selection?[export_vars selection_id]" "Detail"] "Execute"]
+set context_bar [list [list "selection?[export_vars selection_id]" "[_ users-selection.Detail_]"] "[_ users-selection.Execute]"]
if {[empty_string_p $bind_vars]} {
set show_form_p 0
@@ -41,7 +41,7 @@
if {$show_form_p} {
if { [array size bind_var] != [llength $bind_vars_values] } {
- ad_return_complaint 1 "The number of submitted bind vars doesn't seem right."
+ ad_return_complaint 1 "[_ users-selection.lt_The_number_of_submitt]"
ad_script_abort
}
# try to execute the query with the user submitted values for
@@ -69,7 +69,7 @@
# set resultlist "(no rows returned)"
#}
} err] } {
- set query_error "The query returned an error: $err"
+ set query_error "[_ users-selection.lt_The_query_returned_an]"
}
set csv_url "selection-csv?[export_vars [list selection_id bind_var:array]]"
Index: openacs-4/contrib/packages/users-selection/www/admin/selection-vars.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/users-selection/www/admin/selection-vars.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/users-selection/www/admin/selection-vars.adp 1 Oct 2003 04:48:55 -0000 1.1
+++ openacs-4/contrib/packages/users-selection/www/admin/selection-vars.adp 12 Mar 2004 13:44:50 -0000 1.2
@@ -1,5 +1,6 @@
<master src="master">
-<property name="title">Edit Users Selection Bind Vars</property>
+<property name="title">#users-selection.lt_Edit_Users_Selection_#</property>
<property name="context_bar">@context_bar;noquote@</property>
<formtemplate id="bind_vars_form"></formtemplate>
+
Index: openacs-4/contrib/packages/users-selection/www/admin/selection-vars.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/users-selection/www/admin/selection-vars.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/users-selection/www/admin/selection-vars.tcl 1 Oct 2003 04:48:55 -0000 1.1
+++ openacs-4/contrib/packages/users-selection/www/admin/selection-vars.tcl 12 Mar 2004 13:44:50 -0000 1.2
@@ -12,7 +12,7 @@
set package_id [ad_conn package_id]
set user_id [ad_conn user_id]
-set context_bar [list [list "selection?[export_url_vars selection_id]" "Detail"] "Edit Bind Vars"]
+set context_bar [list [list "selection?[export_url_vars selection_id]" "[_ users-selection.Detail]"] "[_ users-selection.Edit_Bind_Vars]"]
# If the user is site wide admin then he may edit the sql
# directly. We must not allow this to anyone else since it enables
Index: openacs-4/contrib/packages/users-selection/www/admin/selection.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/users-selection/www/admin/selection.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/users-selection/www/admin/selection.adp 1 Oct 2003 04:48:55 -0000 1.1
+++ openacs-4/contrib/packages/users-selection/www/admin/selection.adp 12 Mar 2004 13:44:50 -0000 1.2
@@ -1,5 +1,5 @@
<master src="master">
-<property name="title">Users Selection Detail</property>
+<property name="title">#users-selection.lt_Users_Selection_Detai#</property>
<property name="context_bar">@context_bar;noquote@</property>
<h3>@title@</h3>
@@ -10,21 +10,21 @@
@full_sql@
</pre>
-[<a href="@edit_url@">edit</a>]
+[<a href="@edit_url@">#users-selection.edit#</a>]
<if @bind_vars@ not nil>
- [<a href="@edit_vars_url@">edit bind vars</a>]
+ [<a href="@edit_vars_url@">#users-selection.edit_bind_vars#</a>]
</if>
<p>
-[<a href="@execute_url@">execute</a>]
+[<a href="@execute_url@">#users-selection.execute#</a>]
<p>
-Current count of matching users: @count@
+#users-selection.lt_Current_count_of_matc#
<p>
<if @bind_vars@ not nil>
- Bind Variables:
+ #users-selection.Bind_Variables#
<ul>
<multiple name=vars>
- <li><b>:@vars.name@</b> @vars.descr@ (default: "@vars.default_value@")</li>
+ <li><b>:@vars.name@</b> %vars.descr% (#users-selection.default#: "%vars.default_value%")</li>
</multiple>
</ul>
</if>
@@ -33,3 +33,4 @@
@comments;noquote@
@comment_link;noquote@
<p>
+
Index: openacs-4/contrib/packages/users-selection/www/admin/selection.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/users-selection/www/admin/selection.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/users-selection/www/admin/selection.tcl 1 Oct 2003 04:48:55 -0000 1.1
+++ openacs-4/contrib/packages/users-selection/www/admin/selection.tcl 12 Mar 2004 13:44:50 -0000 1.2
@@ -18,7 +18,7 @@
set edit_vars_url "selection-vars?[export_vars selection_id]"
set execute_url "selection-execute?[export_vars selection_id]"
-set context_bar [list "Detail"]
+set context_bar [list "[_ users-selection.Detail]"]
if { ![empty_string_p $bind_vars] } {
set query_string [db_bind_var_substitution $full_sql $subs_list]
Index: openacs-4/packages/acs-admin/acs-admin.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/acs-admin.info,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/acs-admin/acs-admin.info 19 Feb 2004 14:59:40 -0000 1.25
+++ openacs-4/packages/acs-admin/acs-admin.info 12 Mar 2004 13:44:51 -0000 1.26
@@ -10,7 +10,7 @@
<version name="5.1.0d1" url="http://openacs.org/repository/download/apm/acs-admin-5.1.0d1.apm">
<owner url="mailto:dhogaza@pacifier.com">Don Baccus</owner>
<summary>An interface for Site-wide administration of an OpenACS Installation.</summary>
- <release-date>2004-01-21</release-date>
+ <release-date>2004-03-10</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
<description format="text/html">Provides a UI for administering site-wide services
(including package installation, cache, authentication, and user accounts) for an OpenACS system.
Index: openacs-4/packages/acs-api-browser/acs-api-browser.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/acs-api-browser.info,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/acs-api-browser/acs-api-browser.info 19 Feb 2004 14:59:41 -0000 1.13
+++ openacs-4/packages/acs-api-browser/acs-api-browser.info 12 Mar 2004 13:44:51 -0000 1.14
@@ -10,7 +10,7 @@
<version name="5.1.0d1" url="http://openacs.org/repository/download/apm/acs-api-browser-5.1.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
<summary>Interactive documentation for the Tcl and SQL APIs.</summary>
- <release-date>2004-01-21</release-date>
+ <release-date>2004-03-10</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
<description format="text/html">On line interactive documentation for the locally installed Tcl and SQL APIs. Links to the Tcl core and AOLServer online documentation as well.</description>
Index: openacs-4/packages/acs-authentication/acs-authentication.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/acs-authentication.info,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/acs-authentication/acs-authentication.info 19 Feb 2004 14:59:41 -0000 1.13
+++ openacs-4/packages/acs-authentication/acs-authentication.info 12 Mar 2004 13:44:51 -0000 1.14
@@ -10,7 +10,7 @@
<version name="5.1.0d1" url="http://openacs.org/repository/download/apm/acs-authentication-5.1.0d1.apm">
<owner url="mailto:lars@collaboraid.biz">Lars Pind</owner>
<summary>Authentication, account management, and related functionality.</summary>
- <release-date>2004-01-21</release-date>
+ <release-date>2004-03-10</release-date>
<vendor url="http://www.collaboraid.biz">Collaboraid</vendor>
<description format="text/html">Implements authentication-related security functions for OpenACS, including password, account and session management, bulk account creation etc. Provides a contract based interface for different authentication methods such as PAM or LDAP based authentication.</description>
Index: openacs-4/packages/acs-authentication/tcl/sync-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/sync-procs.tcl,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/acs-authentication/tcl/sync-procs.tcl 31 Oct 2003 10:29:19 -0000 1.31
+++ openacs-4/packages/acs-authentication/tcl/sync-procs.tcl 12 Mar 2004 13:44:53 -0000 1.32
@@ -415,9 +415,8 @@
-can_browse=$can_browse_p \
-user_id $user_id
- acs_privacy::set_user_read_private_data \
+ dotlrn_privacy::set_user_is_non_guest \
-user_id $user_id \
- -object_id [dotlrn::get_package_id] \
-value $read_private_data_p
}
Index: openacs-4/packages/acs-automated-testing/acs-automated-testing.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/acs-automated-testing.info,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-automated-testing/acs-automated-testing.info 26 Feb 2004 14:40:27 -0000 1.11
+++ openacs-4/packages/acs-automated-testing/acs-automated-testing.info 12 Mar 2004 13:44:54 -0000 1.12
@@ -10,7 +10,7 @@
<version name="5.1.0d3" url="http://openacs.org/repository/download/apm/acs-automated-testing-5.1.0d3.apm">
<owner url="http://openacs.org">OpenACS</owner>
<summary>The interface to the automated testing facilities within OpenACS.</summary>
- <release-date>2004-02-26</release-date>
+ <release-date>2004-03-10</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
<description format="text/html">Provides a UI for viewing and
running automated tests provided by each package within the
Index: openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info 19 Feb 2004 14:59:42 -0000 1.16
+++ openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info 12 Mar 2004 13:44:54 -0000 1.17
@@ -10,7 +10,7 @@
<version name="5.1.0d1" url="http://openacs.org/repository/download/apm/acs-bootstrap-installer-5.1.0d1.apm">
<owner url="mailto:dhogaza@pacifier.com">Don Baccus</owner>
<summary>Bootstraps an OpenACS installation.</summary>
- <release-date>2004-01-21</release-date>
+ <release-date>2004-03-10</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
<description format="text/html">This package bootstraps OpenACS. If the core packages have not yet been installed, it calls the installer which leads the user through the steps necessary to do so. It also checks that the installation meets the requirements for a successful install of OpenACS.</description>
Index: openacs-4/packages/acs-content-repository/acs-content-repository.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/acs-content-repository.info,v
diff -u -r1.32 -r1.33
--- openacs-4/packages/acs-content-repository/acs-content-repository.info 18 Feb 2004 11:10:30 -0000 1.32
+++ openacs-4/packages/acs-content-repository/acs-content-repository.info 12 Mar 2004 13:44:54 -0000 1.33
@@ -10,7 +10,7 @@
<version name="5.1.0d2" url="http://openacs.org/repository/download/apm/acs-content-repository-5.1.0d2.apm">
<owner url="mailto:dcwickstrom@earthlink.net">Dan Wickstrom</owner>
<summary>The canonical repository for OpenACS content.</summary>
- <release-date>2004-01-21</release-date>
+ <release-date>2004-03-10</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
<description format="text/html">Provides the API for creating and managing user generated content including
full support for versioning, rendering content to the filesystem, folders and composite content items, and
Index: openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl 18 Feb 2004 09:55:51 -0000 1.15
+++ openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl 12 Mar 2004 13:44:55 -0000 1.16
@@ -247,7 +247,7 @@
set text \[ad_html_text_convert -from \$mime_type -to text/html \$text\]
-set context {\$title}
+set context \[list \$title\]
ad_return_template
"
Index: openacs-4/packages/acs-core-docs/acs-core-docs.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/acs-core-docs.info,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/acs-core-docs/acs-core-docs.info 19 Feb 2004 14:59:43 -0000 1.13
+++ openacs-4/packages/acs-core-docs/acs-core-docs.info 12 Mar 2004 13:44:56 -0000 1.14
@@ -10,7 +10,7 @@
<version name="5.1.0d1" url="http://openacs.org/repository/download/apm/acs-core-docs-5.1.0d1.apm">
<owner url="mailto:docs@openacs.org">OpenACS Documentation Team</owner>
<summary>Documentation for the OpenACS Core.</summary>
- <release-date>2004-01-21</release-date>
+ <release-date>2004-03-10</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
<description format="text/html">Static HTML documentation for the OpenACS core (includes the DocBook sources).
</description>
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/i18n.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/i18n.xml,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/i18n.xml 20 Feb 2004 15:13:49 -0000 1.12
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/i18n.xml 12 Mar 2004 13:44:56 -0000 1.13
@@ -288,16 +288,18 @@
</listitem>
<listitem>
- Dynamic key lookup: <computeroutput>[lang::util::localize $var_with_embedded_message_keys]</computeroutput> - In this case the message keys in the variable <computeroutput>var_with_embedded_message_keys</computeroutput> must appear as string literals <computeroutput>\#package_key.message_key\#</computeroutput> somewhere in the code. Here is an example of a dynamic lookup:
-
- <computeroutput>
- set message_key_array {
- dynamic_key_1 \#package_key.message_key1\#
- dynamic_key_2 \#package_key.message_key2\#
- }
+ Dynamic key lookup:
+<screen>
+<userinput>[lang::util::localize $var_with_embedded_message_keys]</userinput>
+- In this case the message keys in the variable <computeroutput>var_with_embedded_message_keys</computeroutput> must appear as string literals <computeroutput>\#package_key.message_key\#</computeroutput> somewhere in the code. Here is an example of a dynamic lookup:
+<userinput>set message_key_array {
+ dynamic_key_1 \#package_key.message_key1\#
+ dynamic_key_2 \#package_key.message_key2\#
+}
- set my_text [lang::util::localize $message_key_array([get_dynamic_key])]
- </computeroutput>
+set my_text [lang::util::localize $message_key_array([get_dynamic_key])]
+</userinput>
+</screen>
</listitem>
</itemizedlist>
@@ -309,18 +311,20 @@
enclosed in double quotes. The following is an example of grep commands
that can be used on Linux to highlight translatable text in TCL files:
</para>
+ <screen>
+# Find text in double quotes
+<userinput>find -iname '*.tcl'|xargs egrep -i '"[a-z]'</userinput>
- <computeroutput>
- # Find text in double quotes
- find -iname '*.tcl'|xargs egrep -i '"[a-z]'
- # Find untranslated text in form labels, options and values
- find -iname '*.tcl'|xargs egrep -i '\-(options|label|value)'|egrep -v '<#'|egrep -v '\-(value|label|options)[[:space:]]+\$[a-zA-Z_]+[[:space:]]*\\?[[:space:]]*$'
- # Find text in page titles and context bars
- find -iname '*.tcl'|xargs egrep -i 'set (title|page_title|context_bar) '|egrep -v '<#'
- # Find text in error messages
- find -iname '*.tcl'|xargs egrep -i '(ad_complain|ad_return_error)'|egrep -v '<#'
- </computeroutput>
+# Find untranslated text in form labels, options and values
+<userinput>find -iname '*.tcl'|xargs egrep -i '\-(options|label|value)'|egrep -v '<#'|egrep -v '\-(value|label|options)[[:space:]]+\$[a-zA-Z_]+[[:space:]]*\\?[[:space:]]*$'</userinput>
+# Find text in page titles and context bars
+<userinput>find -iname '*.tcl'|xargs egrep -i 'set (title|page_title|context_bar) '|egrep -v '<#'</userinput>
+
+# Find text in error messages
+<userinput>find -iname '*.tcl'|xargs egrep -i '(ad_complain|ad_return_error)'|egrep -v '<#'</userinput>
+
+ </screen>
<para>
You may mark up translatable text in TCL library files and TCL pages
with temporary tags on the <#key text#> syntax.
@@ -370,29 +374,31 @@
our example becomes:
</para>
- <computeroutput>
- set msg_subst_list [list subject [parameter::get -localize -parameter classes_pretty_name]
- class_instances [parameter::get -localize -parameter class_instances_pretty_plural]]
+<screen>
+<userinput>set msg_subst_list [list subject [parameter::get -localize -parameter classes_pretty_name] class_instances [parameter::get -localize -parameter class_instances_pretty_plural]]
- ad_return_complaint 1 [_ dotlrn.class_may_not_be_deleted $msg_subst_list]
- </computeroutput>
+ad_return_complaint 1 [_ dotlrn.class_may_not_be_deleted $msg_subst_list]
+</userinput>
+</screen>
<para>
When we were done going through the tcl files we ran the following
commands to check for mistakes:
</para>
- <computeroutput>
- # Message tags should usually not be in curly braces since then the message lookup may not be
- # executed then (you can usually replace curly braces with the list command). Find message tags
- # in curly braces (should return nothing, or possibly a few lines for inspection)
- find -iname '*.tcl'|xargs egrep -i '\{.*<#'
- # Check if you've forgotten space between default key and text in message tags (should return nothing)
- find -iname '*.tcl'|xargs egrep -i '<#_[^ ]'
- # Review the list of tcl files with no message lookups
- for tcl_file in $(find -iname '*.tcl'); do egrep -L '(<#|\[_)' $tcl_file; done
- </computeroutput>
+<screen>
+# Message tags should usually not be in curly braces since then the message lookup may not be
+# executed then (you can usually replace curly braces with the list command). Find message tags
+# in curly braces (should return nothing, or possibly a few lines for inspection)
+<userinput>find -iname '*.tcl'|xargs egrep -i '\{.*<#'</userinput>
+# Check if you've forgotten space between default key and text in message tags (should return nothing)
+<userinput>find -iname '*.tcl'|xargs egrep -i '<#_[^ ]'</userinput>
+
+# Review the list of tcl files with no message lookups
+<userinput>for tcl_file in $(find -iname '*.tcl'); do egrep -L '(<#|\[_)' $tcl_file; done</userinput>
+</screen>
+
<para>
When you feel ready you may vist your package in the
<ulink url="/acs-admin/apm">package manager</ulink>
Index: openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml 26 Feb 2004 15:28:38 -0000 1.15
+++ openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml 12 Mar 2004 13:44:57 -0000 1.16
@@ -44,6 +44,27 @@
</sect2>
+ <sect2 id="release-notes-5-0-4">
+ <title>Version 5.0.4</title>
+
+ <itemizedlist>
+ <listitem>
+ <para>New translations, including for .LRN 2.0.2.</para>
+ </listitem>
+ </itemizedlist>
+ </sect2>
+
+ <sect2 id="release-notes-5-0-3">
+ <title>Version 5.0.3</title>
+
+ <itemizedlist>
+ <listitem>
+ <para>Bug fixes: <ulink url="http://openacs.org/bugtracker/openacs/bug?bug%5fnumber=1560">1560</ulink>, <ulink url="http://openacs.org/bugtracker/openacs/bug?bug%5fnumber=1556">#1556. Site becomes unresponsive, requires restart</ulink></para>
+ </listitem>
+ </itemizedlist>
+ </sect2>
+
+
<sect2 id="release-notes-5-0-2">
<title>Version 5.0.2</title>
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/maintenance.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/maintenance.xml,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/maintenance.xml 20 Feb 2004 15:13:49 -0000 1.11
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/maintenance.xml 12 Mar 2004 13:44:57 -0000 1.12
@@ -61,6 +61,7 @@
<screen>[service0 etc]$ <userinput>killall nsd</userinput>
nsd: no process killed
+[service0 etc]$ <userinput>emacs /var/lib/aolserver/<replaceable>service0</replaceable>/etc/daemontools/run</userinput>
[service0 etc]$ <userinput>exit</userinput>
[root root]# <userinput>ln -s /var/lib/aolserver/<replaceable>service0</replaceable>/etc/daemontools/ /service/<replaceable>service0</replaceable></userinput></screen>
@@ -687,4 +688,4 @@
<para><phrase role="cvstag">($Id$)</phrase></para>
</chapter>
-
\ No newline at end of file
+
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/openacs.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/openacs.xml,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/openacs.xml 15 Feb 2004 11:28:44 -0000 1.20
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/openacs.xml 12 Mar 2004 13:44:58 -0000 1.21
@@ -338,6 +338,14 @@
<para>Add these lines to the file. The vacuum command cleans up temporary structures within a PostGreSQL database, and can improve performance. We vacuum gently every hour and completely every day. The numbers and stars at the beginning are cron columns that specify when the program should be run - in this case, whenever the minute is 0 and the hour is 1, i.e., 1:00 am every day, and every (*) day of month, month, and day of week. Type <computeroutput>man 5 crontab</computeroutput> for more information.</para>
<programlisting>0 1-23 * * * /usr/local/pgsql/bin/vacuumdb --analyze <replaceable>service0</replaceable>
0 0 * * * /usr/local/pgsql/bin/vacuumdb --full --analyze <replaceable>service0</replaceable></programlisting>
+
+ <para>Depending on your distribution, you may receive
+ email when the crontab items are executed. If you
+ don't want to receive email for those crontab items,
+ you can add <computeroutput>> /dev/null
+ 2>&1</computeroutput> to the end of each crontab
+ line</para>
+
</listitem>
<listitem>
<para><link linkend="install-openfts-postgres">Add Full Text Search Support</link> (OPTIONAL)</para>
Index: openacs-4/packages/acs-kernel/acs-kernel.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/acs-kernel.info,v
diff -u -r1.56 -r1.57
--- openacs-4/packages/acs-kernel/acs-kernel.info 20 Feb 2004 01:46:39 -0000 1.56
+++ openacs-4/packages/acs-kernel/acs-kernel.info 12 Mar 2004 13:44:59 -0000 1.57
@@ -10,7 +10,7 @@
<version name="5.1.0d1" url="http://openacs.org/repository/download/apm/acs-kernel-5.1.0d1.apm">
<owner url="mailto:dhogaza@pacifier.com">Don Baccus</owner>
<summary>Routines and data models providing the foundation for OpenACS-based Web services.</summary>
- <release-date>2004-01-21</release-date>
+ <release-date>2004-03-10</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
<description format="text/html">The OpenACS kernel contains the core datamodel create and drop scripts for such things as objects, groups, partiies and the supporting PL/SQL and PL/pgSQL procedures.</description>
<maturity>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.AR_EG.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/Attic/acs-kernel.AR_EG.utf-8.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.AR_EG.utf-8.xml 9 Mar 2004 18:02:31 -0000 1.4
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.AR_EG.utf-8.xml 12 Mar 2004 13:45:00 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="AR_EG" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="AR_EG" charset="utf-8">
<msg key="member_role_pretty_name">عضوِ</msg>
<msg key="member_role_pretty_plural">أعضاء</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.AR_LB.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/Attic/acs-kernel.AR_LB.utf-8.xml,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.AR_LB.utf-8.xml 9 Mar 2004 18:02:31 -0000 1.5
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.AR_LB.utf-8.xml 12 Mar 2004 13:45:00 -0000 1.6
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="AR_LB" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="AR_LB" charset="utf-8">
<msg key="authentication_authority">السلطة</msg>
<msg key="common_apply">طبّق</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.RO_RO.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/Attic/acs-kernel.RO_RO.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.RO_RO.utf-8.xml 9 Mar 2004 18:02:31 -0000 1.3
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.RO_RO.utf-8.xml 12 Mar 2004 13:45:00 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="RO_RO" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="RO_RO" charset="utf-8">
<msg key="authentication_authority">Autoritate</msg>
<msg key="common_add">Adauga</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.ast_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.ast_ES.ISO-8859-1.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.ast_ES.ISO-8859-1.xml 9 Mar 2004 18:02:31 -0000 1.9
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.ast_ES.ISO-8859-1.xml 12 Mar 2004 13:45:00 -0000 1.10
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="ast_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="ast_ES" charset="ISO-8859-1">
<msg key="authentication_authority">Autorid�</msg>
<msg key="common_apply">Aplicar</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.ch_zh.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.ch_zh.utf-8.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.ch_zh.utf-8.xml 9 Mar 2004 18:02:31 -0000 1.4
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.ch_zh.utf-8.xml 12 Mar 2004 13:45:00 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="ch_zh" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="ch_zh" charset="utf-8">
<msg key="authentication_authority">权限</msg>
<msg key="common_add">增加</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.da_DK.ISO-8859-1.xml,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.da_DK.ISO-8859-1.xml 9 Mar 2004 18:02:31 -0000 1.7
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.da_DK.ISO-8859-1.xml 12 Mar 2004 13:45:00 -0000 1.8
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="da_DK" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="da_DK" charset="ISO-8859-1">
<msg key="authentication_authority">Autoritet</msg>
<msg key="common_add">Tilf�j</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.de_DE.ISO-8859-1.xml,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.de_DE.ISO-8859-1.xml 9 Mar 2004 18:02:31 -0000 1.11
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.de_DE.ISO-8859-1.xml 12 Mar 2004 13:45:00 -0000 1.12
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="de_DE" charset="ISO-8859-1">
<msg key="authentication_authority">Authentifizierungsstelle</msg>
<msg key="common_add">Hinzuf�gen</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml 9 Mar 2004 18:02:31 -0000 1.20
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml 12 Mar 2004 13:45:00 -0000 1.21
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="en_US" charset="ISO-8859-1">
<msg key="authentication_authority">Authority</msg>
<description key="authentication_authority">The identifying label for an authentication server, such as an LDAP or RADIUS server.</description>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.es_ES.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.es_ES.ISO-8859-1.xml 9 Mar 2004 18:02:31 -0000 1.10
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.es_ES.ISO-8859-1.xml 12 Mar 2004 13:45:00 -0000 1.11
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="es_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="es_ES" charset="ISO-8859-1">
<msg key="authentication_authority">Autoridad</msg>
<msg key="common_add">A�adir</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.fi_FI.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.fi_FI.utf-8.xml,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.fi_FI.utf-8.xml 9 Mar 2004 18:02:31 -0000 1.7
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.fi_FI.utf-8.xml 12 Mar 2004 13:45:00 -0000 1.8
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="fi_FI" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="fi_FI" charset="utf-8">
<msg key="member_role_pretty_name">Jäsen</msg>
<msg key="member_role_pretty_plural">Jäsenet</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.fr_FR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.fr_FR.ISO-8859-1.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.fr_FR.ISO-8859-1.xml 9 Mar 2004 18:02:31 -0000 1.9
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.fr_FR.ISO-8859-1.xml 12 Mar 2004 13:45:00 -0000 1.10
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="fr_FR" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="fr_FR" charset="ISO-8859-1">
<msg key="authentication_authority">Autorit�</msg>
<msg key="common_add">Ajouter</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.gl_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.gl_ES.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.gl_ES.ISO-8859-1.xml 9 Mar 2004 18:02:31 -0000 1.10
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.gl_ES.ISO-8859-1.xml 12 Mar 2004 13:45:00 -0000 1.11
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="gl_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="gl_ES" charset="ISO-8859-1">
<msg key="authentication_authority">Autoridade</msg>
<msg key="common_apply">Aplicar</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.hu_HU.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.hu_HU.utf-8.xml,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.hu_HU.utf-8.xml 9 Mar 2004 18:02:31 -0000 1.5
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.hu_HU.utf-8.xml 12 Mar 2004 13:45:00 -0000 1.6
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="hu_HU" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="hu_HU" charset="utf-8">
<msg key="authentication_authority">Jogosultság</msg>
<msg key="common_apply">Alkalmaz</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.it_IT.ISO-8859-1.xml,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.it_IT.ISO-8859-1.xml 9 Mar 2004 18:02:31 -0000 1.7
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.it_IT.ISO-8859-1.xml 12 Mar 2004 13:45:00 -0000 1.8
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="it_IT" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="it_IT" charset="ISO-8859-1">
<msg key="authentication_authority">Modalit&agrave; di autentificazione</msg>
<msg key="common_add">Aggiungi</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.ja_JP.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.ja_JP.utf-8.xml,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.ja_JP.utf-8.xml 9 Mar 2004 18:02:31 -0000 1.5
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.ja_JP.utf-8.xml 12 Mar 2004 13:45:00 -0000 1.6
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="ja_JP" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="ja_JP" charset="utf-8">
<msg key="common_cancel">キャンセル</msg>
<msg key="common_close">閉じる</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.ko_KR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.ko_KR.utf-8.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.ko_KR.utf-8.xml 9 Mar 2004 18:02:31 -0000 1.4
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.ko_KR.utf-8.xml 12 Mar 2004 13:45:00 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="ko_KR" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="ko_KR" charset="utf-8">
<msg key="authentication_authority">권한</msg>
<msg key="common_add">추가</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.ms_my.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/Attic/acs-kernel.ms_my.utf-8.xml,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.ms_my.utf-8.xml 9 Mar 2004 18:02:31 -0000 1.5
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.ms_my.utf-8.xml 12 Mar 2004 13:45:00 -0000 1.6
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="ms_my" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="ms_my" charset="utf-8">
<msg key="authentication_authority">Pihak Berkuasa</msg>
<msg key="common_add">Tambah</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.nl_NL.ISO-8859-1.xml,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.nl_NL.ISO-8859-1.xml 9 Mar 2004 18:02:31 -0000 1.11
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.nl_NL.ISO-8859-1.xml 12 Mar 2004 13:45:00 -0000 1.12
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="nl_NL" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="nl_NL" charset="ISO-8859-1">
<msg key="authentication_authority">Autoriteit</msg>
<msg key="common_add">Toevoegen</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.no_NO.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.no_NO.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.no_NO.ISO-8859-1.xml 9 Mar 2004 18:02:31 -0000 1.10
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.no_NO.ISO-8859-1.xml 12 Mar 2004 13:45:00 -0000 1.11
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="no_NO" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="no_NO" charset="ISO-8859-1">
<msg key="member_role_pretty_name">Medlem</msg>
<msg key="member_role_pretty_plural">Medlemmer</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.pl_PL.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.pl_PL.utf-8.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.pl_PL.utf-8.xml 9 Mar 2004 18:02:31 -0000 1.4
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.pl_PL.utf-8.xml 12 Mar 2004 13:45:00 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="pl_PL" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="pl_PL" charset="utf-8">
<msg key="member_role_pretty_name">Członek</msg>
<msg key="member_role_pretty_plural">Członkowie</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.pt_BR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.pt_BR.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.pt_BR.ISO-8859-1.xml 9 Mar 2004 18:02:31 -0000 1.10
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.pt_BR.ISO-8859-1.xml 12 Mar 2004 13:45:00 -0000 1.11
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="pt_BR" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="pt_BR" charset="ISO-8859-1">
<msg key="authentication_authority">Autoridade</msg>
<msg key="common_add">Adicionar</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.pt_PT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.pt_PT.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.pt_PT.ISO-8859-1.xml 9 Mar 2004 18:02:31 -0000 1.8
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.pt_PT.ISO-8859-1.xml 12 Mar 2004 13:45:00 -0000 1.9
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="pt_PT" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="pt_PT" charset="ISO-8859-1">
<msg key="authentication_authority">Autoridade</msg>
<msg key="common_apply">Aplicar</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.ru_RU.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.ru_RU.utf-8.xml,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.ru_RU.utf-8.xml 9 Mar 2004 18:02:31 -0000 1.5
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.ru_RU.utf-8.xml 12 Mar 2004 13:45:00 -0000 1.6
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="ru_RU" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="ru_RU" charset="utf-8">
<msg key="authentication_authority">Удостоверение подлинности</msg>
<msg key="common_apply">Применить</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.sv_SE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.sv_SE.ISO-8859-1.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.sv_SE.ISO-8859-1.xml 9 Mar 2004 18:02:31 -0000 1.9
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.sv_SE.ISO-8859-1.xml 12 Mar 2004 13:45:00 -0000 1.10
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="sv_SE" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="sv_SE" charset="ISO-8859-1">
<msg key="authentication_authority">Auktoritet</msg>
<msg key="common_add">L�gg till</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.tr_TR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.tr_TR.utf-8.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.tr_TR.utf-8.xml 9 Mar 2004 18:02:31 -0000 1.4
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.tr_TR.utf-8.xml 12 Mar 2004 13:45:00 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="tr_TR" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="tr_TR" charset="utf-8">
<msg key="member_role_pretty_name">Üye</msg>
<msg key="member_role_pretty_plural">Üyeler</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.zh_TW.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.zh_TW.utf-8.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.zh_TW.utf-8.xml 9 Mar 2004 18:02:31 -0000 1.4
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.zh_TW.utf-8.xml 12 Mar 2004 13:45:00 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.3" locale="zh_TW" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.4" locale="zh_TW" charset="utf-8">
<msg key="authentication_authority">權限</msg>
<msg key="common_add">增加</msg>
Index: openacs-4/packages/acs-lang/acs-lang.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/acs-lang.info,v
diff -u -r1.34 -r1.35
--- openacs-4/packages/acs-lang/acs-lang.info 19 Feb 2004 14:59:43 -0000 1.34
+++ openacs-4/packages/acs-lang/acs-lang.info 12 Mar 2004 13:45:01 -0000 1.35
@@ -10,7 +10,7 @@
<version name="5.1.0d1" url="http://openacs.org/repository/download/apm/acs-lang-5.1.0d1.apm">
<owner url="mailto:peter@collaboraid.biz">Peter Marklund</owner>
<summary>OpenACS Internationalization Support.</summary>
- <release-date>2004-01-21</release-date>
+ <release-date>2004-03-10</release-date>
<vendor url="http://www.collaboraid.biz">Collaboraid</vendor>
<description format="text/plain">Internationalization and localization support routines and admin UI for manipulating Locales,
request processor hooks, templating, accessing and managing the message catalog, and
Index: openacs-4/packages/acs-lang/catalog/acs-lang.AR_EG.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/Attic/acs-lang.AR_EG.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/catalog/acs-lang.AR_EG.utf-8.xml 9 Mar 2004 18:02:28 -0000 1.3
+++ openacs-4/packages/acs-lang/catalog/acs-lang.AR_EG.utf-8.xml 12 Mar 2004 13:45:03 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="AR_EG" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="AR_EG" charset="utf-8">
<msg key="English">إنجليزيّ</msg>
<msg key="French">فَرَنْسِيّ</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.AR_LB.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/Attic/acs-lang.AR_LB.utf-8.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-lang/catalog/acs-lang.AR_LB.utf-8.xml 9 Mar 2004 18:02:28 -0000 1.4
+++ openacs-4/packages/acs-lang/catalog/acs-lang.AR_LB.utf-8.xml 12 Mar 2004 13:45:04 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="AR_LB" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="AR_LB" charset="utf-8">
<msg key="English">إنجليزيّ</msg>
<msg key="French">فَرَنْسِيّ</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.RO_RO.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/Attic/acs-lang.RO_RO.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/catalog/acs-lang.RO_RO.utf-8.xml 9 Mar 2004 18:02:28 -0000 1.3
+++ openacs-4/packages/acs-lang/catalog/acs-lang.RO_RO.utf-8.xml 12 Mar 2004 13:45:04 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="RO_RO" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="RO_RO" charset="utf-8">
<msg key="available-in-this-language">Disponibil in Engleza</msg>
<msg key="English">Engleză</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.TH_TH.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/Attic/acs-lang.TH_TH.utf-8.xml,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-lang/catalog/acs-lang.TH_TH.utf-8.xml 9 Mar 2004 18:02:28 -0000 1.5
+++ openacs-4/packages/acs-lang/catalog/acs-lang.TH_TH.utf-8.xml 12 Mar 2004 13:45:04 -0000 1.6
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="TH_TH" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="TH_TH" charset="utf-8">
<msg key="English">ภาษาอังกฤษ</msg>
<msg key="French">ภาษาฝรั่งเศส</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.ast_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.ast_ES.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-lang/catalog/acs-lang.ast_ES.ISO-8859-1.xml 9 Mar 2004 18:02:28 -0000 1.10
+++ openacs-4/packages/acs-lang/catalog/acs-lang.ast_ES.ISO-8859-1.xml 12 Mar 2004 13:45:04 -0000 1.11
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="ast_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="ast_ES" charset="ISO-8859-1">
<msg key="English">Ingl�s</msg>
<msg key="French">Franc�s</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.ch_zh.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.ch_zh.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/catalog/acs-lang.ch_zh.utf-8.xml 9 Mar 2004 18:02:28 -0000 1.3
+++ openacs-4/packages/acs-lang/catalog/acs-lang.ch_zh.utf-8.xml 12 Mar 2004 13:45:04 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="ch_zh" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="ch_zh" charset="utf-8">
<msg key="available-in-this-language">中文版</msg>
<msg key="English">英语</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.da_DK.ISO-8859-1.xml,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-lang/catalog/acs-lang.da_DK.ISO-8859-1.xml 9 Mar 2004 18:02:28 -0000 1.12
+++ openacs-4/packages/acs-lang/catalog/acs-lang.da_DK.ISO-8859-1.xml 12 Mar 2004 13:45:04 -0000 1.13
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="da_DK" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="da_DK" charset="ISO-8859-1">
<msg key="available-in-this-language">Findes p� dansk</msg>
<msg key="English">Engelsk</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.de_DE.ISO-8859-1.xml,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-lang/catalog/acs-lang.de_DE.ISO-8859-1.xml 9 Mar 2004 18:02:28 -0000 1.14
+++ openacs-4/packages/acs-lang/catalog/acs-lang.de_DE.ISO-8859-1.xml 12 Mar 2004 13:45:04 -0000 1.15
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="de_DE" charset="ISO-8859-1">
<msg key="available-in-this-language">Deutsche Version verf�gbar</msg>
<msg key="English">Englisch</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.el_GR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.el_GR.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/catalog/acs-lang.el_GR.utf-8.xml 9 Mar 2004 18:02:28 -0000 1.3
+++ openacs-4/packages/acs-lang/catalog/acs-lang.el_GR.utf-8.xml 12 Mar 2004 13:45:04 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="el_GR" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="el_GR" charset="utf-8">
<msg key="English">Αγγλικά</msg>
<msg key="French">Γαλλικά</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.en_GB.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.en_GB.ISO-8859-1.xml,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-lang/catalog/acs-lang.en_GB.ISO-8859-1.xml 9 Mar 2004 18:02:28 -0000 1.7
+++ openacs-4/packages/acs-lang/catalog/acs-lang.en_GB.ISO-8859-1.xml 12 Mar 2004 13:45:04 -0000 1.8
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="en_GB" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="en_GB" charset="ISO-8859-1">
<msg key="localization-abday">{Sun} {Mon} {Tue} {Wed} {Thu} {Fri} {Sat}</msg>
<msg key="localization-abmon">{Jan} {Feb} {Mar} {Apr} {May} {Jun} {Jul} {Aug} {Sep} {Oct} {Nov} {Dec}</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml 9 Mar 2004 18:02:28 -0000 1.16
+++ openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml 12 Mar 2004 13:45:04 -0000 1.17
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="en_US" charset="ISO-8859-1">
<msg key="available-in-this-language">Available in English</msg>
<description key="available-in-this-language">The language referred to in the message body should be the language of the locale, not a localized version of "English".</description>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.es_ES.ISO-8859-1.xml,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-lang/catalog/acs-lang.es_ES.ISO-8859-1.xml 9 Mar 2004 18:02:28 -0000 1.14
+++ openacs-4/packages/acs-lang/catalog/acs-lang.es_ES.ISO-8859-1.xml 12 Mar 2004 13:45:04 -0000 1.15
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="es_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="es_ES" charset="ISO-8859-1">
<msg key="English">Ingl�s</msg>
<msg key="French">Franc�s</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.fi_FI.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.fi_FI.utf-8.xml,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-lang/catalog/acs-lang.fi_FI.utf-8.xml 9 Mar 2004 18:02:28 -0000 1.6
+++ openacs-4/packages/acs-lang/catalog/acs-lang.fi_FI.utf-8.xml 12 Mar 2004 13:45:04 -0000 1.7
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="fi_FI" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="fi_FI" charset="utf-8">
<msg key="English">Englanti</msg>
<msg key="French">Ranska</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.fr_FR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.fr_FR.ISO-8859-1.xml,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-lang/catalog/acs-lang.fr_FR.ISO-8859-1.xml 9 Mar 2004 18:02:28 -0000 1.14
+++ openacs-4/packages/acs-lang/catalog/acs-lang.fr_FR.ISO-8859-1.xml 12 Mar 2004 13:45:04 -0000 1.15
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="fr_FR" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="fr_FR" charset="ISO-8859-1">
<msg key="English">Anglais</msg>
<msg key="French">Fran�ais</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.gl_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.gl_ES.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-lang/catalog/acs-lang.gl_ES.ISO-8859-1.xml 9 Mar 2004 18:02:28 -0000 1.10
+++ openacs-4/packages/acs-lang/catalog/acs-lang.gl_ES.ISO-8859-1.xml 12 Mar 2004 13:45:04 -0000 1.11
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="gl_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="gl_ES" charset="ISO-8859-1">
<msg key="English">Ingl�s</msg>
<msg key="French">Franc�s</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.hu_HU.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.hu_HU.utf-8.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-lang/catalog/acs-lang.hu_HU.utf-8.xml 9 Mar 2004 18:02:28 -0000 1.4
+++ openacs-4/packages/acs-lang/catalog/acs-lang.hu_HU.utf-8.xml 12 Mar 2004 13:45:04 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="hu_HU" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="hu_HU" charset="utf-8">
<msg key="localization-decimal_point">,</msg>
<msg key="localization-grouping">3 3</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.it_IT.ISO-8859-1.xml,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-lang/catalog/acs-lang.it_IT.ISO-8859-1.xml 9 Mar 2004 18:02:28 -0000 1.12
+++ openacs-4/packages/acs-lang/catalog/acs-lang.it_IT.ISO-8859-1.xml 12 Mar 2004 13:45:04 -0000 1.13
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="it_IT" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="it_IT" charset="ISO-8859-1">
<msg key="English">Inglese</msg>
<msg key="French">Francese</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.ja_JP.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.ja_JP.utf-8.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-lang/catalog/acs-lang.ja_JP.utf-8.xml 9 Mar 2004 18:02:28 -0000 1.4
+++ openacs-4/packages/acs-lang/catalog/acs-lang.ja_JP.utf-8.xml 12 Mar 2004 13:45:04 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="ja_JP" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="ja_JP" charset="utf-8">
<msg key="English">英語</msg>
<msg key="French">フランス語</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.ko_KR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.ko_KR.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/catalog/acs-lang.ko_KR.utf-8.xml 9 Mar 2004 18:02:28 -0000 1.3
+++ openacs-4/packages/acs-lang/catalog/acs-lang.ko_KR.utf-8.xml 12 Mar 2004 13:45:04 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="ko_KR" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="ko_KR" charset="utf-8">
<msg key="available-in-this-language">영어로 가능</msg>
<msg key="English">영어</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.ms_my.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/Attic/acs-lang.ms_my.utf-8.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-lang/catalog/acs-lang.ms_my.utf-8.xml 9 Mar 2004 18:02:28 -0000 1.4
+++ openacs-4/packages/acs-lang/catalog/acs-lang.ms_my.utf-8.xml 12 Mar 2004 13:45:04 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="ms_my" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="ms_my" charset="utf-8">
<msg key="available-in-this-language">Tersedia dalam Bahasa Inggeris</msg>
<msg key="English">Bahasa Inggeris</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.nl_NL.ISO-8859-1.xml,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/acs-lang/catalog/acs-lang.nl_NL.ISO-8859-1.xml 9 Mar 2004 18:02:28 -0000 1.13
+++ openacs-4/packages/acs-lang/catalog/acs-lang.nl_NL.ISO-8859-1.xml 12 Mar 2004 13:45:04 -0000 1.14
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="nl_NL" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="nl_NL" charset="ISO-8859-1">
<msg key="available-in-this-language">Nederlandse versie is beschikbaar</msg>
<msg key="English">Engels</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.no_NO.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.no_NO.ISO-8859-1.xml,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-lang/catalog/acs-lang.no_NO.ISO-8859-1.xml 9 Mar 2004 18:02:28 -0000 1.11
+++ openacs-4/packages/acs-lang/catalog/acs-lang.no_NO.ISO-8859-1.xml 12 Mar 2004 13:45:04 -0000 1.12
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="no_NO" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="no_NO" charset="ISO-8859-1">
<msg key="English">Engelsk</msg>
<msg key="French">Fransk</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.pl_PL.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.pl_PL.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/catalog/acs-lang.pl_PL.utf-8.xml 9 Mar 2004 18:02:28 -0000 1.3
+++ openacs-4/packages/acs-lang/catalog/acs-lang.pl_PL.utf-8.xml 12 Mar 2004 13:45:04 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="pl_PL" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="pl_PL" charset="utf-8">
<msg key="English">Angielski</msg>
<msg key="French">Francuski</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.pt_BR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.pt_BR.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-lang/catalog/acs-lang.pt_BR.ISO-8859-1.xml 9 Mar 2004 18:02:28 -0000 1.10
+++ openacs-4/packages/acs-lang/catalog/acs-lang.pt_BR.ISO-8859-1.xml 12 Mar 2004 13:45:04 -0000 1.11
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="pt_BR" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="pt_BR" charset="ISO-8859-1">
<msg key="available-in-this-language">Dispon�vel em Ingl�s</msg>
<msg key="English">Ingl�s</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.pt_PT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.pt_PT.ISO-8859-1.xml,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-lang/catalog/acs-lang.pt_PT.ISO-8859-1.xml 9 Mar 2004 18:02:28 -0000 1.6
+++ openacs-4/packages/acs-lang/catalog/acs-lang.pt_PT.ISO-8859-1.xml 12 Mar 2004 13:45:04 -0000 1.7
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="pt_PT" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="pt_PT" charset="ISO-8859-1">
<msg key="English">Ingl�s</msg>
<msg key="French">Franc�s</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.ru_RU.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.ru_RU.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/catalog/acs-lang.ru_RU.utf-8.xml 9 Mar 2004 18:02:28 -0000 1.3
+++ openacs-4/packages/acs-lang/catalog/acs-lang.ru_RU.utf-8.xml 12 Mar 2004 13:45:04 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="ru_RU" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="ru_RU" charset="utf-8">
<msg key="English">Английский</msg>
<msg key="French">Французский</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.sh_HR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.sh_HR.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/catalog/acs-lang.sh_HR.utf-8.xml 9 Mar 2004 18:02:28 -0000 1.3
+++ openacs-4/packages/acs-lang/catalog/acs-lang.sh_HR.utf-8.xml 12 Mar 2004 13:45:04 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="sh_HR" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="sh_HR" charset="utf-8">
<msg key="English">Engleski</msg>
<msg key="French">Francuski</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.sv_SE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.sv_SE.ISO-8859-1.xml,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-lang/catalog/acs-lang.sv_SE.ISO-8859-1.xml 9 Mar 2004 18:02:28 -0000 1.11
+++ openacs-4/packages/acs-lang/catalog/acs-lang.sv_SE.ISO-8859-1.xml 12 Mar 2004 13:45:04 -0000 1.12
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="sv_SE" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="sv_SE" charset="ISO-8859-1">
<msg key="available-in-this-language">Tillg�ngligt p� svenska</msg>
<msg key="English">Engelska</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.tr_TR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.tr_TR.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/catalog/acs-lang.tr_TR.utf-8.xml 9 Mar 2004 18:02:28 -0000 1.3
+++ openacs-4/packages/acs-lang/catalog/acs-lang.tr_TR.utf-8.xml 12 Mar 2004 13:45:04 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="tr_TR" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="tr_TR" charset="utf-8">
<msg key="English">İnglizce</msg>
<msg key="French">Fransızca</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.zh_TW.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.zh_TW.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/catalog/acs-lang.zh_TW.utf-8.xml 9 Mar 2004 18:02:28 -0000 1.3
+++ openacs-4/packages/acs-lang/catalog/acs-lang.zh_TW.utf-8.xml 12 Mar 2004 13:45:04 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0.3" locale="zh_TW" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.4" locale="zh_TW" charset="utf-8">
<msg key="available-in-this-language">繁体中文版</msg>
<msg key="English">英文</msg>
Index: openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl 26 Feb 2004 15:28:46 -0000 1.31
+++ openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl 12 Mar 2004 13:45:04 -0000 1.32
@@ -320,25 +320,34 @@
@author Peter marklund (peter@collaboraid.biz)
} {
+ # Return quickly for the fairly frequent case where there are no embedded message keys
+ if { ![string match "*#*" $string_with_hashes] } {
+ return $string_with_hashes
+ }
+
set indices_list [get_hash_indices $string_with_hashes]
- set subst_string $string_with_hashes
+ set subst_string ""
+ set start_idx 0
foreach item_idx $indices_list {
# The replacement string starts and ends with a hash mark
set replacement_string [string range $string_with_hashes [lindex $item_idx 0] \
[lindex $item_idx 1]]
set message_key [string range $replacement_string 1 [expr [string length $replacement_string] - 2]]
-
+
# Attempt a message lookup
set message_value [lang::message::lookup [ad_conn locale] $message_key "" "" 2]
# Replace the string
# LARS: We don't use regsub here, because regsub interprets certain characters
# in the replacement string specially.
- set subst_string [string range $string_with_hashes 0 [expr [lindex $item_idx 0]-1]]
+ append subst_string [string range $string_with_hashes $start_idx [expr [lindex $item_idx 0]-1]]
append subst_string $message_value
- append subst_string [string range $string_with_hashes [expr [lindex $item_idx 1]+1] end]
+
+ set start_idx [expr [lindex $item_idx 1] + 1]
}
+
+ append subst_string [string range $string_with_hashes $start_idx end]
return $subst_string
}
Index: openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl 15 Feb 2004 11:11:39 -0000 1.13
+++ openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl 12 Mar 2004 13:45:05 -0000 1.14
@@ -1008,3 +1008,46 @@
lang::test::teardown_test_package
}
}
+
+aa_register_case localize {
+ Test the lang::util::localize proc.
+
+ @author Peter Marklund
+} {
+ set package_key "acs-lang"
+ set message_key "__test-key"
+ set message "Test message"
+
+ aa_run_with_teardown \
+ -rollback \
+ -test_code {
+
+ # Create a temporary test message to test with
+ lang::message::register en_US $package_key $message_key $message
+
+ # Create some random character strings to surround the embedded key
+ set pre_text "a;<ls#;#kdfj'...,mlkjoiu><wgon"
+ set post_text "a;lskd<fj'...,mlkjo>iuwgon#"
+ set message_key_embedded "#${package_key}.${message_key}#"
+
+ # Test replacements
+ set text1 $message_key_embedded
+ aa_equals "One message key with no surrounding text" [lang::util::localize $text1] "${message}"
+
+ set text1 "${pre_text}${message_key_embedded}${post_text}"
+ aa_equals "One message key with surrounding text" [lang::util::localize $text1] "${pre_text}${message}${post_text}"
+
+ set text1 "${pre_text}${message_key_embedded}"
+ aa_equals "One message key with text before" [lang::util::localize $text1] "${pre_text}${message}"
+
+ set text1 "${message_key_embedded}${post_text}"
+ aa_equals "One message key with text after" [lang::util::localize $text1] "${message}${post_text}"
+
+ set text1 "${pre_text}${message_key_embedded}${post_text}${pre_text}${message_key_embedded}${post_text}"
+ aa_equals "Two message keys with surrounding text" [lang::util::localize $text1] \
+ "${pre_text}${message}${post_text}${pre_text}${message}${post_text}"
+ } -teardown_code {
+ # We need to clear the cache
+ lang::message::unregister $package_key $message_key
+ }
+}
Index: openacs-4/packages/acs-mail/acs-mail.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/acs-mail.info,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/acs-mail/acs-mail.info 19 Feb 2004 14:59:43 -0000 1.17
+++ openacs-4/packages/acs-mail/acs-mail.info 12 Mar 2004 13:45:12 -0000 1.18
@@ -11,7 +11,7 @@
<owner url="mailto:vinod@kurup.com">Vinod Kurup</owner>
<owner url="mailto:prevost@maya.com">John Prevost</owner>
<summary>General messaging system, mark II</summary>
- <release-date>2004-01-21</release-date>
+ <release-date>2004-03-10</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
<description format="text/html">Provides generic message services, with email sending. The acs-mail-lite package is the prefered
interface for new packages and it's anticipated that this package will ultimately be deprecated.</description>
Index: openacs-4/packages/acs-messaging/acs-messaging.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-messaging/acs-messaging.info,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/acs-messaging/acs-messaging.info 19 Feb 2004 14:59:43 -0000 1.13
+++ openacs-4/packages/acs-messaging/acs-messaging.info 12 Mar 2004 13:45:12 -0000 1.14
@@ -12,7 +12,7 @@
<owner url="mailto:prevost@maya.com">John Prevost</owner>
<owner url="mailto:vinod@kurup.com">Vinod Kurup</owner>
<summary>General messaging for bboard and general comments.</summary>
- <release-date>2004-01-21</release-date>
+ <release-date>2004-03-10</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
<description format="text/html">Provides generic message services, with email sending. acs-mail-lite and notifications are the
prefered packages for delivering this functionality and it is anticipated that this package will ultimately be deprecated.</description>
Index: openacs-4/packages/acs-reference/acs-reference.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-reference/acs-reference.info,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-reference/acs-reference.info 26 Feb 2004 15:28:48 -0000 1.14
+++ openacs-4/packages/acs-reference/acs-reference.info 12 Mar 2004 13:45:14 -0000 1.15
@@ -7,10 +7,10 @@
<initial-install-p>t</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="5.0.2" url="http://openacs.org/repository/download/apm/acs-reference-5.0.2.apm">
+ <version name="5.0.4" url="http://openacs.org/repository/download/apm/acs-reference-5.0.2.apm">
<owner url="mailto:jon@jongriffin.com">Jon Griffin</owner>
<summary>Tools and API for managing refrence data.</summary>
- <release-date>2004-01-26</release-date>
+ <release-date>2004-03-10</release-date>
<vendor url="http://www.mayuli.com">Mayuli Enterprises, LLC</vendor>
<description format="text/html">Reference Data provides an API to support:
<ul>
@@ -19,7 +19,7 @@
<li> Monitoring the usage of reference data.
</ul></description>
- <provides url="acs-reference" version="5.0.2"/>
+ <provides url="acs-reference" version="5.0.4"/>
<requires url="acs-kernel" version="5.0.0"/>
<callbacks>
Index: openacs-4/packages/acs-service-contract/acs-service-contract.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/acs-service-contract.info,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/acs-service-contract/acs-service-contract.info 19 Feb 2004 14:59:44 -0000 1.21
+++ openacs-4/packages/acs-service-contract/acs-service-contract.info 12 Mar 2004 13:45:15 -0000 1.22
@@ -10,7 +10,7 @@
<version name="5.1.0d1" url="http://openacs.org/repository/download/apm/acs-service-contract-5.1.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
<summary>API and UI for service contracts</summary>
- <release-date>2004-01-21</release-date>
+ <release-date>2004-03-10</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
<description format="text/html">Service contracts defines an API for the creation of interfaces and discovery of interface implementations.
Examples are the contracts used for search which provide a means to get content on a given object and to translate an object_id to a
Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -r1.63 -r1.64
--- openacs-4/packages/acs-subsite/acs-subsite.info 27 Feb 2004 16:08:19 -0000 1.63
+++ openacs-4/packages/acs-subsite/acs-subsite.info 12 Mar 2004 13:45:18 -0000 1.64
@@ -10,7 +10,7 @@
<version name="5.1.0d1" url="http://openacs.org/repository/download/apm/acs-subsite-5.1.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
<summary>Subsite</summary>
- <release-date>2004-01-21</release-date>
+ <release-date>2004-03-10</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
<description format="text/html">Provides for creating subsites within the OpenACS Community System. Aware of parties, groups, users, portraits. Can be themed via a per subsite master template.</description>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.AR_EG.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/Attic/acs-subsite.AR_EG.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.AR_EG.utf-8.xml 9 Mar 2004 18:02:33 -0000 1.3
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.AR_EG.utf-8.xml 12 Mar 2004 13:45:19 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="AR_EG" charset="utf-8">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="AR_EG" charset="utf-8">
<msg key="About_You">عنك</msg>
<msg key="Answer">:الجواب</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.AR_LB.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/Attic/acs-subsite.AR_LB.utf-8.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.AR_LB.utf-8.xml 9 Mar 2004 18:02:33 -0000 1.4
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.AR_LB.utf-8.xml 12 Mar 2004 13:45:21 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="AR_LB" charset="utf-8">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="AR_LB" charset="utf-8">
<msg key="About_You">عَنك</msg>
<msg key="Account_closed"><p>حسابك مغلق حالياً.</p> <p>إذا ترغب، نحن يمكننا <a href="%restore_url%"> إعادة فتح حسابك</a>.</p> </msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.RO_RO.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/Attic/acs-subsite.RO_RO.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.RO_RO.utf-8.xml 9 Mar 2004 18:02:33 -0000 1.3
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.RO_RO.utf-8.xml 12 Mar 2004 13:45:21 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="RO_RO" charset="utf-8">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="RO_RO" charset="utf-8">
<msg key="_or">, sau</msg>
<msg key="A_member_of_the_system">Membru al comunităţii %system_name% din</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.ast_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.ast_ES.ISO-8859-1.xml,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.ast_ES.ISO-8859-1.xml 9 Mar 2004 18:02:33 -0000 1.12
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.ast_ES.ISO-8859-1.xml 12 Mar 2004 13:45:22 -0000 1.13
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="ast_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="ast_ES" charset="ISO-8859-1">
<msg key="About_You">Sobre ti</msg>
<msg key="Account_closed"><p>La to cuenta actualmente ta zarrada.</p> <p>Si quies, podemos <a href="%restore_url%">volver a abrila</a>.</p></msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.ch_zh.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.ch_zh.utf-8.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.ch_zh.utf-8.xml 9 Mar 2004 18:02:33 -0000 1.4
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.ch_zh.utf-8.xml 12 Mar 2004 13:45:22 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="ch_zh" charset="utf-8">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="ch_zh" charset="utf-8">
<msg key="_or">，否则</msg>
<msg key="A_member_of_the_system">%system_name%团体的会员</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.da_DK.ISO-8859-1.xml,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.da_DK.ISO-8859-1.xml 9 Mar 2004 18:02:33 -0000 1.23
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.da_DK.ISO-8859-1.xml 12 Mar 2004 13:45:22 -0000 1.24
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="da_DK" charset="ISO-8859-1">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="da_DK" charset="ISO-8859-1">
<msg key="_or">, eller </msg>
<msg key="A_member_of_the_system">Medlem af %system_name% siden</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml 9 Mar 2004 18:02:33 -0000 1.19
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml 12 Mar 2004 13:45:22 -0000 1.20
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="de_DE" charset="ISO-8859-1">
<msg key="_or"> oder</msg>
<msg key="A_member_of_the_system">Registriert bei %system_name% seit</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.el_GR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.el_GR.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.el_GR.utf-8.xml 9 Mar 2004 18:02:33 -0000 1.3
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.el_GR.utf-8.xml 12 Mar 2004 13:45:22 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="el_GR" charset="utf-8">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="el_GR" charset="utf-8">
<msg key="About_You">Πληροφορίες</msg>
<msg key="Answer">Απάντηση:</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml,v
diff -u -r1.50 -r1.51
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml 9 Mar 2004 18:02:33 -0000 1.50
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml 12 Mar 2004 13:45:22 -0000 1.51
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="en_US" charset="ISO-8859-1">
<msg key="_or">, or</msg>
<msg key="A_member_of_the_system">A member of the %system_name% community since</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.es_ES.ISO-8859-1.xml,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.es_ES.ISO-8859-1.xml 9 Mar 2004 18:02:33 -0000 1.17
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.es_ES.ISO-8859-1.xml 12 Mar 2004 13:45:22 -0000 1.18
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="es_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="es_ES" charset="ISO-8859-1">
<msg key="A_member_of_the_system">Miembro de %system_name% desde</msg>
<msg key="About_You">Mi informaci�n</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.fi_FI.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.fi_FI.utf-8.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.fi_FI.utf-8.xml 9 Mar 2004 18:02:33 -0000 1.9
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.fi_FI.utf-8.xml 12 Mar 2004 13:45:22 -0000 1.10
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="fi_FI" charset="utf-8">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="fi_FI" charset="utf-8">
<msg key="About_You">Tietoja sinusta</msg>
<msg key="Answer">Vastaus:</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.fr_FR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.fr_FR.ISO-8859-1.xml,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.fr_FR.ISO-8859-1.xml 9 Mar 2004 18:02:33 -0000 1.15
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.fr_FR.ISO-8859-1.xml 12 Mar 2004 13:45:22 -0000 1.16
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="fr_FR" charset="ISO-8859-1">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="fr_FR" charset="ISO-8859-1">
<msg key="About_You">A propos de vous</msg>
<msg key="Answer">R�ponse:</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.gl_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.gl_ES.ISO-8859-1.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.gl_ES.ISO-8859-1.xml 9 Mar 2004 18:02:33 -0000 1.3
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.gl_ES.ISO-8859-1.xml 12 Mar 2004 13:45:22 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="gl_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="gl_ES" charset="ISO-8859-1">
<msg key="About_You">Sobre ti</msg>
<msg key="Account_closed"><p>A t�a conta enc�ntrase actualmente fechada.</p> <p>Se desexas, podemos <a href="%restore_url%">reabrir a t�a conta</a>.</p></msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.hu_HU.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.hu_HU.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.hu_HU.utf-8.xml 9 Mar 2004 18:02:33 -0000 1.3
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.hu_HU.utf-8.xml 12 Mar 2004 13:45:22 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="hu_HU" charset="utf-8">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="hu_HU" charset="utf-8">
<msg key="About_You">Infó rólad</msg>
<msg key="Account_close_confirm_no_label">Nem, inkább visszamegyek az %pvt_home_name% (?)</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.it_IT.ISO-8859-1.xml,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.it_IT.ISO-8859-1.xml 9 Mar 2004 18:02:33 -0000 1.16
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.it_IT.ISO-8859-1.xml 12 Mar 2004 13:45:22 -0000 1.17
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="it_IT" charset="ISO-8859-1">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="it_IT" charset="ISO-8859-1">
<msg key="About_You">Riguardo a te</msg>
<msg key="Account_at_system_closed">La tua account su %system_name% &egrave; stata chiusa.</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.ja_JP.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.ja_JP.utf-8.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.ja_JP.utf-8.xml 9 Mar 2004 18:02:33 -0000 1.4
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.ja_JP.utf-8.xml 12 Mar 2004 13:45:22 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="ja_JP" charset="utf-8">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="ja_JP" charset="utf-8">
<msg key="About_You">あなたについて</msg>
<msg key="Answer">回答:</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.ko_KR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.ko_KR.utf-8.xml,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.ko_KR.utf-8.xml 9 Mar 2004 18:02:33 -0000 1.5
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.ko_KR.utf-8.xml 12 Mar 2004 13:45:22 -0000 1.6
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="ko_KR" charset="utf-8">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="ko_KR" charset="utf-8">
<msg key="_or">, 또는</msg>
<msg key="A_member_of_the_system">이후 %system_name% 커뮤너티의 회원</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.ms_my.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/Attic/acs-subsite.ms_my.utf-8.xml,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.ms_my.utf-8.xml 9 Mar 2004 18:02:33 -0000 1.5
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.ms_my.utf-8.xml 12 Mar 2004 13:45:22 -0000 1.6
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="ms_my" charset="utf-8">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="ms_my" charset="utf-8">
<msg key="_or">, atau</msg>
<msg key="A_member_of_the_system">Ahli kepada komuniti %system_name% sejak</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.nl_NL.ISO-8859-1.xml,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.nl_NL.ISO-8859-1.xml 9 Mar 2004 18:02:33 -0000 1.17
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.nl_NL.ISO-8859-1.xml 12 Mar 2004 13:45:22 -0000 1.18
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="nl_NL" charset="ISO-8859-1">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="nl_NL" charset="ISO-8859-1">
<msg key="_or">, of</msg>
<msg key="A_member_of_the_system">Lid van de %system_name% gemeenschap sinds</msg>
@@ -49,7 +49,8 @@
<msg key="Create_new_subsite">Nieuwe subsite aanmaken</msg>
<msg key="Current_Password">Huidig wachtwoord:</msg>
<msg key="Currently_invisible_msg"><P>Mijn onlinestatus: andere gebruikers kunnen momenteel <i>niet</i> zien dat ik online ben.</msg>
- <msg key="Currently_visible_msg"><P>Mijn onlinestatus: andere gebruikers kunnen momenteel zien dat ik online ben.</msg>
+ <msg key="Currently_visible_msg"><P><h2>Mijn onlinestatus:</h2></p><p> <ul><li>Andere gebruikers kunnen momenteel zien dat ik online ben.
+</li></ul></p></msg>
<msg key="Customize_Question">Vraag aanpassen</msg>
<msg key="Database_Error">Databasefout</msg>
<msg key="default_context">standaard context</msg>
@@ -64,9 +65,9 @@
<msg key="edit_comment">opmerking bewerken</msg>
<msg key="Elements_not_editable">Bepaalde elementen kunnen niet worden bewerkt, omdat ze onder het beheer van %authority_name% vallen.</msg>
<msg key="Email">E-mail</msg>
- <msg key="email_body_Forgotten_password">Hier is de nieuwe aanmeldingsinformatie: %account_id_label%: %account_id% %password_label%: %password%
+ <msg key="email_body_Forgotten_password">Hier is de nieuwe aanmeldingsinformatie: %account_id_label%: %account_id% %password_label%: %password%
Bezoek de volgende koppeling en wijzig het wachtwoord direct: %reset_password_url%</msg>
- <msg key="email_body_Registration_password">Bedankt voor de inschrijving op %system_name%. Aanmelden kan op %system_url% met de volgende gegevens: %account_id_label%: %account_id% %password_label%: %password%
+ <msg key="email_body_Registration_password">Bedankt voor de inschrijving op %system_name%. Aanmelden kan op %system_url% met de volgende gegevens: %account_id_label%: %account_id% %password_label%: %password%
Bezoek de volgende koppeling en wijzig het wachtwoord direct: %reset_password_url%</msg>
<msg key="Email_Confirmation">E-mailbevestiging</msg>
<msg key="Email_not_Requested">E-mail niet aangevraagd</msg>
@@ -142,11 +143,11 @@
<msg key="lt_Our_server_can_tell_y">Onze server kan browsers opdragen om dingen te onthouden, zoals een e-mailadres en wachtwoord. Dit heeft als voordeel dat een e-mailadres en wachtwoord niet steeds hoeven te worden ingetypt. Dit is echter alleen veilig als men de computer niet met anderen deelt. </msg>
<msg key="lt_Password_Confirmation">Wachtwoordbevestiging</msg>
<msg key="lt_Personal_Home_Page_UR">Persoonlijke website URL:</msg>
- <msg key="lt_Please_locate_your_co">Kies de eigen landcode uit de onderstaande lijst en gebruik vervolgens de "terug"-knop van de browser om naar het vorige formulier terug te gaan.</msg>
+ <msg key="lt_Please_locate_your_co">Kies de eigen landcode uit de onderstaande lijst en gebruik vervolgens de knop "Terug" van de browser om naar het vorige formulier terug te gaan.</msg>
<msg key="lt_Please_read_and_follo">Lees en volg de instructies in deze e-mail alstublieft.</msg>
<msg key="lt_Please_try_to_a_hrefi">Probeer nogmaals om <a href="index">aan te melden</a> </msg>
<msg key="lt_Portrait_of_first_last">Portretfoto van %first_names% %last_name%</msg>
- <msg key="lt_Privileges_higher_implied">Hogere privileges omvatten alle onderliggende privileges. Bij voorbeeld, het toekennen van admin rechten impliceert ook het toekennen van read en write rechten.
+ <msg key="lt_Privileges_higher_implied">Hogere privileges omvatten alle onderliggende privileges. Bij voorbeeld, het toekennen van admin rechten impliceert ook het toekennen van read en write rechten.
</msg>
<msg key="lt_Problem_with_authenti">Authenticeren is mislukt</msg>
<msg key="lt_Registration_informat">De inschrijfgegevens voor deze service zijn verzonden aan %email%.</msg>
@@ -166,7 +167,7 @@
<msg key="lt_Upload_your_favorite">Biedt ons het favoriete bestand van de eigen computer aan. Het mag een ingescand JPEG- of GIF-bestand zijn. Er kan helaas geen verwijzing worden gemaakt naar een bestand ergens op het internet.</msg>
<msg key="lt_Uploaded_pretty_date">Opgeslagen: %pretty_date%</msg>
<msg key="lt_Uploaded_publish_date">Opgeslagen: %publish_date%</msg>
- <msg key="lt_Use_the_Browse_button">Gebruik de knop "Bladeren..." om een bestand op te zoeken, klik daarna op "Openen".</msg>
+ <msg key="lt_Use_the_Browse_button">Gebruik de knop "Bladeren" om een bestand op te zoeken, klik daarna op "Openen".</msg>
<msg key="lt_We_cant_find_you">We kunnen account %user_id% niet in de gebruikerstabel vinden. Kan het zijn dat deze account is verwijderd?</msg>
<msg key="lt_We_had_a_problem_proc">Er was een probleem bij het verwerken van de invoer.</msg>
<msg key="lt_We_were_not_awaiting_">Wij hadden deze e-mail niet verwacht. Er moet een vergissing in het spel zijn.</msg>
@@ -206,14 +207,14 @@
<msg key="Or_add_a_new_user">Of een nieuwe gebruiker toevoegen</msg>
<msg key="or_the">of de</msg>
<msg key="Password">Wachtwoord:</msg>
- <msg key="Password_changed_body">Aanmeldingsgegevens op %system_name%: %account_id_label%: %account_id%.
-
-Het wachtwoord is gewijzigd.
-Er is geen actie nodig als u deze heeft gewijzigd. Dit bericht is bedoeld om u te informeren en daarmee de veiligheid van uw gegevens te verhogen.
----------------
-U kunt uw wachtwoord altijd wijzigen door het volgende te doen:
-1. Aanmelden op %system_name%
-2. Klik op "%pvt_home_name%"
+ <msg key="Password_changed_body">Aanmeldingsgegevens op %system_name%: %account_id_label%: %account_id%.
+
+Het wachtwoord is gewijzigd.
+Er is geen actie nodig als u deze heeft gewijzigd. Dit bericht is bedoeld om u te informeren en daarmee de veiligheid van uw gegevens te verhogen.
+---------------
+U kunt uw wachtwoord altijd wijzigen door het volgende te doen:
+1. Aanmelden op %system_name%
+2. Klik op "%pvt_home_name%"
3. Kies "%password_update_link_text%" </msg>
<msg key="Password_changed_subject">Wachtwoord is veranderd</msg>
<msg key="Permissions">Rechten</msg>
@@ -226,7 +227,7 @@
<msg key="Recover_Password">Wachtwoord achterhalen</msg>
<msg key="Refresh_login">Aanmelding actualiseren</msg>
<msg key="Register">Inschrijven</msg>
- <msg key="Registration_Approval_Notice"><p> Bedankt voor de inschrijving bij %system_name%. De beheerder is op de hoogte gebracht. Zodra toestemming is gegeven, zal dit via een e-mail worden gemeld. Daarna kan %system_name% verder worden gebruikt.
+ <msg key="Registration_Approval_Notice"><p> Bedankt voor de inschrijving bij %system_name%. De beheerder is op de hoogte gebracht. Zodra toestemming is gegeven, zal dit via een e-mail worden gemeld. Daarna kan %system_name% verder worden gebruikt.
</msg>
<msg key="Reject">Weigeren</msg>
<msg key="Remember_my_login">Aanmeldsessie op deze computer bewaren</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.no_NO.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.no_NO.ISO-8859-1.xml,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.no_NO.ISO-8859-1.xml 9 Mar 2004 18:02:33 -0000 1.14
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.no_NO.ISO-8859-1.xml 12 Mar 2004 13:45:23 -0000 1.15
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="no_NO" charset="ISO-8859-1">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="no_NO" charset="ISO-8859-1">
<msg key="About_You">Om deg</msg>
<msg key="Answer">Svar:</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.pl_PL.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.pl_PL.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.pl_PL.utf-8.xml 9 Mar 2004 18:02:33 -0000 1.3
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.pl_PL.utf-8.xml 12 Mar 2004 13:45:23 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="pl_PL" charset="utf-8">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="pl_PL" charset="utf-8">
<msg key="About_You">O Tobie</msg>
<msg key="Answer">Odpowiedź:</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.pt_BR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.pt_BR.ISO-8859-1.xml,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.pt_BR.ISO-8859-1.xml 9 Mar 2004 18:02:33 -0000 1.7
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.pt_BR.ISO-8859-1.xml 12 Mar 2004 13:45:23 -0000 1.8
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="pt_BR" charset="ISO-8859-1">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="pt_BR" charset="ISO-8859-1">
<msg key="_or">, ou</msg>
<msg key="A_member_of_the_system">Um membro da comunidade %system_name% desde</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.pt_PT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.pt_PT.ISO-8859-1.xml,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.pt_PT.ISO-8859-1.xml 9 Mar 2004 18:02:33 -0000 1.7
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.pt_PT.ISO-8859-1.xml 12 Mar 2004 13:45:23 -0000 1.8
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="pt_PT" charset="ISO-8859-1">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="pt_PT" charset="ISO-8859-1">
<msg key="About_You">Sobre Si</msg>
<msg key="Account_closed"><p>A sua conta encontra-se actualmente fechada.</p> <p>Se desejar, podemos <a href="%restore_url%">reabrir a sua conta</a>.</p></msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.ru_RU.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.ru_RU.utf-8.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.ru_RU.utf-8.xml 9 Mar 2004 18:02:33 -0000 1.4
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.ru_RU.utf-8.xml 12 Mar 2004 13:45:23 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="ru_RU" charset="utf-8">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="ru_RU" charset="utf-8">
<msg key="About_You">О Вас</msg>
<msg key="Answer">Ответ</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.sh_HR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.sh_HR.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.sh_HR.utf-8.xml 9 Mar 2004 18:02:33 -0000 1.3
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.sh_HR.utf-8.xml 12 Mar 2004 13:45:23 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="sh_HR" charset="utf-8">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="sh_HR" charset="utf-8">
<msg key="About_You">O tebi</msg>
<msg key="Answer">Odgovor:</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.sv_SE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.sv_SE.ISO-8859-1.xml,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.sv_SE.ISO-8859-1.xml 9 Mar 2004 18:02:33 -0000 1.15
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.sv_SE.ISO-8859-1.xml 12 Mar 2004 13:45:23 -0000 1.16
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="sv_SE" charset="ISO-8859-1">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="sv_SE" charset="ISO-8859-1">
<msg key="_or">, eller</msg>
<msg key="A_member_of_the_system">En medlem av %system_name% sedan</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.tr_TR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.tr_TR.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.tr_TR.utf-8.xml 9 Mar 2004 18:02:33 -0000 1.3
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.tr_TR.utf-8.xml 12 Mar 2004 13:45:24 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="tr_TR" charset="utf-8">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="tr_TR" charset="utf-8">
<msg key="About_You">Sizin Hakkınızda</msg>
<msg key="Answer">Cevap:</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.zh_TW.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.zh_TW.utf-8.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.zh_TW.utf-8.xml 9 Mar 2004 18:02:33 -0000 1.4
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.zh_TW.utf-8.xml 12 Mar 2004 13:45:24 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-subsite" package_version="5.0.3" locale="zh_TW" charset="utf-8">
+<message_catalog package_key="acs-subsite" package_version="5.0.4" locale="zh_TW" charset="utf-8">
<msg key="About_You">關於你</msg>
<msg key="Account_at_system_closed">你在%system_name%的帳號已被關閉</msg>
Index: openacs-4/packages/acs-subsite/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/index.adp,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/acs-subsite/www/index.adp 26 Feb 2004 15:28:51 -0000 1.21
+++ openacs-4/packages/acs-subsite/www/index.adp 12 Mar 2004 13:45:26 -0000 1.22
@@ -3,7 +3,7 @@
<property name="title">@subsite_name;noquote@</property>
-<table width="100%">
+<table>
<tr>
<td valign="top">
<div class="portlet">
Index: openacs-4/packages/acs-subsite/www/permissions/grant.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/grant.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-subsite/www/permissions/grant.tcl 26 Jan 2004 15:39:46 -0000 1.11
+++ openacs-4/packages/acs-subsite/www/permissions/grant.tcl 12 Mar 2004 13:45:27 -0000 1.12
@@ -153,7 +153,11 @@
# grant all selected privs
foreach privilege $privileges {
- permission::grant -party_id $party_id -object_id $object_id -privilege $privilege
+ # Lars: For some reason, selecting no privileges returns in a list
+ # containing one element, which is the empty string
+ if { ![empty_string_p $privilege] } {
+ permission::grant -party_id $party_id -object_id $object_id -privilege $privilege
+ }
}
ad_returnredirect "one?[export_vars [list object_id application_url]]"
Index: openacs-4/packages/acs-subsite/www/resources/site-master.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/resources/site-master.css,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/acs-subsite/www/resources/site-master.css 5 Mar 2004 04:21:08 -0000 1.21
+++ openacs-4/packages/acs-subsite/www/resources/site-master.css 12 Mar 2004 13:45:29 -0000 1.22
@@ -431,8 +431,14 @@
margin-left: -16px;
}
+div.subsite-context-bar {
+ font-size: 85%;
+ margin-bottom: 4px;
+ position: relative;
+}
+
/* Text Styles */
h1 {
Index: openacs-4/packages/acs-tcl/acs-tcl.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/acs-tcl.info,v
diff -u -r1.33 -r1.34
--- openacs-4/packages/acs-tcl/acs-tcl.info 19 Feb 2004 14:59:44 -0000 1.33
+++ openacs-4/packages/acs-tcl/acs-tcl.info 12 Mar 2004 13:45:31 -0000 1.34
@@ -10,7 +10,7 @@
<version name="5.1.0d1" url="http://openacs.org/repository/download/apm/acs-tcl-5.1.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
<summary>The Kernel Tcl API library.</summary>
- <release-date>2004-01-21</release-date>
+ <release-date>2004-03-10</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
<description format="text/html">Contains all the core Tcl API, including the request processor, security and session management, permissions, site-nodes, package management infrastructure, etc.</description>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.AR_EG.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/Attic/acs-tcl.AR_EG.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.AR_EG.utf-8.xml 9 Mar 2004 18:02:34 -0000 1.3
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.AR_EG.utf-8.xml 12 Mar 2004 13:45:31 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="AR_EG" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="AR_EG" charset="utf-8">
<msg key="approve">صدّقْ</msg>
<msg key="approve_email">صدّقْ بريد إلكتروني</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.AR_LB.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/Attic/acs-tcl.AR_LB.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.AR_LB.utf-8.xml 9 Mar 2004 18:02:34 -0000 1.3
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.AR_LB.utf-8.xml 12 Mar 2004 13:45:31 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="AR_LB" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="AR_LB" charset="utf-8">
<msg key="approve">صدّقْ</msg>
<msg key="approve_email">صدّقْ بريد إلكتروني</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.FA_IR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/Attic/acs-tcl.FA_IR.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.FA_IR.utf-8.xml 9 Mar 2004 18:02:34 -0000 1.3
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.FA_IR.utf-8.xml 12 Mar 2004 13:45:31 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="FA_IR" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="FA_IR" charset="utf-8">
<msg key="approve">تائيد</msg>
<msg key="approve_email">تائيد پست الکترونيک</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.RO_RO.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/Attic/acs-tcl.RO_RO.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.RO_RO.utf-8.xml 9 Mar 2004 18:02:34 -0000 1.3
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.RO_RO.utf-8.xml 12 Mar 2004 13:45:31 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="RO_RO" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="RO_RO" charset="utf-8">
<msg key="approve">aprobă</msg>
<msg key="approve_email">aprobă email</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.ast_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.ast_ES.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.ast_ES.ISO-8859-1.xml 9 Mar 2004 18:02:34 -0000 1.8
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.ast_ES.ISO-8859-1.xml 12 Mar 2004 13:45:31 -0000 1.9
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="ast_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="ast_ES" charset="ISO-8859-1">
<msg key="approve">aprobar</msg>
<msg key="approve_email">aprobar correo</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.ch_zh.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.ch_zh.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.ch_zh.utf-8.xml 9 Mar 2004 18:02:34 -0000 1.3
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.ch_zh.utf-8.xml 12 Mar 2004 13:45:31 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="ch_zh" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="ch_zh" charset="utf-8">
<msg key="approve">批准</msg>
<msg key="approve_email">批准email</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.da_DK.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.da_DK.ISO-8859-1.xml 9 Mar 2004 18:02:34 -0000 1.10
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.da_DK.ISO-8859-1.xml 12 Mar 2004 13:45:31 -0000 1.11
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="da_DK" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="da_DK" charset="ISO-8859-1">
<msg key="approve">godkend</msg>
<msg key="approve_email">godkend e-mail</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.de_DE.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.de_DE.ISO-8859-1.xml 9 Mar 2004 18:02:34 -0000 1.10
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.de_DE.ISO-8859-1.xml 12 Mar 2004 13:45:31 -0000 1.11
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="de_DE" charset="ISO-8859-1">
<msg key="approve">Freischalten</msg>
<msg key="approve_email">E-Mail-Adresse best�tigen</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.en_US.ISO-8859-1.xml,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.en_US.ISO-8859-1.xml 9 Mar 2004 18:02:34 -0000 1.12
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.en_US.ISO-8859-1.xml 12 Mar 2004 13:45:31 -0000 1.13
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="en_US" charset="ISO-8859-1">
<msg key="approve">approve</msg>
<msg key="approve_email">approve email</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.es_ES.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.es_ES.ISO-8859-1.xml 9 Mar 2004 18:02:34 -0000 1.10
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.es_ES.ISO-8859-1.xml 12 Mar 2004 13:45:31 -0000 1.11
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="es_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="es_ES" charset="ISO-8859-1">
<msg key="approve">Aprobar</msg>
<msg key="approve_email">Aprobar correo</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.fi_FI.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.fi_FI.utf-8.xml,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.fi_FI.utf-8.xml 9 Mar 2004 18:02:34 -0000 1.6
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.fi_FI.utf-8.xml 12 Mar 2004 13:45:31 -0000 1.7
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="fi_FI" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="fi_FI" charset="utf-8">
<msg key="approve">hyväksy</msg>
<msg key="approve_email">hyväksy sähköpostiviesti</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.fr_FR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.fr_FR.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.fr_FR.ISO-8859-1.xml 9 Mar 2004 18:02:34 -0000 1.8
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.fr_FR.ISO-8859-1.xml 12 Mar 2004 13:45:31 -0000 1.9
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="fr_FR" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="fr_FR" charset="ISO-8859-1">
<msg key="approve">admettre</msg>
<msg key="approve_email">admettre email</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.gl_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.gl_ES.ISO-8859-1.xml,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.gl_ES.ISO-8859-1.xml 9 Mar 2004 18:02:34 -0000 1.7
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.gl_ES.ISO-8859-1.xml 12 Mar 2004 13:45:31 -0000 1.8
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="gl_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="gl_ES" charset="ISO-8859-1">
<msg key="approve">aprobar</msg>
<msg key="approve_email">aprobar correo-e</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.hu_HU.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.hu_HU.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.hu_HU.utf-8.xml 9 Mar 2004 18:02:34 -0000 1.3
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.hu_HU.utf-8.xml 12 Mar 2004 13:45:31 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="hu_HU" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="hu_HU" charset="utf-8">
<msg key="approve">jóváhagy</msg>
<msg key="approve_email">emailt jóváhagy</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.it_IT.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.it_IT.ISO-8859-1.xml 9 Mar 2004 18:02:34 -0000 1.10
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.it_IT.ISO-8859-1.xml 12 Mar 2004 13:45:31 -0000 1.11
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="it_IT" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="it_IT" charset="ISO-8859-1">
<msg key="approve">approva</msg>
<msg key="approve_email">approva l'email</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.ja_JP.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.ja_JP.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.ja_JP.utf-8.xml 9 Mar 2004 18:02:34 -0000 1.3
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.ja_JP.utf-8.xml 12 Mar 2004 13:45:31 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="ja_JP" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="ja_JP" charset="utf-8">
<msg key="delete">削除</msg>
</message_catalog>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.ko_KR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.ko_KR.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.ko_KR.utf-8.xml 9 Mar 2004 18:02:34 -0000 1.3
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.ko_KR.utf-8.xml 12 Mar 2004 13:45:31 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="ko_KR" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="ko_KR" charset="utf-8">
<msg key="approve">승인</msg>
<msg key="approve_email">승인 전자우편</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.ms_my.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/Attic/acs-tcl.ms_my.utf-8.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.ms_my.utf-8.xml 9 Mar 2004 18:02:34 -0000 1.4
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.ms_my.utf-8.xml 12 Mar 2004 13:45:31 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="ms_my" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="ms_my" charset="utf-8">
<msg key="approve">lulus</msg>
<msg key="approve_email">luluskan e-mel</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.nl_NL.ISO-8859-1.xml,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.nl_NL.ISO-8859-1.xml 9 Mar 2004 18:02:34 -0000 1.11
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.nl_NL.ISO-8859-1.xml 12 Mar 2004 13:45:31 -0000 1.12
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="nl_NL" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="nl_NL" charset="ISO-8859-1">
<msg key="approve">goedkeuren</msg>
<msg key="approve_email">e-mail goedkeuren</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.no_NO.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.no_NO.ISO-8859-1.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.no_NO.ISO-8859-1.xml 9 Mar 2004 18:02:34 -0000 1.9
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.no_NO.ISO-8859-1.xml 12 Mar 2004 13:45:31 -0000 1.10
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="no_NO" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="no_NO" charset="ISO-8859-1">
<msg key="approve">godkjenn</msg>
<msg key="approve_email">godkjenn e-post</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.pl_PL.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.pl_PL.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.pl_PL.utf-8.xml 9 Mar 2004 18:02:34 -0000 1.3
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.pl_PL.utf-8.xml 12 Mar 2004 13:45:31 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="pl_PL" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="pl_PL" charset="utf-8">
<msg key="approve">zatwierdź</msg>
<msg key="approve_email">zatwierdź email</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.pt_BR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.pt_BR.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.pt_BR.ISO-8859-1.xml 9 Mar 2004 18:02:34 -0000 1.8
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.pt_BR.ISO-8859-1.xml 12 Mar 2004 13:45:31 -0000 1.9
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="pt_BR" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="pt_BR" charset="ISO-8859-1">
<msg key="approve">aprovar</msg>
<msg key="approve_email">aprovar email</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.pt_PT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.pt_PT.ISO-8859-1.xml,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.pt_PT.ISO-8859-1.xml 9 Mar 2004 18:02:34 -0000 1.6
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.pt_PT.ISO-8859-1.xml 12 Mar 2004 13:45:31 -0000 1.7
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="pt_PT" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="pt_PT" charset="ISO-8859-1">
<msg key="approve">aprovar</msg>
<msg key="approve_email">aprovar email</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.ru_RU.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.ru_RU.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.ru_RU.utf-8.xml 9 Mar 2004 18:02:34 -0000 1.3
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.ru_RU.utf-8.xml 12 Mar 2004 13:45:31 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="ru_RU" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="ru_RU" charset="utf-8">
<msg key="approve">утвердить</msg>
<msg key="approve_email">утвердить электронный адрес</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.sh_HR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.sh_HR.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.sh_HR.utf-8.xml 9 Mar 2004 18:02:34 -0000 1.3
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.sh_HR.utf-8.xml 12 Mar 2004 13:45:31 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="sh_HR" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="sh_HR" charset="utf-8">
<msg key="approve">dozvoli</msg>
<msg key="approve_email">potvrdi email</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.sv_SE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.sv_SE.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.sv_SE.ISO-8859-1.xml 9 Mar 2004 18:02:34 -0000 1.10
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.sv_SE.ISO-8859-1.xml 12 Mar 2004 13:45:31 -0000 1.11
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="sv_SE" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="sv_SE" charset="ISO-8859-1">
<msg key="approve">godk�nn</msg>
<msg key="approve_email">godk�nn e-postadressen</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.tr_TR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.tr_TR.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.tr_TR.utf-8.xml 9 Mar 2004 18:02:34 -0000 1.3
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.tr_TR.utf-8.xml 12 Mar 2004 13:45:31 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="tr_TR" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="tr_TR" charset="utf-8">
<msg key="approve">onayla</msg>
<msg key="approve_email">eposta onayla</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.zh_TW.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.zh_TW.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.zh_TW.utf-8.xml 9 Mar 2004 18:02:34 -0000 1.3
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.zh_TW.utf-8.xml 12 Mar 2004 13:45:31 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0.3" locale="zh_TW" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.4" locale="zh_TW" charset="utf-8">
<msg key="approve">核可</msg>
<msg key="approve_email">核可電子郵件</msg>
Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl 26 Feb 2004 15:28:54 -0000 1.31
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl 12 Mar 2004 13:45:32 -0000 1.32
@@ -143,12 +143,11 @@
# $session_expr = PreviousSessionIssue + SessionTimeout
if { $session_expr - [sec_session_renew] < [ns_time] } {
- # LARS: We use sec_login_handler here instead, so that we check the authentication status again
- # This prevents people from being logged in indefinitely just because they keep the session open
- #sec_generate_session_id_cookie
-
- ns_log Debug "OACS: sec_handler: Invoking sec_login_handler to reissue session cookie."
- sec_login_handler
+ # LARS: We abandoned the use of sec_login_handler here. This lets people stay logged in forever
+ # if only the keep requesting pages frequently enough, but the alternative was that
+ # the situation where LoginTimeout = 0 (infinte) and the user unchecks the "Remember me" checkbox
+ # would cause users' sessions to expire as soon as the session needed to be renewed
+ sec_generate_session_id_cookie
}
}
}
@@ -228,6 +227,7 @@
if { $forever_p } {
set max_age inf
} else {
+ # ad_user_login cookie will live for as long as the maximum login time
set max_age [sec_login_timeout]
}
@@ -249,6 +249,7 @@
ad_set_cookie -max_age 0 ad_user_login_secure ""
}
+ ns_log Debug "ad_user_login: Setting new ad_user_login cookie with max_age $max_age"
ad_set_signed_cookie \
-max_age $max_age \
-secure f \
@@ -778,38 +779,56 @@
if { [empty_string_p $secret] } {
if { [empty_string_p $token_id] } {
+ ns_log Debug "__ad_verify_signature: Neither secret, nor token_id supplied"
return 0
}
set secret_token [sec_get_token $token_id]
} else {
set secret_token $secret
}
- ns_log Debug "Security: Getting token_id $token_id, value $secret_token"
- ns_log Debug "Security: Expire_Time is $expire_time (compare to [ns_time]), hash is $hash"
+ ns_log Debug "__ad_verify_signature: Getting token_id $token_id, value $secret_token ; "
+ ns_log Debug "__ad_verify_signature: Expire_Time is $expire_time (compare to [ns_time]), hash is $hash"
# validate cookie: verify hash and expire_time
set computed_hash [ns_sha1 "$value$token_id$expire_time$secret_token"]
- if { [string compare $computed_hash $hash] == 0 && ($expire_time > [ns_time] || $expire_time == 0) } {
- return 1
- }
+ # Need to verify both hash and expiration
+ set hash_ok_p 0
+ set expiration_ok_p 0
+
+ if { [string equal $computed_hash $hash] } {
+ ns_log Debug "__ad_verify_signature: Hash matches - Hash check OK"
+ set hash_ok_p 1
+ } else {
+ # check to see if IE is lame (and buggy!) and is expanding \n to \r\n
+ # See: http://www.arsdigita.com/bboard/q-and-a-fetch-msg?msg_id=000bfF
+ set value [string map [list \r ""] $value]
+ set org_computed_hash $computed_hash
+ set computed_hash [ns_sha1 "$value$token_id$expire_time$secret_token"]
- # check to see if IE is lame (and buggy!) and is expanding \n to \r\n
- # See: http://www.arsdigita.com/bboard/q-and-a-fetch-msg?msg_id=000bfF
- set value [string map [list \r ""] $value]
- set computed_hash [ns_sha1 "$value$token_id$expire_time$secret_token"]
-
- if { [string compare $computed_hash $hash] == 0 && ($expire_time > [ns_time] || $expire_time == 0) } {
- return 1
+ if { [string equal $computed_hash $hash] } {
+ ns_log Debug "__ad_verify_signature: Hash matches after correcting for IE bug - Hash check OK"
+ set hash_ok_p 1
+ } else {
+ ns_log Debug "__ad_verify_signature: Hash ($hash) doesn't match what we expected ($org_computed_hash) - Hash check FAILED"
+ }
}
+
+ if { $expire_time == 0 } {
+ ns_log Debug "__ad_verify_signature: No expiration time - Expiration OK"
+ set expiration_ok_p 1
+ } elseif { $expire_time > [ns_time] } {
+ ns_log Debug "__ad_verify_signature: Expiration time ($expire_time) greater than current time ([ns_time]) - Expiration check OK"
+ set expiration_ok_p 1
+ } else {
+ ns_log Debug "__ad_verify_signature: Expiration time ($expire_time) less than or equal to current time ([ns_time]) - Expiration check FAILED"
+ }
+ # Return validation result
+ return [expr $hash_ok_p && $expiration_ok_p]
- ns_log Debug "Security: The string compare is [string compare $computed_hash $hash]."
- # signature could not be authenticated
- return 0
-
}
ad_proc -public ad_get_signed_cookie {
@@ -834,15 +853,17 @@
error "Cookie does not exist."
}
- ns_log Debug "Security: Done calling get_cookie $cookie_value for $name."
-
set value [lindex $cookie_value 0]
set signature [lindex $cookie_value 1]
+ ns_log Debug "ad_get_signed_cookie: Got signed cookie $name with value $value, signature $signature."
+
if { [ad_verify_signature $value $signature] } {
+ ns_log Debug "ad_get_signed_cookie: Verification of cookie $name OK"
return $value
}
+ ns_log Debug "ad_get_signed_cookie: Verification of cookie $name FAILED"
error "Cookie could not be authenticated."
}
@@ -1329,7 +1350,13 @@
@author Peter Marklund
} {
- return [parameter::get_from_package_key -boolean -parameter RestrictLoginToSSLP -package_key acs-kernel]
+ if { ![security::https_available_p] } {
+ return 0
+ }
+ return [parameter::get \
+ -boolean \
+ -parameter RestrictLoginToSSLP \
+ -package_id [ad_acs_kernel_id]]
}
ad_proc -public security::require_secure_conn {} {
Index: openacs-4/packages/acs-templating/acs-templating.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/acs-templating.info,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/acs-templating/acs-templating.info 4 Mar 2004 18:41:54 -0000 1.26
+++ openacs-4/packages/acs-templating/acs-templating.info 12 Mar 2004 13:45:32 -0000 1.27
@@ -10,7 +10,7 @@
<version name="5.1.0d1" url="http://openacs.org/repository/download/apm/acs-templating-5.1.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
<summary>Templating library.</summary>
- <release-date>2004-01-21</release-date>
+ <release-date>2004-03-10</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
<description format="text/html">
The templating system provides the tag library and support routines
Index: openacs-4/packages/acs-templating/catalog/acs-templating.RO_RO.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/catalog/Attic/acs-templating.RO_RO.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-templating/catalog/acs-templating.RO_RO.utf-8.xml 9 Mar 2004 18:02:37 -0000 1.3
+++ openacs-4/packages/acs-templating/catalog/acs-templating.RO_RO.utf-8.xml 12 Mar 2004 13:45:33 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-templating" package_version="5.0.3" locale="RO_RO" charset="utf-8">
+<message_catalog package_key="acs-templating" package_version="5.0.4" locale="RO_RO" charset="utf-8">
<msg key="Invalid_choice">alegere nevalabilă</msg>
<msg key="Invalid_currency">monedă nevalabilă</msg>
Index: openacs-4/packages/acs-templating/catalog/acs-templating.ch_zh.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/catalog/acs-templating.ch_zh.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-templating/catalog/acs-templating.ch_zh.utf-8.xml 9 Mar 2004 18:02:37 -0000 1.3
+++ openacs-4/packages/acs-templating/catalog/acs-templating.ch_zh.utf-8.xml 12 Mar 2004 13:45:33 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-templating" package_version="5.0.3" locale="ch_zh" charset="utf-8">
+<message_catalog package_key="acs-templating" package_version="5.0.4" locale="ch_zh" charset="utf-8">
<msg key="Invalid_choice">无效选择</msg>
<msg key="Invalid_currency">无效货币</msg>
Index: openacs-4/packages/acs-templating/catalog/acs-templating.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/catalog/acs-templating.da_DK.ISO-8859-1.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-templating/catalog/acs-templating.da_DK.ISO-8859-1.xml 9 Mar 2004 18:02:37 -0000 1.4
+++ openacs-4/packages/acs-templating/catalog/acs-templating.da_DK.ISO-8859-1.xml 12 Mar 2004 13:45:33 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-templating" package_version="5.0.3" locale="da_DK" charset="ISO-8859-1">
+<message_catalog package_key="acs-templating" package_version="5.0.4" locale="da_DK" charset="ISO-8859-1">
<msg key="Invalid_choice">Ugyldigt valg</msg>
<msg key="Invalid_currency">Ugyldig valuta</msg>
Index: openacs-4/packages/acs-templating/catalog/acs-templating.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/catalog/acs-templating.de_DE.ISO-8859-1.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-templating/catalog/acs-templating.de_DE.ISO-8859-1.xml 9 Mar 2004 18:02:37 -0000 1.3
+++ openacs-4/packages/acs-templating/catalog/acs-templating.de_DE.ISO-8859-1.xml 12 Mar 2004 13:45:33 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-templating" package_version="5.0.3" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="acs-templating" package_version="5.0.4" locale="de_DE" charset="ISO-8859-1">
<msg key="Invalid_choice">Ung�ltige Auswahl</msg>
<msg key="Invalid_currency">Ung�ltige W�hrung</msg>
Index: openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml 9 Mar 2004 18:02:37 -0000 1.7
+++ openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml 12 Mar 2004 13:45:33 -0000 1.8
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-templating" package_version="5.0.3" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="acs-templating" package_version="5.0.4" locale="en_US" charset="ISO-8859-1">
<msg key="Invalid_choice">Invalid choice</msg>
<msg key="Invalid_currency">Invalid currency</msg>
Index: openacs-4/packages/acs-templating/catalog/acs-templating.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/catalog/acs-templating.es_ES.ISO-8859-1.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-templating/catalog/acs-templating.es_ES.ISO-8859-1.xml 9 Mar 2004 18:02:37 -0000 1.3
+++ openacs-4/packages/acs-templating/catalog/acs-templating.es_ES.ISO-8859-1.xml 12 Mar 2004 13:45:33 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-templating" package_version="5.0.3" locale="es_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-templating" package_version="5.0.4" locale="es_ES" charset="ISO-8859-1">
<msg key="Invalid_choice">Elecci�n incorrecta</msg>
<msg key="Invalid_currency">Moneda incorrecta</msg>
Index: openacs-4/packages/acs-templating/catalog/acs-templating.fr_FR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/catalog/acs-templating.fr_FR.ISO-8859-1.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-templating/catalog/acs-templating.fr_FR.ISO-8859-1.xml 9 Mar 2004 18:02:37 -0000 1.3
+++ openacs-4/packages/acs-templating/catalog/acs-templating.fr_FR.ISO-8859-1.xml 12 Mar 2004 13:45:33 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-templating" package_version="5.0.3" locale="fr_FR" charset="ISO-8859-1">
+<message_catalog package_key="acs-templating" package_version="5.0.4" locale="fr_FR" charset="ISO-8859-1">
<msg key="Next_with_arrow">Suivant >></msg>
<msg key="No_row_pretty_plural">Pas de %row_pretty_plural%.</msg>
Index: openacs-4/packages/acs-templating/catalog/acs-templating.hu_HU.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/catalog/acs-templating.hu_HU.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-templating/catalog/acs-templating.hu_HU.utf-8.xml 9 Mar 2004 18:02:37 -0000 1.3
+++ openacs-4/packages/acs-templating/catalog/acs-templating.hu_HU.utf-8.xml 12 Mar 2004 13:45:33 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-templating" package_version="5.0.3" locale="hu_HU" charset="utf-8">
+<message_catalog package_key="acs-templating" package_version="5.0.4" locale="hu_HU" charset="utf-8">
<msg key="No_row_pretty_plural">Nincsenek %row_pretty_plural%.</msg>
</message_catalog>
Index: openacs-4/packages/acs-templating/catalog/acs-templating.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/catalog/acs-templating.it_IT.ISO-8859-1.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-templating/catalog/acs-templating.it_IT.ISO-8859-1.xml 9 Mar 2004 18:02:37 -0000 1.3
+++ openacs-4/packages/acs-templating/catalog/acs-templating.it_IT.ISO-8859-1.xml 12 Mar 2004 13:45:33 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-templating" package_version="5.0.3" locale="it_IT" charset="ISO-8859-1">
+<message_catalog package_key="acs-templating" package_version="5.0.4" locale="it_IT" charset="ISO-8859-1">
<msg key="Invalid_choice">Scelta non valida</msg>
<msg key="Invalid_currency">Valuta non valida</msg>
Index: openacs-4/packages/acs-templating/catalog/acs-templating.ko_KR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/catalog/acs-templating.ko_KR.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-templating/catalog/acs-templating.ko_KR.utf-8.xml 9 Mar 2004 18:02:37 -0000 1.3
+++ openacs-4/packages/acs-templating/catalog/acs-templating.ko_KR.utf-8.xml 12 Mar 2004 13:45:33 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-templating" package_version="5.0.3" locale="ko_KR" charset="utf-8">
+<message_catalog package_key="acs-templating" package_version="5.0.4" locale="ko_KR" charset="utf-8">
<msg key="Invalid_choice">부적합한 선택</msg>
<msg key="Invalid_currency">부적합한 통화</msg>
Index: openacs-4/packages/acs-templating/catalog/acs-templating.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/catalog/acs-templating.nl_NL.ISO-8859-1.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-templating/catalog/acs-templating.nl_NL.ISO-8859-1.xml 9 Mar 2004 18:02:37 -0000 1.3
+++ openacs-4/packages/acs-templating/catalog/acs-templating.nl_NL.ISO-8859-1.xml 12 Mar 2004 13:45:33 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-templating" package_version="5.0.3" locale="nl_NL" charset="ISO-8859-1">
+<message_catalog package_key="acs-templating" package_version="5.0.4" locale="nl_NL" charset="ISO-8859-1">
<msg key="Invalid_choice">Ongeldige keuze</msg>
<msg key="Invalid_currency">Ongeldige valuta</msg>
Index: openacs-4/packages/acs-templating/catalog/acs-templating.pt_BR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/catalog/acs-templating.pt_BR.ISO-8859-1.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-templating/catalog/acs-templating.pt_BR.ISO-8859-1.xml 9 Mar 2004 18:02:37 -0000 1.3
+++ openacs-4/packages/acs-templating/catalog/acs-templating.pt_BR.ISO-8859-1.xml 12 Mar 2004 13:45:33 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-templating" package_version="5.0.3" locale="pt_BR" charset="ISO-8859-1">
+<message_catalog package_key="acs-templating" package_version="5.0.4" locale="pt_BR" charset="ISO-8859-1">
<msg key="Invalid_choice">Escolha inv�lida</msg>
<msg key="Invalid_currency">Moeda corrente inv�lida</msg>
Index: openacs-4/packages/calendar/calendar.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/calendar.info,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/calendar/calendar.info 25 Feb 2004 12:48:03 -0000 1.26
+++ openacs-4/packages/calendar/calendar.info 12 Mar 2004 13:45:34 -0000 1.27
@@ -7,13 +7,14 @@
<initial-install-p>f</initial-install-p>
<singleton-p>f</singleton-p>
- <version name="2.0d3" url="http://openacs.org/acs-repository/download/apm/calendar-2.0d3.apm">
- <owner url="mailto:openacs@dirkgomez.de">Dirk Gomez</owner>
- <summary>OpenACS Calendar</summary>
- <release-date>2004-01-10</release-date>
- <description format="text/plain">OpenACS Calendar</description>
+ <version name="2.0.1" url="http://openacs.org/repository/download/apm/calendar-2.0.1.apm">
+ <owner url="mailto:openacs-calendar@dirkgomez.de">Dirk Gomez</owner>
+ <summary>Personal and shared event calendars.</summary>
+ <release-date>2004-03-04</release-date>
+ <vendor url="http://openacs.org">OpenACS</vendor>
+ <description format="text/html">Manage group and shared calendars with download.</description>
- <provides url="calendar" version="2.0d3"/>
+ <provides url="calendar" version="2.0.1"/>
<requires url="acs-datetime" version="4.0"/>
<requires url="acs-events" version="0.1d"/>
<requires url="acs-lang" version="5.0.0a5"/>
Index: openacs-4/packages/calendar/www/view-week-display-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display-postgresql.xql,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/calendar/www/view-week-display-postgresql.xql 10 Jan 2004 00:20:38 -0000 1.10
+++ openacs-4/packages/calendar/www/view-week-display-postgresql.xql 12 Mar 2004 13:45:34 -0000 1.11
@@ -15,6 +15,37 @@
</querytext>
</fullquery>
+<fullquery name="select_week_items">
+<querytext>
+select to_char(start_date, :ansi_date_format) as ansi_start_date,
+ to_char(end_date, :ansi_date_format) as ansi_end_date,
+ coalesce(e.name, a.name) as name,
+ coalesce(e.status_summary, a.status_summary) as status_summary,
+ e.event_id as item_id,
+ (to_date(start_date,:ansi_date_format) - to_date(:first_weekday_of_the_week_tz,
+ :ansi_date_format)) as day_of_week,
+ cals.calendar_id,
+ cals.calendar_name,
+ cit.type as item_type
+from acs_activities a,
+ acs_events e,
+ timespans s,
+ time_intervals t,
+ calendars cals,
+ cal_items ci left join
+ cal_item_types cit on cit.item_type_id = ci.item_type_id
+where e.timespan_id = s.timespan_id
+and s.interval_id = t.interval_id
+and e.activity_id = a.activity_id
+and start_date between
+ to_date(:first_weekday_of_the_week_tz, :ansi_date_format) and
+ to_date(:last_weekday_of_the_week_tz, :ansi_date_format)
+and cals.calendar_id = ci.on_which_calendar
+and e.event_id = ci.cal_item_id
+$calendars_clause
+order by to_char(start_date, 'J'), to_char(start_date,'HH24:MI')
+</querytext>
+</fullquery>
<fullquery name="select_week_info">
<querytext>
Index: openacs-4/packages/faq/www/admin/q_and_a-new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q_and_a-new-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/faq/www/admin/q_and_a-new-2.tcl 28 Sep 2003 23:47:58 -0000 1.2
+++ openacs-4/packages/faq/www/admin/q_and_a-new-2.tcl 12 Mar 2004 13:45:34 -0000 1.3
@@ -11,7 +11,6 @@
faq_id:integer,notnull,trim
question:html,notnull,trim
answer:html,notnull,trim
- mime_type:notnull
entry_id:naturalnum,optional
insert_p:optional
Index: openacs-4/packages/faq/www/admin/q_and_a-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q_and_a-new.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/faq/www/admin/q_and_a-new.adp 22 Oct 2003 16:51:32 -0000 1.8
+++ openacs-4/packages/faq/www/admin/q_and_a-new.adp 12 Mar 2004 13:45:34 -0000 1.9
@@ -24,15 +24,6 @@
<th align="right"><br>#faq.Answer#</td>
<td><textarea name="answer" rows="10" cols="50" wrap>@answer_q@</textarea></td>
</tr>
- <tr> <th align="right">#faq.Text_type#</th>
- <td>
- <select name="mime_type">
- <option value="text/plain; format=flowed" selected>#faq.Plain#</option>
- <option value="text/plain">#faq.Preformatted#</option>
- <option value="text/html">#faq.HTML#</option>
- </select>
- </td>
- </tr>
<tr>
<th></th>
<td><input type="submit" value="@submit_label@"></td>
Index: openacs-4/packages/faq/www/admin/q_and_a-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q_and_a-new.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/faq/www/admin/q_and_a-new.tcl 7 Nov 2002 08:13:54 -0000 1.6
+++ openacs-4/packages/faq/www/admin/q_and_a-new.tcl 12 Mar 2004 13:45:34 -0000 1.7
@@ -41,8 +41,6 @@
set insert_p "t"
}
-set mime_type ""
-
set question_q [ad_quotehtml $question]
set answer_q [ad_quotehtml $answer]
Index: openacs-4/packages/file-storage/file-storage.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/file-storage.info,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/file-storage/file-storage.info 16 Feb 2004 19:07:56 -0000 1.28
+++ openacs-4/packages/file-storage/file-storage.info 12 Mar 2004 13:45:36 -0000 1.29
@@ -10,7 +10,7 @@
<version name="5.1.0d" url="http://openacs.org/repository/download/apm/file-storage-5.1.0d.apm">
<owner url="http://openacs.org">OpenACS</owner>
<summary>Collaborative document storage</summary>
- <release-date>2003-11-10</release-date>
+ <release-date>2004-03-04</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
<description format="text/plain">Provides a versioned document store with storage in the filesystem or database (depending on configuration). Documents and folders can be permissioned and folders downloaded.</description>
Index: openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml 10 Mar 2004 13:46:49 -0000 1.22
+++ openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml 12 Mar 2004 13:45:36 -0000 1.23
@@ -132,4 +132,7 @@
<msg key="Version_Notes_1">Version Notes:</msg>
<msg key="view_details">view details</msg>
<msg key="Yes_Delete_It">Yes, Delete It</msg>
+ <msg key="lt_Leave_blank_for_linked_documents">Leave title blank when uploading multiple interlinked documents.</msg>
+ <msg key="lt_This_is_a_ZIP">This is a ZIP file containing multiple files</msg>
+ <msg key="Multiple_files">Multiple files:</msg>
</message_catalog>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-4.6.3-5.0.0.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-4.6.3-5.0.0sql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/file-storage/www/file.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/file-storage/www/file.tcl 15 Dec 2003 11:18:45 -0000 1.17
+++ openacs-4/packages/file-storage/www/file.tcl 12 Mar 2004 13:45:37 -0000 1.18
@@ -90,6 +90,7 @@
}
set version_delete [_ file-storage.Delete_Version]
set version_delete_url "version-delete?[export_vars version_id]"
+ set file_url [ad_urlencode $file_url]
}
set return_url "[ad_conn url]?file_id=$file_id"
Index: openacs-4/packages/file-storage/www/folder-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.tcl,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/file-storage/www/folder-chunk.tcl 7 Mar 2004 00:02:23 -0000 1.20
+++ openacs-4/packages/file-storage/www/folder-chunk.tcl 12 Mar 2004 13:45:37 -0000 1.21
@@ -30,7 +30,7 @@
set fs_url ""
}
-set folder_name [fs::get_object_name -object_id $folder_id]
+set folder_name [lang::util::localize [fs::get_object_name -object_id $folder_id]]
set content_size_total 0
@@ -123,6 +123,10 @@
set file_url "index?[export_vars {{folder_id $object_id}}]"
}
+
+ # We need to encode the hashes in any i18n message keys (.LRN plays this trick on some of its folders).
+ # If we don't, the hashes will cause the path to be chopped off (by ns_conn url) at the leftmost hash.
+ regsub -all {#} $file_url {%23} file_url
}
ad_return_template
Index: openacs-4/packages/file-storage/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/index.adp,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/file-storage/www/index.adp 16 Feb 2004 19:07:57 -0000 1.25
+++ openacs-4/packages/file-storage/www/index.adp 12 Mar 2004 13:45:37 -0000 1.26
@@ -1,14 +1,13 @@
<master>
-<property name="title">@folder_name;noquote@</property>
-<property name="header">@folder_name;noquote@</property>
+<property name="title">@folder_name@</property>
+<property name="header">@folder_name@</property>
<property name="context">@context;noquote@</property>
<if @up_url@ not nil>
<a href="@up_url@">#file-storage.index_page_navigate_up_folder#</a>
</if>
-<include src="folder-chunk" folder_id=@folder_id;noquote@ n_past_days=@n_past_days@>
+<include src="folder-chunk" folder_id=@folder_id@ n_past_days=@n_past_days@>
<if @webdav_url@ not nil>
<p>#file-storage.Folder_available_via_WebDAV_at# @webdav_url@</p>
</if>
-
\ No newline at end of file
Index: openacs-4/packages/forums/www/admin/permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/permissions.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/forums/www/admin/permissions.adp 21 Sep 2003 19:58:58 -0000 1.1
+++ openacs-4/packages/forums/www/admin/permissions.adp 12 Mar 2004 13:45:38 -0000 1.2
@@ -2,4 +2,4 @@
<property name="title">@page_title@</property>
<property name="context">@context@</property>
-<include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@object_id@" user_add_url="permissions-user-add">
+<include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@object_id@" user_add_url="permissions-user-add" privs="read create forum_moderate admin">
Index: openacs-4/packages/ref-timezones/ref-timezones.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ref-timezones/ref-timezones.info,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/ref-timezones/ref-timezones.info 19 Feb 2004 14:59:45 -0000 1.14
+++ openacs-4/packages/ref-timezones/ref-timezones.info 12 Mar 2004 13:45:38 -0000 1.15
@@ -10,7 +10,7 @@
<version name="5.1.0d1" url="http://openacs.org/repository/download/apm/ref-timezones-5.1.0d1.apm">
<owner url="mailto:jon@mayuli.com">Jon Griffin</owner>
<summary>Timezone data for acs-reference.</summary>
- <release-date>2004-01-21</release-date>
+ <release-date>2004-03-10</release-date>
<vendor url="http://www.mayuli.com">Mayuli Enterprises, LLC</vendor>
<description format="text/plain">This is the timezone data for the acs-reference data package. Used by acs-lang (among others) for localized times.</description>
Index: openacs-4/packages/search/search.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/search.info,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/search/search.info 19 Feb 2004 14:59:45 -0000 1.12
+++ openacs-4/packages/search/search.info 12 Mar 2004 13:45:39 -0000 1.13
@@ -9,7 +9,7 @@
<version name="5.1.0d1" url="http://openacs.org/repository/download/apm/search-5.1.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
- <release-date>2004-01-21</release-date>
+ <release-date>2004-03-10</release-date>
<summary>Site wide search</summary>
<vendor url="http://openacs.org">OpenACS</vendor>
<description format="text/html">Site wide search implemented with service contracts, currently
Index: openacs-4/packages/survey/www/one-respondent.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/one-respondent.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/survey/www/one-respondent.tcl 12 Mar 2003 01:05:39 -0000 1.2
+++ openacs-4/packages/survey/www/one-respondent.tcl 12 Mar 2004 13:45:39 -0000 1.3
@@ -38,8 +38,9 @@
set description $survey_info(description)
set editable_p $survey_info(editable_p)
set context_bar [ad_context_bar "[_ survey.Responses]"]
-db_multirow -extend {answer_summary} responses responses_select {} {
+db_multirow -extend {answer_summary pretty_submission_date} responses responses_select {} {
set answer_summary [survey_answer_summary_display $response_id 1]
+ set pretty_submission_date [lc_time_fmt $pretty_submission_date_ansi %x]
}
ad_return_template
Index: openacs-4/packages/trackback/trackback.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/trackback/trackback.info,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/trackback/trackback.info 11 Dec 2003 21:40:14 -0000 1.3
+++ openacs-4/packages/trackback/trackback.info 12 Mar 2004 13:45:40 -0000 1.4
@@ -5,7 +5,7 @@
<package-name>Trackback</package-name>
<pretty-plural>Trackbacks</pretty-plural>
<initial-install-p>f</initial-install-p>
- <singleton-p>f</singleton-p>
+ <singleton-p>t</singleton-p>
<auto-mount>tb</auto-mount>
<version name="0.1d1" url="http://openacs.org/repository/download/apm/trackback-0.1d1.apm">
Index: openacs-4/www/SYSTEM/security-debug.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/SYSTEM/security-debug.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/www/SYSTEM/security-debug.tcl 11 Dec 2003 14:42:50 -0000 1.3
+++ openacs-4/www/SYSTEM/security-debug.tcl 12 Mar 2004 13:45:40 -0000 1.4
@@ -1,4 +1,3 @@
-
# NOTE:
# Comment out below two lines to use this page
#
@@ -9,16 +8,16 @@
sec_login_handler
set session_id {}
-catch { set session_id [ad_get_signed_cookie_with_expr "ad_session_id"] }
+catch { set session_id [ad_get_signed_cookie_with_expr "ad_session_id"] } session_id
set ad_user_login {}
-catch { set ad_user_login [ad_get_signed_cookie "ad_user_login"] }
+catch { set ad_user_login [ad_get_signed_cookie "ad_user_login"] } ad_user_login
set ad_user_login_secure {}
-catch { set ad_user_login_secure [ad_get_signed_cookie "ad_user_login_secure"] }
+catch { set ad_user_login_secure [ad_get_signed_cookie "ad_user_login_secure"] } ad_user_login_secure
set ad_secure_token {}
-catch { set ad_secure_token [ad_get_signed_cookie "ad_secure_token"] }
+catch { set ad_secure_token [ad_get_signed_cookie "ad_secure_token"] } ad_secure_token
set auth_expires_in "N/A"
@@ -29,22 +28,27 @@
}
-ns_return 200 text/html "<html><body>
+set page "<html><body>
<h1>Debug Page For Security Cookies</h1>
<h2>Cookies</h2>
-<p> session_id: <code>$session_id</code> </p>
+<table border=1>
+<tr><th>Cookie name</th><th>Value</th><th>Explanation</th></tr>
+<tr><td>session_id<td><code>$session_id</code><td>session_id, user_id, login_level expiration</tr>
+<tr><td>ad_user_login<td><code>$ad_user_login</code><td>user_id, issue_time, auth_token</tr>
+<tr><td>ad_user_login_secure<td><code>$ad_user_login_secure</code><td>...</tr>
+<tr><td>ad_secure_token<td><code>$ad_secure_token</code><td>...</tr>
+</table>
-<p> ad_user_login: <code>$ad_user_login</code> </p>
+<p> Cookie HTTP header: </p> <pre>"
-<p> ad_user_login_secure: <code>$ad_user_login_secure</code> </p>
+foreach elm [split [ns_set iget [ad_conn headers] Cookie] ";"] {
+ append page [string trim $elm] ";" \n
+}
-<p> ad_secure_token: <code>$ad_secure_token</code> </p>
-
-<p> Cookie HTTP header: <code>[ns_set iget [ad_conn headers] Cookie]</code></p>
-
+append page "
<h2>ad_conn</h2>
<p> user_id: <code>[ad_conn user_id]</code> </p>
@@ -67,3 +71,6 @@
</body></html>"
+
+
+ns_return 200 text/html $page