Index: openacs-4/packages/survey/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/index.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/survey/www/index.adp	21 Jan 2005 17:24:28 -0000	1.7
+++ openacs-4/packages/survey/www/index.adp	5 Mar 2008 21:20:39 -0000	1.8
@@ -1,35 +1,36 @@
 <master>
 <property name="title">#survey.Surveys#</property>
-<if @admin_p@ eq "1"><p style="text-align: right;"><a href="admin/">#survey.lt_img_srcgraphicsadming#</a></if>
+
+    <if @admin_p@ eq "1"><p style="text-align: right;"><a href="admin/">#survey.lt_img_srcgraphicsadming#</a></p></if>
+
     <ul>
-      
       <multiple name="surveys">
-	<li>@surveys.name@
-	  <if @surveys.single_response_p@ eq "t" and
-	@surveys.response_id@ nil> (<a
-	href="respond?survey_id=@surveys.survey_id@">#survey.Answer_Survey#</a>)</if>
-	  <if @surveys.single_response_p@ eq "f">(<a
-	href="respond?survey_id=@surveys.survey_id@">#survey.Answer_Survey#</a>)</if>
+        <li>@surveys.name@
+          <if @surveys.single_response_p@ eq "t" and @surveys.response_id@ nil> 
+            (<a href="respond?survey_id=@surveys.survey_id@">#survey.Answer_Survey#</a>)
+          </if>
+          <if @surveys.single_response_p@ eq "f">
+            (<a	href="respond?survey_id=@surveys.survey_id@">#survey.Answer_Survey#</a>)
+          </if>
           <if @surveys.response_id@ not nil>
             (<a href="one-respondent?survey_id=@surveys.survey_id@&amp;#@surveys.response_id@">#survey.View_Response#</a>)
           </if>
-	</li>
-	<if @surveys.response_id@ not nil>
-	<ul>
-	  <group column="survey_id">
-	    <li>#survey.lt_Previous_response_on_#
-	    
-	    <if @surveys.editable_p@ eq "t">
-	      (<a href="respond?survey_id=@surveys.survey_id@&response_id=@surveys.response_id@">#survey.Edit_Response#</a>)</if>
-	    </li>
-          </group>
-	 </ul>
-	</if>
+          <if @surveys.response_id@ not nil>
+            <ul>
+              <group column="survey_id">
+                <li>#survey.lt_Previous_response_on_#
+                  <if @surveys.editable_p@ eq "t">
+                    (<a href="respond?survey_id=@surveys.survey_id@&amp;response_id=@surveys.response_id@">#survey.Edit_Response#</a>)
+                  </if>
+                </li>
+              </group>
+            </ul>
+          </if>
+        </li>
       </multiple>
       
       <if @surveys:rowcount@ eq 0>
-	<li>#survey.No_surveys_active#
-	  
+        <li>#survey.No_surveys_active#</li>
       </if>
     </ul>
 
Index: openacs-4/packages/survey/www/one-respondent.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/one-respondent.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/survey/www/one-respondent.adp	21 Jan 2005 17:24:28 -0000	1.8
+++ openacs-4/packages/survey/www/one-respondent.adp	5 Mar 2008 21:20:39 -0000	1.9
@@ -14,17 +14,17 @@
       </multiple>
       <p>
         <multiple name=responses>
-          <table width=100% cellpadding=2 cellspacing=2 border=0>
-            <tr class="table-header" bgcolor="#e6e6e6">
+          <table width="100%" cellpadding="2" cellspacing="2" border="0">
+            <tr class="table-header" style="background-color:#e6e6e6;">
               <td><a name="@responses.response_id@">#survey.lt_Your_response________#</a>
-		<if @editable_p@ eq "t">[<a
-            href="respond?survey_id=@survey_id@&response_id=@responses.response_id@">#survey.edit_this_response#</a>]</if>
+                <if @editable_p@ eq "t">
+                  [<a href="@responses.respond_url@">#survey.edit_this_response#</a>]
+                </if>
 	      </td>
             </tr>
-            <tr class="odd" bgcolor="#f4f4f4">
+            <tr class="odd" style="background-color:#f4f4f4;">
               <td>@responses.answer_summary;noquote@</td>
             </tr>
           </table>
         </multiple>
-  </html>
 
Index: openacs-4/packages/survey/www/one-respondent.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/one-respondent.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/survey/www/one-respondent.tcl	1 Mar 2005 00:01:44 -0000	1.6
+++ openacs-4/packages/survey/www/one-respondent.tcl	5 Mar 2008 21:20:39 -0000	1.7
@@ -45,9 +45,10 @@
     set description [ad_text_to_html $description]
 }
 
-db_multirow -extend {answer_summary pretty_submission_date} responses responses_select {} {
+db_multirow -extend {answer_summary pretty_submission_date respond_url} responses responses_select {} {
     set answer_summary [survey_answer_summary_display $response_id 1] 
     set pretty_submission_date [lc_time_fmt $pretty_submission_date_ansi %x]
+    set respond_url [export_vars -base respond {survey_id response_id}]
 }
 
 ad_return_template
Index: openacs-4/packages/survey/www/respond.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/respond.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/survey/www/respond.adp	21 Jan 2005 17:24:28 -0000	1.7
+++ openacs-4/packages/survey/www/respond.adp	5 Mar 2008 21:20:39 -0000	1.8
@@ -1,30 +1,32 @@
 <master>
 <property name=title>#survey.One_Survey_name#</property>
 <property name=context>@context;noquote@</property>
+
+<form enctype="multipart/form-data" method="post" action="process-response">
+      <if @initial_response_id@ not nil>
+        <div>
+          <input type="hidden" name="initial_response_id" value="@initial_response_id@">
+        </div>
+      </if>
+
     <table border="0" cellpadding="0" cellspacing="0" width="100%">
-      <form enctype=multipart/form-data method="post" action="process-response">
-	<if @initial_response_id@ not nil><input type="hidden"
-	name="initial_response_id" value="@initial_response_id@"></if>
-        <tr>
+	<tr>
           <td class="tabledata">@description;noquote@</td>
         </tr>
 	<tr>
 	  <td class="tabledata"><span style="color: #f00;">*</span> #survey.lt_denotes_a_required_qu#</td>                
 	</tr>        
         <tr>
-          <td class="tabledata"><hr noshade size="1" color="#dddddd"></td>
+          <td class="tabledata"><hr></td>
         </tr>
         
         <tr>
           <td class="tabledata">
 	    @form_vars;noquote@
             <include src="one_@display_type;noquote@" questions=@questions;noquote@>
-            <hr noshade size="1" color="#dddddd">
               <input type="submit" value="@button_label@">
           </td>
         </tr>
-        
-      </form>
     </table>
+</form>
 
-