Merge branch '4.x' into fix/translations

resources/js/components/fieldtypes/replicator/Field.vue

@@ -9,7 +9,7 @@
         </label>
 
         <div
-            class="help-block"
+            class="help-block" :class="{ '-mt-2': showLabel }"
             v-if="instructions && field.instructions_position !== 'below'"
             v-html="instructions" />
 
@@ -37,7 +37,7 @@
             v-html="instructions" />
 
         <div v-if="hasError">
-            <small class="help-block text-red-500 mt-2" v-for="(error, i) in errors" :key="i" v-text="error" />
+            <small class="help-block text-red-500 mt-2 mb-0" v-for="(error, i) in errors" :key="i" v-text="error" />
         </div>
 
     </div>

src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php

@@ -133,8 +133,8 @@ public function edit($taxonomy)
             'collections' => $taxonomy->collections()->map->handle()->all(),
             'sites' => $taxonomy->sites()->all(),
             'preview_targets' => $taxonomy->basePreviewTargets(),
-            'term_template' => $taxonomy->termTemplate,
-            'template' => $taxonomy->template,
+            'term_template' => $taxonomy->hasCustomTermTemplate() ? $taxonomy->termTemplate() : null,
+            'template' => $taxonomy->hasCustomTemplate() ? $taxonomy->template() : null,
             'layout' => $taxonomy->layout(),
         ];
 

src/Taxonomies/Taxonomy.php

@@ -518,4 +518,14 @@ private function previewTargetsForFile()
             ];
         })->filter()->values()->all();
     }
+
+    public function hasCustomTemplate()
+    {
+        return $this->template !== null;
+    }
+
+    public function hasCustomTermTemplate()
+    {
+        return $this->termTemplate !== null;
+    }
 }