diff --git a/docs/upgrades/upgrade_6.5.2-6.5.3.sql b/docs/upgrades/upgrade_6.5.2-6.5.3.sql index 2a8d87774..e61f92176 100644 --- a/docs/upgrades/upgrade_6.5.2-6.5.3.sql +++ b/docs/upgrades/upgrade_6.5.2-6.5.3.sql @@ -7,6 +7,9 @@ update template set template='\"> \r\ngetParent->get("title"); $var{'reply.synopsis'} = $self->getParent->get("synopsis"); $var{'reply.content'} = $self->getParent->formatContent; + for my $i (1..5) { + $var{'reply.userDefined'.$i} = WebGUI::HTML::filter($self->getParent->get('userDefined'.$i),"macros"); + } unless ($session{form}{content} || $session{form}{title}) { $content = "[quote]".$self->getParent->get("content")."[/quote]" if ($session{form}{withQuote}); $title = $self->getParent->get("title"); @@ -897,6 +900,9 @@ sub www_edit { $var{'preview.title'} = WebGUI::HTML::filter($session{form}{title},"all"); ($var{'preview.synopsis'}, $var{'preview.content'}) = $self->getSynopsisAndContentFromFormPost; $var{'preview.content'} = $self->formatContent($var{'preview.content'},$session{form}{contentType}); + for my $i (1..5) { + $var{'preview.userDefined'.$i} = WebGUI::HTML::filter($session{form}{'userDefined'.$i},"macros"); + } } $var{'form.footer'} = WebGUI::Form::formFooter(); $var{usePreview} = $self->getThread->getParent->get("usePreview"); @@ -919,7 +925,7 @@ sub www_edit { name=>"userDefined".$x, value=>$self->getValue("userDefined".$x) }); - $var{'userDefined'.$x.'.form.textarea'} = WebGUI::Form::HTMLArea({ + $var{'userDefined'.$x.'.form.htmlarea'} = WebGUI::Form::HTMLArea({ name=>"userDefined".$x, value=>$self->getValue("userDefined".$x) }); diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm index 638ee8697..ae61e22db 100644 --- a/lib/WebGUI/Asset/Wobject/Collaboration.pm +++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm @@ -121,6 +121,7 @@ sub appendTemplateLabels { $var->{"by.label"} = $i18n->get("by"); $var->{'body.label'} = $i18n->get("body"); $var->{"back.label"} = $i18n->get("back"); + $var->{'compensation.label'} = $i18n->get("compensation"); $var->{'contentType.label'} = $i18n->get("contentType"); $var->{"date.label"} = $i18n->get("date"); $var->{"delete.label"} = $i18n->get("delete"); @@ -129,8 +130,13 @@ sub appendTemplateLabels { $var->{"edit.label"} = $i18n->get("edit"); $var->{'endDate.label'} = $i18n->get("endDate"); $var->{'exactphrase.label'} = $i18n->get("exactPhrase"); - $var->{"layout.flat.label"} = $i18n->get("flatLayout"); $var->{'image.label'} = $i18n->get("image"); + $var->{"job.header.label"} = $i18n->get("edit job"); + $var->{"job.title.label"} = $i18n->get("job title"); + $var->{"job.description.label"} = $i18n->get("job description"); + $var->{"job.requirements.label"} = $i18n->get("job requirements"); + $var->{"location.label"} = $i18n->get("location"); + $var->{"layout.flat.label"} = $i18n->get("flatLayout"); $var->{'link.header.label'} = $i18n->get("edit link"); $var->{"lastReply.label"} = $i18n->get("lastReply"); $var->{"lock.label"} = $i18n->get("lock"); diff --git a/lib/WebGUI/i18n/English/Collaboration.pm b/lib/WebGUI/i18n/English/Collaboration.pm index 57191f19c..3df5051df 100644 --- a/lib/WebGUI/i18n/English/Collaboration.pm +++ b/lib/WebGUI/i18n/English/Collaboration.pm @@ -236,6 +236,36 @@ our $I18N = { lastUpdated => 1109696029, }, + 'edit job' => { + message => q|Edit Job Posting|, + lastUpdated => 1109696029, + }, + + 'job description' => { + message => q|Job Description|, + lastUpdated => 1109696029, + }, + + 'job title' => { + message => q|Job Title|, + lastUpdated => 1109696029, + }, + + 'job requirements' => { + message => q|Job Requirements|, + lastUpdated => 1109696029, + }, + + 'location' => { + message => q|Location|, + lastUpdated => 1109696029, + }, + + 'compensation' => { + message => q|Compensation|, + lastUpdated => 1109696029, + }, + 'synopsis' => { message => q|Synopsis|, lastUpdated => 1109696029,