From 75da4c46bd592fc6e5f022217362c5fad6942120 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Fri, 5 Dec 2008 03:32:47 +0000
Subject: [PATCH 01/15] Add more tests for coverage. Interim checkin for debug
 assistance.

---
 t/Asset/Wobject/Survey/SurveyJSON.t | 337 ++++++++++++++++++++++++----
 1 file changed, 299 insertions(+), 38 deletions(-)

diff --git a/t/Asset/Wobject/Survey/SurveyJSON.t b/t/Asset/Wobject/Survey/SurveyJSON.t
index 4ed6ccecd..14a95debc 100644
--- a/t/Asset/Wobject/Survey/SurveyJSON.t
+++ b/t/Asset/Wobject/Survey/SurveyJSON.t
@@ -21,13 +21,12 @@ my $session = WebGUI::Test->session;
 
 #----------------------------------------------------------------------------
 # Tests
-my $tests = 87;
+my $tests = 95;
 plan tests => $tests + 1 + 3;
 
 #----------------------------------------------------------------------------
 # put your tests here
 
-
 ####################################################
 #
 # buildSectionSkeleton
@@ -129,18 +128,9 @@ skip $tests, "Unable to load SurveyJSON" unless $usedOk;
 $surveyJSON = WebGUI::Asset::Wobject::Survey::SurveyJSON->new('{}', $session->log);
 isa_ok($surveyJSON, 'WebGUI::Asset::Wobject::Survey::SurveyJSON');
 
-####################################################
-#
-# log
-#
-####################################################
-
-WebGUI::Test->interceptLogging;
-
-my $logger = $surveyJSON->log("Everyone in here is innocent");
-is ($WebGUI::Test::logger_warns, undef, 'Did not log a warn');
-is ($WebGUI::Test::logger_info,  undef, 'Did not log an info');
-is ($WebGUI::Test::logger_error, "Everyone in here is innocent", 'Logged an error');
+my $sJSON2 = WebGUI::Asset::Wobject::Survey::SurveyJSON->new(undef, $session->log);
+isa_ok($sJSON2, 'WebGUI::Asset::Wobject::Survey::SurveyJSON', 'even with absolutely no JSON');
+undef $sJSON2;
 
 ####################################################
 #
@@ -204,6 +194,23 @@ lives_ok
     }
     'new handles wide characters';
 
+$sJSON2 = WebGUI::Asset::Wobject::Survey::SurveyJSON->new(
+    '{ "sections" : [ { "type" : "section" } ], "survey" : {} }',
+    $session->log,
+);
+
+cmp_deeply(
+    $sJSON2->sections,
+    [
+        {
+            type => 'section',
+        },
+    ],
+    'new: If the JSON has a section, a new one will not be added',
+);
+
+undef $sJSON2;
+
 ####################################################
 #
 # freeze
@@ -435,8 +442,9 @@ my $section1 = $surveyJSON->getObject([2]);
 cmp_deeply(
     $section1,
     superhashof({
-        type  => 'section',
-        title => 'Section 1',
+        type      => 'section',
+        title     => 'Section 1',
+        questions => [],
     }),
     'getObject: Retrieved correct section'
 );
@@ -496,16 +504,17 @@ cmp_deeply(
     $section->{title} = 'Section 1';
     $surveyJSON->update([1], $section );
 }
+##Update the title to make it clearer.
+$surveyJSON->section([2])->{title} = 'Section 2';
+##And give it a question
+$surveyJSON->newObject([2]);
 cmp_deeply(
     summarizeSectionSkeleton($surveyJSON),
     [
         {
             title     => 'Section 0',
             questions => [
-                {
-                    text    => 'Question 0-0',
-                    answers => [],
-                },
+                { text    => 'Question 0-0', answers => [], },
                 {
                     text    => 'Question 0-1',
                     answers => [
@@ -520,10 +529,7 @@ cmp_deeply(
                         },
                     ],
                 },
-                {
-                    text    => 'Question 0-2',
-                    answers => [],
-                },
+                { text    => 'Question 0-2', answers => [], },
             ],
         },
         {
@@ -536,8 +542,13 @@ cmp_deeply(
             ],
         },
         {
-            title     => 'Section 1',
-            questions => [],
+            title     => 'Section 2',
+            questions => [
+                {
+                    text    => '',
+                    answers => [],
+                },
+            ],
         },
     ],
     'Update: updated a section'
@@ -548,8 +559,9 @@ my $question1 = $surveyJSON->getObject([1, 0]);
 cmp_deeply(
     $question1,
     superhashof({
-        type => 'question',
-        text => 'Question 0+-0',
+        type    => 'question',
+        text    => 'Question 0+-0',
+        answers => [],
     }),
     'getObject: Retrieved correct question'
 );
@@ -600,6 +612,97 @@ cmp_deeply(
     'remove: Remove an answer'
 );
 
+$surveyJSON->remove([0]),
+cmp_deeply(
+    $surveyJSON->getObject([0]),
+    superhashof({
+        type  => 'section',
+        title => 'Section 0',
+    }),
+    'remove: Cannot remove the first section, by default'
+);
+
+my $sectionAddress = $surveyJSON->newObject([]);
+
+cmp_deeply(
+    $surveyJSON->sections,
+    [
+        superhashof({
+            type      => 'section',
+            title     => 'Section 0',
+            questions => ignore(),
+        }),
+        superhashof({
+            type      => 'section',
+            title     => 'Section 1',
+            questions => ignore(),
+        }),
+        superhashof({
+            type      => 'section',
+            title     => 'Section 2',
+            questions => ignore(),
+        }),
+        superhashof({
+            type      => 'section',
+            title     => 'NEW SECTION',
+            questions => ignore(),
+        }),
+    ],
+    'Added new section for testing remove'
+);
+
+$surveyJSON->remove($sectionAddress),
+cmp_deeply(
+    $surveyJSON->sections,
+    [
+        superhashof({
+            type      => 'section',
+            title     => 'Section 0',
+            questions => ignore(),
+        }),
+        superhashof({
+            type      => 'section',
+            title     => 'Section 1',
+            questions => ignore(),
+        }),
+        superhashof({
+            type      => 'section',
+            title     => 'Section 2',
+            questions => ignore(),
+        }),
+    ],
+    'remove: Removed a section'
+);
+
+
+$surveyJSON->newObject([2]);
+cmp_deeply(
+    $surveyJSON->getObject([2]),
+    #$surveyJSON->section([2]),
+    superhashof({
+        title => 'Section 2',
+        type  => 'section',
+        questions => [
+            superhashof({
+                text => '',
+                type => 'question',
+            }),
+        ],
+    }),
+    'Added a question to section 2 to test removing it'
+);
+
+$surveyJSON->remove([2,0]);
+cmp_deeply(
+    $surveyJSON->getObject([2]),
+    superhashof({
+        title => 'Section 2',
+        type  => 'section',
+        questions => [],
+    }),
+    'remove: removed a question'
+);
+
 ####################################################
 #
 # copy
@@ -659,8 +762,13 @@ cmp_deeply(
             ],
         },
         {
-            title     => 'Section 1',
-            questions => [],
+            title     => 'Section 2',
+            questions => [
+                {
+                    text    => '',
+                    answers => [],
+                },
+            ],
         },
     ],
     'copy: copied a question with answers'
@@ -716,16 +824,19 @@ cmp_deeply(
             ],
         },
         {
-            title     => 'Section 1',
-            questions => [],
+            title     => 'Section 2',
+            questions => [
+                {
+                    text    => '',
+                    answers => [],
+                },
+            ],
         },
     ],
     'copy: copies safe references for a question'
 );
 
 ##Now, try a section copy.
-##Update the title to make the copying clear.
-$surveyJSON->section([2])->{title} = 'Section 2';
 $stompedAddress = [1];
 $returnedAddress = $surveyJSON->copy($stompedAddress);
 is_deeply($returnedAddress, [3], 'Added a section');
@@ -779,7 +890,12 @@ cmp_deeply(
         },
         {
             title     => 'Section 2',
-            questions => [],
+            questions => [
+                {
+                    text    => '',
+                    answers => [],
+                },
+            ],
         },
         {
             title     => 'Section 1',
@@ -826,7 +942,15 @@ cmp_deeply(
                 { text    => 'Question 1-0', answers => [], },
             ],
         },
