Index: openacs-4/packages/faq/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/index.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/faq/www/index.adp 22 May 2003 14:54:15 -0000 1.7 +++ openacs-4/packages/faq/www/index.adp 22 Dec 2003 23:24:40 -0000 1.8 @@ -3,7 +3,9 @@ #faq.FAQs# -

[#faq.administer#]

+

+ #faq.administer# +

Index: openacs-4/packages/faq/www/admin/faq-add-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-add-edit.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/faq/www/admin/faq-add-edit.adp 28 Nov 2003 16:55:15 -0000 1.1 +++ openacs-4/packages/faq/www/admin/faq-add-edit.adp 22 Dec 2003 23:24:41 -0000 1.2 @@ -1,4 +1,6 @@ @page_title;noquote@ @context;noquote@ +faq_add_edit.faq_name + Index: openacs-4/packages/faq/www/admin/faq-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-add-edit.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/faq/www/admin/faq-add-edit.tcl 28 Nov 2003 20:41:31 -0000 1.2 +++ openacs-4/packages/faq/www/admin/faq-add-edit.tcl 22 Dec 2003 23:24:41 -0000 1.3 @@ -5,6 +5,7 @@ @creation-date 2003-11-26 } { faq_id:optional + return_url:optional } -properties { context:onevalue faq_id:onevalue @@ -32,23 +33,28 @@ permission::require_permission -object_id [ad_conn package_id] -privilege faq_create_faq } -ad_form -name faq_add_edit -export { } -form { +ad_form -name faq_add_edit -form { faq_id:key - {faq_name:text(text) {label "FAQ Name"} {html { size 20 }}} + {faq_name:text(text) {label "FAQ Name"} {html { size 50 }}} {separate_p:text(select) {label "Category"} { options {{No f} {Yes t}} } } } -select_query { select faq_name,separate_p from faqs where faq_id = :faq_id } -new_data { - db_exec_plsql create_faq { *SQL* } + set faq_id [db_exec_plsql create_faq {}] } -edit_data { -db_dml faq_edit "update faqs - set faq_name = :faq_name, - separate_p = :separate_p - where faq_id = :faq_id" + db_dml faq_edit { + update faqs + set faq_name = :faq_name, + separate_p = :separate_p + where faq_id = :faq_id + } } -after_submit { - ad_returnredirect "/faq/admin" + if { ![exists_and_not_null return_url] } { + set return_url [export_vars -base one-faq { faq_id }] + } + ad_returnredirect $return_url ad_script_abort } Index: openacs-4/packages/faq/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/index.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/faq/www/admin/index.adp 28 Nov 2003 16:55:15 -0000 1.7 +++ openacs-4/packages/faq/www/admin/index.adp 22 Dec 2003 23:24:41 -0000 1.8 @@ -2,35 +2,8 @@ @context;noquote@ #faq.FAQ_Admin# - - #faq.lt_no_FAQs#

- - - -

Disabled FAQs

 -

Available FAQs

 - - - - + -#faq.Create_a_new_FAQ# +#faq.Create_a_new_FAQ# Index: openacs-4/packages/faq/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/index.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/faq/www/admin/index.tcl 28 Nov 2003 16:55:15 -0000 1.5 +++ openacs-4/packages/faq/www/admin/index.tcl 22 Dec 2003 23:24:41 -0000 1.6 @@ -23,17 +23,59 @@ set user_id [ad_verify_and_get_user_id] +template::list::create \ + -name faqs \ + -elements { + edit { + link_url_col edit_url + display_template { + + } + sub_class narrow + } + faq_name { + label "Name" + link_url_col manage_url + } + num_q_and_as { + label "\# Q&A's" + html { align right } + } + disabled_p { + label "Enabled" + display_template { + + Disable + + + Enable + + } + html { align center } + } + delete { + link_url_col delete_url + display_template { + + } + sub_class narrow + } + } -db_multirow -extend { disable_url enable_url } faqs faq_select { - select faq_id, faq_name, disabled_p +db_multirow -extend { edit_url manage_url delete_url disable_url enable_url } faqs faq_select { + select faq_id, faq_name, disabled_p, + (select count(*) from faq_q_and_as where faq_id = f.faq_id) as num_q_and_as from acs_objects o, faqs f where object_id = faq_id and context_id = :package_id order by disabled_p, faq_name } { - set disable_url "faq-disable?[export_vars { faq_id }]" - set enable_url "faq-enable?[export_vars { faq_id }]" + set edit_url [export_vars -base faq-add-edit { faq_id }] + set manage_url [export_vars -base one-faq { faq_id }] + set delete_url [export_vars -base faq-delete { faq_id }] + set disable_url [export_vars -base faq-disable { faq_id }] + set enable_url [export_vars -base faq-enable { faq_id }] } ad_return_template Index: openacs-4/packages/faq/www/admin/one-faq.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/one-faq.adp,v diff -u -r1.9 -r1.10 --- openacs-4/packages/faq/www/admin/one-faq.adp 28 Nov 2003 16:55:15 -0000 1.9 +++ openacs-4/packages/faq/www/admin/one-faq.adp 22 Dec 2003 23:24:41 -0000 1.10 @@ -31,8 +31,8 @@ - +#faq.Create_New_QA# +#faq.View_All_FAQs# + + Index: openacs-4/packages/faq/www/admin/q-and-a-add-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q-and-a-add-edit.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/faq/www/admin/q-and-a-add-edit.adp 28 Nov 2003 16:55:15 -0000 1.1 +++ openacs-4/packages/faq/www/admin/q-and-a-add-edit.adp 22 Dec 2003 23:24:41 -0000 1.2 @@ -1,4 +1,6 @@ @page_title;noquote@ @context;noquote@ +new_quest_answ.question +