Index: openacs-4/packages/survey/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/survey/www/admin/index.adp	21 Jan 2005 17:24:28 -0000	1.4
+++ openacs-4/packages/survey/www/admin/index.adp	5 Mar 2008 21:43:07 -0000	1.5
@@ -5,11 +5,11 @@
 <ul>
 <multiple name=surveys>
 <group column="enabled_p">
-<li> <a href=one?survey_id=@surveys.survey_id@>@surveys.name@</a> 
+<li> <a href="one?survey_id=@surveys.survey_id@">@surveys.name@</a> 
 <if @surveys.enabled_p@ eq "f"><span style="color: #f00">#survey.disabled#</span></if>
 </group>
 </multiple>
 <p>
-<li> <a href=survey-create>#survey.New_Survey#</a>
+<li> <a href="survey-create">#survey.New_Survey#</a>
 </ul>
 
Index: openacs-4/packages/survey/www/admin/one-respondent.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/one-respondent.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/survey/www/admin/one-respondent.adp	21 Jan 2005 17:24:28 -0000	1.7
+++ openacs-4/packages/survey/www/admin/one-respondent.adp	5 Mar 2008 21:43:07 -0000	1.8
@@ -14,20 +14,21 @@
 
 <multiple name="responses">
 
-    <tr class="odd"><td>
+    <tr class="odd">
+            <td>
+              <a href="@responses.respond_url@">
+                <img src="../graphics/edit.gif" style="float:right; border: 0; vertical-align:top;" alt="#survey.Edit#">
+              </a>
 
-<a href="respond?response_id=@responses.response_id@&survey_id=@survey_id@&user_id=@user_id@">
-<img valign="top" align="right" src="../graphics/edit.gif" border="0" alt="#survey.Edit#"></a>
-
 <group column="initial_response">
 
 <if @responses.original_p@><a href="response-delete?response_id=@response_id@">
-<img valign="top" align="right" src="../graphics/delete.gif" border="0" alt="#survey.Delete#"></a>
+<img src="../graphics/delete.gif" style="float:right; vertical-align:top; border: 0;" alt="#survey.Delete#"></a>
 </if>
  <strong>[<if
       @responses.original_p@>#survey.Original#</if><else>#survey.Edited#</a></else>
       #survey.lt_Response_on_responses#</strong> 
-	  <br />
+	  <br>
 @responses.response_display;noquote@
 
 
Index: openacs-4/packages/survey/www/admin/one-respondent.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/one-respondent.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/survey/www/admin/one-respondent.tcl	21 Jan 2005 17:24:28 -0000	1.4
+++ openacs-4/packages/survey/www/admin/one-respondent.tcl	5 Mar 2008 21:43:07 -0000	1.5
@@ -38,10 +38,11 @@
 }
 
 set context [_ survey.One_Respondent]
- 
 
-db_multirow -extend {response_display} responses get_responses {} {
-set response_display [survey_answer_summary_display $response_id 1 ]
+
+db_multirow -extend {response_display respond_url} responses get_responses {} {
+    set response_display [survey_answer_summary_display $response_id 1 ]
+    set respond_url [export_vars -base respond {response_id survey_id user_id}]
 }
 
 ad_return_template
Index: openacs-4/packages/survey/www/admin/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/one.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/survey/www/admin/one.adp	21 Jan 2005 17:24:28 -0000	1.9
+++ openacs-4/packages/survey/www/admin/one.adp	5 Mar 2008 21:43:07 -0000	1.10
@@ -4,7 +4,7 @@
 <property name="title">#survey.lt_One_Survey_survey_inf#</property>
 <property name="context">@context;noquote@</property>
 <p><a href=".">#survey.lt_Main_Survey_Administr#</a></p>
-<font size=+1><b>@survey_info.name@</b></font> #survey.-__Created_by# <a href="@user_link@">@survey_info.creator_name@</a>#survey._on_creation_date#</h2>
+<h2><b style="font-size: large">@survey_info.name@</b> #survey.-__Created_by# <a href="@user_link@">@survey_info.creator_name@</a>#survey._on_creation_date#</h2>
 <table class="table-display" cellpadding=2 cellspacing=0>
 	<tr class="even"><td> </td><td> #survey.This_survey_is# <if @survey_info.enabled_p@ eq t><%= [lang::util::localize @survey_info.enabled_display@]%></if><else><span style="color: #f00;"><%=[lang::util::localize @survey_info.enabled_display@]%></span></else>. - <a href="@toggle_enabled_url@">@toggle_enabled_text@</a></td></tr>
 
@@ -24,7 +24,7 @@
 	href="responses?survey_id=@survey_id@">#survey.Summary#</a> | 
 	<a href="responses-export?survey_id=@survey_id@"> #survey.CSV_file#</a></td>
 	</tr>
-	<tr class="odd"><td valign="top" rowspan="2"><nobr>#survey.Response_Options# </nobr></td><td> <%= [lang::util::localize @survey_info.single_response_display@]%> - [ 
+	<tr class="odd"><td valign="top" rowspan="2">#survey.Response_Options# </td><td> <%= [lang::util::localize @survey_info.single_response_display@]%> - [ 
 	<a href="response-limit-toggle?survey_id=@survey_id@">@response_limit_toggle@</a>
 	]</td></tr>
 	
