Index: openacs-4/packages/simple-survey/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simple-survey/www/index.adp	18 Feb 2002 20:48:01 -0000	1.2
+++ openacs-4/packages/simple-survey/www/index.adp	25 Feb 2002 20:27:41 -0000	1.3
@@ -1,5 +1,6 @@
 <master src=./master>
 <property name=title>Surveys</property>
+<property name=context_bar>@context_bar@</property>
     <ul>
       
       <multiple name=surveys>
Index: openacs-4/packages/simple-survey/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simple-survey/www/index.tcl	20 Apr 2001 20:51:22 -0000	1.1
+++ openacs-4/packages/simple-survey/www/index.tcl	25 Feb 2002 20:27:41 -0000	1.2
@@ -15,7 +15,7 @@
 
 set package_id [ad_conn package_id]
 
-#set context_bar [list "Surveys"]
+set context_bar [ad_context_bar_ws_or_index "Surveys"]
 
 set user_id [ad_maybe_redirect_for_registration]
 
Index: openacs-4/packages/simple-survey/www/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/Attic/master.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simple-survey/www/master.adp	18 Feb 2002 20:48:01 -0000	1.1
+++ openacs-4/packages/simple-survey/www/master.adp	25 Feb 2002 20:27:41 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
 <property name=title>@title@</property>
-
 <h2>@title@</h2>
+@context_bar@
 <hr><p>
 <slave>
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.3 -r1.4
--- openacs-4/packages/simple-survey/www/one.adp	18 Feb 2002 20:48:01 -0000	1.3
+++ openacs-4/packages/simple-survey/www/one.adp	25 Feb 2002 20:27:41 -0000	1.4
@@ -1,5 +1,6 @@
 <master src=./master>
 <property name=title>One Survey: @name@</property>
+<property name=context_bar>@context_bar@</property>
 
     <table border="0" cellpadding="0" cellspacing="0" width="100%">
       <form enctype=multipart/form-data method="post" action="process-response">
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.1 -r1.2
--- openacs-4/packages/simple-survey/www/one.tcl	20 Apr 2001 20:51:22 -0000	1.1
+++ openacs-4/packages/simple-survey/www/one.tcl	25 Feb 2002 20:27:41 -0000	1.2
@@ -40,7 +40,7 @@
 db_1row survey_info "select name, description, single_response_p, single_editable_p
     from survsimp_surveys where survey_id = :survey_id"
 
-#set context_bar [list [list "index" "Surveys"] $name]
+set context_bar [ad_context_bar_ws_or_index [list "./" "Surveys"] "$name"]
 
 set num_responses [db_string responses_count {
     select count(response_id)
@@ -78,6 +78,8 @@
 # build a list containing the HTML (generated with survsimp_question_display) for each question
 set rownum 0
 
+set questions [list]
+
 db_foreach question_ids_select {
     select question_id
     from survsimp_questions  
Index: openacs-4/packages/simple-survey/www/process-response.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/process-response.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simple-survey/www/process-response.adp	18 Feb 2002 20:48:01 -0000	1.2
+++ openacs-4/packages/simple-survey/www/process-response.adp	25 Feb 2002 20:27:41 -0000	1.3
@@ -1,5 +1,6 @@
 <master src=./master>
 <property name=title>Response Submitted</property>
+<property name=context_bar>@context_bar@</property>
     <blockquote>
       Response submitted. Thank you.
     </blockquote>
Index: openacs-4/packages/simple-survey/www/process-response.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/process-response.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simple-survey/www/process-response.tcl	15 Jun 2001 00:45:42 -0000	1.2
+++ openacs-4/packages/simple-survey/www/process-response.tcl	25 Feb 2002 20:27:41 -0000	1.3
@@ -331,7 +331,7 @@
 	    ad_returnredirect "$return_url"
 	    return
 	} else {
-#	    set context_bar [list [list "index.tcl" "Surveys"] "One Survey"]	    
+            set context_bar [ad_context_bar_ws_or_index [list "./" "Surveys"] "Response Submitted for $survey_name"]
 	    ad_return_template
 	}
     }
@@ -369,7 +369,8 @@
 	    ad_returnredirect "$return_url"
 	    return
 	} else {
-#	    set context_bar [list [list "index.tcl" "Surveys"] "One Survey"]	    
+            set context_bar [ad_context_bar_ws_or_index [list "./" "Surveys"] "Response Submitted for $survey_name"]
+
 	    ad_return_template
 	}	
     }
