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

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

View File

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

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>