Index: openacs-4/packages/faq/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/index.adp,v
diff -u -r1.10 -r1.10.6.1
--- openacs-4/packages/faq/www/index.adp	2 Feb 2005 23:25:52 -0000	1.10
+++ openacs-4/packages/faq/www/index.adp	12 Mar 2007 02:40:07 -0000	1.10.6.1
@@ -1,12 +1,15 @@
 <master>
 <property name="context">@context;noquote@</property>
 <property name="title">#faq.FAQs#</property>
+
+<h1>#faq.FAQs#</h1>
+
 <p>
       @notification_chunk;noquote@ 
 </p>
 <if @admin_p@ eq 1>
   <p>
-    <a href="./admin" class="button">#faq.administer#</a>
+    <a href="./admin" class="button" title="#faq.administer#">#faq.administer#</a>
   </p>
 </if>
 
@@ -18,7 +21,7 @@
 <else>
  <ul>
   <multiple name=faqs>
-   <li><a href="one-faq?faq_id=@faqs.faq_id@">@faqs.faq_name@</a>
+   <li><a href="one-faq?faq_id=@faqs.faq_id@" title="#faq.View# @faqs.faq_name@">@faqs.faq_name@</a>
    </li>
   </multiple>
  </ul>
Index: openacs-4/packages/faq/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/index.tcl,v
diff -u -r1.7 -r1.7.6.1
--- openacs-4/packages/faq/www/index.tcl	1 Mar 2005 00:01:36 -0000	1.7
+++ openacs-4/packages/faq/www/index.tcl	12 Mar 2007 02:42:21 -0000	1.7.6.1
@@ -39,14 +39,6 @@
     set admin_p 1
 }
 
+db_multirow faqs faq_select "" {}
 
-db_multirow faqs faq_select {
-    select faq_id, faq_name
-      from acs_objects o, faqs f
-      where object_id = faq_id
-        and context_id = :package_id     
-        and disabled_p = 'f'
-    order by faq_name
-}
-
 ad_return_template
Index: openacs-4/packages/faq/www/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/index.vuh,v
diff -u -r1.3 -r1.3.6.1
--- openacs-4/packages/faq/www/index.vuh	12 Aug 2004 14:00:29 -0000	1.3
+++ openacs-4/packages/faq/www/index.vuh	12 Mar 2007 02:42:21 -0000	1.3.6.1
@@ -6,6 +6,6 @@
           # As the categories package currently doesn't have short names we
           # are using IDs. We don't check whether this is a valid integer here
           # because index.tcl will take care of that.
-          rp_form_put sw_category_id $sw_category_id
+          rp_form_put category_id $sw_category_id
 }
 rp_internal_redirect "/packages/faq/www/one-faq"
Index: openacs-4/packages/faq/www/one-question.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-question.adp,v
diff -u -r1.7 -r1.7.6.1
--- openacs-4/packages/faq/www/one-question.adp	29 Jun 2004 10:18:18 -0000	1.7
+++ openacs-4/packages/faq/www/one-question.adp	12 Mar 2007 02:43:11 -0000	1.7.6.1
@@ -3,12 +3,18 @@
 <property name="title">#faq.One_Question#</property>
 <property name="displayed_object_id">@entry_id;noquote@</property>
 
+<h1>@faq_name;noquote@</h1>
+
+<p>
 <b>#faq.Q#</b> @question;noquote@
-<P>
-<b>#faq.A#</b> @answer;noquote@
+</p>
 <p>
+<b>#faq.A#</b> @answer;noquote@
+</p>
 
 <p>
-<a href="index">#faq.Back_to_FAQs#</a>
+<a href="one-faq?faq_id=@faq_id@" title="#faq.Back_to_current_FAQ# @faq_name;noquote@">#faq.Back_to_current_FAQ# @faq_name;noquote@</a>
+<br>
+<a href="index" title="#faq.Back_to_FAQs#">#faq.Back_to_FAQs#</a>
+</p>
 
-
Index: openacs-4/packages/faq/www/one-question.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-question.tcl,v
diff -u -r1.4 -r1.4.6.1
--- openacs-4/packages/faq/www/one-question.tcl	1 Mar 2005 00:01:36 -0000	1.4
+++ openacs-4/packages/faq/www/one-question.tcl	12 Mar 2007 02:43:11 -0000	1.4.6.1
@@ -18,10 +18,7 @@
 
 set user_id [ad_conn user_id]
 
-db_1row q_and_a_info "select question, answer,faq_name, f.faq_id 
-                       from faq_q_and_as qa, faqs f
-                       where entry_id = :entry_id
-                         and qa.faq_id = f.faq_id"
+db_1row question_info ""
 
 set context [list [list "one-faq?faq_id=$faq_id" $faq_name] [_ faq.One_Question]]
 