Index: openacs-4/packages/simple-survey/www/admin/description-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/description-edit-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simple-survey/www/admin/description-edit-2.tcl	20 Apr 2001 20:51:22 -0000	1.1
+++ openacs-4/packages/simple-survey/www/admin/description-edit-2.tcl	25 Feb 2002 20:27:41 -0000	1.2
@@ -35,52 +35,24 @@
 }
 
 if {$checked_p == "f"} {
-    set whole_page "[ad_header "Confirm Description"]
-    
-    <h2>Confirm Description</h2>
-    
-    [ad_context_bar_ws_or_index [list "index.tcl" "Simple Survey Admin"] [list "one.tcl?[export_url_vars survey_id]" "Administer Survey"] "Confirm Description"]
+    set context_bar [ad_context_bar_ws_or_index [list "index.tcl" "Simple Survey Admin"] [list "one.tcl?[export_url_vars survey_id]" "Administer Survey"] "Confirm Description"]
 
-    <hr>
-    
-    Here is how your survey description will appear:
-    <blockquote><p>"
-
     switch $desc_html {
 	"t" {
-	    append whole_page "$description"
 	}
 	
 	"pre" {
 	    regsub "\[ \012\015\]+\$" $description {} description
 	    set description "<pre>[ns_quotehtml $description]</pre>"
-	    append whole_page "$description"
 	    set desc_html  "t"
 	}
 
 	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 description desc_html survey_id]
-    <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
 } else {
  
 
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 -r1.2 -r1.3
--- openacs-4/packages/simple-survey/www/admin/description-edit.tcl	15 Jun 2001 00:45:42 -0000	1.2
+++ openacs-4/packages/simple-survey/www/admin/description-edit.tcl	25 Feb 2002 20:27:41 -0000	1.3
@@ -23,31 +23,7 @@
 set html_p_set [ns_set create]
 ns_set put $html_p_set desc_html $desc_html
 
-doc_return 200 text/html "[ad_header "Edit Description"]
-<h2>$survey_name</h2>
+set context_bar [ad_context_bar_ws_or_index [list "./" "Simple Survey Admin"] [list "one?[export_url_vars survey_id]" "Administer Survey"] "Edit Description"]
 
-[ad_context_bar_ws_or_index [list "" "Simple Survey Admin"] [list "one?[export_url_vars survey_id]" "Administer Survey"] "Edit Description"]
 
-<hr>
-
-<blockquote>
-Edit and submit to change the description for this survey:
-<form method=post action=\"description-edit-2\">
-[export_form_vars survey_id]
-<textarea name=description rows=10 cols=65>$description</textarea>  
-<br>
-The description above is:
-<input type=radio name=desc_html value=\"pre\">Preformatted text
-[survsimp_bt_mergepiece  "<input type=radio name=desc_html value=\"f\">Plain text
-<input type=radio name=desc_html value=\"t\">" $html_p_set] HTML
-<P>
-
-<center>
-<input type=submit value=Update>
-</center>
-
-</blockquote>
-
-[ad_footer]
-"
-
+ad_return_template
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 -r1.1 -r1.2
--- openacs-4/packages/simple-survey/www/admin/one.tcl	20 Apr 2001 20:51:22 -0000	1.1
+++ openacs-4/packages/simple-survey/www/admin/one.tcl	25 Feb 2002 20:27:41 -0000	1.2
@@ -41,18 +41,14 @@
 }
 
 # allow site-wide admins to enable/disable surveys directly from here
-if { 1 == 1 } {
-    set target "one?[export_url_vars survey_id]"
-    set toggle_enabled_link "\[ <a href=\"survey-toggle?[export_url_vars survey_id enabled_p target]\">"
-    if {$enabled_p == "t"} {
-	append toggle_enabled_link "Disable"
-    } else {
-	append toggle_enabled_link "Enable"
-    }
-    append toggle_enabled_link "</a> \]"
+set target "one?[export_url_vars survey_id]"
+set toggle_enabled_link "\[ <a href=\"survey-toggle?[export_url_vars survey_id enabled_p target]\">"
+if {$enabled_p == "t"} {
+    append toggle_enabled_link "Disable"
 } else {
-    set toggle_enabled_link "(can only be changed by a site-wide admin)"
+    append toggle_enabled_link "Enable"
 }
+append toggle_enabled_link "</a> \]"
 
 set questions_summary "<form><ol>\n"
 set count 0
@@ -140,29 +136,6 @@
 }
 
 
-doc_return 200 text/html "[ad_header "Administer Survey"]
-<h2>$survey_name</h2>
+set context_bar [ad_context_bar_ws_or_index [list "./" "Simple Survey Admin"] "Administer Survey"]
 
