use common pager settings for availabled and used templates
This commit is contained in:
parent
cbec958dd1
commit
65db1c53dd
3 changed files with 12 additions and 15 deletions
|
@ -6,7 +6,7 @@ if (!defined('DC_RC_PATH')) {
|
||||||
Clearbricks::lib()->autoload([
|
Clearbricks::lib()->autoload([
|
||||||
'dcTemplator' => __DIR__ . '/inc/class.templator.php',
|
'dcTemplator' => __DIR__ . '/inc/class.templator.php',
|
||||||
'templatorMedia' => __DIR__ . '/inc/class.templator.media.php',
|
'templatorMedia' => __DIR__ . '/inc/class.templator.media.php',
|
||||||
'pagerTemplator' => __DIR__ . '/inc/admin.pager.templator.php',
|
'templatorPager' => __DIR__ . '/inc/class.templator.pager.php',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
dcCore::app()->templator = new dcTemplator();
|
dcCore::app()->templator = new dcTemplator();
|
||||||
|
|
|
@ -14,7 +14,7 @@ if (!defined('DC_RC_PATH')) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
class pagerTemplator
|
class templatorPager
|
||||||
{
|
{
|
||||||
public static function templatorItemLine($f, $i)
|
public static function templatorItemLine($f, $i)
|
||||||
{
|
{
|
||||||
|
|
23
index.php
23
index.php
|
@ -13,15 +13,12 @@ $part = $_REQUEST['part'] ?? '';
|
||||||
### grab info ###
|
### grab info ###
|
||||||
|
|
||||||
if (in_array($part, ['files', 'delete'])) {
|
if (in_array($part, ['files', 'delete'])) {
|
||||||
$page = !empty($_GET['page']) ? $_GET['page'] : 1;
|
//Extend dcMedia to change settings to allow .html vs media_exclusion
|
||||||
$nb_per_page = 20;
|
|
||||||
|
|
||||||
$media = new templatorMedia();
|
$media = new templatorMedia();
|
||||||
$media->chdir(dcCore::app()->templator->template_dir_name);
|
$media->chdir(dcCore::app()->templator->template_dir_name);
|
||||||
// For users with only templator permission, we use sudo.
|
// For users with only templator permission, we use sudo.
|
||||||
dcCore::app()->auth->sudo([$media,'getDir']);
|
dcCore::app()->auth->sudo([$media,'getDir']);
|
||||||
$dir = $media->dir;
|
$dir = $media->dir;
|
||||||
//if files did not appear in this list, check blog->settings->media_exclusion
|
|
||||||
$items = array_values($dir['files']);
|
$items = array_values($dir['files']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -308,23 +305,24 @@ if (!dcCore::app()->templator->canUseRessources(true)) {
|
||||||
if (count($items) == 0) {
|
if (count($items) == 0) {
|
||||||
echo '<p><strong>' . __('No template.') . '</strong></p>';
|
echo '<p><strong>' . __('No template.') . '</strong></p>';
|
||||||
} else {
|
} else {
|
||||||
$pager = new pager($page, count($items), $nb_per_page, 10);
|
// reuse "used templatro template" filter settings
|
||||||
|
$filter = new adminGenericFilterV2('templator');
|
||||||
|
$filter->add(dcAdminFilters::getPageFilter());
|
||||||
|
|
||||||
|
$pager = new dcPager($filter->page, count($items), $filter->nb, 10);
|
||||||
$pager->html_prev = __('«prev.');
|
$pager->html_prev = __('«prev.');
|
||||||
$pager->html_next = __('next»');
|
$pager->html_next = __('next»');
|
||||||
|
|
||||||
echo
|
echo
|
||||||
'<form action="media.php" method="get">' .
|
|
||||||
'</form>' .
|
|
||||||
|
|
||||||
'<div class="media-list">' .
|
'<div class="media-list">' .
|
||||||
'<p>' . __('Page(s)') . ' : ' . $pager->getLinks() . '</p>';
|
$pager->getLinks();
|
||||||
|
|
||||||
for ($i = $pager->index_start, $j = 0; $i <= $pager->index_end; $i++, $j++) {
|
for ($i = $pager->index_start, $j = 0; $i <= $pager->index_end; $i++, $j++) {
|
||||||
echo pagerTemplator::templatorItemLine($items[$i], $j);
|
echo templatorPager::templatorItemLine($items[$i], $j);
|
||||||
}
|
}
|
||||||
|
|
||||||
echo
|
echo
|
||||||
'<p class="clear">' . __('Page(s)') . ' : ' . $pager->getLinks() . '</p>' .
|
$pager->getLinks() .
|
||||||
'</div>';
|
'</div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -413,11 +411,10 @@ if (!dcCore::app()->templator->canUseRessources(true)) {
|
||||||
while ($cat_parents->fetch()) {
|
while ($cat_parents->fetch()) {
|
||||||
$full_name = $cat_parents->cat_title . ' › ';
|
$full_name = $cat_parents->cat_title . ' › ';
|
||||||
};
|
};
|
||||||
$full_name = $full_name . dcCore::app()->blog->getCategory($cat_id)->cat_title;
|
|
||||||
$name .= '</strong> (' . $full_name . $category->cat_title . ')<strong>';
|
$name .= '</strong> (' . $full_name . $category->cat_title . ')<strong>';
|
||||||
}
|
}
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
$file = $file_default;
|
$file = '';
|
||||||
|
|
||||||
throw $e;
|
throw $e;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue