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>