-        { title     => 'Section 2', questions => [], },
+        {
+            title     => 'Section 2',
+            questions => [
+                {
+                    text    => '',
+                    answers => [],
+                },
+            ],
+        },
         {
             title     => 'Section 3',
             questions => [
@@ -841,6 +965,89 @@ cmp_deeply(
 
 $surveyJSON->question([0, 3])->{text} = 'Question 0-3';
 $surveyJSON->answer([0, 3, 1])->{text} = 'Answer 0-3-1';
+
+##Now, try copying the last section.
+$surveyJSON->copy([3]);
+cmp_deeply(
+    summarizeSectionSkeleton($surveyJSON),
+    [
+        {
+            title     => 'Section 0',
+            questions => [
+                {
+                    text    => 'Question 0-0',
+                    answers => [],
+                },
+                {
+                    text    => 'Question 0-1',
+                    answers => [
+                        {
+                            text    => 'Answer 0-1-0',
+                        },
+                        {
+                            text    => 'Answer 0-1-1',
+                        },
+                    ],
+                },
+                {
+                    text    => 'Question 0-2',
+                    answers => [],
+                },
+                {
+                    text    => 'Question 0-3',
+                    answers => [
+                        {
+                            text    => 'Answer 0-3-0',
+                        },
+                        {
+                            text    => 'Answer 0-3-1',
+                        },
+                    ],
+                },
+            ],
+        },
+        {
+            title     => 'Section 1',
+            questions => [
+                {
+                    text    => 'Question 1-0',
+                    answers => [],
+                },
+            ],
+        },
+        {
+            title     => 'Section 2',
+            questions => [
+                {
+                    text    => '',
+                    answers => [],
+                },
+            ],
+        },
+        {
+            title     => 'Section 3',
+            questions => [
+                {
+                    text    => 'Question 3-0',
+                    answers => [],
+                },
+            ],
+        },
+        {
+            title     => 'Section 3',
+            questions => [
+                {
+                    text    => 'Question 3-0',
+                    answers => [],
+                },
+            ],
+        },
+    ],
+    'copy: copied last section'
+);
+
+$surveyJSON->remove([4]);
+
 cmp_deeply(
     summarizeSectionSkeleton($surveyJSON),
     [
@@ -875,7 +1082,13 @@ cmp_deeply(
             ],
         },
         {
-            title     => 'Section 2', questions => [],
+            title     => 'Section 2',
+            questions => [
+                {
+                    text    => '',
+                    answers => [],
+                },
+            ],
         },
         {
             title     => 'Section 3',
@@ -984,12 +1197,16 @@ cmp_deeply(
             type => 'section',
             text => 'Section 2',
         },
+        {
+            type => 'question',
+            text => '',
+        },
         {
             type => 'section',
             text => 'Section 3',
         },
     ],
-    'getDragDropList: list of sections, no questions'
+    'getDragDropList: FIXME: list of sections, no questions'
 );
 
 ####################################################
@@ -1226,6 +1443,37 @@ cmp_deeply(
     'addAnswersToQuestion: setup verbatims on two answers'
 );
 
+$surveyJSON->question([3,0])->{answers} = [];
+
+$surveyJSON->addAnswersToQuestion( [3,0],
+    [ qw[ one two three ] ],
+    { 1 => 0 }
+);
+
+cmp_deeply(
+    $surveyJSON->question([3,0]),
+    superhashof({
+        answers => [
+            superhashof({
+                text     => 'one',
+                verbatim => 0,
+                recordedAnswer => 1,
+            }),
+            superhashof({
+                text     => 'two',
+                verbatim => 0,
+                recordedAnswer => 2,
+            }),
+            superhashof({
+                text     => 'three',
+                verbatim => 0,
+                recordedAnswer => 3,
+            }),
+        ],
+    }),
+    'addAnswersToQuestion: verbatims have to exist, and be true'
+);
+
 ####################################################
 #
 # updateQuestionAnswers
@@ -1745,6 +1993,19 @@ cmp_deeply(
     'updateQuestionAnswers: Dual Slider - Range'
 );
 
+####################################################
+#
+# log
+#
+####################################################
+
+WebGUI::Test->interceptLogging;
+
+my $logger = $surveyJSON->log("Everyone in here is innocent");
+is ($WebGUI::Test::logger_warns, undef, 'Did not log a warn');
+is ($WebGUI::Test::logger_info,  undef, 'Did not log an info');
+is ($WebGUI::Test::logger_error, "Everyone in here is innocent", 'Logged an error');
+
 }
 
 ####################################################

From ace2c81fca5556f5d83a6335374e7ed3a15cf1c9 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Fri, 5 Dec 2008 03:41:29 +0000
Subject: [PATCH 02/15] update SurveyJSON test to fix perl 5.10 misleading
 errors

---
 t/Asset/Wobject/Survey/SurveyJSON.t | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/t/Asset/Wobject/Survey/SurveyJSON.t b/t/Asset/Wobject/Survey/SurveyJSON.t
index 14a95debc..1fd441120 100644
--- a/t/Asset/Wobject/Survey/SurveyJSON.t
+++ b/t/Asset/Wobject/Survey/SurveyJSON.t
@@ -687,6 +687,10 @@ cmp_deeply(
                 text => '',
                 type => 'question',
             }),
+            superhashof({
+                text => '',
+                type => 'question',
+            }),
         ],
     }),
     'Added a question to section 2 to test removing it'
@@ -698,7 +702,12 @@ cmp_deeply(
     superhashof({
         title => 'Section 2',
         type  => 'section',
-        questions => [],
+        questions => [
+            superhashof({
+                text => '',
+                type => 'question',
+            }),
+        ],
     }),
     'remove: removed a question'
 );

From 8ea45fe4560f67ccb5f953bc813d5f7235034bf6 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Fri, 5 Dec 2008 04:21:43 +0000
Subject: [PATCH 03/15] Switch to using dclone from Clone::clone due to bugs
 under perl 5.10

---
 lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm | 13 +++++++------
 t/Asset/Wobject/Survey/SurveyJSON.t           | 11 ++++++-----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm b/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
index e58961537..697fcd54e 100644
--- a/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
@@ -29,7 +29,8 @@ Asset in WebGUI.
 
 use strict;
 use JSON;
-use Clone qw/clone/;
+#use Clone qw/clone/;
+use Storable qw/dclone/;
 
 =head2 new ( $json, $log )
 
@@ -238,13 +239,13 @@ question in a section.  Returns that answer.
 sub getObject {
     my ( $self, $address ) = @_;
     if ( @$address == 1 ) {
-        return clone $self->{sections}->[ $address->[0] ];
+        return dclone $self->{sections}->[ $address->[0] ];
     }
     elsif ( @$address == 2 ) {
-        return clone $self->{sections}->[ $address->[0] ]->{questions}->[ $address->[1] ];
+        return dclone $self->{sections}->[ $address->[0] ]->{questions}->[ $address->[1] ];
     }
     else {
-        return clone $self->{sections}->[ $address->[0] ]->{questions}->[ $address->[1] ]->{answers}->[ $address->[2] ];
+        return dclone $self->{sections}->[ $address->[0] ]->{questions}->[ $address->[1] ]->{answers}->[ $address->[2] ];
     }
 }
 
