Merge branch 'task-2494-config-replacement' into 'master'

Task 2494 config replacement

See merge request !86

public_html/deployment/classes/config-replacement.class.php

@@ -169,7 +169,7 @@ class configreplacement {
             'method'=>'GET',
         ));
         
-        // HACK: minify YAML of the host ... because it is too large for SPYC parser
+        // HACK: minify YAML of the host ... because it is too large for SPYC parser?
         $sPart="---\n";
         $bCopy=false;
         foreach(explode("\n", $aData['body']) as $sLine){
@@ -193,9 +193,16 @@ class configreplacement {
             }
             // echo 'DEBUG: '.($bCopy ? 'COPY':'SKIP').$sLine.'<br>';
         }
-
+        if (strstr($sPart, '|-')){
+            echo 'WARNING: the chars &quot;|-&quot; were found:<br><pre> '
+            .str_replace('|-', '<span class="replace">|-</span>', $sPart)
+            .'</pre><br>';
+        }
         require_once __DIR__.'./../../vendor/spyc/spyc.php';
+        
+        // echo 'DEBUG: <pre>'.print_r(spyc_load($aData['body']), 1).'</pre>';
         $aYaml=spyc_load($sPart);
+        // echo 'DEBUG: <pre>'.print_r($aYaml, 1).'</pre>';
 
         $aReturn=array();
         foreach ($aYaml as $aProject){

public_html/deployment/classes/formgen.class.php

@@ -270,7 +270,7 @@ class formgen {
                 if (array_key_exists("inline", $elementData) && $elementData["inline"]){
                     $sLabelElement = $this->_addLabel($sLabelText, $sId, "col-sm-2");
                     // $sHtmlDefault = $sLabelElement . "\n" . $sFormElement . "\n";
-                    $sHtmlDefault = $sLabelElement . '<div class="col-sm-2">' . "\n" . $sFormElement . '</div>' . "\n";                    
+                    $sHtmlDefault = $sLabelElement . '<div class="col-sm-3">' . "\n" . $sFormElement . '</div>' . "\n";                    
                 } else {
                     $sLabelElement = $this->_addLabel($sLabelText, $sId, "col-sm-2");
                     // $sHtmlDefault = $sLabelElement . '<div class="controls">' . "\n" . $sFormElement . '</div>' . "\n";