@@ -33,7 +33,15 @@
 	href="response-editable-toggle?survey_id=@survey_id@">#survey.make# <if
 	@survey_info.editable_p@>#survey.non-#</if>#survey.editable#</a> ]</td></tr>
 
-	<tr class="odd"><td>#survey.Display_Options# </td><td><%= [lang::util::localize "#survey.@survey_info.display_type@#"]%> - <list name="survey_display_types"><if @survey_info.display_type@ ne @survey_display_types:item@>[<a href="survey-display-type-edit?display_type=@survey_display_types:item@&survey_id=@survey_id@"><%= [lang::util::localize "#survey.@survey_display_types:item@#"]%></a>]</if></list></td></tr>
+      <tr class="odd">
+        <td>#survey.Display_Options# </td>
+        <td><%= [lang::util::localize "#survey.@survey_info.display_type@#"]%> - <list name="survey_display_types">
+            <if @survey_info.display_type@ ne @survey_display_types:item@>
+              [<a href="survey-display-type-edit?display_type=@survey_display_types:item@&amp;survey_id=@survey_id@"><%= [lang::util::localize "#survey.@survey_display_types:item@#"]%></a>]
+            </if>
+          </list>
+        </td>
+      </tr>
 	
       
 <tr class="odd"><td valign="top" rowspan="2">#survey.Email_Options#</td><td >@notification_chunk;noquote@</td></tr>
@@ -49,7 +57,7 @@
 	<a href="survey-copy?survey_id=@survey_id@">#survey.Copy_this_survey#</a> #survey.lt_-_Lets_you_use_this_s#
 	</td></tr>
 </table>
-<br />
+<br>
 
 <h3>#survey.Questions#</h3>
 <table cellspacing=0>
@@ -69,13 +77,13 @@
 
 <td valign="top">@questions.rownum@.  <a name="@questions.sort_order@"></a></td>
 
-<td><a	href="question-modify?question_id=@questions.question_id@&section_id=@section_id@&survey_id=@survey_id@">#survey.Edit#</a>
+<td><a	href="@question_modify_url@">#survey.Edit#</a>
 <if @questions.active_p@ eq "f"><span style="color: #f00;">#survey.inactive#</span></if>
-<a href="question-copy?question_id=@questions.question_id@&sort_order=@questions.sort_order@">#survey.Copy#</a>
-<a href="question-add?section_id=@section_id@&after=@questions.sort_order@">#survey.Add_New#</a><img src="../graphics/spacer.gif" border="0" alt="" width="10">
+<a href="@question_copy_url@">#survey.Copy#</a>
+<a href="@question_add_url@">#survey.Add_New#</a><img src="../graphics/spacer.gif" style="border:0;" alt="" width="10">
 <if @questions.rownum@ lt @questions:rowcount@ ><a
