tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-06-30 16:39:29 +02:00
Code Issues Projects Releases Wiki Activity

Revert "Updated siteconfig layout to be more like modeladmin"

Browse Source 
This reverts commit afd9f28279.
See https://github.com/silverstripe/silverstripe-cms/issues/830
This commit is contained in:
Ingo Schommer 2013-08-20 15:20:44 +02:00
parent 88081d5333
commit 26bca388e8
3 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/controllers/CMSSettingsController.php
View File

@ -41,7 +41,8 @@ class CMSSettingsController extends LeftAndMain {
$this, 'EditForm', $fields, $actions $this, 'EditForm', $fields, $actions
)->setHTMLID('Form_EditForm'); )->setHTMLID('Form_EditForm');
$form->setResponseNegotiator($this->getResponseNegotiator()); $form->setResponseNegotiator($this->getResponseNegotiator());
$form->addExtraClass('cms-add-form cms-content center cms-edit-form'); $form->addExtraClass('root-form');
$form->addExtraClass('cms-edit-form cms-panel-padded center');
// don't add data-pjax-fragment=CurrentForm, its added in the content template instead // don't add data-pjax-fragment=CurrentForm, its added in the content template instead
if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet'); if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');

7
templates/Includes/CMSSettingsController_Content.ss
View File

@ -1,4 +1,4 @@
<div id="settings-controller-cms-content" class="cms-content cms-edit-form center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content CurrentForm"> <div id="settings-controller-cms-content" class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content CurrentForm">
<div class="cms-content-header north"> <div class="cms-content-header north">
<% with $EditForm %> <% with $EditForm %>
@ -7,10 +7,9 @@
<% include CMSBreadcrumbs %> <% include CMSBreadcrumbs %>
<% end_with %> <% end_with %>
</div> </div>
<% if $Fields.hasTabset %> <% if $Fields.hasTabset %>
<% with $Fields.fieldByName('Root') %> <% with $Fields.fieldByName('Root') %>
<div class="cms-content-header-tabs cms-tabset-nav-primary ss-ui-tabs-nav"> <div class="cms-content-header-tabs">
<ul class="cms-tabset-nav-primary"> <ul class="cms-tabset-nav-primary">
<% loop $Tabs %> <% loop $Tabs %>
<li<% if $extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li> <li<% if $extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
@ -28,4 +27,4 @@
</div> </div>
</div> </div>

52
templates/Includes/CMSSettingsController_EditForm.ss
View File

@ -1,33 +1,29 @@
<form $FormAttributes data-layout-type="border"> <form $FormAttributes>
<div class="cms-content-fields center"> <% if $Message %>
<% if $Message %> <p id="{$FormName}_error" class="message $MessageType">$Message</p>
<p id="{$FormName}_error" class="message $MessageType">$Message</p> <% else %>
<% else %> <p id="{$FormName}_error" class="message $MessageType" style="display: none"></p>
<p id="{$FormName}_error" class="message $MessageType" style="display: none"></p> <% end_if %>
<% end_if %>
<fieldset> <fieldset>
<% if $Legend %><legend>$Legend</legend><% end_if %> <% if $Legend %><legend>$Legend</legend><% end_if %>
<% loop $Fields %> <% loop $Fields %>
$FieldHolder $FieldHolder
<% end_loop %> <% end_loop %>
<div class="clear"><!-- --></div> <div class="clear"><!-- --></div>
</fieldset> </fieldset>
</div>
<div class="cms-content-actions cms-content-controls south"> <% if $Actions %>
<% if $Actions %> <div class="Actions">
<div class="Actions"> <% loop $Actions %>
<% loop $Actions %> $Field
$Field <% end_loop %>
<% end_loop %> <% if $Controller.LinkPreview %>
<% if $Controller.LinkPreview %> <a href="$Controller.LinkPreview" class="cms-preview-toggle-link ss-ui-button" data-icon="preview">
<a href="$Controller.LinkPreview" class="cms-preview-toggle-link ss-ui-button" data-icon="preview"> <% _t('LeftAndMain.PreviewButton', 'Preview') %> &raquo;
<% _t('LeftAndMain.PreviewButton', 'Preview') %> &raquo; </a>
</a>
<% end_if %>
</div>
<% end_if %> <% end_if %>
</div> </div>
</form> <% end_if %>
</form>