Index: openacs-4/packages/faq/templates/first/one-faq.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/templates/first/one-faq.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/faq/templates/first/one-faq.adp	5 Jul 2002 15:56:53 -0000	1.2
+++ openacs-4/packages/faq/templates/first/one-faq.adp	28 Oct 2002 16:07:26 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="master">
 <property name="context_bar">@context_bar@</property>
-<property name="title">$faq_name</property>
+<property name="title">@faq_name@</property>
 
 <if @one_question:rowcount@ eq 0>
  <i>There are no questions available.</i><p>
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.5 -r1.6
--- openacs-4/packages/faq/www/admin/one-faq.adp	17 Sep 2002 21:41:48 -0000	1.5
+++ openacs-4/packages/faq/www/admin/one-faq.adp	28 Oct 2002 16:07:28 -0000	1.6
@@ -32,6 +32,6 @@
  </ol>
 </else>
 <ul>
-  <li><a href="q_and_a-new?<%=[export_url_vars faq_id]%>">Create New Q&A</a>
+  <li><a href="@new_faq_url@">Create New Q&A</a>
 <li><a href="index">View All FAQs</a>
 </ul>
Index: openacs-4/packages/faq/www/admin/one-faq.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/one-faq.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/faq/www/admin/one-faq.tcl	4 Sep 2002 13:28:33 -0000	1.2
+++ openacs-4/packages/faq/www/admin/one-faq.tcl	28 Oct 2002 16:07:28 -0000	1.3
@@ -35,4 +35,6 @@
 db_1row faq_name "select faq_name from faqs where faq_id=:faq_id"
 set context [list $faq_name]
 
+set new_faq_url "q_and_a-new?[export_vars { faq_id }]"
+
 ad_return_template
Index: openacs-4/packages/faq/www/admin/one-question.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/one-question.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/faq/www/admin/one-question.adp	6 Sep 2002 21:50:37 -0000	1.3
+++ openacs-4/packages/faq/www/admin/one-question.adp	28 Oct 2002 16:07:28 -0000	1.4
@@ -6,7 +6,11 @@
 <P>
 <b>A:</b> @answer@
 <p>
-<a href=q_and_a-edit?<%=[export_url_vars entry_id faq_id]%>>Edit</a> | <a href=q_and_a-delete?<%=[export_url_vars entry_id faq_id]%>>Delete</a> | <a href="q_and_a-new?<%=[export_url_vars faq_id]%>">New</a>
+<a href="@edit_url@">Edit</a> 
+| 
+<a href="@delete_url@">Delete</a> 
+| 
+<a href="@create_url@">New</a>
 
 <p>
 <a href="index">Back to FAQs</a>
Index: openacs-4/packages/faq/www/admin/one-question.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/one-question.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/faq/www/admin/one-question.tcl	4 Sep 2002 13:28:33 -0000	1.2
+++ openacs-4/packages/faq/www/admin/one-question.tcl	28 Oct 2002 16:07:28 -0000	1.3
@@ -27,4 +27,9 @@
       and a.faq_id = f.faq_id"
 
 set context [list [list "one-faq?faq_id=$faq_id" "$faq_name"] "One Q&A"]
+
+set edit_url "q_and_a-edit?[export_vars { entry_id faq_id }]"
+set delete_url "q_and_a-delete?[export_vars { entry_id faq_id }]"
+set create_url "q_and_a-new?[export_vars { faq_id } ]"
+
 ad_return_template
Index: openacs-4/packages/faq/www/admin/q_and_a-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-edit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/faq/www/admin/q_and_a-edit.adp	17 Sep 2002 21:41:48 -0000	1.4
+++ openacs-4/packages/faq/www/admin/q_and_a-edit.adp	28 Oct 2002 16:07:28 -0000	1.5
@@ -23,7 +23,7 @@
   </tr>
   <tr>
    <td>&nbsp;</td>
-   <td> <a href=q_and_a-delete?<%=[export_url_vars entry_id faq_id]%>>Delete This Q&A</a></td>
+   <td> <a href="@delete_url@">Delete This Q&A</a></td>
   </tr>
  </table>
 </form>
Index: openacs-4/packages/faq/www/admin/q_and_a-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/faq/www/admin/q_and_a-edit.tcl	4 Sep 2002 13:28:33 -0000	1.2
+++ openacs-4/packages/faq/www/admin/q_and_a-edit.tcl	28 Oct 2002 16:07:28 -0000	1.3
@@ -30,5 +30,6 @@
 
 set context [list [list "one-faq?faq_id=$faq_id" "$faq_name"] "One Q&A"]
 
+set delete_url "q_and_a-delete?[export_vars { entry_id faq_id }]"
 
 ad_return_template
Index: openacs-4/packages/faq/www/admin/q_and_a-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-new.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/faq/www/admin/q_and_a-new.adp	6 Sep 2002 21:50:37 -0000	1.4
+++ openacs-4/packages/faq/www/admin/q_and_a-new.adp	28 Oct 2002 16:07:28 -0000	1.5
@@ -16,12 +16,12 @@
   
    <tr valign="top">
     <th align="right"><br>Question</td>
-    <td><textarea name="question" rows="3" cols="50" wrap><%= [ad_quotehtml $question] %></textarea></td>
+    <td><textarea name="question" rows="3" cols="50" wrap>@question_q@</textarea></td>
    </tr>
    <tr>
   <tr valign="top">
     <th align="right"><br>Answer</td>
-    <td><textarea name="answer" rows="10" cols="50" wrap><%= [ad_quotehtml $answer] %></textarea></td>
+    <td><textarea name="answer" rows="10" cols="50" wrap>@answer_q@</textarea></td>
    </tr>
    <tr>   <th align="right">Text type?</th>
     <td>
Index: openacs-4/packages/faq/www/admin/q_and_a-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-new.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/faq/www/admin/q_and_a-new.tcl	4 Sep 2002 13:28:33 -0000	1.4
+++ openacs-4/packages/faq/www/admin/q_and_a-new.tcl	28 Oct 2002 16:07:28 -0000	1.5
@@ -19,7 +19,9 @@
     action:onevalue
     submit_label:onevalue
     question:onevalue
+    question_q:onevalue
     answer:onevalue
+    answer_q:onevalue
 }
 
 ad_require_permission [ad_conn package_id] faq_create_faq
@@ -41,5 +43,8 @@
 
 set mime_type ""
 
+set question_q [ad_quotehtml $question]
+set answer_q [ad_quotehtml $answer]
+
 ad_return_template