diff --git a/_config.php b/_config.php
index 6e95a905..ca38bc80 100644
--- a/_config.php
+++ b/_config.php
@@ -29,13 +29,6 @@ Director::addRules(1, array(
'$URLSegment//$Action/$ID/$OtherID' => 'ModelAsController',
));
-// Register default side reports
-SS_Report::register("SideReport", "SideReport_EmptyPages");
-SS_Report::register("SideReport", "SideReport_RecentlyEdited");
-if (class_exists('SubsiteReportWrapper')) SS_Report::register('ReportAdmin', 'SubsiteReportWrapper("BrokenLinksReport")',-20);
-else SS_Report::register('ReportAdmin', 'BrokenLinksReport',-20);
-
-
/**
* Register the default internal shortcodes.
*/
diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index 15e4f280..5e941d6f 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -44,6 +44,9 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
'SiteTreeAsUL',
'getshowdeletedsubtree',
'batchactions',
+ 'ListView',
+ 'getListView',
+ 'listchildren',
);
public function init() {
@@ -157,7 +160,6 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
function SearchForm() {
// get all page types in a dropdown-compatible format
$pageTypes = SiteTree::page_type_classes();
- array_unshift($pageTypes, _t('CMSMain.PAGETYPEANYOPT','Any'));
$pageTypes = array_combine($pageTypes, $pageTypes);
asort($pageTypes);
@@ -456,6 +458,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
* @return Form
*/
public function getEditForm($id = null, $fields = null) {
+
if(!$id) $id = $this->currentPageID();
$form = parent::getEditForm($id);
@@ -528,7 +531,6 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
}
$this->extend('updateEditForm', $form);
-
return $form;
} else if($id) {
return new Form($this, "EditForm", new FieldList(
@@ -537,6 +539,95 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
}
}
+ /**
+ * Returns the pages meet a certain criteria as {@see CMSSiteTreeFilter} or the subpages of a parent page
+ * defaulting to no filter and show all pages in first level.
+ * Doubles as search results, if any search parameters are set through {@link SearchForm()}.
+ *
+ * @return SS_List
+ */
+ public function getList(&$filterOn) {
+ $list = new DataList($this->stat('tree_class'));
+
+ $request = $this->request;
+ $filter = null;
+ $ids = array();
+ if($filterClass = $request->requestVar('FilterClass')){
+ if(!is_subclass_of($filterClass, 'CMSSiteTreeFilter')) {
+ throw new Exception(sprintf('Invalid filter class passed: %s', $filterClass));
+ }
+ $filter = new $filterClass($request->requestVars());
+ $filterOn = true;
+ foreach($pages=$filter->pagesIncluded() as $pageMap){
+ $ids[] = $pageMap['ID'];
+ }
+ if(count($ids)) $list->where('"'.$this->stat('tree_class').'"."ID" IN ('.implode(",", $ids).')');
+ }else{
+ $parentID = 0;
+ if($this->urlParams['Action'] == 'listchildren' && $this->urlParams['ID']){
+ $parentID = $this->urlParams['ID'];
+ }
+ $list->filter("ParentID", $parentID);
+ }
+
+ return $list;
+ }
+
+ public function getListView(){
+ $filterOn = false;
+ $list = $this->getList($filterOn);
+ $gridFieldConfig = GridFieldConfig::create()->addComponents(
+ new GridFieldSortableHeader(),
+ new GridFieldDataColumns(),
+ new GridFieldPaginator(15)
+ );
+ $gridField = new GridField('Page','Pages', $list, $gridFieldConfig);
+
+ if($filterOn){
+ $gridField->setDisplayFields(array(
+ 'getTreeTitle' => _t('SiteTree.PAGETITLE', 'Page Title'),
+ 'Created' => _t('SiteTree.CREATED', 'Date Created'),
+ 'LastEdited' => _t('SiteTree.LASTUPDATED', 'Last Updated'),
+ ));
+ }else{
+ $gridField->setDisplayFields(array(
+ 'listChildrenLink' => "",
+ 'getTreeTitle' => _t('SiteTree.PAGETITLE', 'Page Title'),
+ 'Created' => _t('SiteTree.CREATED', 'Date Created'),
+ 'LastEdited' => _t('SiteTree.LASTUPDATED', 'Last Updated'),
+ ));
+ }
+
+ $gridField->setFieldCasting(array(
+ 'Created' => 'Date->Ago',
+ 'LastEdited' => 'Date->Ago',
+ ));
+
+ $gridField->setFieldFormatting(array(
+ 'getTreeTitle' => '$value'
+ ));
+
+ $listview = new Form(
+ $this,
+ 'ListView',
+ new FieldList($gridField),
+ new FieldList()
+ );
+
+ $this->extend('updateListView', $listview);
+
+ $listview->disableSecurityToken();
+ return $listview;
+ }
+
+ public function getListViewHTML(){
+ return $this->getListView()->forTemplate();
+ }
+
+ public function ListView() {
+ return $this->getListView();
+ }
+
public function currentPageID() {
$id = parent::currentPageID();
@@ -549,6 +640,14 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
return $id;
}
+
+ public function listchildren(){
+ if(Director::is_ajax()){
+ return $this->getListViewHTML();
+ }else{
+ return $this;
+ }
+ }
//------------------------------------------------------------------------------------------//
// Data saving handlers
diff --git a/code/controllers/CMSSiteTreeFilter.php b/code/controllers/CMSSiteTreeFilter.php
index d6c6bfaf..9df361e9 100644
--- a/code/controllers/CMSSiteTreeFilter.php
+++ b/code/controllers/CMSSiteTreeFilter.php
@@ -185,7 +185,7 @@ class CMSSiteTreeFilter_Search extends CMSSiteTreeFilter {
switch($name) {
// Match against URLSegment, Title, MenuTitle & Content
case 'Term':
- $where[] = "\"URLSegment\" LIKE '%$val%' OR \"Title\" LIKE '%$val%' OR \"MenuTitle\" LIKE '%$val%' OR \"Content\" LIKE '%$val%'";
+ if($val) $where[] = "\"URLSegment\" LIKE '%$val%' OR \"Title\" LIKE '%$val%' OR \"MenuTitle\" LIKE '%$val%' OR \"Content\" LIKE '%$val%'";
break;
// Match against date
case 'LastEditedFrom':
diff --git a/code/controllers/ContentController.php b/code/controllers/ContentController.php
index 1e0099ae..a4a49205 100644
--- a/code/controllers/ContentController.php
+++ b/code/controllers/ContentController.php
@@ -458,7 +458,7 @@ HTML;
Email: $username
Password: $password
- 
For security reasons you should now delete the install files, unless you are planning to reinstall later (requires admin login, see above). The web server also now only needs write access to the "assets" folder, you can remove write access from all other folders. Click here to delete the install files.
For security reasons you should now delete the install files, unless you are planning to reinstall later (requires admin login, see above). The web server also now only needs write access to the "assets" folder, you can remove write access from all other folders. Click here to delete the install files.
' + response.responseText);
}
);
+ },
+
+ _reloadListview: function(params){
+ $('.cms-list').refresh(params);
+
+ }
+ });
+
+ $('#cms-content-listview .cms-list').entwine({
+ refresh: function(params){
+ var self = this;
+
+ $.ajax({
+ url: this.data('url-list'),
+ data: params,
+ success: function(data, status, xhr) {
+ self.html(data);
+ },
+ error: function(xhr, status, e) {
+ errorMessage(e);
+ }
+ });
+ },
+ replace: function(url){
+ if(window.History.enabled) {
+ var container = $('.cms-container')
+ container.loadPanel(url, '', {selector: '.cms-list form'});
+ } else {
+ window.location = $.path.makeUrlAbsolute(url, $('base').attr('href'));
+ }
+ }
+ });
+
+ $('.cms-list .list-children-link').entwine({
+ onclick: function(e) {
+ this.closest('.cms-list').replace(this.attr('href'));
+ e.preventDefault();
+ return false;
+
}
});
diff --git a/templates/Includes/CMSPagesController_Content.ss b/templates/Includes/CMSPagesController_Content.ss
index 9d0b09c9..f8341c53 100644
--- a/templates/Includes/CMSPagesController_Content.ss
+++ b/templates/Includes/CMSPagesController_Content.ss
@@ -1,4 +1,4 @@
-