From d584e8ba5e6420474b13af0d6f9b64cd75f78ca3 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Thu, 2 Nov 2006 05:28:18 +0000
Subject: [PATCH] forward port of Survey template doc fixes

---
 docs/changelog/7.x.x.txt                |  4 +++
 lib/WebGUI/Help/Asset_Survey.pm         | 42 ++++++++++++++++---------
 lib/WebGUI/i18n/English/Asset_Survey.pm | 28 ++++++++++++++---
 3 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index c6d477917..aaadef17b 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -16,6 +16,10 @@
    Apache::Request object replacement.  It doesn't do everything, but it
    does enough to test Session/Http.pm, except for cookies.
 
+7.1.4
+ - Template variables in the main Survey Template were out of date in the
+   documentation.
+
 7.1.3
  - fix: SQLReport now returns error if can't find DatabaseLink
  - WebGUI::DatabaseLink->new now warns if can't find requested DatabaseLink
diff --git a/lib/WebGUI/Help/Asset_Survey.pm b/lib/WebGUI/Help/Asset_Survey.pm
index 008a0085f..4700efcee 100644
--- a/lib/WebGUI/Help/Asset_Survey.pm
+++ b/lib/WebGUI/Help/Asset_Survey.pm
@@ -274,6 +274,33 @@ our $HELP = {
 		          {
 		            'name' => 'response.isComplete'
 		          },
+		          {
+		            'name' => 'section.edit_loop',
+		            'variables' => [
+				  {
+				     'name' => 'section.edit.controls'
+				  },
+				  {
+				     'name' => 'section.edit.sectionName'
+				  },
+				  {
+				     'name' => 'section.edit.id'
+				  },
+				  {
+				    'name' => 'section.questions_loop',
+				    'variables' => [
+						     {
+						       'name' => 'question.edit.controls'
+						     },
+						     {
+						       'name' => 'question.edit.question'
+						     },
+						     {
+						       'name' => 'question.edit.id'
+						     },
+				   ],
+				  },
+				],
 		          {
 		            'name' => 'question_loop',
 		            'variables' => [
@@ -297,20 +324,7 @@ our $HELP = {
 		                             }
 		                           ]
 		          },
-		          {
-		            'name' => 'question.edit_loop',
-		            'variables' => [
-		                             {
-		                               'name' => 'question.edit.controls'
-		                             },
-		                             {
-		                               'name' => 'question.edit.question'
-		                             },
-		                             {
-		                               'name' => 'question.edit.id'
-		                             }
-		                           ]
-		          }
+			  },
 		],
 		related => [
 			{
diff --git a/lib/WebGUI/i18n/English/Asset_Survey.pm b/lib/WebGUI/i18n/English/Asset_Survey.pm
index 934aec7e1..7cb2f87ce 100644
--- a/lib/WebGUI/i18n/English/Asset_Survey.pm
+++ b/lib/WebGUI/i18n/English/Asset_Survey.pm
@@ -319,14 +319,29 @@ our $I18N = {
 		lastUpdated => 1149654653,
 	},
 
-	'question.edit_loop' => {
-		message => q|A loop containing all the questions in the survey with edit controls.|,
+	'section.questions_loop' => {
+		message => q|A loop containing all the questions in this section of the survey with edit controls.|,
 		lastUpdated => 1149654653,
 	},
 
+	'section.edit_loop' => {
+		message => q|A loop containing all the sections and their questions with edit controls.|,
+		lastUpdated => 1162445117,
+	},
+
+	'section.edit.controls' => {
+		message => q|A toolbar to use to edit, delete or move this section.|,
+		lastUpdated => 1162270258,
+	},
+
+	'section.edit.sectionName' => {
+		message => q|The name of this section of questions.|,
+		lastUpdated => 1162270301,
+	},
+
 	'question.edit.controls' => {
-		message => q|A toolbar to use to edit this question.|,
-		lastUpdated => 1149654653,
+		message => q|A toolbar to use to edit, delete or move this question.|,
+		lastUpdated => 1162270256,
 	},
 
 	'question.edit.question' => {
@@ -339,6 +354,11 @@ our $I18N = {
 		lastUpdated => 1149654653,
 	},
 
+	'section.edit.id' => {
+		message => q|The unique id for this section.|,
+		lastUpdated => 1162270283,
+	},
+
 	'89' => {
 		message => q|<p>The following template variables are available for the Survey:</p>
 |,