@@ -575,13 +576,13 @@ Nothing happens.  It is not allowed to duplicate answers.
 sub copy {
     my ( $self, $address ) = @_;
     if ( @$address == 1 ) {
-        my $newSection = clone $self->section($address);
+        my $newSection = dclone $self->section($address);
         push( @{ $self->sections }, $newSection );
         $address->[0] = $#{ $self->sections };
         return $address;
     }
     elsif ( @$address == 2 ) {
-        my $newQuestion = clone $self->question($address);
+        my $newQuestion = dclone $self->question($address);
         push( @{ $self->questions($address) }, $newQuestion );
         $address->[1] = $#{ $self->questions($address) };
         return $address;
diff --git a/t/Asset/Wobject/Survey/SurveyJSON.t b/t/Asset/Wobject/Survey/SurveyJSON.t
index 1fd441120..d308388b2 100644
--- a/t/Asset/Wobject/Survey/SurveyJSON.t
+++ b/t/Asset/Wobject/Survey/SurveyJSON.t
@@ -13,7 +13,8 @@ use Data::Dumper;
 use WebGUI::Test;    # Must use this before any other WebGUI modules
 use WebGUI::Session;
 use JSON;
-use Clone qw/clone/;
+#use Clone qw/clone/;
+use Storable qw/dclone/;
 
 #----------------------------------------------------------------------------
 # Init
@@ -21,7 +22,7 @@ my $session = WebGUI::Test->session;
 
 #----------------------------------------------------------------------------
 # Tests
-my $tests = 95;
+my $tests = 96;
 plan tests => $tests + 1 + 3;
 
 #----------------------------------------------------------------------------
@@ -2062,13 +2063,13 @@ sub buildSectionSkeleton {
     my $sections = [];
     my ($bareSection, $bareQuestion, $bareAnswer) = getBareSkeletons();
     foreach my $questionSpec ( @{ $spec } ) {
-        my $section = clone $bareSection;
+        my $section = dclone $bareSection;
         push @{ $sections }, $section;
         foreach my $answers ( @{$questionSpec} ) {
-            my $question = clone $bareQuestion;
+            my $question = dclone $bareQuestion;
             push @{ $section->{questions} }, $question;
             while ($answers-- > 0) {
-                my $answer = clone $bareAnswer;
+                my $answer = dclone $bareAnswer;
                 push @{ $question->{answers} }, $answer;
             }
         }

From 8a854a6ffa630eeeb30f6559c0e0485e4a9afc56 Mon Sep 17 00:00:00 2001
From: Yung Han Khoe <yung@webgui-svn>
Date: Fri, 5 Dec 2008 11:18:42 +0000
Subject: [PATCH 04/15] fixed some Matrix rating bugs

---
 lib/WebGUI/Asset/MatrixListing.pm             | 29 ++++++-------
 lib/WebGUI/i18n/English/Asset_Matrix.pm       | 41 -------------------
 .../i18n/English/Asset_MatrixListing.pm       | 41 +++++++++++++++++++
 3 files changed, 56 insertions(+), 55 deletions(-)

diff --git a/lib/WebGUI/Asset/MatrixListing.pm b/lib/WebGUI/Asset/MatrixListing.pm
index 9ba704f1b..c1bcd579c 100644
--- a/lib/WebGUI/Asset/MatrixListing.pm
+++ b/lib/WebGUI/Asset/MatrixListing.pm
@@ -426,7 +426,7 @@ sub setRatings {
     foreach my $category (keys %{$self->getParent->getCategories}) {
         if ($ratings->{$category}) {
             $db->write("insert into MatrixListing_rating 
-                (userId, category, rating, timeStamp, listingId, ipAddress, matrixId) values (?,?,?,?,?,?,?)",
+                (userId, category, rating, timeStamp, listingId, ipAddress, assetId) values (?,?,?,?,?,?,?)",
                 [$session->user->userId,$category,$ratings->{$category},$session->datetime->time(),$self->getId,
                 $session->env->get("HTTP_X_FORWARDED_FOR"),$matrixId]);
         }
@@ -439,7 +439,7 @@ sub setRatings {
         my $median  = $db->quickScalar("select rating $sql limit $half,$half",[$self->getId,$category]);
         
         $db->write("replace into MatrixListing_ratingSummary 
-            (listingId, category, meanValue, medianValue, countValue, matrixId) 
+            (listingId, category, meanValue, medianValue, countValue, assetId) 
             values (?,?,?,?,?,?)",[$self->getId,$category,$mean,$median,$count,$matrixId]);
     }
     return undef;
@@ -482,8 +482,9 @@ sub view {
 	my $self        = shift;
     my $hasRated    = shift || $self->hasRated;
     my $emailSent   = shift;
-    my $db          = $self->session->db;
-    my $i18n        = WebGUI::International->new($self->session, "Asset_Matrix");
+    my $session     = $self->session;
+    my $db          = $session->db;
+    my $i18n        = WebGUI::International->new($self->session, "Asset_MatrixListing");
     my @categories  = keys %{$self->getParent->getCategories};
    
     # Increment views before getting template var hash so that the views tmpl_var has the incremented value. 
@@ -497,7 +498,7 @@ sub view {
     $var->{comments}            = $self->getFormattedComments();
     $var->{productName}         = $var->{title};
     $var->{lastUpdated_epoch}   = $self->get('lastUpdated');
-    $var->{lastUpdated_date}    = $self->session->datetime->epochToHuman($self->get('lastUpdated'),"%z");
+    $var->{lastUpdated_date}    = $session->datetime->epochToHuman($self->get('lastUpdated'),"%z");
 
     $var->{manufacturerUrl_click}  = $self->getUrl("func=click;manufacturer=1");
     $var->{productUrl_click}       = $self->getUrl("func=click");
@@ -532,7 +533,7 @@ sub view {
     foreach my $category (@categories) {
         my $attributes;
         my @attribute_loop;
-        my $categoryLoopName = $self->session->url->urlize($category)."_loop";
+        my $categoryLoopName = $session->url->urlize($category)."_loop";
         $attributes = $db->read("select * from Matrix_attribute as a
             left join MatrixListing_attribute as l on (a.attributeId = l.attributeId and l.matrixListingId = ?)
             where category =? and a.assetId = ?",
@@ -540,7 +541,7 @@ sub view {
         while (my $attribute = $attributes->hashRef) {
             $attribute->{label} = $attribute->{name};
             if ($attribute->{fieldType} eq 'MatrixCompare'){
-                $attribute->{value} = WebGUI::Form::MatrixCompare->new($self->session,$attribute)->getValueAsHtml;
+                $attribute->{value} = WebGUI::Form::MatrixCompare->new($session,$attribute)->getValueAsHtml;
             }
             push(@attribute_loop,$attribute);
         }
@@ -554,7 +555,7 @@ sub view {
     # Screenshots
 
     if ($var->{screenshots}) {
-        my $file = WebGUI::Form::File->new($self->session,{ value=>$var->{screenshots} });
+        my $file = WebGUI::Form::File->new($session,{ value=>$var->{screenshots} });
         my $storage = $file->getStorageLocation;
         my @files;
         @files = @{ $storage->getFiles } if (defined $storage);
@@ -631,11 +632,11 @@ pluginspage="http://www.macromedia.com/go/getflashplayer" />
         <th>".$i18n->get('median label')."</th>
         <th>".$i18n->get('count label')."</th></tr>\n";
 
-    my $ratingForm = WebGUI::HTMLForm->new($self->session,
+    my $ratingForm = WebGUI::HTMLForm->new($session,
         -extras     =>'class="content"',
         -tableExtras=>'class="content"'
         );
-    $ratingForm = WebGUI::HTMLForm->new($self->session,
+    $ratingForm = WebGUI::HTMLForm->new($session,
         -extras     =>'class="ratingForm"',
         -tableExtras=>'class="ratingForm"'
         );
@@ -664,9 +665,9 @@ pluginspage="http://www.macromedia.com/go/getflashplayer" />
     $ratingForm->submit(
         -extras =>'class="ratingForm"',
         -value  =>$i18n->get('rate submit label'),
-        -label  =>'<a href="'.$self->getUrl("func=rate").'">'.$i18n->get('show ratings').'</a>'
+        -label  =>'<a href="'.$self->getUrl("showRatings=1").'">'.$i18n->get('show ratings').'</a>'
         );
-    if ($hasRated) {
+    if ($hasRated || $session->form->process('showRatings')) {
         $var->{ratings} = $ratingsTable;
     } else {
         $var->{ratings} = $ratingForm->print;
@@ -674,7 +675,7 @@ pluginspage="http://www.macromedia.com/go/getflashplayer" />
 
     # Mail form
 
-    my $mailForm = WebGUI::HTMLForm->new($self->session,
+    my $mailForm = WebGUI::HTMLForm->new($session,
         -extras     =>'class="content"',
         -tableExtras=>'class="content"'
         );
@@ -688,7 +689,7 @@ pluginspage="http://www.macromedia.com/go/getflashplayer" />
     $mailForm->email(
         -extras     =>'class="content"',
         -name       =>"from",
-        -value      =>$self->session->user->profileField("email"),
+        -value      =>$session->user->profileField("email"),
         -label      =>$i18n->get('your email label'),
         );
     $mailForm->selectBox(
diff --git a/lib/WebGUI/i18n/English/Asset_Matrix.pm b/lib/WebGUI/i18n/English/Asset_Matrix.pm
index bee03b53c..5267f0c33 100644
--- a/lib/WebGUI/i18n/English/Asset_Matrix.pm
+++ b/lib/WebGUI/i18n/English/Asset_Matrix.pm
@@ -780,47 +780,6 @@ listing,|,
 		lastUpdated => 0,
 	},
 
-	'your email label' => {
-		message => q|Your Email Address|,
-		lastUpdated => 0,
-	},
-
-	'report error label' => {
-		message => q|Report an error.|,
-		lastUpdated => 0,
-	},
-
-	'general comment label' => {
-		message => q|General comment.|,
-		lastUpdated => 0,
-	},
-
-	'request type label' => {
-		message => q|Type of Request|,
-		lastUpdated => 0,
-	},
-
-	'comment label' => {
-		message => q|Comment|,
-		lastUpdated => 0,
-	},
-
-    'send button label' => {
-        message => q|Send...|,
-        lastUpdated => 0,
-    },
-
-
-	'show ratings' => {
-		message => q|Show Ratings|,
-		lastUpdated => 0,
-	},
-
-    'rate submit label' => {
-        message => q|Rate|,
-        lastUpdated => 0,
-    },
-
 	'no copy' => {
 		message => q|This asset may not be copied.|,
 		lastUpdated => 1133758944,
diff --git a/lib/WebGUI/i18n/English/Asset_MatrixListing.pm b/lib/WebGUI/i18n/English/Asset_MatrixListing.pm
index 054d52ff5..51af42326 100644
--- a/lib/WebGUI/i18n/English/Asset_MatrixListing.pm
+++ b/lib/WebGUI/i18n/English/Asset_MatrixListing.pm
@@ -153,6 +153,47 @@ this listing.|,
         lastUpdated => 0,
     },
 
+    'your email label' => {
+        message => q|Your Email Address|,
+        lastUpdated => 0,
+    },
+
+    'report error label' => {
+        message => q|Report an error.|,
+        lastUpdated => 0,
+    },
+
+    'general comment label' => {
+        message => q|General comment.|,
+        lastUpdated => 0,
+    },
+
+    'request type label' => {
+        message => q|Type of Request|,
+        lastUpdated => 0,
+    },
+
+    'comment label' => {
+        message => q|Comment|,
+        lastUpdated => 0,
+    },
+
+    'send button label' => {
+        message => q|Send...|,
+        lastUpdated => 0,
+    },
+
+
+    'show ratings' => {
+        message => q|Show Ratings|,
+        lastUpdated => 0,
+    },
+
+    'rate submit label' => {
+        message => q|Rate|,
+        lastUpdated => 0,
+    },
+
 };
 
 1;

From 187c19b84e0d253b66bb9505c88852a96beddb75 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Fri, 5 Dec 2008 17:22:58 +0000
Subject: [PATCH 05/15] canAdd is a class method

---
 lib/WebGUI/Asset.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 84ee30f2f..3176f9b6b 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -184,6 +184,8 @@ sub assetExists {
 
 Verifies that the user has the privileges necessary to add this type of asset. Return a boolean.
 
+A class method.
+
 =head3 session
 
 The session variable.

From 0768af119f116cdfabcf9612b8a0a220d711bec2 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Fri, 5 Dec 2008 18:46:43 +0000
Subject: [PATCH 06/15] fix quoting problems in webgui tinymce image plug-in

---
 docs/changelog/7.x.x.txt                                      | 1 +
 .../tinymce-webgui/plugins/wginsertimage/js/insertimage.js    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 40ed4f952..52d6d2522 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -3,6 +3,7 @@
  - fixed #8774: Forum Rich Edit no longer supports indent/outdent
  - fixed #4173: fieldnames in profilefields can contain spaces
  - fixed #8811: Bug Tracker: Formatting is bad for the resolution form.
+ - fixed #9235: Image Bug in rich text editor.
 
 7.6.5
  - security: A problem was discovered and fixed in which users could email executable attachments to a collaboration system and then when viewed online, could execute them. 
diff --git a/www/extras/tinymce-webgui/plugins/wginsertimage/js/insertimage.js b/www/extras/tinymce-webgui/plugins/wginsertimage/js/insertimage.js
index dea6e4971..86a4fdef3 100644
--- a/www/extras/tinymce-webgui/plugins/wginsertimage/js/insertimage.js
+++ b/www/extras/tinymce-webgui/plugins/wginsertimage/js/insertimage.js
@@ -43,10 +43,10 @@ var WGInsertImageDialog = {
             img += ' hspace="' + parseInt(form.imagehspace.value) + '"';
         }
         if (form.imagevspace.value != "") {
-            img += ' vspace="' + parseInt(form.imagevspace.value) + "'";
+            img += ' vspace="' + parseInt(form.imagevspace.value) + '"';
         }
         if (form.imageborder.value != "") {
-            img += ' border="' + parseInt(form.imageborder.value) + "'";
+            img += ' border="' + parseInt(form.imageborder.value) + '"';
         }
         if (form.imagealign.value != "") {
             img += ' align="' + form.imagealign.value + '"';

From 4d1f311c42f8b04ea8bc8fd2ee1f7c97638c127f Mon Sep 17 00:00:00 2001
From: Kaleb Murphy <perlmonkey2@webgui-svn>
Date: Fri, 5 Dec 2008 21:43:15 +0000
Subject: [PATCH 07/15] Fixed hasTimeLimit to work with the new storage
 location of the time limit.

---
 lib/WebGUI/Asset/Wobject/Survey.pm              | 2 +-
 lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index dbe305588..65467725c 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -718,7 +718,7 @@ sub www_loadQuestions {
         $self->session->log->debug('No responseId, surveyEnd');
         return $self->surveyEnd();
     }
-    if($self->response->hasTimedOut()){
+    if($self->response->hasTimedOut($self->get('timeLimit'))){
         $self->session->log->debug('Response hasTimedOut, surveyEnd');
         return $self->surveyEnd();
     }
diff --git a/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm b/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm
index 060697f5c..25507c91c 100644
--- a/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm
@@ -91,7 +91,8 @@ sub freeze {
 
 sub hasTimedOut{
     my $self=shift;
-    return 1 if($self->{startTime} + ($self->{timeLimit} * 60) < time() and $self->{timeLimit} > 0);
+    my $limit = shift;
+    return 1 if($self->{startTime} + ($limit * 60) < time() and $limit > 0);
     return 0;
 }
 

From 36253e8a0792340004a925e8ef4d5819d470972e Mon Sep 17 00:00:00 2001
From: Kaleb Murphy <perlmonkey2@webgui-svn>
Date: Fri, 5 Dec 2008 23:09:15 +0000
Subject: [PATCH 08/15] When an edit is submitted the edit screen no longer
 shows up

---
 www/extras/wobject/Survey/editsurvey.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/www/extras/wobject/Survey/editsurvey.js b/www/extras/wobject/Survey/editsurvey.js
index 5989a5376..f1e4c0a7f 100644
--- a/www/extras/wobject/Survey/editsurvey.js
+++ b/www/extras/wobject/Survey/editsurvey.js
@@ -5,7 +5,7 @@ if (typeof Survey == "undefined") {
 Survey.Data = new function(){
     var lastDataSet = {};
     var focus;
-
+    var lastId = -1;
 
     this.dragDrop = function(did){
         var type;
@@ -46,6 +46,14 @@ YAHOO.log(first.id+' '+data.id);
 
     this.loadData = function(d){
         focus = d.address;//What is the current highlighted item.
+        var showEdit = 1;
+        if(lastId.toString() == d.address.toString()){
+            showEdit = 0;
+            lastId = -1;
+        }else{
+            lastId = d.address;
+        }
+console.log(d.address);
         document.getElementById('sections').innerHTML=d.ddhtml;
         
         //add event handlers for if a tag is clicked
@@ -72,7 +80,11 @@ YAHOO.log('adding handler for '+ d.ids[x]);
             button.on("click", this.addAnswer,d.buttons['answer']); 
         }
 
-        this.loadObjectEdit(d.edithtml,d.type);
+        if(showEdit == 1){
+            this.loadObjectEdit(d.edithtml,d.type);
+        }else{
+            document.getElementById('edit').innerHTML = "";
+        }
         lastDataSet = d;
     }
 

From 3671e80bea1cce726d3ddc77f3e9f12805d186d0 Mon Sep 17 00:00:00 2001
From: Kaleb Murphy <perlmonkey2@webgui-svn>
Date: Fri, 5 Dec 2008 23:53:11 +0000
Subject: [PATCH 09/15] terminal sections now work correctly

---
 lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm b/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm
index 25507c91c..860d7f2be 100644
--- a/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm
@@ -150,14 +150,15 @@ sub recordResponses {
     #These were just submitted from the user, so we need to see what and how they were (un)answered.
     my $questions = $self->nextQuestions();
     my $qAnswered = 1;
+    my $sterminal  = 0;
     my $terminal  = 0;
     my $terminalUrl;
     my $goto;
 
-    #my $section = $self->survey->section([$questions->[0]->{sid}]);
-    my $section = $self->currentSection();
+    my $section = $self->nextSection();#which gets the current section for the just submitted questions.  IE, current response pointer has not moved forward for these questions
+
     if ( $section->{terminal} ) {
-        $terminal    = 1;
+        $sterminal    = 1;
         $terminalUrl = $section->{terminalUrl};
     }
 
@@ -211,6 +212,11 @@ sub recordResponses {
     else {
         $terminal = 0;
     }
+    
+    if($sterminal and $self->nextSection != $self->currentSection){
+        $terminal = 1;
+    }     
+
     return [ $terminal, $terminalUrl ];
 } ## end sub recordResponses
 

From 931b5026668250b546d2c6c9d48b351bccc56f8a Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Sat, 6 Dec 2008 00:23:17 +0000
Subject: [PATCH 10/15] Update SurveyJSON POD for the new method. Add legal and
 header POD for ResponseJSON.

---
 .../Asset/Wobject/Survey/ResponseJSON.pm      | 58 ++++++++++++++++++-
 lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm |  4 +-
 2 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm b/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm
index 860d7f2be..42044a9c7 100644
--- a/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm
@@ -1,9 +1,59 @@
 package WebGUI::Asset::Wobject::Survey::ResponseJSON;
 
+=head1 LEGAL
+
+-------------------------------------------------------------------
+WebGUI is Copyright 2001-2008 Plain Black Corporation.
+-------------------------------------------------------------------
+Please read the legal notices (docs/legal.txt) and the license
+(docs/license.txt) that came with this distribution before using
+this software.
+-------------------------------------------------------------------
+http://www.plainblack.com                     info@plainblack.com
+-------------------------------------------------------------------
+
+=head1 NAME
+
+Package WebGUI::Asset::Wobject::Survey::ResponseJSON
+
+=head1 DESCRIPTION
+
+Helper class for WebGUI::Asset::Wobject::Survey.  It manages data
+from the user, sets the order of questions and answers in the survey,
+based on forks, and gotos, and also handles expiring the survey
+due to time limits.
+
+This package is not intended to be used by any other Asset in WebGUI.
+
+=cut
+
+
 use strict;
 use JSON;
 use Data::Dumper;
 
+=head2 new ( $json, $log, $survey )
+
+Object constructor.
+
+=head3 $json
+
+Pass in some JSON to be serialized into a data structure.  Useful JSON would
+contain a hash with "startTime", "surveyOrder", "responses", "lastReponse"
+and "questionsAnswered" keys, with appropriate values.
+
+=head3 $log
+
+The session logger, from $session->log.  The class needs nothing else from the
+session object.
+
+=head3 $survey
+
+A WebGUI::Asset::Wobject::Survey::SurveyJSON object that represents the current
+survey.
+
+=cut
+
 sub new {
     my $class  = shift;
     my $json   = shift;
@@ -28,9 +78,11 @@ sub new {
 
 =head2 createSurveyOrder ( SurveyJSON, [address,address] )
 
-This creates the order for the survey which will change after every fork.  
-The survey order is to precreate random questions and answers, which also leaves a record or what the user was presented with.
-Forks are passed in to show where to branch the new order.
+This creates the order for the survey which will change after every fork.  The survey
+order is to precreate random questions and answers, which also leaves a record or what
+the user was presented with.  Forks are passed in to show where to branch the new order.
+
+If questions and/or answers were set to be randomized, it is handled in here.
 
 =cut
 
diff --git a/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm b/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
index 697fcd54e..ad126a066 100644
--- a/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
@@ -38,8 +38,8 @@ Object constructor.
 
 =head3 $json
 
-Pass in some JSON to be serialized into a data structure.  At the very least, you
-must pass in the "null" JSON string, '{}'.
+Pass in some JSON to be serialized into a data structure.  Useful JSON would
+be a hash with "survey" and "sections" keys with appropriate values.
 
 =head3 $log
 

From 8ba4f6ef70c63adfefd3b299bbb0c16db9d52663 Mon Sep 17 00:00:00 2001
From: Yung Han Khoe <yung@webgui-svn>
Date: Sun, 7 Dec 2008 13:10:08 +0000
Subject: [PATCH 11/15] More Matrix bugfixes

---
 .../matrix-default-compare-template.wgpkg     | Bin 0 -> 1270 bytes
 .../matrix-default-view-template.wgpkg        | Bin 0 -> 1991 bytes
 lib/WebGUI/Asset/Wobject/Matrix.pm            |  16 +++++-----
 www/extras/wobject/Matrix/matrix.js           |  29 ++++++++++++------
 .../wobject/Matrix/matrixCompareList.js       |  24 ++++++++++++++-
 www/extras/wobject/Matrix/matrixSearch.js     |   7 ++---
 6 files changed, 54 insertions(+), 22 deletions(-)
 create mode 100644 docs/upgrades/packages-7.6.5/matrix-default-compare-template.wgpkg
 create mode 100644 docs/upgrades/packages-7.6.5/matrix-default-view-template.wgpkg

diff --git a/docs/upgrades/packages-7.6.5/matrix-default-compare-template.wgpkg b/docs/upgrades/packages-7.6.5/matrix-default-compare-template.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..32c3fc99d0a1caf3029d1deb5f7dc3d728fad562
GIT binary patch
literal 1270
zcmV<S1PS{eiwFP!000001MOFBZ`(Ey_UHZzLIai#h%L!4apGhFy0&SIB}K3%3$}SH
zXpy$q$fQ70cHAQWeMeF@6~An4knGE%0<y~Ez3{o`j+aL5>7OWyx}8p~7DaKl6W403
zu6xk(iE1%Cd);=s-R#s*9L1e>4S~wjKZVj*LTEEO92e~2{@{@Cm_xeXhg<qjHEp!9
zf5-doyYWd0{z#F4#l3cWYyLaksI`*+R=e4)Awcu#pQp-y<LN_x3=dykKoJH?3yH@x
zKt1%wpSyM`mm;T9Gpfw0-DY+sl44ECPjj;xv;w=?2r{hn+uK}7kiN1yyvVYp7^+NL
z`$1j|Gp15Xye_A+YsQI~S)-8`s5uw8V(aF_j8l1~sO*!~K<KTO_>^LDiN{tkILa8m
zL8+vp9|u8b<tm&PEF2arBVi)A#tiI*SShNNUuYys4FV)-28v40GYWB24NH2SQ&`hr
zEOeW~<AEITjjmELr81>i{s4O_ku29p$>d*RU!I~qVH~P=CCE>Bik+=NaC{WHPZ#n=
z7e3~1GG#DY2gmvu=!W6QRZa|n&=&*OKo9f~CpTj$3Qp>Y$b{^DcM_R@hi=22`)MSg
zH5PL26-SV_x?-PcFK*?x)$MRT6NqyQZakrEhD**&u$JsrPx8#RJojq)y@kvyx7@xu
zp(9*m8iJhUSkk(tplL|G<Tz8Oj1bCKS<KXh6j~V0tcuLR^FDb?n6{$0;(zJDRN7J6
zJpQZCHI*D|COFPs?zl)8G-{OLA<cGncU~C=e>}G*+xg+}C<HajOO1z+nS^FpjtOCW
z40MWsBW6YAIPoh(AqkbG*y0G^9%~fG05-A<BRpZ*yoZ3>Q>s~lcM+BhXS+yYuIf;p
zY;*{Gvne#yp=B8jK~tQuF$dFH<mHy5l8M#gs`7Sg6$}fl1&4ArKTH0v(mcl;F#;aT
z44Oi4DhtNC|H1lZq$w)5Z$;b5-5EoGmAg;#<y<R@Ws+|9jMiK`jqM5E;&Lca*^vmF
z-aGb*kP{O?2m%+L-|GV{F=}oPbuH3T<)I*jnk>n&pxulSo%Z6$ly`9aJs+wZIK6eF
zX#;ERL@^+z{3`u_aI}H0uCAa7e4Jv5JW<zj4wZ4kDES5`Q${FKrQQPoJ@P4CP5&8F
zaDi3QZ;xRx1z@FlnNDHPQ0Z(ug<95EGCPrCaslm+yM9%<tKpKR<qQ$H8PdNOQ>C|<
zz+Ir;<B98t*L3*qs^9C`_SNfMuC-P>KD<sbA8(sI&IMs3K)GzA&HcSjyV>q~kDBSs
zd2{U%y>Sg4y><=V?<|}0uZ+5Zq+*0A)2a<Z&W~48H!OcIG{gWm6*TD8PCuc%xcur6
z%y|npz2F>1v1xT&vX|HgxcFQQ`^`!g;A(=lYXw_C?e$JC&(GE&X6j5NHw$?04R1`9
zSgjtanieZNIOrZ6bh_1uB%Lw^fV^1@fN`@-&YnjPu1FXImh|xgm5N!Po1W#+h`opd
zd(72UO=`H7Ov)2E&-KLy+ZvC{QDA)bb8~c=rF$y*<=uW;{>EuPAA46!eV8k_k5|uc
z&$fW9It>F)>@2*ADRzXu2T0s%b=$3GYu|e`BL>%HcxQx(&q@C(Vb{e}w|=j4+_|0w
gW=_9*arYR120Yt%M&KEN{~-c@1MUEPq5u>C0LnFMApigX

literal 0
HcmV?d00001

diff --git a/docs/upgrades/packages-7.6.5/matrix-default-view-template.wgpkg b/docs/upgrades/packages-7.6.5/matrix-default-view-template.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..80fffdb7d55306f27e9f5b3e34236c6948363c42
GIT binary patch
literal 1991
zcmV;&2RQg2iwFP!000001MOLRZ`(Ey&)@wNgohz5P(LKwb>n&g()5uGY1bjiigj5H
zT4HQ2vM7*rY`5rl-yNx^CAn?V6vI#zO&sx_Ki(aW=hn{MKb=lz(C_c;bUMzU@9gY!
z2lgT9)7f$0c{J$tdV|gmaXL=Fw?lyC?w^IyRDx+sHkmH?&Gmtk@Sv0S_su1JS59NC
zll^oao6m0RA0@(XWC=)o)a%vlztii(W*7Ir+r#|_H1GbotNm}?z3JaV!^eA&gbk&I
zq*K-)L-N<(56!Dciik<gnZmb*3@JUysAm4tHNI_h8-^Gc0;=@$RU{;=9vGf*5d`Tn
zWSKVd8_{ACa5ZCo#v8KbTORsiX@qvN1+@-Eq<C4JScXiVD<+TqO+(m9OM1kpe@3T<
zu`yD59WbKT5&Pw$p@E?7DRt4<zmON<%q1W3_l3R`p>AH%IS<xDDme|F;QLSbqlIgy
zOluxaRe@gd4{W#>X+yhR#++)&SI^ibT?9H2lBp;zYd@hdX5Cm#D`1!UPy~y4m<U{Q
zU(bfU$3N%%D=KeIC0#!itAt}hy{oAdi_mX+A`o);)3XEo7dstM-v?lZ-DnlRY0kxm
z=0vQTU^lKzg!GxjH!(r_LTfP}DiLs>pi<(-GA!&HW?>L1(gGX6o!>(C(Qce|sN31%
zP=WJoDGHqKmvhb}D{Ac*cxUp|gjy`V%F9UrU=k;VYR33<ria-J>kX9ToIB{}sBOa7
z1Z|cfR4Jz8B(P}dc@&r$Zhtr#?Lr17Su9=Cw~^Sq=4{#24A?M5(~RZni2FVZH*=D!
zH&SSU*|fQYF%lj7&wZ}VlH+FLQUzEyMrh=iUlPTX;v#HaQ`w^aoWrgf2QTy}+P74&
zL_A18DFU@WYDZ>$)Q%<Czh-WZSaTgPpoEtuJ`lS^pU;#hd89#SqQ~dg#DnUkpf=>w
zJgyHH8f-D_Xh;Qr8w6C?WVTGx2^1c)qaYpk^rDd}D+G6}ZKNf5;*)C{@M(zEN<=x9
zESVGfRJn?1NVpFyo|s2eGN2eu7LZ?IQu*v(@c#XAsF@5Y!a#%jyD<le$pboJ!S2J|
z1B|WlD^s?1A3Pbg?RxAiDzqOn)rwK+&FVFil4{FAzE<T#lD1WzZcXgO3nAyRg()@}
zb!KWz?$#Syvh|iQwY6^yvyrj6$JXX3jgGhkgL#I2QnH4vU;})jXN=fL+5#d(LJ=@X
zJ+4l~bjtkWBop8iA5j7o?h=A13wbE+HUv(%!t-woWn{l1h=7j3K~CUsN3wcrXvvjL
zRy?B1@n><v!odQ?3@oKUHr)xKo(G4OCXfc&A=T1yzP_jT10G(9Fjzl$QsJ5Hc~Ysh
zu}b&J7Z~K$7-ZZllr{Ut7Cii%{I{DqDu+Y@J)U;B3!bXqg-IbMs_K+Iy&x7kxe8<s
z(j+LMSfNc2H&C*Y8k(NY6-ds7(m=?)t6Iy3P}*&tREdS78^mV8Iblj48hK;0<xuvw
zapUog{1suIlN1MdrIwJ+@ob^n6}=D(S!bt$7Wt{E%b5(Y+Cqu-KZUfECk8$|uD=w$
z4W#}+)=HpiA+ao#h}flD0AdB)7LT|p-w={Rdsu!YDk)bbFzM<out{ZXg$F~W5Hipy
z1$f3m)^>AQ8~3G{k*5*$n7r>ibnrxvlchTTNYaFO4EqI?mzQ20o{}MTuqKPh$D3kZ
z1=^nHr3Aw3<++tO-U^A$+CYd1G%G!h%^2ewdz9u=EcIyD-OVLSPFt3wrXE!$N+}A;
z8=oO;OMGh1e`^b|3KF?(->PB;&t!u*vX6ls+l17^LV)H#_CU>4$aM+fw56LfXffMP
zC)N4Aw%{uRe<|dxU^D#x2iywvA?*mhxcZn}Xq!uuNmcWA*14Kb6>X2=nvom!JXzNQ
zB`(xZAxjBas&h%3Wt+^Jc5tJ<<>EeOKg1R_i~W3oz-}xB0PRWs+v2w6-VC?qnl>J_
z9%z_A!6lBVx+Wf}2u;cAiZ?bu!~m7t$7}V%H3b@;&ug}HH`1M4?jsiB94c3N$}MtC
zliX6abqy063Wb(@w1B&hIds#SSJoQvuRbM!#lmTP$x3HC(O0k{CiO9TU|z71G1<(8
zhchO*K9|7@DdulrC=lAgOm4&qHy;*{ej8?DRPkj%CeftJYv_T^eCI8jygWZ14$Yuo
zI6N!OkT5CP;f#iG&#WF9zY;#b<S-1zv5@1sk014WZs&2P(M)s9s=bAhWPpm@V@4K_
zp3F-WHOQ8@!hsa#lvR?gs4E`578(qIvj}D(W<7_^oP~=soF;u<KYF^b<7OJc?EE@E
z-!?<KQ<xMRIsHy2Hy49DDvYtsLJge5;nCTvlQOt?f%mQwU<=cBu40rnJ<4y0S=-wi
z?CtdjZq94Tt~n0np26N3nsi$VpuT}QW*Rs-OlM+w9O4wlqLG_FVpjyssh5W{V`QNx
z*O7ixAyd<7JmPeZg0cJVWa&3g-QN#>eYxU)9<HXD5Ux(w3Pz2aejA?>sPbQ1Kya7>
zRTUoQ-d_O1>2?RbuG`JUCyv^}WCDBQbMe7DKKJ<B#kKCfYlgJ{cG<u$R6gDN^ew)x
Z`61&60zVM=fxx#y;9r<167B#Z001BK&OQJD

literal 0
HcmV?d00001

diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm
index fe14e820c..1b41ff35f 100644
--- a/lib/WebGUI/Asset/Wobject/Matrix.pm
+++ b/lib/WebGUI/Asset/Wobject/Matrix.pm
@@ -361,7 +361,8 @@ sub getCompareForm {
         $maxComparisons = $self->get('maxComparisonsPrivileged');
     }        
     $form .=  "\n<script type='text/javascript'>\n".
-        'var maxComparisons = '.$maxComparisons.';'.
+        'var maxComparisons = '.$maxComparisons.";\n".
+        "var matrixUrl = '".$self->getUrl."';\n".
         "\n</script>\n";
     return $form;
 }
@@ -449,7 +450,7 @@ sub view {
     'text/javascript'});
     $self->session->style->setScript($self->session->url->extras('wobject/Matrix/matrix.js'), {type =>
     'text/javascript'});
-
+    
 	my $var = $self->get;
     $var->{isLoggedIn}              = ($self->session->user->userId ne "1");
     $var->{addMatrixListing_url}    = $self->getUrl('func=add;class=WebGUI::Asset::MatrixListing'); 
@@ -457,7 +458,7 @@ sub view {
     $var->{exportAttributes_url}    = $self->getUrl('func=exportAttributes');
     $var->{listAttributes_url}      = $self->getUrl('func=listAttributes');
     $var->{search_url}              = $self->getUrl('func=search');
-
+    
     # Get the MatrixListing with the most views as an object using getLineage.
     my ($bestViews_listing) = @{ $self->getLineage(['descendants'], {
             includeOnlyClasses  => ['WebGUI::Asset::MatrixListing'],
@@ -674,6 +675,7 @@ sub www_compare {
         'var listingIds = new Array('.join(", ",map {'"'.$_.'"'} @listingIds).");\n".
         'var responseFields = new Array("attributeId", "name", "fieldType", "checked", '.join(", ",map {'"'.$_.'"'} @responseFields).");\n".
         "var maxComparisons = ".$maxComparisons.";\n".
+        "var matrixUrl = '".$self->getUrl."';\n".
         "</script>";
 
     return $self->processStyle($self->processTemplate($var,$self->get("compareTemplateId")));
@@ -903,12 +905,12 @@ sub www_getCompareFormData {
     my $session         = $self->session;
     my $form            = $session->form;
     my $sort            = shift || $session->scratch->get('matrixSort') || $self->get('defaultSort');
-    my $sortDirection   = ' asc';
-
+    my $sortDirection   = ' desc';
+=cut
     if ( WebGUI::Utility::isIn($sort, qw(revisionDate score)) ) {
         $sortDirection = " desc";
     }
-
+=cut
     my @results;
     my @listingIds = $self->session->form->checkList("listingId");
     
@@ -983,7 +985,7 @@ assetData.revisionDate
                 }
             }
             $result->{assetId}  =~ s/-/_____/g;
-            $result->{url}      = "/".$result->{url};
+            $result->{url}      = $session->url->gateway($result->{url});
     }
 
     my $jsonOutput;
diff --git a/www/extras/wobject/Matrix/matrix.js b/www/extras/wobject/Matrix/matrix.js
index 507bc4042..7b9b62a18 100644
--- a/www/extras/wobject/Matrix/matrix.js
+++ b/www/extras/wobject/Matrix/matrix.js
@@ -22,13 +22,13 @@ YAHOO.util.Event.addListener(window, "load", function() {
         ];
 
 	var uri = "func=getCompareFormData";
-	if(typeof(listingIds) != 'undefined'){
-	for (var i = 0; i < listingIds.length; i++) {
-		uri = uri+';listingId='+listingIds[i];
-	}
+		if(typeof(listingIds) != 'undefined'){
+		for (var i = 0; i < listingIds.length; i++) {
+			uri = uri+';listingId='+listingIds[i];
+		}
 	}
 
-        this.myDataSource = new YAHOO.util.DataSource("?");
+        this.myDataSource = new YAHOO.util.DataSource(matrixUrl + "?");
         this.myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
         this.myDataSource.connXhrMode = "queueRequests";
         this.myDataSource.responseSchema = {
@@ -47,25 +47,25 @@ YAHOO.util.Event.addListener(window, "load", function() {
 	var btnSortByViews = new YAHOO.widget.Button("sortByViews");
         btnSortByViews.on("click", function(e) {
 		this.myDataTable.sortColumn(this.myDataTable.getColumn(2)); 
-		var request = YAHOO.util.Connect.asyncRequest('POST', "?func=setSort;sort=views");
+		var request = YAHOO.util.Connect.asyncRequest('POST', matrixUrl + "?func=setSort;sort=views");
         },this,true);
 
 	var btnSortByClicks = new YAHOO.widget.Button("sortByClicks");
         btnSortByClicks.on("click", function(e) {
 	    this.myDataTable.sortColumn(this.myDataTable.getColumn(3)); 
-		var request = YAHOO.util.Connect.asyncRequest('POST', "?func=setSort;sort=clicks");
+		var request = YAHOO.util.Connect.asyncRequest('POST', matrixUrl + "?func=setSort;sort=clicks");
         },this,true);
 
 	var btnSortByCompares = new YAHOO.widget.Button("sortByCompares");
         btnSortByCompares.on("click", function(e) {
 	    this.myDataTable.sortColumn(this.myDataTable.getColumn(4)); 
-		var request = YAHOO.util.Connect.asyncRequest('POST', "?func=setSort;sort=compares");
+		var request = YAHOO.util.Connect.asyncRequest('POST', matrixUrl + "?func=setSort;sort=compares");
         },this,true);
 
 	var btnSortByUpdated = new YAHOO.widget.Button("sortByUpdated");
         btnSortByUpdated.on("click", function(e) {
 	    this.myDataTable.sortColumn(this.myDataTable.getColumn(5)); 
-		var request = YAHOO.util.Connect.asyncRequest('POST', "?func=setSort;sort=lastUpdated");
+		var request = YAHOO.util.Connect.asyncRequest('POST', matrixUrl + "?func=setSort;sort=lastUpdated");
         },this,true);
 
         var myCallback = function() {
@@ -77,6 +77,15 @@ YAHOO.util.Event.addListener(window, "load", function() {
         btnCompare.on("click", function(e) {
 		window.document.forms['doCompare'].submit();
         },this,true);
+	var btnCompare2 = new YAHOO.widget.Button("compare2",{disabled:true,id:"compareButton2"});
+        btnCompare2.on("click", function(e) {
+		window.document.forms['doCompare'].submit();
+        },this,true);
+
+	var btnSearch = new YAHOO.widget.Button("search");
+        btnSearch.on("click", function(e) {
+		window.location.href = matrixUrl + '?func=search';
+	},this,true);
 
 	window.compareDataTable = this.myDataTable;
 
@@ -92,8 +101,10 @@ YAHOO.util.Event.addListener(window, "load", function() {
     		}
 		if (checked > 1 && checked < maxComparisons){
 			btnCompare.set("disabled",false);
+			btnCompare2.set("disabled",false);
 		}else{
 			btnCompare.set("disabled",true);
+			btnCompare2.set("disabled",true);
 		}
 		var elements = window.compareDataTable.getRecordSet().getRecords();
 		for(j=0; j<elements.length; j++){
diff --git a/www/extras/wobject/Matrix/matrixCompareList.js b/www/extras/wobject/Matrix/matrixCompareList.js
index e786447c5..eee8ad403 100644
--- a/www/extras/wobject/Matrix/matrixCompareList.js
+++ b/www/extras/wobject/Matrix/matrixCompareList.js
@@ -89,10 +89,13 @@ YAHOO.util.Event.addListener(window, "load", function() {
             scope : myDataTable
         };
 
+
+	
+
 	var btnCompare = new YAHOO.widget.Button("compare",{disabled:true,id:"compareButton"});
         btnCompare.on("click", function(e) {
-		var uri = "func=getCompareListData";
 		var compareCheckBoxes = YAHOO.util.Dom.getElementsByClassName('compareCheckBox','input');
+		var uri = "func=getCompareListData";
 		for (var i = compareCheckBoxes.length; i--; ) {
 			if(compareCheckBoxes[i].checked == true){
 				uri = uri+';listingId='+compareCheckBoxes[i].value;
@@ -101,6 +104,23 @@ YAHOO.util.Event.addListener(window, "load", function() {
             	this.myDataSource.sendRequest(uri,callback2); 
         },this,true);
 
+	var btnCompare2 = new YAHOO.widget.Button("compare2",{disabled:true,id:"compareButton2"});
+        btnCompare2.on("click", function(e) {
+		var compareCheckBoxes = YAHOO.util.Dom.getElementsByClassName('compareCheckBox','input');
+		var uri = "func=getCompareListData";
+		for (var i = compareCheckBoxes.length; i--; ) {
+			if(compareCheckBoxes[i].checked == true){
+				uri = uri+';listingId='+compareCheckBoxes[i].value;
+			}
+		}
+            	this.myDataSource.sendRequest(uri,callback2); 
+        },this,true);
+
+	var btnSearch = new YAHOO.widget.Button("search");
+        btnSearch.on("click", function(e) {
+		window.location.href = matrixUrl + '?func=search';
+	},this,true);
+
 	window.compareFormButton = function() {
 		var compareCheckBoxes = YAHOO.util.Dom.getElementsByClassName('compareCheckBox','input');
 		var checked = 0;
@@ -111,8 +131,10 @@ YAHOO.util.Event.addListener(window, "load", function() {
     		}
 		if (checked > 1 && checked < maxComparisons){
 			btnCompare.set("disabled",false);
+			btnCompare2.set("disabled",false);
 		}else{
 			btnCompare.set("disabled",true);
+			btnCompare2.set("disabled",true);
 		}
 	}
 
diff --git a/www/extras/wobject/Matrix/matrixSearch.js b/www/extras/wobject/Matrix/matrixSearch.js
index e9f9872e8..dbea4e00c 100644
--- a/www/extras/wobject/Matrix/matrixSearch.js
+++ b/www/extras/wobject/Matrix/matrixSearch.js
@@ -16,10 +16,7 @@ YAHOO.util.Event.addListener(window, "load", function() {
 
         var myColumnDefs = [
 	    {key:"assetId",label:"",sortable:false, formatter:this.formatCheckBox},
-            {key:"title", label:"Name", sortable:true, formatter:this.formatUrl},
-            {key:"views", sortable:true},
-            {key:"clicks", sortable:true},
-            {key:"compares", sortable:true}
+            {key:"title", label:"Name", sortable:true, formatter:this.formatUrl}
         ];
 
 	var uri = "func=getCompareFormData";
@@ -34,7 +31,7 @@ YAHOO.util.Event.addListener(window, "load", function() {
         this.myDataSource.connXhrMode = "queueRequests";
         this.myDataSource.responseSchema = {
             resultsList: "ResultSet.Result",
-            fields: ["title","views","clicks","compares","checked","url","assetId"]
+            fields: ["title","checked","url","assetId"]
         };
 
         var myDataTable = new YAHOO.widget.DataTable("compareForm", myColumnDefs,

From 77aefb85e6a9322ea81c93a151f5aa1ecd1e42a3 Mon Sep 17 00:00:00 2001
From: Yung Han Khoe <yung@webgui-svn>
Date: Sun, 7 Dec 2008 17:25:17 +0000
Subject: [PATCH 12/15] fixed #9219: Thingy After Save Search This Thing not
 showing all rows

---
 docs/changelog/7.x.x.txt           | 2 ++
 lib/WebGUI/Asset/Wobject/Thingy.pm | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 52d6d2522..6e8577e3f 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -4,6 +4,8 @@
  - fixed #4173: fieldnames in profilefields can contain spaces
  - fixed #8811: Bug Tracker: Formatting is bad for the resolution form.
  - fixed #9235: Image Bug in rich text editor.
+ - fixed #9219: Thingy After Save Search This Thing not showing all rows (SDH
+   Consulting Group)
 
 7.6.5
  - security: A problem was discovered and fixed in which users could email executable attachments to a collaboration system and then when viewed online, could execute them. 
diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm
index 2b17c3925..d68660b8e 100644
--- a/lib/WebGUI/Asset/Wobject/Thingy.pm
+++ b/lib/WebGUI/Asset/Wobject/Thingy.pm
@@ -3090,7 +3090,10 @@ sequenceNumber');
         }
         $query .= join(", ",map {$dbh->quote_identifier('field_'.$_->{fieldId})} @displayInSearchFields);
         $query .= " from ".$dbh->quote_identifier("Thingy_".$thingId);
-        $query .= " where ".join(" and ",@constraints) if (scalar(@constraints) > 0);
+        if($session->form->process('func') eq 'search'){
+            # Don't add constraints when the search screen is displayed as an 'after save' option.
+            $query .= " where ".join(" and ",@constraints) if (scalar(@constraints) > 0);
+        }
         if ($orderBy){
             $query .= " order by ".$dbh->quote_identifier("field_".$orderBy);
         }

From a30d4140d97f581f77ce892b3f6ea20dc9ac5cf3 Mon Sep 17 00:00:00 2001
From: Yung Han Khoe <yung@webgui-svn>
Date: Mon, 8 Dec 2008 11:34:20 +0000
Subject: [PATCH 13/15] fixed a bug in matrix compare display

---
 www/extras/wobject/Matrix/matrixCompareList.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/www/extras/wobject/Matrix/matrixCompareList.js b/www/extras/wobject/Matrix/matrixCompareList.js
index eee8ad403..3c9a4295d 100644
--- a/www/extras/wobject/Matrix/matrixCompareList.js
+++ b/www/extras/wobject/Matrix/matrixCompareList.js
@@ -55,6 +55,9 @@ YAHOO.util.Event.addListener(window, "load", function() {
         var myDataTable = new YAHOO.widget.DataTable("compareList", myColumnDefs,
                 this.myDataSource, {initialRequest:uri});
 
+	window.removeListing = function(key) {
+		myDataTable.hideColumn(myDataTable.removeColumn(key));
+	}
 
 	this.myDataSource.doBeforeParseData = function (oRequest, oFullResponse) {
 		myDataTable.getRecordSet().reset();
@@ -72,6 +75,7 @@ YAHOO.util.Event.addListener(window, "load", function() {
 		
 		for (var i = 0; i < len; i++) {
 		var c = oFullResponse.ColumnDefs[i];
+		oFullResponse.ColumnDefs[i].label = oFullResponse.ColumnDefs[i].label + "<a href='javascript:removeListing(\""+oFullResponse.ColumnDefs[i].key+"\")'><img src='/extras/toolbar/bullet/delete.gif' border='0'></a>"
 		myDataTable.insertColumn(c);
 		}
 	    }
@@ -89,9 +93,6 @@ YAHOO.util.Event.addListener(window, "load", function() {
             scope : myDataTable
         };
 
-
-	
-
 	var btnCompare = new YAHOO.widget.Button("compare",{disabled:true,id:"compareButton"});
         btnCompare.on("click", function(e) {
 		var compareCheckBoxes = YAHOO.util.Dom.getElementsByClassName('compareCheckBox','input');

From aabec44de85c041a439405eab251c0a34250d248 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 8 Dec 2008 19:21:12 +0000
Subject: [PATCH 14/15] Forward porting singleton warn vs error for Cron.

---
 docs/changelog/7.x.x.txt        | 4 ++--
 lib/WebGUI/Operation/Cron.pm    | 7 +++++++
 lib/WebGUI/Workflow/Instance.pm | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 6e8577e3f..f4ae9d7c1 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -4,8 +4,8 @@
  - fixed #4173: fieldnames in profilefields can contain spaces
  - fixed #8811: Bug Tracker: Formatting is bad for the resolution form.
  - fixed #9235: Image Bug in rich text editor.
- - fixed #9219: Thingy After Save Search This Thing not showing all rows (SDH
-   Consulting Group)
+ - fixed #9219: Thingy After Save Search This Thing not showing all rows (SDH Consulting Group)
+ - fixed #9231: Singleton workflows should not report an error when an attempt is made to run them again
 
 7.6.5
  - security: A problem was discovered and fixed in which users could email executable attachments to a collaboration system and then when viewed online, could execute them. 
diff --git a/lib/WebGUI/Operation/Cron.pm b/lib/WebGUI/Operation/Cron.pm
index 38ff395e0..05d848f7c 100644
--- a/lib/WebGUI/Operation/Cron.pm
+++ b/lib/WebGUI/Operation/Cron.pm
@@ -291,6 +291,13 @@ sub www_runCronJob {
 			priority    => $task->get("priority"),
                     });
                 if ( !$instance ) {
+                    if ($session->stow->get('singletonWorkflowClash')) {
+                        $session->errorHandler->warn( 
+                            "Could not create workflow instance for workflowId '" . $task->get( "workflowId" )
+                            . "': It is a singleton workflow and is still running from the last invocation."
+                        );
+                        return "done";
+                    }
                     $session->errorHandler->error( 
                         "Could not create workflow instance for workflowId '" . $task->get( "workflowId" )
                         . "': The result was undefined"
diff --git a/lib/WebGUI/Workflow/Instance.pm b/lib/WebGUI/Workflow/Instance.pm
index fcab62bb3..5c8a795f2 100644
--- a/lib/WebGUI/Workflow/Instance.pm
+++ b/lib/WebGUI/Workflow/Instance.pm
@@ -73,8 +73,10 @@ sub create {
         $sql .= ' and parameters IS NULL';
     }
 	my ($count) = $session->db->quickArray($sql,$placeHolders);
+    $session->stow->set('singletonWorkflowClash', 0);
     if ($isSingleton && $count) {
         $session->log->info("An instance of singleton workflow $properties->{workflowId} already exists, not creating a new one");
+        $session->stow->set('singletonWorkflowClash', 1);
         return undef
     }
 

From e636e927e835f8b2814e10aba881369e2b042c70 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 8 Dec 2008 22:06:08 +0000
Subject: [PATCH 15/15] Fixed some Account i18n typos.

---
 docs/changelog/7.x.x.txt                   |  1 +
 lib/WebGUI/i18n/English/Account_Inbox.pm   |  4 ++--
 lib/WebGUI/i18n/English/Account_Profile.pm | 14 +++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index f4ae9d7c1..0caf25015 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -6,6 +6,7 @@
  - fixed #9235: Image Bug in rich text editor.
  - fixed #9219: Thingy After Save Search This Thing not showing all rows (SDH Consulting Group)
  - fixed #9231: Singleton workflows should not report an error when an attempt is made to run them again
+ - fixed #9244: i18n for colin
 
 7.6.5
  - security: A problem was discovered and fixed in which users could email executable attachments to a collaboration system and then when viewed online, could execute them. 
diff --git a/lib/WebGUI/i18n/English/Account_Inbox.pm b/lib/WebGUI/i18n/English/Account_Inbox.pm
index 3956446aa..3a86f1359 100644
--- a/lib/WebGUI/i18n/English/Account_Inbox.pm
+++ b/lib/WebGUI/i18n/English/Account_Inbox.pm
@@ -75,8 +75,8 @@ our $I18N = {
     },
 
     'inbox manage invitations template hoverHelp' => {
-        message     => q|Choose the template to user for managing invitations|,
-        lastUpdated => 1119068809
+        message     => q|Choose the template to use for managing invitations|,
+        lastUpdated => 1228773936
     },
 
     'invitation confirm message template label' => {
diff --git a/lib/WebGUI/i18n/English/Account_Profile.pm b/lib/WebGUI/i18n/English/Account_Profile.pm
index 5f3bc7d42..cf54fb29e 100644
--- a/lib/WebGUI/i18n/English/Account_Profile.pm
+++ b/lib/WebGUI/i18n/English/Account_Profile.pm
@@ -5,8 +5,8 @@ our $I18N = {
 
     'title' => {
         message     => q{Profile},
-        lastUpdated => 1225724810,
-        context     => q{Tab label for Profile Account pluggin},
+        lastUpdated => 1228764827,
+        context     => q{Tab label for Profile Account plugin},
     },
 
     'profile style template label' => {
@@ -15,7 +15,7 @@ our $I18N = {
 	},
 
     'profile style template hoverHelp' => {
-        message     => q|Select a style template from the list to enclose the inbox in.|,
+        message     => q|Select a style template from the list to enclose the profile in.|,
         lastUpdated => 1119068809
 	},
 
@@ -25,8 +25,8 @@ our $I18N = {
 	},
     
     'profile layout template hoverHelp' => {
-        message     => q{Choose a layout from the list to display the various account pluggins that are editable by the current user as well as the contents of the one currently chosen},
-        lastUpdated => 1119068809
+        message     => q{Choose a layout from the list to display the various account plugins that are usable by the current user as well as the contents of the plugin currently chosen.},
+        lastUpdated => 1228773692
     },
 
     'profile view template label' => {
@@ -35,7 +35,7 @@ our $I18N = {
     },
 
     'profile view template hoverHelp' => {
-        message     => q|Choose the main template for viewing a profile|,
+        message     => q|Choose the main template for viewing a profile.|,
         lastUpdated => 1119068809
     },
 
@@ -55,7 +55,7 @@ our $I18N = {
     },
 
     'profile edit layout template hoverHelp' => {
-        message     => q{Choose a layout from the list to display the various account pluggins that are viewable by others as well as the contents of the one currently chosen},
+        message     => q{Choose a layout from the list to display the user's profile for editing.},
         lastUpdated => 1119068809
     },