diff --git a/code/Controllers/CMSMain.php b/code/Controllers/CMSMain.php index 32a29d02..7e4e344b 100644 --- a/code/Controllers/CMSMain.php +++ b/code/Controllers/CMSMain.php @@ -1668,7 +1668,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr $form->saveInto($record); $record->write(); - // If the 'Save & Publish' button was clicked, also publish the page + // If the 'Publish' button was clicked, also publish the page if ($doPublish) { $record->publishRecursive(); $message = _t( diff --git a/code/Model/SiteTree.php b/code/Model/SiteTree.php index 8a240013..1fc95dca 100755 --- a/code/Model/SiteTree.php +++ b/code/Model/SiteTree.php @@ -2316,7 +2316,7 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi ->setAttribute('data-btn-alternate-add', 'btn-primary font-icon-save') ->setAttribute('data-btn-alternate-remove', $noChangesClasses) ->setUseButtonTag(true) - ->setAttribute('data-text-alternate', _t('SilverStripe\\CMS\\Controllers\\CMSMain.SAVEDRAFT', 'Save draft')) + ->setAttribute('data-text-alternate', _t('SilverStripe\\CMS\\Controllers\\CMSMain.SAVEDRAFT', 'Save')) ); } @@ -2328,13 +2328,13 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi ->setAttribute('data-btn-alternate-add', 'btn-primary font-icon-rocket') ->setAttribute('data-btn-alternate-remove', $noChangesClasses) ->setUseButtonTag(true) - ->setAttribute('data-text-alternate', _t(__CLASS__.'.BUTTONSAVEPUBLISH', 'Save & publish')) + ->setAttribute('data-text-alternate', _t(__CLASS__.'.BUTTONSAVEPUBLISH', 'Publish')) ); // Set up the initial state of the button to reflect the state of the underlying SiteTree object. if ($stagesDiffer) { $publish->addExtraClass('btn-primary font-icon-rocket'); - $publish->setTitle(_t(__CLASS__.'.BUTTONSAVEPUBLISH', 'Save & publish')); + $publish->setTitle(_t(__CLASS__.'.BUTTONSAVEPUBLISH', 'Publish')); $publish->removeExtraClass($noChangesClasses); } } diff --git a/lang/en.yml b/lang/en.yml index 6f53138b..36a61f25 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -58,7 +58,7 @@ en: ROLLEDBACKPUBv2: 'Rolled back to published version.' ROLLEDBACKVERSIONv2: 'Rolled back to version #{version}.' SAVED: 'Saved ''{title}'' successfully.' - SAVEDRAFT: 'Save draft' + SAVEDRAFT: 'Save' SHOW_AS_LIST: 'show as list' TOO_MANY_PAGES: 'Too many pages' TabContent: Content @@ -180,7 +180,7 @@ en: BUTTONDELETEDESC: 'Remove from draft/live and send to archive' BUTTONPUBLISHED: Published BUTTONSAVED: Saved - BUTTONSAVEPUBLISH: 'Save & publish' + BUTTONSAVEPUBLISH: 'Publish' BUTTONUNPUBLISH: Unpublish BUTTONUNPUBLISHDESC: 'Remove this page from the published site' Comments: Comments diff --git a/tests/behat/features/apply-formatting.feature b/tests/behat/features/apply-formatting.feature index c41b603f..2a96ebc0 100644 --- a/tests/behat/features/apply-formatting.feature +++ b/tests/behat/features/apply-formatting.feature @@ -14,7 +14,7 @@ Feature: Apply rich formatting to content When I press the "Align right" HTML field button Then "My awesome headline" in the "Content" HTML field should be right aligned But "Some amazing content" in the "Content" HTML field should be left aligned - Then I press the "Save draft" button + Then I press the "Save" button Then "My awesome headline" in the "Content" HTML field should be right aligned Scenario: I can bold selected content @@ -22,6 +22,6 @@ Feature: Apply rich formatting to content When I press the "Bold" HTML field button Then "awesome" in the "Content" HTML field should be bold But "My" in the "Content" HTML field should not be bold - When I press the "Save draft" button + When I press the "Save" button Then "awesome" in the "Content" HTML field should be bold But "My" in the "Content" HTML field should not be bold diff --git a/tests/behat/features/duplicate-a-page.feature b/tests/behat/features/duplicate-a-page.feature index d51e1c2f..82d36acc 100644 --- a/tests/behat/features/duplicate-a-page.feature +++ b/tests/behat/features/duplicate-a-page.feature @@ -19,6 +19,6 @@ Feature: Duplicate a page Then I should see a "Duplicated 'Page1' and children successfully" notice When I fill in "MenuTitle" with "Duplicate Page" - And I press the "Save & publish" button + And I press the "Publish" button Then I should see "Page1" in the tree And I should see "Duplicate Page" in the tree diff --git a/tests/behat/features/edit-a-page.feature b/tests/behat/features/edit-a-page.feature index 03a17b92..5c359685 100644 --- a/tests/behat/features/edit-a-page.feature +++ b/tests/behat/features/edit-a-page.feature @@ -21,7 +21,7 @@ Feature: Edit a page When I fill in "Title" with "About Us!" And I fill in the "Content" HTML field with "