-[ad_context_bar_ws_or_index [list "" "Simple Survey Admin"] "Administer Survey"]
-
-<hr>
-
-<ul>
-<li>Created by: <a href=\"/shared/community-member?user_id=$creation_user\">$creator_name</a>
-<li>Short name: $short_name
-<li>Created: [util_AnsiDatetoPrettyDate $creation_date]
-<li>Status: $survey_status <font size=-1>$toggle_enabled_link</font>
-<li>Responses per user: $survey_response_limit <font size=-1>\[ <a href=\"response-limit-toggle?[export_url_vars survey_id]\">$response_limit_toggle</a> $response_editable_link \]</font>
-<li>Description: $survey_description <font size=-1>\[ <a href=\"description-edit?[export_url_vars survey_id]\">edit</a> \]</font>
-<li>Type: $type
-<li>View responses:  <a href=\"respondents?survey_id=$survey_id\">by user</a>|<a href=\"responses?survey_id=$survey_id\">summary</a>
-[survey_specific_html $type]
-</ul>
-<p>
-
-$questions_summary
-
-[ad_footer]
-"
-
-
+ad_return_template
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 -r1.2 -r1.3
--- openacs-4/packages/simple-survey/www/admin/question-add.tcl	15 Jun 2001 00:45:42 -0000	1.2
+++ openacs-4/packages/simple-survey/www/admin/question-add.tcl	25 Feb 2002 20:27:41 -0000	1.3
@@ -67,36 +67,6 @@
     return $return_html
 }
 
-doc_return 200 text/html "[ad_header "Add A Question"]
-<h2>$name</h2>
+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"]
 
-[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-2\" method=post>
-[export_form_vars survey_id after]
-
-Question:
-<blockquote>
-<textarea name=question_text rows=5 cols=70></textarea>
-</blockquote>
-[survey_specific_html $type]
-<p>
-
-Active? 
-<input type=radio value=t name=active_p checked>Yes
-<input type=radio value=f name=active_p>No
-<br>
-Required?
-<input type=radio value=t name=required_p checked>Yes
-<input type=radio value=f name=required_p>No
-
-<center>
-<input type=submit value=\"Continue\">
-</center>
-
-</form>
-
-[ad_footer]
-"
+ad_return_template
Index: openacs-4/packages/simple-survey/www/admin/question-modify-text.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/question-modify-text.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simple-survey/www/admin/question-modify-text.tcl	20 Apr 2001 20:51:22 -0000	1.1
+++ openacs-4/packages/simple-survey/www/admin/question-modify-text.tcl	25 Feb 2002 20:27:41 -0000	1.2
@@ -24,29 +24,6 @@
 from survsimp_questions
 where question_id = :question_id" ]
 
+set context_bar [ad_context_bar_ws_or_index [list "./" "Simple Survey Admin"] [list "one.tcl?[export_url_vars survey_id]" "Administer Survey"] "Modify a Question's Text"]
 
-doc_return 200 text/html "[ad_header "Modify A Question's Text"]
-<h2>$survey_name</h2>
-
-[ad_context_bar_ws_or_index [list "index.tcl" "Simple Survey Admin"] [list "one.tcl?[export_url_vars survey_id]" "Administer Survey"] "Modify a Question's Text"]
-
-<hr>
-
-<form action=\"question-modify-text-2\" method=GET>
-[export_form_vars question_id survey_id]
-Question:
-<blockquote>
-<textarea name=question_text rows=5 cols=70>[ns_quotehtml $question_text]</textarea>
-</blockquote>
-
-<p>
-
-<center>
-<input type=submit value=\"Continue\">
-</center>
-
-
-</form>
-
-[ad_footer]
-"
+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 -r1.1 -r1.2
--- openacs-4/packages/simple-survey/www/admin/respondents.tcl	20 Apr 2001 20:51:22 -0000	1.1
+++ openacs-4/packages/simple-survey/www/admin/respondents.tcl	25 Feb 2002 20:27:41 -0000	1.2
@@ -36,21 +36,9 @@
 from survsimp_surveys
 where survey_id = :survey_id" ]
 
-
-
-doc_return 200 text/html "[ad_header "Respondents to Survey"]
-<h2>$survey_name</h2>
-
-[ad_context_bar_ws_or_index [list "" "Simple Survey Admin"] \
+set context_bar [ad_context_bar_ws_or_index [list "./" "Simple Survey Admin"] \
      [list "one?survey_id=$survey_id" "Administer Survey"] \
      "Respondents"]
 
-<hr>
 
-<ul>
-$respondents
-</ul>
-
-[ad_footer]
-"
-
+ad_return_template
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 -r1.1 -r1.2
--- openacs-4/packages/simple-survey/www/admin/responses.tcl	20 Apr 2001 20:51:22 -0000	1.1
+++ openacs-4/packages/simple-survey/www/admin/responses.tcl	25 Feb 2002 20:27:41 -0000	1.2
@@ -159,24 +159,8 @@
     }
 }
 
-
-doc_return 200 text/html "[ad_header "Responses to Survey"]
-<h2>$survey_name</h2>
-
-[ad_context_bar_ws_or_index [list "" "Simple Survey Admin"] \
+set context_bar [ad_context_bar_ws_or_index [list "./" "Simple Survey Admin"] \
      [list "one?survey_id=$survey_id" "Administer Survey"] \
      "Responses"]
 
-<hr>
-$unique_users_toggle
-[survey_specific_html $type]
-<p>
-$response_sentence
-
-<ul>
-$results
-</ul>
-
-[ad_footer]
-"
-
+ad_return_template
Index: openacs-4/packages/simple-survey/www/admin/survey-create-2-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/survey-create-2-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simple-survey/www/admin/survey-create-2-oracle.xql	11 Feb 2002 07:10:48 -0000	1.2
+++ openacs-4/packages/simple-survey/www/admin/survey-create-2-oracle.xql	25 Feb 2002 20:27:41 -0000	1.3
@@ -10,7 +10,7 @@
 	        :1 := survsimp_survey.new (
                     survey_id => :survey_id,
                     name => :name,
-                    short_name => :short_name,
+                    short_name => :name,
                     description => :description,
                     description_html_p => :description_html_p,
                     type => :type,
Index: openacs-4/packages/simple-survey/www/admin/survey-create-2-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/survey-create-2-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simple-survey/www/admin/survey-create-2-postgresql.xql	15 Jun 2001 01:06:40 -0000	1.1
+++ openacs-4/packages/simple-survey/www/admin/survey-create-2-postgresql.xql	25 Feb 2002 20:27:41 -0000	1.2
@@ -9,7 +9,7 @@
 	        select survsimp_survey__new (
                     :survey_id,
                     :name,
-                    :short_name,
+                    :name,
                     :description,
                     :description_html_p,
 		    'f',
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 -r1.3 -r1.4
--- openacs-4/packages/simple-survey/www/admin/survey-create-2.tcl	11 Feb 2002 07:10:48 -0000	1.3
+++ openacs-4/packages/simple-survey/www/admin/survey-create-2.tcl	25 Feb 2002 20:27:41 -0000	1.4
@@ -18,7 +18,6 @@
 
   survey_id:integer,optional
   name
-  short_name
   description:html
   desc_html
   {checked_p "f"}
@@ -38,23 +37,6 @@
 set exception_count 0
 set exception_text ""
 
-if { [empty_string_p $short_name] } {
-    incr exception_count
-    append exception_text "<li>You didn't enter a short name for this survey.\n"
-} else {
-    # make sure the short name isn't used somewhere else
-
-    set short_name_used_p [db_string short_name_uniqueness_check "
-select count(short_name)
-from survsimp_surveys
-where lower(short_name) = lower(:short_name)"]
-
-    if {$short_name_used_p > 0} {
-	incr exception_count
-	append exception_text "<li>This short name, $short_name, is already in use.\n"
-    }
-}
-
 if { [empty_string_p $name] } {
     incr exception_count
     append exception_text "<li>You didn't enter a name for this survey.\n"
@@ -110,7 +92,7 @@
     }
     
     append whole_page "<form method=post action=\"[ns_conn url]\">
-    [export_form_vars survey_id name short_name description desc_html type variable_names logic]
+    [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>
@@ -145,7 +127,7 @@
 	        :1 := survsimp_survey.new (
                     survey_id => :survey_id,
                     name => :name,
-                    short_name => :short_name,
+                    short_name => :name,
                     description => :description,
                     description_html_p => :description_html_p,
                     type => :type,
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 -r1.1 -r1.2
--- openacs-4/packages/simple-survey/www/admin/survey-create.tcl	20 Apr 2001 20:51:22 -0000	1.1
+++ openacs-4/packages/simple-survey/www/admin/survey-create.tcl	25 Feb 2002 20:27:41 -0000	1.2
@@ -53,7 +53,7 @@
 	    upvar variable_names local_variable_names
 	    set return_html "
 
-Survey variable names (comma-seperated list):
+Survey variable names (comma-separated list):
 <br>
 <input type=text name=variable_names value=\"$local_variable_names\" size=65>
 <p>
@@ -88,8 +88,6 @@
 
 Survey Name:  <input type=text name=name value=\"$name\" size=30>
 <p>
-Short Name:  <input type=text name=short_name value = \"$short_name\" size=20 Maxlength=20>
-<p> 
 Survey Description: 
 <br>
 <textarea name=description rows=10 cols=65>$description</textarea>