Now handles horizontal forms

GrafiteInc · Aug 21, 2017 · bbc1f10 · bbc1f10
1 parent f4e1872
commit bbc1f10
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 20 deletions.
diff --git a/config/form-maker.php b/config/form-maker.php
@@ -9,10 +9,23 @@
 return [
 
     'form' => [
-        'form-class' => 'form-control',
         'group-class' => 'form-group',
         'error-class' => 'has-error',
         'label-class' => 'control-label',
+
+        /*
+         * --------------------------------------------------------------------------
+         * For Horizontal forms
+         * --------------------------------------------------------------------------
+         *  You may wish to use horizontal forms. If you do, you need to set the
+         *  orientation to horizontal, and ensure that your form has the 'form-horizontal'
+         *  class.
+        */
+
+        'orientation' => 'vertical',
+        'label-column' => 'col-md-2',
+        'input-column' => 'col-md-10',
+        'checkbox-column' => 'col-md-offset-2 col-md-10',
     ],
 
     'inputTypes' => [
@@ -36,6 +49,4 @@
         'radio'             => null,
         'radio-inline'      => null,
     ]
-
 ];
-
diff --git a/src/Services/FormMaker.php b/src/Services/FormMaker.php
@@ -264,8 +264,8 @@ public function getFormErrors()
      */
     private function formBuilder($view, $errors, $field, $column, $input)
     {
-        $formGroupClass = Config::get('form-maker.form.group-class', 'form-group');
-        $formErrorClass = Config::get('form-maker.form.error-class', 'has-error');
+        $formGroupClass = config('form-maker.form.group-class', 'form-group');
+        $formErrorClass = config('form-maker.form.error-class', 'has-error');
 
         $errorHighlight = '';
         $errorMessage = false;
@@ -304,18 +304,32 @@ private function formBuilder($view, $errors, $field, $column, $input)
      */
     public function formContentBuild($field, $column, $input, $errorMessage)
     {
-        $formLabelClass = Config::get('form-maker.form.label-class', 'control-label');
+        $labelColumn = $labelCheckableColumn = '';
+        $singleLineCheckType = false;
+        $formLabelClass = config('form-maker.form.label-class', 'control-label');
+
+        if (config('form-maker.form.orientation') == 'horizontal') {
+            $labelColumn = config('form-maker.form.label-column');
+            $labelCheckableColumn = config('form-maker.form.checkbox-column');
+            $singleLineCheckType = true;
+        }
 
-        $formBuild = '<label class="'.$formLabelClass.'" for="'.ucfirst($column).'">';
+        $formBuild = '<label class="'.$formLabelClass.' '.$labelColumn.'" for="'.ucfirst($column).'">';
         $formBuild .= $this->inputUtilities->cleanString($this->columnLabel($field, $column));
         $formBuild .= '</label>'.$input.$this->errorMessage($errorMessage);
 
         if (isset($field['type'])) {
             if (in_array($field['type'], ['radio', 'checkbox'])) {
                 $formBuild = '<div class="'.$field['type'].'">';
+                if ($singleLineCheckType) {
+                    $formBuild .= '<div class="'.$labelCheckableColumn.'">';
+                }
                 $formBuild .= '<label for="'.ucfirst($column).'" class="'.$formLabelClass.'">'.$input;
                 $formBuild .= $this->inputUtilities->cleanString($this->columnLabel($field, $column));
                 $formBuild .= '</label>'.$this->errorMessage($errorMessage).'</div>';
+                if ($singleLineCheckType) {
+                    $formBuild .= '</div>';
+                }
             } elseif (stristr($field['type'], 'hidden')) {
                 $formBuild = $input;
             }

diff --git a/src/Services/InputMaker.php b/src/Services/InputMaker.php
@@ -40,6 +40,17 @@ class InputMaker
         ],
     ];
 
+    protected $standardMethods = [
+        'makeHidden',
+        'makeText',
+    ];
+
+    protected $selectedMethods = [
+        'makeSelected',
+        'makeCheckbox',
+        'makeRadio',
+    ];
+
     public function __construct()
     {
         $this->htmlGenerator = new HtmlGenerator();
@@ -126,6 +137,7 @@ public function inputStringPreparer($config)
     {
         $inputString = '';
         $beforeAfterCondition = ($this->before($config) > '' || $this->after($config) > '');
+        $method = $this->getGeneratorMethod($config['inputType']);
 
         if ($beforeAfterCondition) {
             $inputString .= '<div class="input-group">';
@@ -139,6 +151,10 @@ public function inputStringPreparer($config)
             $inputString .= '</div>';
         }
 
+        if (config('form-maker.form.orientation') == 'horizontal' && !in_array($method, $this->selectedMethods)) {
+            return '<div class="'.config('form-maker.form.input-column', '').'">'.$inputString.'</div>';
+        }
+
         return $inputString;
     }
 
@@ -276,20 +292,11 @@ private function inputStringGenerator($config)
         $custom = $this->inputCalibrator->getField($config, 'custom');
         $method = $this->getGeneratorMethod($config['inputType']);
 
-        $standardMethods = [
-            'makeHidden',
-            'makeText',
-        ];
-
-        $selectedMethods = [
-            'makeSelected',
-            'makeCheckbox',
-            'makeRadio',
-        ];
-
-        if (in_array($method, $standardMethods)) {
+        if (in_array($method, $this->standardMethods)) {
             $inputString = $this->htmlGenerator->$method($config, $population, $custom);
-        } elseif (in_array($method, $selectedMethods)) {
+        } elseif (in_array($method, $this->selectedMethods)) {
+            // add extra class
+
             $inputString = $this->htmlGenerator->$method($config, $selected, $custom);
         } elseif ($method === 'makeRelationship') {
             $inputString = $this->htmlGenerator->makeRelationship(