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.5 -r1.6
--- openacs-4/contrib/packages/project-manager/www/add-edit.tcl	2 Aug 2003 00:26:28 -0000	1.5
+++ openacs-4/contrib/packages/project-manager/www/add-edit.tcl	6 Aug 2003 20:22:18 -0000	1.6
@@ -32,15 +32,20 @@
 set package_id [ad_conn package_id]
 set user_id    [ad_maybe_redirect_for_registration]
 
+# terminology
+set project_term    [parameter::get -parameter "ProjectName" -default "Project"]
+set project_term_lower    [parameter::get -parameter "projectname" -default "project"]
+
+
 if {[exists_and_not_null project_id]} {
-    set title "Edit a project"
-    set context_bar [ad_context_bar "Edit Project"]
+    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"
-    set context_bar [ad_context_bar "New Project"]
+    set title "Add a $project_term_lower"
+    set context_bar [ad_context_bar "New $project_term"]
 
     # permissions
     permission::require_permission -party_id $user_id -object_id $package_id -privilege create
@@ -58,66 +63,72 @@
         {value $item_id}
     }
 
+} -select_query_name project_query -on_submit {
+
+    set user_id [ad_conn user_id]
+    set peeraddr [ad_conn peeraddr]
+
+} -new_data {
+    set project_id [db_exec_plsql new_project_item { *SQL* }]
+
+    ad_returnredirect "one?[export_url_vars project_id]"
+    ad_script_abort
+
+} -edit_data {
+
+    set project_id [db_exec_plsql new_project_revision { *SQL* }]
+
+} -after_submit {
+
+    ad_returnredirect "one?[export_url_vars project_id]"
+    ad_script_abort
+}
+
+
+set extend_txt "
     {project_name:text
-        {label "Project name"}
+        {label \"$project_term name\"}
 	{value $project_name}
     }
 
     {project_code:text
-        {label "Project code"}
+        {label \"$project_term code\"}
 	{value $project_code}
     }
 
     {goal:text(textarea)
-	{label "Project goal"}
+	{label \"$project_term goal\"}
 	{optional}
 	{value $goal}
 	{html { rows 5 cols 40 wrap soft}}}
 
     {description:text(textarea)
-	{label "Description"}
+	{label \"Description\"}
 	{optional}
 	{value $description}
 	{html { rows 5 cols 40 wrap soft}}}
 
     {deadline_scheduling:text(select)
-	{label "Scheduling"}
-	{options {{"From today" "t"} {"From deadline" "e"}} 
-	{value $deadline_scheduling}} }
+	{label \"Scheduling\"}
+	{options {{\"From today\" \"t\"} {\"From deadline\" \"e\"}} 
+	{value \$deadline_scheduling}} }
 
     {planned_start_date:date {value {[util::date acquire clock [clock scan $planned_start_date]]}} optional
-	{label "Planned start date"}
-	{format "MONTH DD YYYY"}
+	{label \"Planned start date\"}
+	{format \"MONTH DD YYYY\"}
 	{help}
     }
 
     {planned_end_date:date {value {[util::date acquire clock [clock scan $planned_end_date]]}} optional
-	{label "Planned end date"}
-	{format "MONTH DD YYYY"}
+	{label \"Planned end date\"}
+	{format \"MONTH DD YYYY\"}
 	{help}
     }
 
     {ongoing_p:text(select)
-	{label "Project is ongoing?"}
-	{options {{"Yes" "t"} {"No" "f"}} {value $ongoing_p}} }
+	{label \"Project is ongoing?\"}
+	{options {{\"Yes\" \"t\"} {\"No\" \"f\"}} {value \$ongoing_p}} }
 
-} -select_query_name project_query -on_submit {
+"
 
-    set user_id [ad_conn user_id]
-    set peeraddr [ad_conn peeraddr]
-
-} -new_data {
-    set project_id [db_exec_plsql new_project_item { *SQL* }]
-
-    ad_returnredirect "one?[export_url_vars project_id]"
-    ad_script_abort
-
-} -edit_data {
-
-    set project_id [db_exec_plsql new_project_revision { *SQL* }]
-
-} -after_submit {
-
-    ad_returnredirect "one?[export_url_vars project_id]"
-    ad_script_abort
-}
+ad_form -extend -name add_edit -form $extend_txt -select_query_name project_query