From 2bd407d70e88721dd681f8f4491e468acda0c9f0 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Tue, 24 Mar 2009 19:36:02 +0000 Subject: [PATCH] Prune out preview code for now. --- .../root_import_storymanager.wgpkg | Bin 3175 -> 3232 bytes lib/WebGUI/Asset/Story.pm | 13 +++++-------- lib/WebGUI/Help/Asset_Story.pm | 1 - lib/WebGUI/i18n/English/Asset_Story.pm | 11 ----------- 4 files changed, 5 insertions(+), 20 deletions(-) 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 6eb7ef6a9df571831977b3da164335ade37c5cb4..1426c8861940e01bf6181f0375c812982e4e2ccb 100644 GIT binary patch literal 3232 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 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,