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.8 -r1.9
--- openacs-4/packages/faq/www/admin/one-faq.adp	22 May 2003 14:54:51 -0000	1.8
+++ openacs-4/packages/faq/www/admin/one-faq.adp	28 Nov 2003 16:55:15 -0000	1.9
@@ -2,7 +2,7 @@
 <property name="context">@context;noquote@</property>
 <property name="title">#faq.faq_name_Admin#</property>
 
-<b>#faq.Title#</b> @faq_name@ (<a href=faq-edit?faq_id=@faq_id@>#faq.edit#</a>)
+<b>#faq.Title#</b> @faq_name@ (<a href=faq-add-edit?faq_id=@faq_id@>#faq.edit#</a>)
 <p>
 <if @faq_q_and_as:rowcount@ eq 0>
  <i>#faq.lt_no_questions#</i><p>
@@ -14,16 +14,16 @@
    <li>
 	@faq_q_and_as.question@ 
 	(	
-	 <a href="q_and_a-edit?entry_id=@faq_q_and_as.entry_id@">#faq.edit#</a> |
+	 <a href="q-and-a-add-edit?entry_id=@faq_q_and_as.entry_id@&faq_id=@faq_id@">#faq.edit#</a> |
 	 <a href="one-question?entry_id=@faq_q_and_as.entry_id@">#faq.preview#</a> |
 	 <a href="q_and_a-delete?entry_id=@faq_q_and_as.entry_id@" onclick="return confirm('#faq.lt_Are_you_sure_you_want_1#');">#faq.delete#</a> |
 
          <if @faq_q_and_as.sort_key@ ne @highest_sort_key_in_list@>
-	   <a href="q_and_a-new?entry_id=@faq_q_and_as.entry_id@&faq_id=@faq_id@">#faq.insert_after#</a> |
+	   <a href="q-and-a-add-edit?prev_entry_id=@faq_q_and_as.entry_id@&faq_id=@faq_id@">#faq.insert_after#</a> |
  	   <a href="swap?faq_id=@faq_id@&entry_id=@faq_q_and_as.entry_id@">#faq.swap_with_next#</a>
          </if>
 	 <else>
-	   <a href="q_and_a-new?entry_id=@faq_q_and_as.entry_id@&faq_id=@faq_id@">#faq.insert_after#</a>
+	   <a href="q-and-a-add-edit?prev_entry_id=@faq_q_and_as.entry_id@&faq_id=@faq_id@">#faq.insert_after#</a>
 	</else>
 
 	)
@@ -32,7 +32,7 @@
  </ol>
 </else>
 <ul>
-  <li><a href="@new_faq_url@">#faq.Create_New_QA#</a>
+  <li><a href="q-and-a-add-edit?faq_id=@faq_id@ ">#faq.Create_New_QA#</a>
 <li><a href="index">#faq.View_All_FAQs#</a>
 </ul>