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

Merge pull request #1894 from robbieaverill/pulls/4.0/fix-settings-tab-states

Browse Source 
FIX Ensure tab states are reflected when switching on page edit screen
This commit is contained in:
Daniel Hensby 2017-07-17 13:21:33 +01:00 committed by GitHub
commit 6422866f40
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
code/Controllers/CMSMain.php
View File

@ -350,6 +350,21 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
} }
} }
/**
* Decide which is the active primary tab in a CMS edit screen
*
* @return string
*/
public function getActiveTab()
{
if ($this instanceof CMSPageSettingsController) {
return 'settings';
} elseif ($this instanceof CMSPageHistoryController) {
return 'history';
}
return 'edit';
}
public function LinkWithSearch($link) public function LinkWithSearch($link)
{ {
// Whitelist to avoid side effects // Whitelist to avoid side effects

6
templates/SilverStripe/CMS/Controllers/Includes/CMSMain_Content.ss
View File

@ -10,17 +10,17 @@
<div class="cms-content-header-tabs cms-tabset"> <div class="cms-content-header-tabs cms-tabset">
<ul class="cms-tabset-nav-primary nav nav-tabs"> <ul class="cms-tabset-nav-primary nav nav-tabs">
<li class="nav-item content-treeview<% if $class == 'SilverStripe\\CMS\\Controllers\\CMSPageEditController' %> ui-tabs-active<% end_if %>"> <li class="nav-item content-treeview<% if $ActiveTab == 'edit' %> ui-tabs-active<% end_if %>">
<a href="$LinkPageEdit" class="nav-link cms-panel-link" title="Form_EditForm" data-href="$LinkPageEdit"> <a href="$LinkPageEdit" class="nav-link cms-panel-link" title="Form_EditForm" data-href="$LinkPageEdit">
<% _t('SilverStripe\CMS\Controllers\CMSMain.TabContent', 'Content') %> <% _t('SilverStripe\CMS\Controllers\CMSMain.TabContent', 'Content') %>
</a> </a>
</li> </li>
<li class="nav-item content-listview<% if $class == 'SilverStripe\\CMS\\Controllers\\CMSPageSettingsController' %> ui-tabs-active<% end_if %>"> <li class="nav-item content-listview<% if $ActiveTab == 'settings' %> ui-tabs-active<% end_if %>">
<a href="$LinkPageSettings" class="nav-link cms-panel-link" title="Form_EditForm" data-href="$LinkPageSettings"> <a href="$LinkPageSettings" class="nav-link cms-panel-link" title="Form_EditForm" data-href="$LinkPageSettings">
<% _t('SilverStripe\CMS\Controllers\CMSMain.TabSettings', 'Settings') %> <% _t('SilverStripe\CMS\Controllers\CMSMain.TabSettings', 'Settings') %>
</a> </a>
</li> </li>
<li class="nav-item content-listview<% if $class == 'SilverStripe\\CMS\\Controllers\\CMSPageHistoryController' %> ui-tabs-active<% end_if %>"> <li class="nav-item content-listview<% if $ActiveTab == 'history' %> ui-tabs-active<% end_if %>">
<a href="$LinkPageHistory" class="nav-link cms-panel-link" title="Form_EditForm" data-href="$LinkPageHistory"> <a href="$LinkPageHistory" class="nav-link cms-panel-link" title="Form_EditForm" data-href="$LinkPageHistory">
<% _t('SilverStripe\CMS\Controllers\CMSMain.TabHistory', 'History') %> <% _t('SilverStripe\CMS\Controllers\CMSMain.TabHistory', 'History') %>
</a> </a>

11
tests/behat/features/edit-a-page.feature
View File

@ -27,3 +27,14 @@ Feature: Edit a page
When I click on "About Us" in the tree When I click on "About Us" in the tree
Then the "Title" field should contain "About Us!" Then the "Title" field should contain "About Us!"
And the "Content" HTML field should contain "my new content" And the "Content" HTML field should contain "my new content"
@javascript
Scenario: I can toggle between the main tabs on a page
When I click on "About Us" in the tree
Then I should see an edit page form
And I should see a "Settings" tab in the CMS content header tabs
And the "Content" header tab should be active
When I click on "Settings" in the header tabs
Then the "Settings" header tab should be active
And the "Content" header tab should not be active