Ticket #2987

studio/template/form_input_wrapper.html

@@ -0,0 +1 @@
+<div class="bx-form-input-wrapper bx-form-input-wrapper-__type____class__" __attrs__>__content__</div>

studio/template/form_row_standard.html

@@ -0,0 +1,16 @@
+<div __tr_attrs__>
+    <div class="bx-form-element">
+        <bx_if:show_one_line>
+            <div class="bx-form-value bx-clearfix__class_value__">__value__</div>
+            <bx_if:show_caption>
+                <div class="bx-form-caption__class_caption__">__caption____required__</div>
+            </bx_if:show_caption>
+        </bx_if:show_one_line>
+        <bx_if:show_lined>
+            <bx_if:show_caption>
+                <div class="bx-form-caption__class_caption__">__caption____required__</div>
+            </bx_if:show_caption>
+            <div class="bx-form-value bx-clearfix__class_value__">__value__</div>
+        </bx_if:show_lined>
+    </div>__info____error__
+</div>

studio/template/form_view_row.html

@@ -0,0 +1,4 @@
+<div class="bx-form-row-view-wrapper bx-form-row-view-wrapper-__type__ bx-def-padding-sec-top">
+    <div class="bx-form-row-view-caption">__caption__:</div>
+    <div class="bx-form-row-view-value">__value__</div>
+</div>

template/form_input_wrapper.html

@@ -0,0 +1 @@
+<div class="bx-form-input-wrapper bx-form-input-wrapper-__type____class__" __attrs__>__content__</div>

template/form_row_standard.html

@@ -0,0 +1,16 @@
+<div __tr_attrs__>
+    <div class="bx-form-element">
+        <bx_if:show_one_line>
+            <div class="bx-form-value bx-clearfix__class_value__">__value__</div>
+            <bx_if:show_caption>
+                <div class="bx-form-caption__class_caption__">__caption____required__</div>
+            </bx_if:show_caption>
+        </bx_if:show_one_line>
+        <bx_if:show_lined>
+            <bx_if:show_caption>
+                <div class="bx-form-caption__class_caption__">__caption____required__</div>
+            </bx_if:show_caption>
+            <div class="bx-form-value bx-clearfix__class_value__">__value__</div>
+        </bx_if:show_lined>
+    </div>__info____error__
+</div>

template/form_view_row.html

@@ -0,0 +1,4 @@
+<div class="bx-form-row-view-wrapper bx-form-row-view-wrapper-__type__ bx-def-padding-sec-top">
+    <div class="bx-form-row-view-caption">__caption__:</div>
+    <div class="bx-form-row-view-value">__value__</div>
+</div>

template/scripts/BxBaseFormView.php

@@ -626,14 +626,11 @@ BLAH;
         if (null === $sValue)
             return '';
 
-        $sCaption = isset($aInput['caption']) ? bx_process_output($aInput['caption']) : '';
-
-        return <<<EOS
-            <div class="bx-form-row-view-wrapper bx-form-row-view-wrapper-{$aInput['type']} bx-def-padding-sec-top">
-                <div class="bx-form-row-view-caption">{$sCaption}:</div>
-                <div class="bx-form-row-view-value">{$sValue}</div>
-            </div>
-EOS;
+        return $this->oTemplate->parseHtmlByName('form_view_row.html', array(
+            'type' => $aInput['type'], 
+            'caption' => isset($aInput['caption']) ? bx_process_output($aInput['caption']) : '',
+            'value' => $sValue
+        ));
     }
 
     /**
@@ -804,28 +801,42 @@ EOS;
         $sInput = $this->genInput($aInput);
         if(isset($aInput['error_updated']) && $aInput['error_updated'] === true)
             $sErrorIcon = $this->genErrorIcon(empty($aInput['error']) ? '' : $aInput['error']);
+        if(empty($sErrorIcon)) 
+            $sErrorIcon = '';
 
-        $sCaptionCode = $sCaption ? '<div class="bx-form-caption' . $sClassOneLineCaption . '">' . $sCaption . $sRequired . '</div>' : '';
-        $sInputCode = $this->genWrapperInput($aInput, $sInput);
-
-        if (empty($sInfoIcon)) $sInfoIcon = '';
-        if (empty($sInputCode)) $sInputCode = '';
-        if (empty($sErrorIcon)) $sErrorIcon = '';
-
-        $sValueCode = '<div class="bx-form-value bx-clearfix' . $sClassAdd . $sClassOneLineValue . '">' . $sInputCode . '</div>';
-
-        if ($isOneLine)
-            $sCode = $sValueCode . $sCaptionCode;
-        else
-            $sCode = $sCaptionCode . $sValueCode;
+        $aTmplVarsRow = array(
+            'bx_if:show_caption' => array(
+                'condition' => !empty($sCaption),
+                'content' => array(
+                    'class_caption' => $sClassOneLineCaption,
+                    'caption' => $sCaption,
+                    'required' => $sRequired
+                )
+            ),
+            'class_value' => $sClassAdd . $sClassOneLineValue,
+            'value' => $this->genWrapperInput($aInput, $sInput),
+            'info' => $sInfoIcon,
+            'error' => $sErrorIcon,
+        );
 
-        return '<div ' . $sTrAttrs . '><div class="bx-form-element">' . $sCode . '</div>' . $sInfoIcon . $sErrorIcon . '</div>';
+        return $this->oTemplate->parseHtmlByName('form_row_standard.html', array(
+            'tr_attrs' => $sTrAttrs,
+            'bx_if:show_one_line' => array(
+                'condition' => $isOneLine,
+                'content' => $aTmplVarsRow
+            ),
+            'bx_if:show_lined' => array(
+                'condition' => !$isOneLine,
+                'content' => $aTmplVarsRow
+            ),
+            'info' => $sInfoIcon,
+            'error' => $sErrorIcon
+        ));
     }
 
-
     function genWrapperInput($aInput, $sContent)
     {
-        $sClass = "bx-form-input-wrapper bx-form-input-wrapper-" . $aInput['type'];
+        $sClass = "";
         if(isset($aInput['html']) && $aInput['html'] && $this->isHtmlEditor($aInput['html'], $aInput))
             $sClass .= ' bx-form-input-wrapper-html';
 
@@ -840,7 +851,12 @@ EOS;
             $sAttrs = bx_convert_array2attrs($aInput['attrs_wrapper']);
         }
 
-        return "<div class=\"$sClass\" $sAttrs>$sContent</div>";
+        return $this->oTemplate->parseHtmlByName('form_input_wrapper.html', array(
+            'type' => $aInput['type'],
+            'class' => $sClass,
+            'attrs' => $sAttrs,
+            'content' => $sContent
+        ));
     }
 
     /**