Index: openacs-4/packages/simple-survey/www/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/one.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/simple-survey/www/one.adp	25 Feb 2002 20:27:41 -0000	1.4
+++ openacs-4/packages/simple-survey/www/one.adp	15 Mar 2002 05:42:09 -0000	1.5
@@ -5,28 +5,17 @@
     <table border="0" cellpadding="0" cellspacing="0" width="100%">
       <form enctype=multipart/form-data method="post" action="process-response">
         <tr>
-          <td class="mainheading">@name@</td>
-        </tr>
-        <tr>
-          <td class="tabledata"><hr noshade size="1" color="#dddddd"></td>
-        </tr>
-                
-        <tr>
           <td class="tabledata">@description@</td>
         </tr>
         
         <tr>
-          <td class="tabledata"><hr noshapde size="1" color="#dddddd"></td>
+          <td class="tabledata"><hr noshade size="1" color="#dddddd"></td>
         </tr>
         
         <tr>
           <td class="tabledata">
             <%= [export_form_vars survey_id] %>
-            <ol>
-              <list name="questions">
-                <li><!--qis-->@questions:item@<!--qie-->
-              </list>
-            </ol>
+            <include src=one_@display_type@ questions=@questions@>
             <hr noshapde size="1" color="#dddddd">
               <input type=submit value="Continue">
           </td>
Index: openacs-4/packages/simple-survey/www/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/one.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simple-survey/www/one.tcl	25 Feb 2002 20:27:41 -0000	1.2
+++ openacs-4/packages/simple-survey/www/one.tcl	15 Mar 2002 05:42:09 -0000	1.3
@@ -37,7 +37,7 @@
 
 set user_id [ad_maybe_redirect_for_registration]
 
-db_1row survey_info "select name, description, single_response_p, single_editable_p
+db_1row survey_info "select name, description, single_response_p, single_editable_p, display_type
     from survsimp_surveys where survey_id = :survey_id"
 
 set context_bar [ad_context_bar_ws_or_index [list "./" "Surveys"] "$name"]
Index: openacs-4/packages/simple-survey/www/one.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/one.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simple-survey/www/one.xql	15 Jun 2001 01:06:39 -0000	1.1
+++ openacs-4/packages/simple-survey/www/one.xql	15 Mar 2002 05:42:09 -0000	1.2
@@ -12,7 +12,7 @@
  
 <fullquery name="survey_info">      
       <querytext>
-      select name, description, single_response_p, single_editable_p
+      select name, description, single_response_p, single_editable_p, display_type
     from survsimp_surveys where survey_id = :survey_id
       </querytext>
 </fullquery>
Index: openacs-4/packages/simple-survey/www/one_list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/one_list.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simple-survey/www/one_list.adp	15 Mar 2002 05:42:09 -0000	1.1
@@ -0,0 +1,5 @@
+            <ol>
+              <list name="questions">
+                <li><!--qis-->@questions:item@<!--qie-->
+              </list>
+            </ol>
Index: openacs-4/packages/simple-survey/www/one_paragraph.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/one_paragraph.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simple-survey/www/one_paragraph.adp	15 Mar 2002 05:42:09 -0000	1.1
@@ -0,0 +1,4 @@
+<list name=questions>
+@questions:item@<p>
+</list>
+
Index: openacs-4/packages/simple-survey/www/one_table.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/one_table.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simple-survey/www/one_table.adp	15 Mar 2002 05:42:09 -0000	1.1
@@ -0,0 +1,5 @@
+<table border=1 cellpadding=4 width=80%>
+<list name=questions>
+<tr><td>@questions:item@</td></tr>
+</list>
+</table>