tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity

ENHANCEMENT Shortened CMS button labels: "Delete from the draft site" -> "Delete draft", "Delete from the published site" -> "Delete", "Save and Publish" -> "Save & Publish". Renamed "Save" to "Save draft"

Browse Source
This commit is contained in:
Ingo Schommer 2011-08-12 16:58:35 +02:00
parent 07094f5b10
commit 4eebf7f0be
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/model/SiteTree.php
View File

@ -2020,7 +2020,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
$actions->push(new FormAction('revert',_t('CMSMain.RESTORE','Restore'))); $actions->push(new FormAction('revert',_t('CMSMain.RESTORE','Restore')));
if($this->canDelete() && $this->canDeleteFromLive()) { if($this->canDelete() && $this->canDeleteFromLive()) {
// "delete from live" // "delete from live"
$actions->push($deleteFromLiveAction = new FormAction('deletefromlive',_t('CMSMain.DELETEFP','Delete from the published site'))); $actions->push($deleteFromLiveAction = new FormAction('deletefromlive',_t('CMSMain.DELETEFP','Delete')));
$deleteFromLiveAction->addExtraClass('ss-ui-action-destructive'); $deleteFromLiveAction->addExtraClass('ss-ui-action-destructive');
} }
} else { } else {
@ -2030,20 +2030,20 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
} else { } else {
if($this->canDelete()) { if($this->canDelete()) {
// "delete" // "delete"
$actions->push($deleteAction = new FormAction('delete',_t('CMSMain.DELETE','Delete from the draft site'))); $actions->push($deleteAction = new FormAction('delete',_t('CMSMain.DELETE','Delete draft')));
$deleteAction->addExtraClass('delete'); $deleteAction->addExtraClass('delete');
$deleteAction->addExtraClass('ss-ui-action-destructive'); $deleteAction->addExtraClass('ss-ui-action-destructive');
} }
// "save" // "save"
$actions->push($saveDraftAction = new FormAction('save',_t('CMSMain.SAVE','Save Draft'))); $actions->push($saveDraftAction = new FormAction('save',_t('CMSMain.SAVEDRAFT','Save Draft')));
$saveDraftAction->addExtraClass('save-draft'); $saveDraftAction->addExtraClass('save-draft');
} }
} }
if($this->canPublish() && !$this->IsDeletedFromStage) { if($this->canPublish() && !$this->IsDeletedFromStage) {
// "publish" // "publish"
$actions->push($publishAction = new FormAction('publish', _t('SiteTree.BUTTONSAVEPUBLISH', 'Save and Publish'))); $actions->push($publishAction = new FormAction('publish', _t('SiteTree.BUTTONSAVEPUBLISH', 'Save & Publish')));
$publishAction->addExtraClass('ss-ui-action-constructive'); $publishAction->addExtraClass('ss-ui-action-constructive');
} }

9
lang/en_US.php
View File

