diff --git a/docs/upgrades/packages-7.7.0/root_import_storymanager.wgpkg b/docs/upgrades/packages-7.7.0/root_import_storymanager.wgpkg index 6eb7ef6a9..1426c8861 100644 Binary files a/docs/upgrades/packages-7.7.0/root_import_storymanager.wgpkg and b/docs/upgrades/packages-7.7.0/root_import_storymanager.wgpkg differ diff --git a/lib/WebGUI/Asset/Story.pm b/lib/WebGUI/Asset/Story.pm index 1d33cacb8..03859fd8a 100644 --- a/lib/WebGUI/Asset/Story.pm +++ b/lib/WebGUI/Asset/Story.pm @@ -313,7 +313,8 @@ sub getEditForm { my $var = { formHeader => WebGUI::Form::formHeader($session, {action => $url}) . WebGUI::Form::hidden($session, { name => 'func', value => 'editSave' }) - . WebGUI::Form::hidden($session, { name => 'proceed', value => 'showConfirmation' }), + . WebGUI::Form::hidden($session, { name => 'proceed', value => 'showConfirmation' }) + , formFooter => WebGUI::Form::formFooter($session), formTitle => $isNew ? $i18n->get('add a story','Asset_StoryArchive') @@ -336,25 +337,21 @@ sub getEditForm { } ), keywordsForm => WebGUI::Form::text($session, { name => 'keywords', - value => $form->get('keywords') || WebGUI::Keyword->new($session)->getKeywordsForAsset({ asset => $self }) + value => $form->get('keywords') || WebGUI::Keyword->new($session)->getKeywordsForAsset({ asset => $self }) } ), highlightsForm => WebGUI::Form::textarea($session, { name => 'highlights', - value => $form->get('highlights') || $self->get('highlights') + value => $form->get('highlights') || $self->get('highlights') } ), storyForm => WebGUI::Form::HTMLArea($session, { name => 'story', - value => $form->get('story') || $self->get('story'), + value => $form->get('story') || $self->get('story'), richEditId => $archive->get('richEditorId') }), saveButton => WebGUI::Form::submit($session, { name => 'saveStory', value => $i18n->get('save story'), }), - previewButton => WebGUI::Form::submit($session, { - name => 'saveAndPreview', - value => $i18n->get('save and preview'), - }), cancelButton => WebGUI::Form::button($session, { name => 'cancel', value => $i18n->get('cancel','WebGUI'), diff --git a/lib/WebGUI/Help/Asset_Story.pm b/lib/WebGUI/Help/Asset_Story.pm index d6f8bf6fa..208fb127d 100644 --- a/lib/WebGUI/Help/Asset_Story.pm +++ b/lib/WebGUI/Help/Asset_Story.pm @@ -27,7 +27,6 @@ our $HELP = { { name => 'highlightsForm', }, { name => 'storyForm', }, { name => 'saveButton', }, - { name => 'previewButton', }, { name => 'saveAndAddButton', }, { name => 'cancelButton', }, { name => 'photo_form_loop', diff --git a/lib/WebGUI/i18n/English/Asset_Story.pm b/lib/WebGUI/i18n/English/Asset_Story.pm index cafb1cdc8..bf7f6f569 100644 --- a/lib/WebGUI/i18n/English/Asset_Story.pm +++ b/lib/WebGUI/i18n/English/Asset_Story.pm @@ -123,12 +123,6 @@ our $I18N = { lastUpdated => 0 }, - 'save and preview' => { - message => q|Save and Preview|, - context => q|Button label in the Edit Story form.|, - lastUpdated => 0 - }, - 'save and add another photo' => { message => q|Save and Add Another Photo|, context => q|Button label in the Edit Story form.|, @@ -200,11 +194,6 @@ our $I18N = { lastUpdated => 0, }, - 'previewButton' => { - message => q|Button for the user to preview the story before saving.|, - lastUpdated => 0, - }, - 'saveAndAddButton' => { message => q|Button for the user to save the form, and then reopen the edit form to add another photo.|, lastUpdated => 0,