diff --git a/docs/upgrades/packages-7.7.0/root_import_storymanager_editstory.wgpkg b/docs/upgrades/packages-7.7.0/root_import_storymanager_editstory.wgpkg index d2fbf2be7..296848c22 100644 Binary files a/docs/upgrades/packages-7.7.0/root_import_storymanager_editstory.wgpkg and b/docs/upgrades/packages-7.7.0/root_import_storymanager_editstory.wgpkg differ diff --git a/lib/WebGUI/Asset/Story.pm b/lib/WebGUI/Asset/Story.pm index e78dd4bfa..cd077ed55 100644 --- a/lib/WebGUI/Asset/Story.pm +++ b/lib/WebGUI/Asset/Story.pm @@ -212,28 +212,28 @@ sub getEditForm { my $url = $isNew ? $archive->getUrl : $self->getUrl; my $title = $self->getTitle; 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' }), - formFooter => WebGUI::Form::formFooter($session), - formTitle => $i18n->get('editing','Asset_WikiPage').' '.$title, - titleForm => WebGUI::Form::text($session, { - name => 'title', - value => $form->get('title') || $self->get('title'), - } ), - subTitleForm => WebGUI::Form::text($session, { - name => 'subtitle', - value => $form->get('subtitle') || $self->get('subtitle') - } ), - bylineForm => WebGUI::Form::text($session, { - name => 'byline', - value => $form->get('byline') || $self->get('byline') - } ), - locationForm => WebGUI::Form::text($session, { - name => 'location', - value => $form->get('location') || $self->get('location') - } ), - keywordsForm => WebGUI::Form::text($session, { + formHeader => WebGUI::Form::formHeader($session, {action => $url}) + . WebGUI::Form::hidden($session, { name => 'func', value => 'editSave' }) + . WebGUI::Form::hidden($session, { name => 'proceed', value => 'showConfirmation' }), + formFooter => WebGUI::Form::formFooter($session), + formTitle => $i18n->get('editing','Asset_WikiPage').' '.$title, + titleForm => WebGUI::Form::text($session, { + name => 'title', + value => $form->get('title') || $self->get('title'), + } ), + subTitleForm => WebGUI::Form::text($session, { + name => 'subtitle', + value => $form->get('subtitle') || $self->get('subtitle') + } ), + bylineForm => WebGUI::Form::text($session, { + name => 'byline', + value => $form->get('byline') || $self->get('byline') + } ), + locationForm => WebGUI::Form::text($session, { + name => 'location', + value => $form->get('location') || $self->get('location') + } ), + keywordsForm => WebGUI::Form::text($session, { name => 'keywords', value => $form->get('keywords') || WebGUI::Keyword->new($session)->getKeywordsForAsset({ asset => $self }) } ), @@ -258,6 +258,11 @@ sub getEditForm { name => 'saveAndPreview', value => $i18n->get('save and preview'), }), + cancelButton => WebGUI::Form::button($session, { + name => 'cancel', + value => $i18n->get('cancel','WebGUI'), + extras => q|onclick="history.go(-1);" class="backwardButton"|, + }), saveAndAddButton => WebGUI::Form::submit($session, { name => 'saveAndAddPhoto', value => $i18n->get('save and add another photo'),