Переглянути джерело

Ticket #3385 - for Forms: Custom fields.

AntonLV 5 роки тому
батько
коміт
ace6457114
2 змінених файлів з 8 додано та 5 видалено
  1. 1 1
      template/form_row_custom.html
  2. 7 4
      template/scripts/BxBaseFormView.php

+ 1 - 1
template/form_row_custom.html

@@ -1,6 +1,6 @@
 <div __tr_attrs__>
     <bx_if:show_caption>
-        <div class="bx-form-caption__class_caption__">__caption____required__</div>
+        <div class="bx-form-caption__class_caption__">__caption____required____help__</div>
     </bx_if:show_caption>
     <div class="bx-form-value__class_value__">
         <div class="bx-clear"></div>

+ 7 - 4
template/scripts/BxBaseFormView.php

@@ -801,9 +801,9 @@ BLAH;
     {
         $sCaption = isset($aInput['caption']) ? bx_process_output($aInput['caption'], BX_DATA_HTML) : '';
 
-        $sRequired = !empty($aInput['required']) ? '<span class="bx-form-required">*</span> ' : '';
+        $sRequired = !empty($aInput['required']) ? '<span class="bx-form-required">*</span>' : '';
         
-        $sHelp = !empty($aInput['help']) ? '<a href="javascript:void(0)" onclick="javascript:' . $this->getJsObjectName() . '.showHelp(this, \'' . $aInput['name'] . '\')"><i class="sys-icon question-circle"></i></a> ' : '';
+        $sHelp = !empty($aInput['help']) ? ' <a href="javascript:void(0)" onclick="javascript:' . $this->getJsObjectName() . '.showHelp(this, \'' . $aInput['name'] . '\')"><i class="sys-icon question-circle"></i></a> ' : '';
 
         $sClassAdd = !empty($aInput['error']) ? ' bx-form-error' : '';
         $sInfoIcon = !empty($aInput['info']) ? $this->genInfoIcon($aInput['info']) : '';
@@ -902,7 +902,9 @@ BLAH;
     {
         $sCaption = isset($aInput['caption']) ? bx_process_output($aInput['caption']) : '';
 
-        $sRequired = !empty($aInput['required']) ? '<span class="bx-form-required">*</span> ' : '';
+        $sRequired = !empty($aInput['required']) ? '<span class="bx-form-required">*</span>' : '';
+        
+        $sHelp = !empty($aInput['help']) ? ' <a href="javascript:void(0)" onclick="javascript:' . $this->getJsObjectName() . '.showHelp(this, \'' . $aInput['name'] . '\')"><i class="sys-icon question-circle"></i></a> ' : '';
 
         $sClassAdd = !empty($aInput['error']) ? ' bx-form-error' : '';
         $sInfoIcon = !empty($aInput['info']) ? $this->genInfoIcon($aInput['info']) : '';
@@ -920,7 +922,8 @@ BLAH;
                 'condition' => !empty($sCaption),
                 'content' => array(
                     'caption' => $sCaption,
-                    'required' => $sRequired
+                    'required' => $sRequired,
+                    'help' => $sHelp
                 )
             ),
             'class_value' => $sClassAdd,