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

Merge remote branch 'origin/master' into translation-staging

Browse Source
This commit is contained in:
TeamCity 2012-10-06 04:27:39 +13:00
commit f4c918dabe
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/javascript/LeftAndMain.Preview.js
View File

@ -124,7 +124,7 @@
canPreview: function() { canPreview: function() {
var contentEl = this.getLayoutContainer().find('.cms-content'); var contentEl = this.getLayoutContainer().find('.cms-content');
// Only load if we're in the "edit page" view // Only load if we're in the "edit page" view
var blockedClasses = ['CMSPagesController', 'CMSSettingsController', 'CMSPageHistoryController']; var blockedClasses = ['CMSPagesController', 'CMSPageHistoryController'];
return !(contentEl.is('.' + blockedClasses.join(',.'))); return !(contentEl.is('.' + blockedClasses.join(',.')));
}, },

5
admin/templates/Includes/CMSSettingsController_SilverStripeNavigator.ss Normal file
View File

@ -0,0 +1,5 @@
<div class="cms-navigator">
<a href="#" class="ss-ui-button cms-preview-toggle-link" data-icon="preview">
&laquo; <% _t('SilverStripeNavigator.Edit', 'Edit') %>
</a>
</div>