my new content

" - And I press the "Save draft" button + And I press the "Save" button Then I should see the "Saved" button When I click on "About Us" in the tree diff --git a/tests/behat/features/insert-a-link.feature b/tests/behat/features/insert-a-link.feature index 69a2fd82..48508b37 100644 --- a/tests/behat/features/insert-a-link.feature +++ b/tests/behat/features/insert-a-link.feature @@ -24,7 +24,7 @@ So that I can link to a external website or a page on my site And I press the "Insert" button Then the "Content" HTML field should contain "awesome" # Required to avoid "unsaved changes" browser dialog - Then I press the "Save draft" button + Then I press the "Save" button Scenario: I can link to an anchor in an internal page When I select "awesome" in the "Content" HTML field @@ -41,7 +41,7 @@ So that I can link to a external website or a page on my site And I press the "Insert" button Then the "Content" HTML field should contain "awesome" # Required to avoid "unsaved changes" browser dialog - Then I press the "Save draft" button + Then I press the "Save" button Scenario: I can edit a link to an internal page Given I fill in the "Content" HTML field with "awesome" @@ -58,7 +58,7 @@ So that I can link to a external website or a page on my site And I press the "Insert" button Then the "Content" HTML field should contain "awesome" # Required to avoid "unsaved changes" browser dialog - Then I press the "Save draft" button + Then I press the "Save" button Scenario: I can link to an external URL Given I select "awesome" in the "Content" HTML field @@ -70,7 +70,7 @@ So that I can link to a external website or a page on my site And I press the "Insert" button Then the "Content" HTML field should contain "awesome" # Required to avoid "unsaved changes" browser dialog - Then I press the "Save draft" button + Then I press the "Save" button Scenario: I can edit a link Given I fill in the "Content" HTML field with "

