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

MINOR Clearer CSS classes in CMS controller templates, added $BaseCSSClasses to content templates in order to support partial template loads through ajax (instead of relying on stale CSS classes on the <body> tag)

Browse Source
This commit is contained in:
Ingo Schommer 2011-07-05 11:31:33 +02:00
parent c4a99dfc09
commit 38db63c3b0
6 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/controller/CMSMain.php
View File

@ -438,14 +438,6 @@ JS;
$actions = $record->getCMSActions(); $actions = $record->getCMSActions();
} }
// Add a default or custom validator.
// @todo Currently the default Validator.js implementation
// adds javascript to the document body, meaning it won't
// be included properly if the associated fields are loaded
// through ajax. This means only serverside validation
// will kick in for pages+validation loaded through ajax.
// This will be solved by using less obtrusive javascript validation
// in the future, see http://open.silverstripe.com/ticket/2915 and http://open.silverstripe.com/ticket/3386
if($record->hasMethod('getCMSValidator')) { if($record->hasMethod('getCMSValidator')) {
$validator = $record->getCMSValidator(); $validator = $record->getCMSValidator();
} else { } else {
@ -464,7 +456,7 @@ JS;
$form->addExtraClass('cms-edit-form'); $form->addExtraClass('cms-edit-form');
$form->setTemplate($this->getTemplatesWithSuffix('_EditForm')); $form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
// TODO Can't merge $FormAttributes in template at the moment // TODO Can't merge $FormAttributes in template at the moment
$form->addExtraClass('cms-content center ss-tabset'); $form->addExtraClass('cms-content center ss-tabset ' . $this->BaseCSSClasses());
if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet'); if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
if(!$record->canEdit() || $record->IsDeletedFromStage) { if(!$record->canEdit() || $record->IsDeletedFromStage) {

4
templates/Includes/AssetAdmin_Content.ss
View File

@ -1,4 +1,4 @@
<div class="cms-content center ss-tabset" data-layout="{type: 'border'}"> <div class="cms-content center ss-tabset $BaseCSSClasses" data-layout="{type: 'border'}">
<div class="cms-content-header north"> <div class="cms-content-header north">
<div> <div>
@ -35,7 +35,7 @@
</div> </div>
<div class="cms-content-form center"> <div class="cms-content-fields center">
<div id="cms-content-listview"> <div id="cms-content-listview">
$EditForm $EditForm
</div> </div>

2
templates/Includes/CMSPageHistoryController_Content.ss
View File

@ -1,3 +1,3 @@
<div class="cms-content center"> <div class="cms-content center $BaseCSSClasses">
<i>Not implemented yet</i> <i>Not implemented yet</i>
</div> </div>

2
templates/Includes/CMSPageReportsController_Content.ss
View File

@ -1,3 +1,3 @@
<div class="cms-content center"> <div class="cms-content center $BaseCSSClasses">
<i>Not implemented yet</i> <i>Not implemented yet</i>
</div> </div>

4
templates/Includes/CMSPagesController_Content.ss
View File

@ -1,4 +1,4 @@
<div class="cms-content center ss-tabset" data-layout="{type: 'border'}"> <div class="cms-content center ss-tabset $BaseCSSClasses" data-layout="{type: 'border'}">
<div class="cms-content-header north"> <div class="cms-content-header north">
<div> <div>
@ -30,7 +30,7 @@
</div> </div>
<div class="cms-content-form center ui-widget-content"> <div class="cms-content-fields center ui-widget-content">
<div id="cms-content-treeview"> <div id="cms-content-treeview">

4
templates/Includes/ReportAdmin_Content.ss
View File

@ -1,4 +1,4 @@
<div class="cms-content center" data-layout="{type: 'border'}"> <div class="cms-content center $BaseCSSClasses" data-layout="{type: 'border'}">
<div class="cms-content-header north"> <div class="cms-content-header north">
<h2><% _t('REPORTS','Reports') %></h2> <h2><% _t('REPORTS','Reports') %></h2>
@ -17,7 +17,7 @@
</div> </div>
<div class="cms-content-form center ui-widget-content"> <div class="cms-content-fields center ui-widget-content">
$EditForm $EditForm
</div> </div>