diff --git a/core/functions/actions/mutate_content.php b/core/functions/actions/mutate_content.php index 7f28e366f0..647011fd51 100644 --- a/core/functions/actions/mutate_content.php +++ b/core/functions/actions/mutate_content.php @@ -516,11 +516,13 @@ function getTVDisplayFormat($name, $value, $format, $paramstring = "", $tvtype = $grd->cssClass = $params['tblc']; $grd->itemClass = $params['itmc']; $grd->altItemClass = $params['aitmc']; + $grd->pagerClass = $params['pclass']; $grd->columnHeaderStyle = $params['chdrs']; $grd->cssStyle = $params['tbls']; $grd->itemStyle = $params['itms']; $grd->altItemStyle = $params['aitms']; + $grd->pagerStyle = $params['pstyle']; $grd->columns = $params['cols']; $grd->fields = $params['flds']; @@ -533,10 +535,10 @@ function getTVDisplayFormat($name, $value, $format, $paramstring = "", $tvtype = $grd->cellSpacing = $params['cspace']; $grd->header = $params['head']; $grd->footer = $params['foot']; + $grd->pageSize = $params['psize']; $grd->pagerLocation = $params['ploc']; - $grd->pagerClass = $params['pclass']; - $grd->pagerStyle = $params['pstyle']; + $o = $grd->render(); break; diff --git a/core/functions/tv.php b/core/functions/tv.php index 9400205986..7451347aae 100644 --- a/core/functions/tv.php +++ b/core/functions/tv.php @@ -476,15 +476,17 @@ function getTVDisplayFormat($name, $value, $format, $paramstring = '', $tvtype = $grd->noRecordMsg = $params['egmsg']; - $grd->columnHeaderClass = $params['chdrc']; $grd->cssClass = $params['tblc']; + $grd->columnHeaderClass = $params['chdrc']; $grd->itemClass = $params['itmc']; $grd->altItemClass = $params['aitmc']; + $grd->pagerClass = $params['pclass']; $grd->columnHeaderStyle = $params['chdrs']; $grd->cssStyle = $params['tbls']; $grd->itemStyle = $params['itms']; $grd->altItemStyle = $params['aitms']; + $grd->pagerStyle = $params['pstyle']; $grd->columns = $params['cols']; $grd->fields = $params['flds']; @@ -497,10 +499,10 @@ function getTVDisplayFormat($name, $value, $format, $paramstring = '', $tvtype = $grd->cellSpacing = $params['cspace']; $grd->header = $params['head']; $grd->footer = $params['foot']; + $grd->pageSize = $params['psize']; $grd->pagerLocation = $params['ploc']; - $grd->pagerClass = $params['pclass']; - $grd->pagerStyle = $params['pstyle']; + $o = $grd->render(); break; diff --git a/core/src/Controllers/ManagerLog.php b/core/src/Controllers/ManagerLog.php index 2692c356e4..a1efd14690 100644 --- a/core/src/Controllers/ManagerLog.php +++ b/core/src/Controllers/ManagerLog.php @@ -1,4 +1,5 @@ -amount); - $grd->pagerClass = ''; - $grd->pagerStyle = 'white-space: normal;'; - $grd->pageClass = 'page-item'; - $grd->selPageClass = 'page-item active'; - $grd->noRecordMsg = $this->managerTheme->getLexicon('no_records_found'); + $grd->cssClass = 'table data nowrap'; $grd->columnHeaderClass = 'tableHeader'; $grd->itemClass = 'tableItem overflow-hidden'; $grd->altItemClass = 'tableAltItem'; + $grd->pagerClass = ''; + $grd->pageClass = 'page-item'; + $grd->selPageClass = 'page-item active'; + + $grd->pagerStyle = 'white-space: normal;'; + $grd->fields = 'username,action,itemid,itemname,timestamp,ip,useragent'; + // $grd->pageSize = $this->amount; + $grd->pagerLocation = 'both-left'; + $columns = [ [ // username 'width' => '1%', diff --git a/manager/actions/mutate_module.dynamic.php b/manager/actions/mutate_module.dynamic.php index d2054205c0..902871a113 100644 --- a/manager/actions/mutate_module.dynamic.php +++ b/manager/actions/mutate_module.dynamic.php @@ -374,15 +374,26 @@ class="form-control" onchange="documentDirty=true;"/> ->where('site_module_depobj.module', $id) ->orderBy('site_module_depobj.type') ->orderBy('name'); - $grd = new \EvolutionCMS\Support\DataGrid('', $depobj, 0); // set page size to 0 t show all items + + // set page size to 0 to show all items + $grd = new \EvolutionCMS\Support\DataGrid('', $depobj, 0); + $grd->noRecordMsg = $_lang['no_records_found']; $grd->prepareResult = ['type' => [10 => 'Chunk', 20 => 'Document', 30 => 'Plugin', 40 => 'Snippet', 50 => 'Template', 60 => 'TV']]; + $grd->cssClass = 'grid'; $grd->columnHeaderClass = 'gridHeader'; $grd->itemClass = 'gridItem'; $grd->altItemClass = 'gridAltItem'; + + $grd->pagerStyle = 'white-space: normal;'; + $grd->columns = $_lang['element_name'] . " ," . $_lang['type']; $grd->fields = "name,type"; + + // $grd->pageSize = 0; + $grd->pagerLocation = 'both-left'; + echo $grd->render(); ?> diff --git a/manager/actions/mutate_module_resources.dynamic.php b/manager/actions/mutate_module_resources.dynamic.php index 442bed17f7..e6ff87cae2 100644 --- a/manager/actions/mutate_module_resources.dynamic.php +++ b/manager/actions/mutate_module_resources.dynamic.php @@ -230,16 +230,27 @@ function openSelector(resource, mode, callback, w, h) { ->where('site_module_depobj.module', $id) ->orderBy('site_module_depobj.type') ->orderBy('name'); - $grd = new \EvolutionCMS\Support\DataGrid('', $depobj, 0); // set page size to 0 t show all items + + // set page size to 0 to show all items + $grd = new \EvolutionCMS\Support\DataGrid('', $depobj, 0); + $grd->noRecordMsg = $_lang["no_records_found"]; $grd->prepareResult = ['type' => [10 => 'Chunk', 20 => 'Document', 30 => 'Plugin', 40 => 'Snippet', 50 => 'Template', 60 => 'TV']]; + $grd->cssClass = "grid"; $grd->columnHeaderClass = "gridHeader"; $grd->itemClass = "gridItem"; $grd->altItemClass = "gridAltItem"; + + $grd->pagerStyle = 'white-space: normal;'; + $grd->columns = $_lang["element_name"] . " ," . $_lang["type"]; - $grd->colTypes = "template: [+value+]"; $grd->fields = "name,type"; + $grd->colTypes = "template: [+value+]"; + + // $grd->pageSize = 0; + $grd->pagerLocation = 'both-left'; + echo $grd->render(); ?> diff --git a/manager/actions/resource_selector.static.php b/manager/actions/resource_selector.static.php index a2146f8db6..20175af881 100644 --- a/manager/actions/resource_selector.static.php +++ b/manager/actions/resource_selector.static.php @@ -190,19 +190,30 @@ function setCheckbox(chk)
noRecordMsg = $_lang["no_records_found"]; + $grd->cssClass = "table data nowrap"; $grd->columnHeaderClass = "tableHeader"; $grd->itemClass = "tableItem"; $grd->altItemClass = "tableAltItem"; + + $grd->pagerStyle = 'white-space: normal;'; + $grd->columns = $_lang["name"] . " ," . $_lang["description"]; + $grd->fields = $rt == 'tpl' ? 'templatename,description' : 'name,description'; $grd->colTypes = "template: [+e.value+]||template:[+e.value+]"; $grd->colWidths = "45%"; - $grd->fields = $rt == 'tpl' ? 'templatename,description' : 'name,description'; + + // $grd->pageSize = 0; + $grd->pagerLocation = 'both-left'; + if ($_REQUEST['listmode'] == '1') { $grd->pageSize = 0; } + echo $grd->render(); ?>
diff --git a/manager/views/page/eventlog.blade.php b/manager/views/page/eventlog.blade.php index 2891ffccc9..dcf590e3d4 100644 --- a/manager/views/page/eventlog.blade.php +++ b/manager/views/page/eventlog.blade.php @@ -27,7 +27,12 @@ $cm = new \EvolutionCMS\Support\ContextMenu('cntxm', 150); $cm->addItem(ManagerTheme::getLexicon('view_log'), 'js:menuAction(1)', $_style['icon_eye']); //$cm->addSeparator(); - $cm->addItem(ManagerTheme::getLexicon('delete'), 'js:menuAction(2)', $_style['icon_trash'], !$modx->hasPermission('delete_eventlog') ? 1 : 0); + $cm->addItem( + ManagerTheme::getLexicon('delete'), + 'js:menuAction(2)', + $_style['icon_trash'], + !$modx->hasPermission('delete_eventlog') ? 1 : 0, + ); $contextmenu = $cm->render(); @endphp @push('scripts.top') @@ -157,29 +162,37 @@ class="{{ $_style['icon_table'] }}"> }); } } + $grd = new \EvolutionCMS\Support\DataGrid('', $eventLog, 100); // set page size to 0 t show all items - $grd->pagerClass = ''; - $grd->pagerStyle = 'white-space: normal;'; - $grd->pageClass = 'page-item'; - $grd->selPageClass = 'page-item active'; - $grd->prepareResult = ['icon' => [1 => 'text-info ' . $_style['icon_info_circle'], 2 => 'text-warning ' . $_style['icon_info_triangle'], 3 => 'text-danger ' . $_style['icon_cancel']]]; + $grd->noRecordMsg = ManagerTheme::getLexicon('no_records_found'); + $grd->prepareResult = ['icon' => [1 => 'text-info ' . $_style['icon_info_circle'], 2 => 'text-warning ' . $_style['icon_info_triangle'], 3 => 'text-danger ' . $_style['icon_cancel']]]; + $grd->cssClass = 'table data nowrap'; $grd->columnHeaderClass = 'tableHeader'; $grd->itemClass = 'tableItem'; $grd->altItemClass = 'tableAltItem'; - $grd->fields = 'type,source,createdon,eventid,username'; + $grd->pageClass = 'page-item'; + $grd->selPageClass = 'page-item active'; + + $grd->pagerStyle = 'white-space: normal;'; + $grd->columns = ManagerTheme::getLexicon('type') . ' ,' . ManagerTheme::getLexicon('source') . ' ,' . ManagerTheme::getLexicon('date') . ' ,' . ManagerTheme::getLexicon('event_id') . ' ,' . ManagerTheme::getLexicon('sysinfo_userid'); + $grd->fields = 'type,source,createdon,eventid,username'; $grd->colWidths = '1%,,1%,1%,1%'; $grd->colAligns = 'center,,,center,center'; $grd->colTypes = "template:||template:[+source+]||date: " . $modx->toDateFormat(null, 'formatOnly') . ' H:i:s'; + + // $grd->pageSize = 0; + $grd->pagerLocation = 'both-left'; + if ($listmode == '1') { $grd->pageSize = 0; } if (get_by_key($_REQUEST, 'op') === 'reset') { $grd->pageNumber = 1; } - // render grid + echo $grd->render(); ?>