Index: openacs-4/packages/simple-survey/www/admin/description-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/description-edit.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/simple-survey/www/admin/description-edit.tcl	25 Feb 2002 20:27:41 -0000	1.3
+++ openacs-4/packages/simple-survey/www/admin/description-edit.tcl	18 Mar 2002 16:58:06 -0000	1.4
@@ -23,7 +23,7 @@
 set html_p_set [ns_set create]
 ns_set put $html_p_set desc_html $desc_html
 
-set context_bar [ad_context_bar_ws_or_index [list "./" "Simple Survey Admin"] [list "one?[export_url_vars survey_id]" "Administer Survey"] "Edit Description"]
+set context_bar [list [list "./" "Simple Survey Admin"] [list "one?[export_url_vars survey_id]" "Administer Survey"] "Edit Description"]
 
 
 ad_return_template
Index: openacs-4/packages/simple-survey/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/index.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/simple-survey/www/admin/index.tcl	18 Mar 2002 06:22:33 -0000	1.3
+++ openacs-4/packages/simple-survey/www/admin/index.tcl	18 Mar 2002 16:58:06 -0000	1.4
@@ -11,7 +11,7 @@
 
 }
 
-set context_bar [ad_context_bar_ws_or_index "Simple Survey Admin"]
+set context_bar [list "Survey Admin"]
 
 set package_id [ad_conn package_id]
 
Index: openacs-4/packages/simple-survey/www/admin/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/Attic/master.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/simple-survey/www/admin/master.adp	18 Feb 2002 20:48:01 -0000	1.1
+++ openacs-4/packages/simple-survey/www/admin/master.adp	18 Mar 2002 16:58:06 -0000	1.2
@@ -2,6 +2,8 @@
 <property name=title>@title@</property>
 
 <h2>@title@</h2>
-@context_bar@
+ <if @context_bar@ not nil>
+  <%= [eval ad_context_bar $context_bar] %>
+ </if>
 <hr><p>
 <slave>
Index: openacs-4/packages/simple-survey/www/admin/name-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/name-edit.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/simple-survey/www/admin/name-edit.tcl	25 Feb 2002 20:28:14 -0000	1.1
+++ openacs-4/packages/simple-survey/www/admin/name-edit.tcl	18 Mar 2002 16:58:06 -0000	1.2
@@ -23,7 +23,7 @@
 set html_p_set [ns_set create]
 ns_set put $html_p_set desc_html $desc_html
 
-set context_bar [ad_context_bar_ws_or_index [list "./" "Simple Survey Admin"] [list "one?[export_url_vars survey_id]" "Administer Survey"] "Edit Name"]
+set context_bar [list [list "./" "Simple Survey Admin"] [list "one?[export_url_vars survey_id]" "Administer Survey"] "Edit Name"]
 
 
 ad_return_template
Index: openacs-4/packages/simple-survey/www/admin/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/one.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/simple-survey/www/admin/one.adp	15 Mar 2002 05:26:42 -0000	1.2
+++ openacs-4/packages/simple-survey/www/admin/one.adp	18 Mar 2002 16:58:06 -0000	1.3
@@ -3,7 +3,7 @@
 <property name=context_bar>@context_bar@</property>
 
 <ul>
-<li>Created by: <a href="/shared/community-member?user_id=@creation_user@">@creator_name@</a>
+<li>Created by: <a href="<%= [acs_community_member_url -user_id $creation_user] %>">@creator_name@</a>
 <li>Name: @survey_name@ <font size=-1>[ <a href="name-edit?survey_id=@survey_id@">edit</a> ]</font>
 <li>Created: <%= [util_AnsiDatetoPrettyDate $creation_date] %>
 <li>Status: @survey_status@ <font size=-1>@toggle_enabled_link@</font>
Index: openacs-4/packages/simple-survey/www/admin/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/one.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/simple-survey/www/admin/one.tcl	18 Mar 2002 06:22:33 -0000	1.5
+++ openacs-4/packages/simple-survey/www/admin/one.tcl	18 Mar 2002 16:58:06 -0000	1.6
@@ -158,6 +158,6 @@
 }
 
 
-set context_bar [ad_context_bar_ws_or_index [list "./" "Simple Survey Admin"] "Administer Survey"]
+set context_bar [list [list "./" "Simple Survey Admin"] "Administer Survey"]
 
 ad_return_template
Index: openacs-4/packages/simple-survey/www/admin/question-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/question-add-2.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simple-survey/www/admin/question-add-2.adp	18 Mar 2002 16:58:06 -0000	1.1
@@ -0,0 +1,29 @@
+<master src=./master>
+<property name=title>Survey Administration: Add a Question (cont.)</property>
+<property name=context_bar>@context_bar@</property>
+
+<form action="question-add-3" method=post>
+@form_var_list@
+
+Question:
+<blockquote>
+@question_text@
+</blockquote>
+
+@presentation_options_html@
+
+@response_type_html@
+
+@response_fields@
+
+<p>
+
+Response Location: <input type=radio name=presentation_alignment value="beside"> Beside the question <input type=radio name=presentation_alignment value="below" checked> Below the question
+
+<p>
+
+<center>
+<input type=submit value="Submit">
+</center>
+
+</form>
Index: openacs-4/packages/simple-survey/www/admin/question-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/question-add-2.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/simple-survey/www/admin/question-add-2.tcl	15 Mar 2002 05:26:42 -0000	1.3
+++ openacs-4/packages/simple-survey/www/admin/question-add-2.tcl	18 Mar 2002 16:58:06 -0000	1.4
@@ -179,38 +179,6 @@
 
 }
 