@ -82,10 +82,10 @@ $lang['en_US']['BrokenLinksReport']['RedirectorNonExistent'] = 'redirector page
$lang['en_US']['BrokenLinksReport']['VirtualPageNonExistent'] = 'virtual page pointing to non-existent page'; $lang['en_US']['BrokenLinksReport']['VirtualPageNonExistent'] = 'virtual page pointing to non-existent page';
$lang['en_US']['CMSBatchActions']['DELETED_DRAFT_PAGES'] = 'Deleted %d pages from the draft site, %d failures'; $lang['en_US']['CMSBatchActions']['DELETED_DRAFT_PAGES'] = 'Deleted %d pages from the draft site, %d failures';
$lang['en_US']['CMSBatchActions']['DELETED_PAGES'] = 'Deleted %d pages from the published site, %d failures'; $lang['en_US']['CMSBatchActions']['DELETED_PAGES'] = 'Deleted %d pages from the published site, %d failures';
$lang['en_US']['CMSBatchActions']['DELETE_DRAFT_PAGES'] = 'Delete from draft site'; $lang['en_US']['CMSBatchActions']['DELETE_DRAFT_PAGES'] = 'Delete draft';
$lang['en_US']['CMSBatchActions']['DELETE_PAGES'] = 'Delete from published site'; $lang['en_US']['CMSBatchActions']['DELETE_PAGES'] = 'Delete';
$lang['en_US']['CMSBatchActions']['DELETED_DRAFT_PAGES'] = 'Deleted %d pages from the draft site'; $lang['en_US']['CMSBatchActions']['DELETED_DRAFT_PAGES'] = 'Deleted %d pages from the draft site';
$lang['en_US']['CMSBatchActions']['DELETE_DRAFT_PAGES'] = 'Delete from draft site'; $lang['en_US']['CMSBatchActions']['DELETE_DRAFT_PAGES'] = 'Delete draft';
$lang['en_US']['CMSBatchActions']['PUBLISHED_PAGES'] = 'Published %d pages, %d failures'; $lang['en_US']['CMSBatchActions']['PUBLISHED_PAGES'] = 'Published %d pages, %d failures';
$lang['en_US']['CMSBatchActions']['PUBLISH_PAGES'] = 'Publish'; $lang['en_US']['CMSBatchActions']['PUBLISH_PAGES'] = 'Publish';
$lang['en_US']['CMSBatchActions']['UNPUBLISHED_PAGES'] = 'Un-published %d pages'; $lang['en_US']['CMSBatchActions']['UNPUBLISHED_PAGES'] = 'Un-published %d pages';
@ -100,7 +100,7 @@ $lang['en_US']['CMSMain']['ACCESSALLINTERFACES'] = 'Access to all CMS sections';
$lang['en_US']['CMSMain']['BTNCOMPAREVERSIONS'] = 'Compare Versions'; $lang['en_US']['CMSMain']['BTNCOMPAREVERSIONS'] = 'Compare Versions';
$lang['en_US']['CMSMain']['BTNREFRESH'] = 'Refresh'; $lang['en_US']['CMSMain']['BTNREFRESH'] = 'Refresh';
$lang['en_US']['CMSMain']['COMPARINGV'] = 'Comparing versions %s and %s'; $lang['en_US']['CMSMain']['COMPARINGV'] = 'Comparing versions %s and %s';
$lang['en_US']['CMSMain']['DELETE'] = 'Delete from the draft site'; $lang['en_US']['CMSMain']['DELETE'] = 'Delete draft';
$lang['en_US']['CMSMain']['DESCREMOVED'] = 'and %s descendants'; $lang['en_US']['CMSMain']['DESCREMOVED'] = 'and %s descendants';
$lang['en_US']['CMSMain']['EMAIL'] = 'Email'; $lang['en_US']['CMSMain']['EMAIL'] = 'Email';
$lang['en_US']['CMSMain']['GO'] = 'Go'; $lang['en_US']['CMSMain']['GO'] = 'Go';
@ -140,6 +140,7 @@ $lang['en_US']['CMSMain']['ROLLBACK'] = 'Roll back to this version';
$lang['en_US']['CMSMain']['ROLLEDBACKPUB'] = 'Rolled back to published version. New version number is #%d'; $lang['en_US']['CMSMain']['ROLLEDBACKPUB'] = 'Rolled back to published version. New version number is #%d';
$lang['en_US']['CMSMain']['ROLLEDBACKVERSION'] = 'Rolled back to version #%d. New version number is #%d'; $lang['en_US']['CMSMain']['ROLLEDBACKVERSION'] = 'Rolled back to version #%d. New version number is #%d';
$lang['en_US']['CMSMain']['SAVE'] = 'Save'; $lang['en_US']['CMSMain']['SAVE'] = 'Save';
$lang['en_US']['CMSMain']['SAVEDRAFT'] = 'Save draft';
$lang['en_US']['CMSMain']['STATUSOPT'] = 'Status'; $lang['en_US']['CMSMain']['STATUSOPT'] = 'Status';
$lang['en_US']['CMSMain']['SearchTreeFormPagesDropdown'] = 'Pages'; $lang['en_US']['CMSMain']['SearchTreeFormPagesDropdown'] = 'Pages';
$lang['en_US']['CMSMain']['TITLEOPT'] = 'Title'; $lang['en_US']['CMSMain']['TITLEOPT'] = 'Title';