My awesome content" @@ -84,7 +84,7 @@ So that I can link to a external website or a page on my site And I press the "Insert" button Then the "Content" HTML field should contain "awesome" # Required to avoid "unsaved changes" browser dialog - Then I press the "Save draft" button + Then I press the "Save" button Scenario: I can remove a link Given I fill in the "Content" HTML field with "My awesome content" @@ -93,4 +93,4 @@ So that I can link to a external website or a page on my site Then the "Content" HTML field should contain "My awesome content" And the "Content" HTML field should not contain "http://silverstripe.org" # Required to avoid "unsaved changes" browser dialog - Then I press the "Save draft" button + Then I press the "Save" button diff --git a/tests/behat/features/manage-page-permissions.feature b/tests/behat/features/manage-page-permissions.feature index c27aa67f..2a50e8b4 100644 --- a/tests/behat/features/manage-page-permissions.feature +++ b/tests/behat/features/manage-page-permissions.feature @@ -23,7 +23,7 @@ Feature: Manage page permissions Scenario: I can limit page view permissions to logged-in users Given I select "Logged-in users" from "Who can view this page?" input group - And I press the "Save & publish" button + And I press the "Publish" button When I am not logged in And I go to the homepage Then I should see a log-in form @@ -34,7 +34,7 @@ Feature: Manage page permissions Scenario: I can limit page view permissions to certain groups Given I select "Only these groups (choose from list)" from "Who can view this page?" input group And I select "AUTHOR group" in the "#Form_EditForm_ViewerGroups_Holder" tree dropdown - And I press the "Save & publish" button + And I press the "Publish" button When I am not logged in And I go to the homepage Then I should see a log-in form @@ -48,14 +48,14 @@ Feature: Manage page permissions Scenario: I can limit page edit permissions to logged-in users Given I select "Logged-in users" from "Who can edit this page?" input group - And I press the "Save & publish" button + And I press the "Publish" button Then pages should be editable by "AUTHOR" And pages should be editable by "ADMIN" Scenario: I can limit page edit permissions to certain groups Given I select "Only these groups (choose from list)" from "Who can edit this page?" input group And I select "ADMIN group" in the "#Form_EditForm_EditorGroups_Holder" tree dropdown - And I press the "Save & publish" button + And I press the "Publish" button Then pages should not be editable by "AUTHOR" But pages should be editable by "ADMIN" diff --git a/tests/behat/features/preview-a-page.feature b/tests/behat/features/preview-a-page.feature index abe4a994..8769117b 100644 --- a/tests/behat/features/preview-a-page.feature +++ b/tests/behat/features/preview-a-page.feature @@ -31,7 +31,7 @@ Feature: Preview a page And I fill in the "Content" HTML field with "

first content

" And I press the "Publish" button And I fill in the "Content" HTML field with "

my new content

" - And I press the "Save draft" button + And I press the "Save" button And I set the CMS mode to "Preview mode" When I switch the preview to "Published" diff --git a/tests/behat/features/publish-a-page.feature b/tests/behat/features/publish-a-page.feature index 516d6331..d4ec9d0b 100644 --- a/tests/behat/features/publish-a-page.feature +++ b/tests/behat/features/publish-a-page.feature @@ -18,7 +18,7 @@ Feature: Publish a page And I go to "/admin/pages" And I should see "My Page" in the tree And I click on "My Page" in the tree - And I press the "Save & publish" button + And I press the "Publish" button Then I am not logged in And I go to "/my-page" @@ -36,16 +36,16 @@ Feature: Publish a page Then I should see "Not published" in the "#ActionMenus_MoreOptions" element And I should not see an "Unpublish" button And I should see an "Archive" button - And I should see a "Save & publish" button + And I should see a "Publish" button And I should see a "Saved" button When I fill in the "Content" HTML field with "

my new content

" And I click "More options" in the "#ActionMenus" element Then I should not see an "Unpublish" button - And I should see a "Save & publish" button - And I should see a "Save draft" button + And I should see a "Publish" button + And I should see a "Save" button - When I press the "Save & publish" button + When I press the "Publish" button And I click "More options" in the "#ActionMenus" element Then I should see an "Unpublish" button And I should see an "Unpublish and archive" button @@ -76,7 +76,7 @@ Feature: Publish a page And I go to "/admin/pages" And I should see "My Page" in the tree And I click on "My Page" in the tree - And I press the "Save & publish" button + And I press the "Publish" button And I click "More options" in the "#ActionMenus" element Then I should see an "Unpublish" button @@ -87,9 +87,9 @@ Feature: Publish a page When I press the "Archive" button, confirming the dialog Then I should see a "Restore" button And I should not see a "Published" button - And I should not see a "Save & publish" button + And I should not see a "Publish" button And I should not see a "Saved" button - And I should not see a "Save draft" button + And I should not see a "Save" button When I press the "Restore" button, confirming the dialog - Then I should see a "Save & publish" button + Then I should see a "Publish" button diff --git a/tests/behat/features/search-for-a-page.feature b/tests/behat/features/search-for-a-page.feature index 7fa6afdc..3a87fb70 100644 --- a/tests/behat/features/search-for-a-page.feature +++ b/tests/behat/features/search-for-a-page.feature @@ -80,7 +80,7 @@ Feature: Search for a page Then I should see an edit page form When I fill in the "Content" HTML field with "

my new content

" - And I press the "Save draft" button + And I press the "Save" button Then I should see "Saved" in the "button#Form_EditForm_action_save" element When I go to "/admin/pages"