-doc_return 200 text/html "[ad_header "Add A Question (cont.)"]
-<h2>$name</h2>
+set context_bar [list [list "./" "Simple Survey Admin"] [list "one?[export_url_vars survey_id]" "Administer Survey"] "Add A Question"]
 
-[ad_context_bar_ws_or_index [list "./" "Simple Survey Admin"] [list "one?[export_url_vars survey_id]" "Administer Survey"] "Add A Question"]
-
-<hr>
-
-<form action=\"question-add-3\" method=post>
-$form_var_list
-
-Question:
-<blockquote>
-$question_text
-</blockquote>
-
-$presentation_options_html
-
-$response_type_html
-
-$response_fields
-
-<p>
-
-Response Location: <input type=radio name=presentation_alignment value=\"beside\"> Beside the question <input type=radio name=presentation_alignment value=\"below\" checked> Below the question
-
-<p>
-
-<center>
-<input type=submit value=\"Submit\">
-</center>
-
-</form>
-
-[ad_footer]
-"
+ad_return_template
\ No newline at end of file
Index: openacs-4/packages/simple-survey/www/admin/question-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/question-add.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/simple-survey/www/admin/question-add.tcl	15 Mar 2002 05:26:42 -0000	1.4
+++ openacs-4/packages/simple-survey/www/admin/question-add.tcl	18 Mar 2002 16:58:06 -0000	1.5
@@ -67,6 +67,6 @@
     return $return_html
 }
 
-set context_bar [ad_context_bar_ws_or_index [list "./" "Simple Survey Admin"] [list "one?[export_url_vars survey_id]" "Administer Survey"] "Add A Question"]
+set context_bar [list [list "./" "Simple Survey Admin"] [list "one?[export_url_vars survey_id]" "Administer Survey"] "Add A Question"]
 
 ad_return_template
Index: openacs-4/packages/simple-survey/www/admin/respondents.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/respondents.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/simple-survey/www/admin/respondents.tcl	25 Feb 2002 20:27:41 -0000	1.2
+++ openacs-4/packages/simple-survey/www/admin/respondents.tcl	18 Mar 2002 16:58:06 -0000	1.3
@@ -36,7 +36,7 @@
 from survsimp_surveys
 where survey_id = :survey_id" ]
 
-set context_bar [ad_context_bar_ws_or_index [list "./" "Simple Survey Admin"] \
+set context_bar [list [list "./" "Simple Survey Admin"] \
      [list "one?survey_id=$survey_id" "Administer Survey"] \
      "Respondents"]
 
Index: openacs-4/packages/simple-survey/www/admin/responses.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/responses.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/simple-survey/www/admin/responses.tcl	25 Feb 2002 20:27:41 -0000	1.2
+++ openacs-4/packages/simple-survey/www/admin/responses.tcl	18 Mar 2002 16:58:06 -0000	1.3
@@ -159,7 +159,7 @@
     }
 }
 
