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 -r1.16 -r1.17
--- 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	15 May 2007 20:14:35 -0000	1.17
@@ -1,61 +1,65 @@
 <master>
 <property name="context">@context;noquote@</property>
+<property name="title">#faq.FAQs#</property>
+
+<h1>@faq_info.faq_name;noquote@</h1>
+
 <p>
       @notification_chunk;noquote@ 
 </p>
-<property name="title">@faq_name;noquote@</property>
+<property name="title">@faq_info.faq_name;noquote@</property>
 <property name="displayed_object_id">@faq_id;noquote@</property>
 
 <table width="70%" border="0">
 <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>
+<if @faq_info.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>
+<if @faq_info.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@&amp;faq_id=@faq_id@" title="#faq.Categorize_Q#">Categorize</a>
 </if>
     </li>
 </if>
 </multiple>
   </ol>
 
-<if @separate_p@ false>
+<if @faq_info.separate_p@ false>
   <hr>
   <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@&amp;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>