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

Merge pull request #49 from open-sausages/pulls/4.0/alignment-and-spacing

Browse Source 
Alignment and spacing of main CMS panels
This commit is contained in:
Will Rossiter 2016-09-19 19:05:45 +12:00 committed by GitHub
commit 3b32047f28
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/ReportAdmin.php
View File

@ -240,7 +240,7 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider
$actions = new FieldList(); $actions = new FieldList();
$form = new Form($this, "EditForm", $fields, $actions); $form = new Form($this, "EditForm", $fields, $actions);
$form->addExtraClass('cms-edit-form cms-panel-padded center ' . $this->BaseCSSClasses()); $form->addExtraClass('panel panel--padded panel--scrollable cms-edit-form cms-panel-padded' . $this->BaseCSSClasses());
$form->loadDataFrom($this->request->getVars()); $form->loadDataFrom($this->request->getVars());
$this->extend('updateEditForm', $form); $this->extend('updateEditForm', $form);

7
javascript/ReportAdmin.js
View File

@ -6,7 +6,7 @@
$.entwine('ss', function($){ $.entwine('ss', function($){
$('.ReportAdmin .cms-edit-form').entwine({ $('.ReportAdmin .cms-edit-form').entwine({
onsubmit: function(e) { onsubmit: function(e) {
var url = $.path.parseUrl(document.location.href).hrefNoSearch, var url = $.path.parseUrl(document.location.href).hrefNoSearch,
params = this.find(':input[name^=filters]').serializeArray(); params = this.find(':input[name^=filters]').serializeArray();
params = $.grep(params, function(param) {return (param.value);}); // filter out empty params = $.grep(params, function(param) {return (param.value);}); // filter out empty
if(params) url = $.path.addSearchParams(url, $.param(params)); if(params) url = $.path.addSearchParams(url, $.param(params));
@ -14,10 +14,5 @@
return false; return false;
} }
}); });
$('.ReportAdmin').css({
'overflow-y': 'scroll',
'padding-top': 0
});
}); });
})(jQuery); })(jQuery);