-set context_bar [ad_context_bar_ws_or_index [list "./" "Simple Survey Admin"] \
+set context_bar [list [list "./" "Simple Survey Admin"] \
      [list "one?survey_id=$survey_id" "Administer Survey"] \
      "Responses"]
 
Index: openacs-4/packages/simple-survey/www/admin/survey-create-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/survey-create-2.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/simple-survey/www/admin/survey-create-2.tcl	15 Mar 2002 05:26:42 -0000	1.5
+++ openacs-4/packages/simple-survey/www/admin/survey-create-2.tcl	18 Mar 2002 16:58:06 -0000	1.6
@@ -65,52 +65,24 @@
 
 if {$checked_p == "f"} {
     set survey_id [db_nextval acs_object_id_seq]
-    set whole_page "[ad_header "Confirm New Survey Description"]
+    set context_bar [list [list "index.tcl" "Simple Survey Admin"] "Confirm New Survey Description"]
     
-    <h2>Confirm New Survey Description</h2>
-    
-    [ad_context_bar_ws_or_index [list "index.tcl" "Simple Survey Admin"] "Confirm New Survey Description"]
-    
-    <hr>
-    
-    Here is how your survey description will appear:
-    <blockquote><p>"
-
     switch $desc_html {
 	"html" {
-	    append whole_page "$description"
+	    # nothing, the description is the description
 	}
 	
 	"pre" {
 	    regsub "\[ \012\015\]+\$" $description {} description
 	    set description "<pre>[ns_quotehtml $description]</pre>"
-	    append whole_page "$description"
 	}
 
 	default {
-	    append whole_page "[util_convert_plaintext_to_html $description]"
+	    set description "[util_convert_plaintext_to_html $description]"
 	}
     }
     
-    append whole_page "<form method=post action=\"[ns_conn url]\">
-    [export_form_vars survey_id name description desc_html type variable_names logic]
-    <input type=hidden name=checked_p value=\"t\">
-    <br><center><input type=submit value=\"Confirm\"></center>
-    </form>
-
-    </blockquote>
-
-    <font size=-1 face=\"verdana, arial, helvetica\">
-    Note: if the text above has a bunch of visible HTML tags then you probably
-    should have selected \"HTML\" rather than \"Plain Text\". If it is all smashed together
-    and you want the original line breaks saved then choose \"Preformatted Text\".
-    Use your browser's Back button to return to the submission form.
-    </font>
-    
-    [ad_footer]"
-    
-    
-    doc_return 200 text/html $whole_page
+    ad_return_template survey-create-confirm
     return
 } else {
     
Index: openacs-4/packages/simple-survey/www/admin/survey-create-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/survey-create-confirm.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simple-survey/www/admin/survey-create-confirm.adp	18 Mar 2002 16:58:06 -0000	1.1
@@ -0,0 +1,25 @@
+<master src=./master>
+<property name=title>Survey Administration: Confirm New Survey</property>
+<property name=context_bar>@context_bar@</property>
+
+<p>
+Here is how your survey description will appear:
+<blockquote><p>
+@description@
+</p>
+
+<form method=post action="<%= [ns_conn url] %>">
+    <%= [export_form_vars survey_id name description desc_html type variable_names logic] %>
+    <input type=hidden name=checked_p value="t">
+    <br><center><input type=submit value="Confirm"></center>
+    </form>
+
+    </blockquote>
+
+    <font size=-1 face="verdana, arial, helvetica">
+    Note: if the text above has a bunch of visible HTML tags then you probably
+    should have selected "HTML" rather than "Plain Text". If it is all smashed together
+    and you want the original line breaks saved then choose "Preformatted Text".
+    Use your browser's Back button to return to the submission form.
+    </font>
+    
Index: openacs-4/packages/simple-survey/www/admin/survey-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/survey-create.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simple-survey/www/admin/survey-create.adp	18 Mar 2002 16:58:06 -0000	1.1
@@ -0,0 +1,30 @@
+<master src=./master>
+<property name=title>Survey Administration: Create New Survey</property>
+<property name=context_bar>@context_bar@</property>
+
+<blockquote>
+
+<form method=post action="survey-create-2">
+<%= [ad_export_vars -form type] %>
+<p>
+
+Survey Name:  <input type=text name=name value="@name@" size=30>
+<p>
+Survey Description: 
+<br>
+<textarea name=description rows=10 cols=65>@description@</textarea>
+<br>
+The description above is: 
+<input type=radio name=desc_html value="pre">Preformatted text
+<input type=radio name=desc_html value="plain" checked>Plain text
+<input type=radio name=desc_html value="html">HTML
+<p>
+<%= [survey_specific_html $type] %>
+<p>
+Display Type: <%= [survsimp_display_type_select -name display_type -value list] %>
+<center>
+<input type=submit value="Create">
+</center>
+</form>
+
+</blockquote>
Index: openacs-4/packages/simple-survey/www/admin/survey-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/survey-create.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/simple-survey/www/admin/survey-create.tcl	15 Mar 2002 05:26:42 -0000	1.3
+++ openacs-4/packages/simple-survey/www/admin/survey-create.tcl	18 Mar 2002 16:58:06 -0000	1.4
@@ -72,45 +72,7 @@
     return $return_html
 }
 
-set whole_page "[ad_header "Create New Survey"]
+set context_bar [list [list "./" "Survey Admin"] "Create Survey"]
 
-<h2>Create a New Survey</h2>
+ad_return_template
 
-[ad_context_bar_ws_or_index [list "./" "Simple Survey Admin"] "Create Survey"]
-
-<hr>
-
-<blockquote>
-
-<form method=post action=\"survey-create-2\">
-[ad_export_vars -form type]
-<p>
-
-Survey Name:  <input type=text name=name value=\"$name\" size=30>
-<p>
-Survey Description: 
-<br>
-<textarea name=description rows=10 cols=65>$description</textarea>
-<br>
-The description above is: 
-<input type=radio name=desc_html value=\"pre\">Preformatted text
-<input type=radio name=desc_html value=\"plain\" checked>Plain text
-<input type=radio name=desc_html value=\"html\">HTML
-<p>
-[survey_specific_html $type]
-<p>
-Display Type: [survsimp_display_type_select -name display_type -value list]
-<center>
-<input type=submit value=\"Create\">
-</center>
-</form>
-
-</blockquote>
-
-[ad_footer]
-"
-
-
-
-doc_return 200 text/html $whole_page 
-