Merge pull request #607 from azisyus/master

Author: kristijanhusak

src/helpers.php

@@ -3,6 +3,27 @@
 use Kris\LaravelFormBuilder\Fields\FormField;
 use Kris\LaravelFormBuilder\Form;
 
+
+if(!function_exists('errorBlockPath'))
+{
+
+    function errorBlockPath()
+    {
+        return __DIR__.'/views/errors.php';
+    }
+
+}
+
+if(!function_exists('helpBlockPath'))
+{
+
+    function helpBlockPath()
+    {
+        return __DIR__.'/views/help_block.php';
+    }
+
+}
+
 if (!function_exists('form')) {
 
     function form(Form $form, array $options = [])

src/views/button.php

@@ -3,7 +3,7 @@
 <?php endif; ?>
 
 <?= Form::button($options['label'], $options['attr']) ?>
-<?php include 'help_block.php' ?>
+<?php include helpBlockPath(); ?>
 
 <?php if ($options['wrapper'] !== false): ?>
 </div>

src/views/checkbox.php

@@ -11,10 +11,10 @@
         <?= Form::customLabel($name, $options['label'], $options['label_attr']) ?>
     <?php endif; ?>
 
-    <?php include 'help_block.php' ?>
+    <?php include helpBlockPath(); ?>
 <?php endif; ?>
 
-<?php include 'errors.php' ?>
+<?php include errorBlockPath(); ?>
 
 <?php if ($showLabel && $showField): ?>
     <?php if ($options['wrapper'] !== false): ?>

src/views/child_form.php

@@ -15,11 +15,11 @@
         <?php } ?>
     <?php endforeach; ?>
 
-    <?php include 'help_block.php' ?>
+    <?php include helpBlockPath(); ?>
 
 <?php endif; ?>
 
-<?php include 'errors.php' ?>
+<?php include errorBlockPath(); ?>
 
 <?php if ($showLabel && $showField): ?>
     <?php if ($options['wrapper'] !== false): ?>

src/views/choice.php

@@ -13,12 +13,12 @@
         <?= $child->render($options['choice_options'], true, true, false) ?>
     <?php endforeach; ?>
 
-    <?php include 'help_block.php' ?>
+    <?php include helpBlockPath(); ?>
 
 <?php endif; ?>
 
 
-<?php include 'errors.php' ?>
+<?php include errorBlockPath(); ?>
 
 <?php if ($showLabel && $showField): ?>
     <?php if ($options['wrapper'] !== false): ?>

src/views/collection.php

@@ -13,11 +13,11 @@
         <?= $child->render() ?>
     <?php endforeach; ?>
 
-    <?php include 'help_block.php' ?>
+    <?php include helpBlockPath(); ?>
 
 <?php endif; ?>
 
-<?php include 'errors.php' ?>
+<?php include errorBlockPath(); ?>
 
 <?php if ($showLabel && $showField): ?>
     <?php if ($options['wrapper'] !== false): ?>

src/views/radio.php

@@ -11,10 +11,10 @@
         <?= Form::customLabel($name, $options['label'], $options['label_attr']) ?>
     <?php endif; ?>
 
-    <?php include 'help_block.php' ?>
+    <?php include helpBlockPath(); ?>
 <?php endif; ?>
 
-<?php include 'errors.php' ?>
+<?php include errorBlockPath(); ?>
 
 <?php if ($showLabel && $showField): ?>
     <?php if ($options['wrapper'] !== false): ?>

src/views/repeated.php

@@ -8,7 +8,7 @@
     <?= $options['children']['first']->render([], true, true, false) ?>
     <?= $options['children']['second']->render([], true, true, false) ?>
 
-    <?php include 'help_block.php' ?>
+    <?php include helpBlockPath(); ?>
 
 <?php endif; ?>
 

src/views/select.php

@@ -11,10 +11,10 @@
 <?php if ($showField): ?>
     <?php $emptyVal = $options['empty_value'] ? ['' => $options['empty_value']] : null; ?>
     <?= Form::select($name, (array)$emptyVal + $options['choices'], $options['selected'], $options['attr']) ?>
-    <?php include 'help_block.php' ?>
+    <?php include helpBlockPath(); ?>
 <?php endif; ?>
 
-<?php include 'errors.php' ?>
+<?php include errorBlockPath(); ?>
 
 <?php if ($showLabel && $showField): ?>
     <?php if ($options['wrapper'] !== false): ?>

src/views/static.php

@@ -11,7 +11,7 @@
 <?php if ($showField): ?>
     <<?= $options['tag'] ?> <?= $options['elemAttrs'] ?>><?= e($options['value']) ?></<?= $options['tag'] ?>>
 
-    <?php include 'help_block.php' ?>
+    <?php include helpBlockPath(); ?>
 
 <?php endif; ?>