Index: openacs-4/packages/faq/www/admin/faq-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-new.adp,v
diff -u -r1.6 -r1.6.12.1
--- openacs-4/packages/faq/www/admin/faq-new.adp	22 Oct 2003 16:51:32 -0000	1.6
+++ openacs-4/packages/faq/www/admin/faq-new.adp	12 Mar 2007 02:47:07 -0000	1.6.12.1
@@ -2,27 +2,39 @@
 <property name="context">@context;noquote@</property>
 <property name="title">@title;noquote@</property>
 <property name="focus">faq.faq_name</property>
+
+<h1>Create an FAQ:</h1>
   
-<form action="@action@" name="faq">
+<form action="@action@" name="faq" class="margin-form">
   <input type="hidden" name="faq_id" value="@faq_id@">
-  <blockquote>
-    <table>
-      <tr>
-        <th align="right">#faq.Name#</th>
-        <td><input size="50" name="faq_name" value="@faq_name@"></td>
-      </tr>
-      <tr>
-        <th align="right">#faq.QA_on_Separate_Pages#</th>
-        <td><select name="separate_p">
-    	<option value=f>#faq.No#</option>
-    	<option value=t>#faq.Yes#</option>
-    	</select>
-        </td>
-      </tr>
-      
-      <tr>
-        <th></th>
-        <td><input type="submit" value="@submit_label@"></td>
-    </table>
-  </blockquote>
+  <fieldset>
+    <div class="form-item-wrapper">
+      <div class="form-label">
+        <label for="faq_name">
+          #faq.Name#
+        </label>
+      </div>
+      <div class="form-widget">                  
+        <input id="faq_name" name="faq_name" value="@faq_name@">
+      </div>    
+    </div>
+
+    <div class="form-item-wrapper">
+      <div class="form-label">
+        <label for="separate_p">
+          #faq.QA_on_Separate_Pages#
+        </label>
+      </div>
+      <div class="form-widget">                  
+        <select name="separate_p" id="separate_p">
+          <option value="f">#faq.No#</option>
+          <option value="t">#faq.Yes#</option>
+        </select>
+      </div>    
+    </div>
+
+    <div class="form-button">
+      <input type="submit" value="@submit_label@">
+    </div>
+  </fieldset>
 </form>
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.12 -r1.12.6.1
--- openacs-4/packages/faq/www/admin/index.adp	14 Mar 2005 13:44:47 -0000	1.12
+++ openacs-4/packages/faq/www/admin/index.adp	12 Mar 2007 02:48:02 -0000	1.12.6.1
@@ -1,14 +1,13 @@
 <master>
+<property name="title">@title;noquote@</property>
 <property name="context">@context;noquote@</property>
-<property name="title">#faq.FAQ_Admin#</property>
-
+<h1>@title;noquote@</h1>
 <listtemplate name="faqs"></listtemplate>
 
 <ul class="action-links">
-  <li><a href="faq-add-edit">#faq.Create_a_new_FAQ#</a></lI>
-
-<li><a href=configure?<%=[export_url_vars return_url]%>>#faq.Configure#</a>
-<if @use_categories_p@ and @category_container@ eq "package_id">
-   <li><a href="@category_map_url@" class="action_link">#faq.Site_wide_categories#</a>
-</if>
+    <li><a href="faq-add-edit">#faq.Create_a_new_FAQ#</a></li>
+    <li><a href="configure?<%=[export_url_vars return_url]%>" title="Configure FAQ Preferences">#faq.Configure#</a></li>
+    <if @use_categories_p@ and @category_container@ eq "package_id">
+        <li><a href="@category_map_url@" class="action_link">#faq.Site_wide_categories#</a></li>
+    </if>
 </ul>
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.10 -r1.10.6.1
--- openacs-4/packages/faq/www/admin/index.tcl	14 Mar 2005 13:44:47 -0000	1.10
+++ openacs-4/packages/faq/www/admin/index.tcl	12 Mar 2007 02:48:35 -0000	1.10.6.1
@@ -12,15 +12,16 @@
    
 } {
 } -properties {
-  context:onevalue
-  package_id:onevalue
-  user_id:onevalue
+    context:onevalue
+    package_id:onevalue
+    user_id:onevalue
 }
 
 set package_id [ad_conn package_id]
 
 permission::require_permission -object_id $package_id -privilege faq_admin_faq
 
+set title "#faq.FAQ_Admin#"
 set context {}
 
 set user_id [ad_conn user_id]
@@ -31,7 +32,7 @@
         edit {
             link_url_col edit_url
             display_template {
-                <img src="/resources/acs-subsite/Edit16.gif" border="0">
+                <img src="/resources/acs-subsite/Edit16.gif" border="0" alt="Edit">
             }
             sub_class narrow
         }
@@ -40,8 +41,8 @@
             link_url_col manage_url
         }
         num_q_and_as {
-            label "\# Q&A's"
-            html { align right }
+            label "# Questions"
+            html { align center }
         }
         disabled_p {
             label "Enabled"
@@ -58,7 +59,7 @@
         delete {
             link_url_col delete_url
             display_template {
-                <img src="/resources/acs-subsite/Delete16.gif" border="0">
+                <img src="/resources/acs-subsite/Delete16.gif" border="0" alt="Delete">
             }
             sub_class narrow
         }