Index: openacs-4/packages/faq/www/one-faq.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-faq.adp,v
diff -u -N -r1.16 -r1.16.2.1
--- openacs-4/packages/faq/www/one-faq.adp	8 Jun 2006 01:29:22 -0000	1.16
+++ openacs-4/packages/faq/www/one-faq.adp	17 Mar 2007 22:10:58 -0000	1.16.2.1
@@ -1,5 +1,9 @@
 <master>
 <property name="context">@context;noquote@</property>
+<property name="title">#faq.FAQs#</property>
+
+<h1>@faq_name;noquote@</h1>
+
 <p>
       @notification_chunk;noquote@ 
 </p>
@@ -10,21 +14,20 @@
 <tr><td align="left" valign="top">
 <if @one_question:rowcount@ eq 0>
   <i>#faq.lt_no_questions#</i>
-  <p>
 </if>
 <else>
   <ol>
 <multiple name="one_question">
 <if @separate_p@ true>
     <li>
-      <a href="one-question?entry_id=@one_question.entry_id@">@one_question.question;noquote@</a>
+      <a href="one-question?entry_id=@one_question.entry_id@" title="#faq.View_QA#">@one_question.question;noquote@</a>
     </li>
 </if>
 <if @separate_p@ false>
     <li>
-      <a href="#@one_question.entry_id@">@one_question.question;noquote@</a>
+      <a href="#@one_question.entry_id@" title="#faq.Jump_to_Answer#">@one_question.question;noquote@</a>
 <if @use_categories_p@>
-      <a href="categories/categorize?object_id=@one_question.entry_id@">Categorize</a>
+      <a href="categories/categorize?object_id=@one_question.entry_id@" title="#faq.Categorize_Q#">Categorize</a>
 </if>
     </li>
 </if>
@@ -36,26 +39,27 @@
   <ol>
 <multiple name="one_question">
     <li>
-      <a name=@one_question.entry_id@></a>
+      <a name=@one_question.entry_id@ title="#faq.View_QA#"></a>
+      <p>
       <b>#faq.Q#</b> <i>@one_question.question;noquote@</i>
+      </p>
       <p>
       <b>#faq.A#</b> @one_question.answer;noquote@
-      <p>
+      </p>
     </li>
 </multiple>
   </ol>
 </if>
-
 </else>
 </td><td align="right" valign="top">
 <if @use_categories_p@>
- <multiple name="categories">
+  <multiple name="categories">
            <h2>@categories.tree_name@</h2>
            <group column="tree_id">
-             <a href="@package_url@cat@categories.category_id@?faq_id=@faq_id@&category_id=@categories.category_id@">@categories.category_name@</a><br>
+             <a href="@package_url@cat@categories.category_id@?faq_id=@faq_id@&category_id=@categories.category_id@" title="#faq.View_in_Category# @categories.category_name@">@categories.category_name@</a><br>
            </group>
-         </multiple>
-<br><a href="@package_url@one-faq?faq_id=@faq_id@">#faq.All_QA#</a>
+  </multiple>
+<br><a href="@package_url@one-faq?faq_id=@faq_id@" title="#faq.All_QA#">#faq.All_QA#</a>
 </if>
 </td></tr>
 </table>
Index: openacs-4/packages/faq/www/one-faq.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-faq.tcl,v
diff -u -N -r1.7 -r1.7.2.1
--- openacs-4/packages/faq/www/one-faq.tcl	8 Jun 2006 01:29:22 -0000	1.7
+++ openacs-4/packages/faq/www/one-faq.tcl	17 Mar 2007 22:12:59 -0000	1.7.2.1
@@ -30,25 +30,11 @@
 set use_categories_p [parameter::get -parameter "EnableCategoriesP" -default 0]
 
 if { $use_categories_p == 1 && [exists_and_not_null category_id] } {
-
-    set select_sql_query "select entry_id, faq_id, question, answer, sort_key
-from faq_q_and_as qa, category_object_map com, acs_named_objects nam
-where faq_id = :faq_id and
-com.object_id = qa.entry_id and
-nam.package_id = :package_id and
-com.object_id = nam.object_id and 
-com.category_id = :category_id
-order by sort_key"
-
+    db_multirow one_question categorized_faq "" {}
 } else {
-
-    set select_sql_query "select entry_id, faq_id, question, answer, sort_key
-from faq_q_and_as
-where faq_id = :faq_id
-order by sort_key"
+    db_multirow one_question uncategorized_faq "" {}
 }
 
-db_multirow one_question q_and_a_info $select_sql_query
 
 # Site-Wide Categories
 if { $use_categories_p == 1} {
@@ -64,19 +50,14 @@
 	append context_base_url /cat/$category_id
 	lappend context [list $context_base_url $category_name]
 	set type "all"
-    }
     
-    # Cut the URL off the last item in the context bar
-    if { [llength $context] > 0 } {
-        set context [lreplace $context end end [lindex [lindex $context end] end]]
-    }
-    
-    db_multirow -unclobber -extend { category_name tree_name } categories categories {
-	select c.category_id as category_id, c.tree_id
-	from   categories c, category_tree_map ctm
-	where  ctm.tree_id = c.tree_id
-	and    ctm.object_id = :package_id
-    } {
+	# Cut the URL off the last item in the context bar
+	if { [llength $context] > 0 } {
+	    set context [lreplace $context end end [lindex [lindex $context end] end]]
+	}
+	
+    }    
+    db_multirow -unclobber -extend { category_name tree_name } categories faq_categories "" {
 	set category_name [category::get_name $category_id]
 	set tree_name [category_tree::get_name $tree_id]
     }