diff --git a/wire/modules/Fieldtype/FieldtypeOptions/FieldtypeOptions.module b/wire/modules/Fieldtype/FieldtypeOptions/FieldtypeOptions.module index 12738483..b1c8e627 100644 --- a/wire/modules/Fieldtype/FieldtypeOptions/FieldtypeOptions.module +++ b/wire/modules/Fieldtype/FieldtypeOptions/FieldtypeOptions.module @@ -103,7 +103,7 @@ class FieldtypeOptions extends FieldtypeMulti implements Module { if($field->initValue) { $value = $page->getUnformatted($field->name); if($field->required && !$field->requiredIf) { - if(empty($value) || !count($value)) { + if(empty($value) || !wireCount($value)) { $page->set($field->name, $field->initValue); } } else if($this->wire('process') != 'ProcessField' && !wireCount($value)) { diff --git a/wire/modules/Inputfield/InputfieldPageTable/InputfieldPageTable.css b/wire/modules/Inputfield/InputfieldPageTable/InputfieldPageTable.css index 0820bcaa..f3521555 100644 --- a/wire/modules/Inputfield/InputfieldPageTable/InputfieldPageTable.css +++ b/wire/modules/Inputfield/InputfieldPageTable/InputfieldPageTable.css @@ -45,3 +45,10 @@ margin-bottom: 0; } +small .InputfieldPageTableAdd { + display: inline-block; + margin: 0 3px 3px 0; +} +.InputfieldPageTable small .InputfieldPageTableAdd button { + margin: 0; +} diff --git a/wire/modules/Inputfield/InputfieldPageTable/InputfieldPageTable.module b/wire/modules/Inputfield/InputfieldPageTable/InputfieldPageTable.module index 2f53b5bc..19768fc5 100644 --- a/wire/modules/Inputfield/InputfieldPageTable/InputfieldPageTable.module +++ b/wire/modules/Inputfield/InputfieldPageTable/InputfieldPageTable.module @@ -150,6 +150,7 @@ class InputfieldPageTable extends Inputfield { if($this->nameFormat) $url .= "&name_format=" . $this->wire('sanitizer')->entities($this->nameFormat); $btn .= "" . $button->render() . ""; } + if(count($this->rowTemplates) > 1) $btn = "$btn"; $out .= "