1
0
mirror of https://github.com/processwire/processwire.git synced 2025-08-15 11:14:12 +02:00

Minor adjustments to ProcessPageLister and InputfieldSelector

This commit is contained in:
Ryan Cramer
2019-06-14 11:53:58 -04:00
parent 51c6becf9a
commit 108f8c5511
2 changed files with 9 additions and 3 deletions

View File

@@ -113,10 +113,14 @@
} }
.InputfieldSelector .selector-row .opval input.input-or { .InputfieldSelector .selector-row .opval input.input-or {
width: 1.5%;
margin-left: 0.5%; margin-left: 0.5%;
display: none; display: none;
} }
body.AdminThemeDefault .InputfieldSelector .selector-row .opval input.input-or,
body.AdminThemeReno .InputfieldSelector .selector-row .opval input.input-or {
width: 1.5%;
}
.InputfieldSelector .selector-row.has-or-value .opval input.input-or, .InputfieldSelector .selector-row.has-or-value .opval input.input-or,
.InputfieldSelector .selector-row.has-or-field .opval input.input-or { .InputfieldSelector .selector-row.has-or-field .opval input.input-or {
display: block; display: block;

View File

@@ -636,7 +636,7 @@ class ProcessPageLister extends Process implements ConfigurableModule {
} }
} }
$f->addOption('-', '———'); $f->addOption('-', '———', array('disabled' => 'disabled'));
// custom fields (sort) // custom fields (sort)
foreach($fields as $field) { foreach($fields as $field) {
@@ -662,17 +662,19 @@ class ProcessPageLister extends Process implements ConfigurableModule {
$_field = $template->fieldgroup->getField($field->name, true); // context $_field = $template->fieldgroup->getField($field->name, true); // context
if($_field) $field = $_field; if($_field) $field = $_field;
} }
if($useLabels) { if($useLabels) {
$label = $field->getLabel(); $label = $field->getLabel();
$desc = $field->name; $desc = $field->name;
$f->addOption($field->name, $field->getLabel(), array('data-desc' => $field->name));
} else { } else {
$label = $field->name; $label = $field->name;
$desc = $field->getLabel(); $desc = $field->getLabel();
} }
$attr = array('data-desc' => $desc); $attr = array('data-desc' => $desc);
$icon = $field->getIcon(true); $icon = $field->getIcon(true);
if($icon) $attr['data-handle'] = wireIconMarkup($icon, 'fw'); if($icon) $attr['data-handle'] = wireIconMarkup($icon, 'fw');
$f->addOption($field->name, $label, $attr); $f->addOption($field->name, $label, $attr);
} }