-	  href="question-swap?section_id=@section_id@&survey_id=@survey_id@&sort_order=@questions.sort_order@&direction=down"><img src="../graphics/down" border="0" alt="#survey.Move_Down#"></a></if><if @questions.rownum@ gt 1><a
-	  href="question-swap?section_id=@section_id@&survey_id=@survey_id@&sort_order=@questions.sort_order@&direction=up"><img src="../graphics/up.gif" border="0" alt="#survey.Move_Up#"></a></if><a href="question-delete?question_id=@questions.question_id@&survey_id=@survey_id@"><img src="../graphics/delete.gif" border="0" alt="#survey.Delete#"></a></td></tr>
+	  href="question-swap?section_id=@section_id@&amp;survey_id=@survey_id@&amp;sort_order=@questions.sort_order@&amp;direction=down"><img src="../graphics/down" style="border:0;" alt="#survey.Move_Down#"></a></if><if @questions.rownum@ gt 1><a
+	  href="question-swap?section_id=@section_id@&amp;survey_id=@survey_id@&amp;sort_order=@questions.sort_order@&amp;direction=up"><img src="../graphics/up.gif" style="border:0;" alt="#survey.Move_Up#"></a></if><a href="@question_delete_url@"><img src="../graphics/delete.gif" style="border:0;" alt="#survey.Delete#"></a></td></tr>
 
   <if @questions.rownum@ odd>
     <tr class="odd">
@@ -84,7 +92,7 @@
     <tr class="even">
   </else>
 <td colspan="3">
-  <blockquote>@questions.question_display;noquote@</blockquote>
+  <blockquote><div>@questions.question_display;noquote@</div></blockquote>
 </td></tr>
 <if @questions.rownum@ eq @questions:rowcount@>
   <if @questions.rownum@ odd>
@@ -93,7 +101,7 @@
   <else>
     <tr class="odd">
   </else>
-<td></td><td><a href="question-add?section_id=@survey_info.section_id@">#survey.add_new_question#</a></tr></tr>
+<td></td><td><a href="question-add?section_id=@survey_info.section_id@">#survey.add_new_question#</a></tr>
 </if>
 </multiple>
 </table>      
Index: openacs-4/packages/survey/www/admin/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/one.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/survey/www/admin/one.tcl	26 Jan 2005 21:05:13 -0000	1.8
+++ openacs-4/packages/survey/www/admin/one.tcl	5 Mar 2008 21:43:07 -0000	1.9
@@ -70,9 +70,21 @@
 
 set context [list $survey_info(name)]
 
-db_multirow -extend { question_display } questions survey_questions "" {set question_display [survey_question_display $question_id]}
 
+db_multirow -extend { question_display question_modify_url question_copy_url question_add_url question_delete_url question_swap_down_url question_swap_up_url } questions survey_questions "" {
 
+    set question_display [survey_question_display $question_id]
+    set question_modify_url [export_vars -base question-modify {{question_id $question_id} section_id survey_id}]
+    set question_copy_url [export_vars -base question-copy {{question_id $question_id} {sort_order $sort_order}}]
+    set question_add_url [export_vars -base question-add {section_id {after $sort_order}}]
+    set question_delete_url [export_vars -base question-delete {question_id survey_id}]
+    set question_swap_down_url [export_vars -base question-swap {section_id survey_id {sort_order $sort_order} {direction down}}]
+    set question_swap_up_url [export_vars -base question-swap {section_id survey_id {sort_order $sort_order} {direction up}}]
+
+}
+
+
+
 set notification_chunk [notification::display::request_widget \
     -type survey_response_notif \
     -object_id $survey_id \
Index: openacs-4/packages/survey/www/admin/respond.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/respond.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/survey/www/admin/respond.adp	21 Jan 2005 17:24:28 -0000	1.3
+++ openacs-4/packages/survey/www/admin/respond.adp	5 Mar 2008 21:43:07 -0000	1.4
@@ -3,28 +3,30 @@
 
 <property name=title>#survey.lt_survey_name_Responses_1#</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>
           <td class="tabledata">@description@</td>
         </tr>
 	<tr>
 	  <td class="tabledata"><span style="color: #f00;">*</span> denotes a required question</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@" questions=@questions;noquote@>
-            <hr noshade size="1" color="#dddddd">
               <input type="submit" value="@button_label@">
           </td>
         </tr>
-        
-      </form>
     </table>
+</form>
Index: openacs-4/packages/survey/www/admin/respondents.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/respondents.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/survey/www/admin/respondents.tcl	8 Aug 2006 21:27:13 -0000	1.8
+++ openacs-4/packages/survey/www/admin/respondents.tcl	5 Mar 2008 21:43:07 -0000	1.9
@@ -31,7 +31,7 @@
 		   [list first_names "[_ survey.First_Name]" {upper(first_names) $order} {<td><a href="one-respondent?[export_vars {user_id survey_id}]">$first_names</a></td>}] \
 		   [list last_name "[_ survey.Last_Name]" "" {<td><a href="one-respondent?[export_vars {user_id survey_id}]">$last_name</a></td>}] \
 		   [list email "[_ survey.Email_Address]" "" {<td><a href="one-respondent?[export_vars {user_id survey_id}]">$email</a></td>}] \
-		   [list actions "[_ survey.Actions]" no_sort {<td><a href="one-respondent?[export_vars {user_id survey_id}]"><img src="../graphics/view.gif" border="0" alt="[_ survey.View]"></a></td>}] \
+		   [list actions "[_ survey.Actions]" no_sort {<td><a href="one-respondent?[export_vars {user_id survey_id}]"><img src="../graphics/view.gif" style="border:0;" alt="[_ survey.View]"></a></td>}] \
 		   ]
 
 set respondents_table [ad_table -Torderby $orderby -Textra_vars {survey_id} -Tmissing_text "[_ survey.No_data_found]" select_respondents {}  $table_def]
Index: openacs-4/packages/survey/www/admin/responses.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/responses.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/survey/www/admin/responses.adp	21 Jan 2005 17:24:28 -0000	1.5
+++ openacs-4/packages/survey/www/admin/responses.adp	5 Mar 2008 21:43:07 -0000	1.6
@@ -12,4 +12,3 @@
 @results;noquote@
 </ul>
 
-
Index: openacs-4/packages/survey/www/admin/responses.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/responses.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/survey/www/admin/responses.tcl	21 Jan 2005 17:24:28 -0000	1.3
+++ openacs-4/packages/survey/www/admin/responses.tcl	5 Mar 2008 21:43:07 -0000	1.4
@@ -44,7 +44,7 @@
 	"date" -
 	"text" -
 	"shorttext" {
-	    append results "<a href=\"view-text-responses?question_id=$question_id\">[_ survey.View_responses]</a>\n"
+	    append results "<div><a href=\"view-text-responses?question_id=$question_id\">[_ survey.View_responses]</a></div>\n"
 	}
 	
 	"boolean" {
@@ -70,7 +70,7 @@
 	 }
 	"blob" {
 	    db_foreach survey_attachment_summary {} {
-	        append results "<a href=\"../view-attachment?response_id=$response_id&question_id=$question_id\">$title</a><br />"
+	        append results "<a href=\"../view-attachment?response_id=$response_id&question_id=$question_id\">$title</a><br>"
 	    }
 	}
     }
Index: openacs-4/packages/survey/www/admin/survey-preview.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/survey-preview.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/survey/www/admin/survey-preview.adp	21 Jan 2005 17:24:28 -0000	1.5
+++ openacs-4/packages/survey/www/admin/survey-preview.adp	5 Mar 2008 21:43:07 -0000	1.6
@@ -4,27 +4,25 @@
 <property name=title>#survey.lt_Preview_One_Survey_na#</property>
 <property name=context>@context;noquote@</property>
 <a href="@return_url@">#survey.Return#</a>
+<form enctype="multipart/form-data" action="">
     <table border="0" cellpadding="0" cellspacing="0" width="100%">
-      <form enctype="multipart/form-data" >
         <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 noshapde size="1" color="#dddddd">
           </td>
         </tr>
         
-      </form>
     </table>
+</form>
 
-
Index: openacs-4/packages/survey/www/admin/view-text-responses.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/view-text-responses.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/survey/www/admin/view-text-responses.adp	21 Jan 2005 17:24:28 -0000	1.6
+++ openacs-4/packages/survey/www/admin/view-text-responses.adp	5 Mar 2008 21:43:07 -0000	1.7
@@ -5,14 +5,13 @@
 <property name="title">#survey.lt_survey_name_Responses_1#</property>
 <property name="context">@context;noquote@</property>
 @question_text@ 
-<hr />
+<hr>
 <if @responses:rowcount@ eq 0>
 	<em>#survey.No_Responses#</em>
 	</if>
       <multiple name="responses">
-<a
-	  href="one-respondent?user_id=@responses.creation_user@&survey_id=@survey_id@">@responses.respondent_name@</a>
+<a href="one-respondent?user_id=@responses.creation_user@&amp;survey_id=@survey_id@">@responses.respondent_name@</a>
 	  #survey.lt_on_responsessubmissio#
-<br />
+<br>
 </multiple>