tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-09-28 20:29:20 +02:00
Code Issues Projects Releases Wiki Activity

Template reorder and adjust step styles

Browse Source
This commit is contained in:
Paul Clarke 2016-07-21 18:36:03 +12:00 committed by Damian Mooyman
parent 41f7e5bd27
commit 1c2228f508
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
code/controllers/CMSPageAddController.php
View File

@ -26,7 +26,7 @@ class CMSPageAddController extends CMSPageEditController {
public function AddForm() { public function AddForm() {
$pageTypes = array(); $pageTypes = array();
foreach($this->PageTypes() as $type) { foreach($this->PageTypes() as $type) {
$html = sprintf('<span class="page-icon class-%s"></span><strong class="title">%s</strong><span class="description">%s</span>', $html = sprintf('<span class="page-icon class-%s"></span><span class="title">%s</span><span class="form__field-description">%s</span>',
$type->getField('ClassName'), $type->getField('ClassName'),
$type->getField('AddAction'), $type->getField('AddAction'),
$type->getField('Description') $type->getField('Description')
@ -39,13 +39,12 @@ class CMSPageAddController extends CMSPageEditController {
$pageTypes = array_merge(array('Page' => $pageTitle), $pageTypes); $pageTypes = array_merge(array('Page' => $pageTitle), $pageTypes);
} }
$numericLabelTmpl = '<div><label class="left"><span class="step-label"><span class="flyout">%d</span><span class="arrow"></span><span class="title">%s</span></span></label></div>'; $numericLabelTmpl = '<span class="step-label"><span class="flyout">Step %d. </span><span class="title">%s</span></span>';
$topTitle = _t('CMSPageAddController.ParentMode_top', 'Top level'); $topTitle = _t('CMSPageAddController.ParentMode_top', 'Top level');
$childTitle = _t('CMSPageAddController.ParentMode_child', 'Under another page'); $childTitle = _t('CMSPageAddController.ParentMode_child', 'Under another page');
$fields = new FieldList( $fields = new FieldList(
new LiteralField('PageModeHeader', sprintf($numericLabelTmpl, 1, _t('CMSMain.ChoosePageParentMode', 'Choose where to create this page'))),
$parentModeField = new SelectionGroup( $parentModeField = new SelectionGroup(
"ParentModeField", "ParentModeField",
array( array(
@ -67,15 +66,6 @@ class CMSPageAddController extends CMSPageEditController {
) )
) )
), ),
$typeField = new OptionsetField(
"PageType",
DBField::create_field(
'HTMLFragment',
sprintf($numericLabelTmpl, 2, _t('CMSMain.ChoosePageType', 'Choose page type'))
),
$pageTypes,
'Page'
),
new LiteralField( new LiteralField(
'RestrictedNote', 'RestrictedNote',
sprintf( sprintf(
@ -85,8 +75,21 @@ class CMSPageAddController extends CMSPageEditController {
'Note: Some page types are not allowed for this selection' 'Note: Some page types are not allowed for this selection'
) )
) )
),
$typeField = new OptionsetField(
"PageType",
DBField::create_field(
'HTMLFragment',
sprintf($numericLabelTmpl, 2, _t('CMSMain.ChoosePageType', 'Choose page type'))
),
$pageTypes,
'Page'
) )
); );
// TODO Insert page step title
$parentModeField->setTitle(sprintf($numericLabelTmpl, 1, _t('CMSMain.ChoosePageParentMode', 'Choose where to create this page')));
$parentField->setSearchFunction(function ($sourceObject, $labelField, $search) { $parentField->setSearchFunction(function ($sourceObject, $labelField, $search) {
return DataObject::get($sourceObject) return DataObject::get($sourceObject)
->filterAny([ ->filterAny([
@ -140,7 +143,7 @@ class CMSPageAddController extends CMSPageEditController {
)); ));
} }
}); });
$form->addExtraClass('cms-add-form stacked cms-content center cms-edit-form ' . $this->BaseCSSClasses()); $form->addExtraClass('cms-add-form cms-content center cms-edit-form ' . $this->BaseCSSClasses());
$form->setTemplate($this->getTemplatesWithSuffix('_EditForm')); $form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
return $form; return $form;

14
templates/Includes/CMSPageAddController_Content.ss
View File

@ -1,13 +1,19 @@
<div class="cms-content center $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content"> <div class="cms-content center $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
<% with $AddForm %> <% with $AddForm %>
<form $FormAttributes data-layout-type="border"> <form $FormAttributes data-layout-type="border">
<div class="cms-content-header north"> <div class="toolbar--north container-fluid">
<div class="cms-content-header-info"> <div class="toolbar__navigation">
<h2><% _t('CMSAddPageController.Title','Add page') %></h2> <ol class="breadcrumb">
<li class="breadcrumb__item breadcrumb__item--last">
<h2 class="breadcrumb__item-title breadcrumb__item-title--last">
<% _t('CMSAddPageController.Title','Add page') %>
</h2>
</li>
</ol>
</div> </div>
</div> </div>
<div class="cms-content-fields center cms-panel-content cms-panel-padded"> <div class="panel-scrollable panel-scrollable--double-toolbar container-fluid cms-panel-padded">
<% if $Message %> <% if $Message %>
<p id="{$FormName}_error" class="message $MessageType">$Message</p> <p id="{$FormName}_error" class="message $MessageType">$Message</p>
<% else %> <% else %>