diff --git a/wire/modules/Inputfield/InputfieldSelector/InputfieldSelector.css b/wire/modules/Inputfield/InputfieldSelector/InputfieldSelector.css index 8f1f1a46..9fd70f86 100644 --- a/wire/modules/Inputfield/InputfieldSelector/InputfieldSelector.css +++ b/wire/modules/Inputfield/InputfieldSelector/InputfieldSelector.css @@ -113,10 +113,14 @@ } .InputfieldSelector .selector-row .opval input.input-or { - width: 1.5%; margin-left: 0.5%; 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-field .opval input.input-or { display: block; diff --git a/wire/modules/Process/ProcessPageLister/ProcessPageLister.module b/wire/modules/Process/ProcessPageLister/ProcessPageLister.module index 1353bdcb..2a4ef838 100644 --- a/wire/modules/Process/ProcessPageLister/ProcessPageLister.module +++ b/wire/modules/Process/ProcessPageLister/ProcessPageLister.module @@ -636,7 +636,7 @@ class ProcessPageLister extends Process implements ConfigurableModule { } } - $f->addOption('-', '———'); + $f->addOption('-', '———', array('disabled' => 'disabled')); // custom fields (sort) foreach($fields as $field) { @@ -662,17 +662,19 @@ class ProcessPageLister extends Process implements ConfigurableModule { $_field = $template->fieldgroup->getField($field->name, true); // context if($_field) $field = $_field; } + if($useLabels) { $label = $field->getLabel(); $desc = $field->name; - $f->addOption($field->name, $field->getLabel(), array('data-desc' => $field->name)); } else { $label = $field->name; $desc = $field->getLabel(); } + $attr = array('data-desc' => $desc); $icon = $field->getIcon(true); if($icon) $attr['data-handle'] = wireIconMarkup($icon, 'fw'); + $f->addOption($field->name, $label, $attr); }