Changeset 15972

Timestamp:

02/10/12 03:49:40 (4 months ago)

Author:

Anton Lesnikov

Message:

Forms Builder checklists and updates.

Location:

trunk

Files:

• modules/boonex/english/install/data/langs/en.xml (modified) (3 diffs)
• studio/templates/base/bx_img_with_text.html (added)
• studio/templates/base/css/builder_forms.css (modified) (1 diff)
• studio/templates/base/images/icons/ui-block_header.png (added)
• studio/templates/base/images/icons/ui-button.png (added)
• studio/templates/base/images/icons/ui-captcha.png (added)
• studio/templates/base/images/icons/ui-checkbox.png (added)
• studio/templates/base/images/icons/ui-checkbox_set.png (added)
• studio/templates/base/images/icons/ui-custom.png (added)
• studio/templates/base/images/icons/ui-datepicker.png (added)
• studio/templates/base/images/icons/ui-datetime.png (added)
• studio/templates/base/images/icons/ui-doublerange.png (added)
• studio/templates/base/images/icons/ui-file.png (added)
• studio/templates/base/images/icons/ui-hidden.png (added)
• studio/templates/base/images/icons/ui-image.png (added)
• studio/templates/base/images/icons/ui-input_set.png (added)
• studio/templates/base/images/icons/ui-number.png (added)
• studio/templates/base/images/icons/ui-password.png (added)
• studio/templates/base/images/icons/ui-radio_set.png (added)
• studio/templates/base/images/icons/ui-reset.png (added)
• studio/templates/base/images/icons/ui-select.png (added)
• studio/templates/base/images/icons/ui-select_multiple.png (added)
• studio/templates/base/images/icons/ui-slider.png (added)
• studio/templates/base/images/icons/ui-submit.png (added)
• studio/templates/base/images/icons/ui-switcher.png (added)
• studio/templates/base/images/icons/ui-text.png (added)
• studio/templates/base/images/icons/ui-textarea.png (added)
• studio/templates/base/images/icons/ui-value.png (added)
• studio/templates/base/scripts/BxBaseStudioFormsFields.php (modified) (2 diffs)

trunk/modules/boonex/english/install/data/langs/en.xml

@@ -2281 +2281 @@
     <string name="_adm_form_btn_fields_create"><![CDATA[Add New Field]]></string>
     <string name="_adm_form_txt_forms_title"><![CDATA[Title]]></string>
-    <string name="_adm_form_dsc_forms_title"><![CDATA[You need to enter form title]]></string>
+    <string name="_adm_form_dsc_forms_title"><![CDATA[Name of the form. Displayed in Studio only.]]></string>
     <string name="_adm_form_err_forms_title"><![CDATA[Enter title, more then 3 characters]]></string>
     <string name="_adm_form_txt_forms_action"><![CDATA[Action]]></string>
@@ -2302 +2302 @@
     <string name="_adm_form_err_forms_edit"><![CDATA[Cannot update form]]></string>
     <string name="_adm_form_txt_displays_title"><![CDATA[Title]]></string>
-    <string name="_adm_form_dsc_displays_title"><![CDATA[You need to enter display title]]></string>
+    <string name="_adm_form_dsc_displays_title"><![CDATA[Name of the form display mode. Displayed in Studio only.]]></string>
     <string name="_adm_form_err_displays_title"><![CDATA[Enter title, more then 3 characters]]></string>
     <string name="_adm_form_btn_displays_add"><![CDATA[Add]]></string>
@@ -2356 +2356 @@
     <string name="_adm_form_err_field_name"><![CDATA[Enter name, more then 3 characters]]></string>
     <string name="_adm_form_txt_field_caption"><![CDATA[Title]]></string>
-    <string name="_adm_form_dsc_field_caption"><![CDATA[You need to enter field title]]></string>
+    <string name="_adm_form_dsc_field_caption"><![CDATA[Item name displayed on site.]]></string>
     <string name="_adm_form_err_field_caption"><![CDATA[Enter title, more then 3 characters]]></string>
     <string name="_adm_form_txt_field_value"><![CDATA[Value]]></string>

trunk/studio/templates/base/css/builder_forms.css

@@ -32 +32 @@
 }
 
+/*--- Fields page -> Main Content style ---*/
+div.bx-form-field-type {
+    padding-left: 20px;
+    background-repeat: no-repeat;
+    background-position: 0px center;
+}
+
 /*--- Pre Lists page -> Add/Edit Form block ---*/
 div.bx-form-add-list {}

trunk/studio/templates/base/scripts/BxBaseStudioFormsFields.php

@@ -272 +272 @@
         $oForm->addCssJs();
     }
+
     protected function _getCellSwitcher ($mixedValue, $sKey, $aField, $aRow) {
         if((int)$aRow['editable'] == 0)
@@ -278 +279 @@
         return parent::_getCellSwitcher($mixedValue, $sKey, $aField, $aRow);
     }
+
     protected function _getCellTitle ($mixedValue, $sKey, $aField, $aRow) {
         $mixedValue = $this->_limitMaxLength(_t($aRow['title']), $sKey, $aField, $aRow, $this->_isDisplayPopupOnTextOverflow);
+        return parent::_getCellDefault($mixedValue, $sKey, $aField, $aRow);
+    }
+
+    protected function _getCellType ($mixedValue, $sKey, $aField, $aRow) {
+        $mixedValue = $this->_oTemplate->parseHtmlByName('bx_img_with_text.html', array(
+            'bx_if:class' => array(
+                'condition' => true,
+                'content' => array(
+                    'content' => 'bx-form-field-type'
+                )
+            ),
+            'icon' => $this->_oTemplate->getIconUrl('ui-' . $aRow['type'] . '.png'),
+            'content' => $mixedValue
+        ));
+
         return parent::_getCellDefault($mixedValue, $sKey, $aField, $aRow);
     }