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 remote-tracking branch 'silverstripe-cms/3.1' into 3.2

Browse Source 
Conflicts:
	.gitignore
	.travis.yml
	README.md
	_config.php
	composer.json
	javascript/ReportAdmin.js
	templates/Includes/ReportAdmin_Content.ss
	templates/ReportAdminForm.ss
This commit is contained in:
Damian Mooyman 2015-11-03 11:11:58 +13:00
commit 0d736d0f3e
4 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
.sass-cache
.DS_Store .DS_Store

5
code/Report.php
View File

@ -268,8 +268,9 @@ class SS_Report extends ViewableData {
new GridFieldSortableHeader(), new GridFieldSortableHeader(),
new GridFieldDataColumns(), new GridFieldDataColumns(),
new GridFieldPaginator(), new GridFieldPaginator(),
new GridFieldPrintButton(), new GridFieldButtonRow('after'),
new GridFieldExportButton() new GridFieldPrintButton('buttons-after-left'),
new GridFieldExportButton('buttons-after-left')
); );
$gridField = new GridField('Report',$this->title(), $items, $gridFieldConfig); $gridField = new GridField('Report',$this->title(), $items, $gridFieldConfig);
$columns = $gridField->getConfig()->getComponentByType('GridFieldDataColumns'); $columns = $gridField->getConfig()->getComponentByType('GridFieldDataColumns');

4
templates/Includes/ReportAdmin_Content.ss
View File

@ -1,10 +1,10 @@
<div id="reportadmin-cms-content" class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content"> <div id="reportadmin-cms-content" class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
<div class="cms-content-header north"> <div class="cms-content-header north">
<% with EditForm %> <% with $EditForm %>
<div class="cms-content-header-info"> <div class="cms-content-header-info">
<% include BackLink_Button %> <% include BackLink_Button %>
<% with Controller %> <% with $Controller %>
<% include CMSBreadcrumbs %> <% include CMSBreadcrumbs %>
<% end_with %> <% end_with %>
</div> </div>

10
templates/ReportAdminForm.ss
View File

@ -9,19 +9,19 @@
$FieldMap.ReportTitle.FieldHolder $FieldMap.ReportTitle.FieldHolder
$FieldMap.ReportDescription.FieldHolder $FieldMap.ReportDescription.FieldHolder
<% if FieldMap.Filters.Children %> <% if $FieldMap.Filters.Children %>
<h4><% _t('ReportAdminForm.FILTERBY', 'Filter by') %></h4> <h4><% _t('ReportAdminForm.FILTERBY', 'Filter by') %></h4>
<div class="filters"> <div class="filters">
<% loop FieldMap.Filters %> <% loop $FieldMap.Filters %>
<% loop Children %> <% loop $Children %>
$FieldHolder $FieldHolder
<% end_loop %> <% end_loop %>
<% end_loop %> <% end_loop %>
</div> </div>
<div id="action_updatereport"> <div id="action_updatereport">
<% if FieldMap.action_updatereport %> <% if $FieldMap.action_updatereport %>
$FieldMap.action_updatereport.Field $FieldMap.action_updatereport.Field
<% end_if %> <% end_if %>
</div> </div>
@ -31,7 +31,7 @@
$FieldMap.ReportContent.FieldHolder $FieldMap.ReportContent.FieldHolder
<% loop HiddenFields %>$Field<% end_loop %> <% loop $HiddenFields %>$Field<% end_loop %>
</fieldset> </fieldset>
</div> </div>