Changeset 15546 for trunk/templates

Timestamp:

10/06/11 02:16:37 (8 months ago)

Author:

Alexander Trofimov

Message:

Forms design and fixes

Location:

trunk/templates/base

Files:

• css/forms.css (modified) (6 diffs)
• images/icons/toggle_down.png (modified) (previous)
• scripts/BxBaseFormView.php (modified) (29 diffs)
• uploader_button_html5.html (modified) (1 diff)
• uploader_button_simple.html (modified) (1 diff)
• uploader_nested_form_wrapper.html (modified) (1 diff)

trunk/templates/base/css/forms.css

@@ -1 +1 @@
 
+.bx-form-advanced-wrapper > .bx-form-section-header:first-child {
+    margin-top:0;
+}
+
+.bx-form-advanced-wrapper > .bx-form-section:first-child {
+    border-top:none;
+    padding-top:0;
+}
 
 .bx-form-section-header {
-    font-size:16px;
-    font-weight:bold;
+    position:relative;
     text-transform:uppercase;
+}
+
+.bx-form-section {
+    border-width:2px;
 }
 
@@ -12 +23 @@
 
 .bx-form-caption {
-    font-size:16px;
     font-weight:bold;
     margin-bottom:5px;
@@ -27 +37 @@
 
 .bx-form-info {
-    font-style:italic;
+
 }
 
 /* form inputs */
 
+.bx-form-input-wrapper-doublerange,
+.bx-form-input-select_multiple,
+.bx-form-input-select,
+.bx-form-input-radio_set,
+.bx-form-input-checkbox_set,
 .bx-form-input-email,
 .bx-form-input-number,
@@ -86 +101 @@
 }
 
+.bx-form-input-select_multiple,
+.bx-form-input-radio_set,
+.bx-form-input-checkbox_set {
+    height:auto;
+}
+
 .bx-form-input-textarea {
     padding:8px;
@@ -94 +115 @@
 
 .bx-form-input-datepicker {
-    width:80px;
+    width:110px;
 }
 
@@ -117 +138 @@
 }
 
+/* section toggler */
+
+.bx-form-section-toggle {
+    position:absolute;
+    top:10px;
+    right:0;
+}
+
+.bx-form-section-toggle .bx-btn u {
+    background-image:url(../images/icons/toggle_down.png);
+
+    -moz-transform: rotate(-180deg);
+    -webkit-transform: rotate(-180deg);
+    -ms-transform: rotate(-180deg);
+    -o-transform: rotate(-180deg);
+
+    -webkit-transition: all 0.5s ease;
+    -moz-transition: all 0.5s ease;
+    -ms-transition: all 0.5s ease;
+    -o-transition: all 0.5s ease;
+}
+
+.bx-form-section-toggle .bx-btn u.collapsed {
+
+    -moz-transform: rotate(0deg);
+    -webkit-transform: rotate(0deg);
+    -ms-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+}

trunk/templates/base/scripts/BxBaseFormView.php

@@ -11 +11 @@
 class BxBaseFormView extends BxDolForm {
 
+    protected static $_isToggleJsAdded = false;
+
+    protected static $_isCssJsAdded = false;
+
     var $bEnableErrorIcon = true;
 
@@ -42 +46 @@
      */
     var $_bHtmlEditorAdded = false;
+
+    /**
+     * Default divider for several inputs
+     * @var string
+     */
+    var $_sDivider = '<span class="bx-def-margin-left"></span>';
+
+    /**
+     * Alternative divider for several inputs
+     * @var string
+     */
+    var $_sDividerAlt = '<br />';
 
     /**
@@ -130 +146 @@
                 )
             );
+        }        
+
+        // check if we need to generate open section clause
+        $sOpenSection = '';
+        foreach ($this->aInputs as $aInput) {
+            if (isset($aInput['type']) && 'hidden' == $aInput['type'])
+                continue;
+            if (isset($aInput['type']) && 'block_header' != $aInput['type'])
+                $sOpenSection = $this->getOpenSection();
+            break;
         }
 
@@ -136 +162 @@
         foreach ($this->aInputs as $aInput)
             $sCont .= $this->genRow($aInput);
-
-        $sOpenSection  = $this->getOpenSection();
+        
         $sCloseSection = $this->getCloseSection();
 
@@ -150 +175 @@
      */
     function genRow(&$aInput) {
+
+        if (!isset($aInput['type']))
+            $aInput['type'] = false;
 
         switch ($aInput['type']) {
@@ -215 +243 @@
         }
 
-        $sInput     = $this->genInput($aInput);
+        $sInput = $this->genInput($aInput);
+
+        $sCaptionCode = '';
+        if ($sCaption)
+            $sCaptionCode = '<div class="bx-form-caption">' . $sCaption . $sRequired . '</div>';
+        else
+            $sInput .= $sRequired; // TODO: maybe some other way to show required item
+
         $sInputCode = $this->genWrapperInput($aInput, $sInput);
 
@@ -227 +262 @@
         $sCode = <<<BLAH
                 <div $sTrAttrs>
-                    <div class="bx-form-caption">
-                        $sCaption
-                        $sRequired
-                    </div>
-
+                    $sCaptionCode
                     <div class="bx-form-value$sClassAdd">
                         <div class="bx-clear"></div>
@@ -284 +315 @@
         $sTrAttrs = $this->convertArray2Attrs(empty($aInput['tr_attrs']) ? array() : $aInput['tr_attrs']);
 
+        $sCaptionCode = '';
+        if ($sCaption)
+            $sCaptionCode = '<div class="bx-form-caption">' . $sCaption . $sRequired . '</div>';
+
         $sCode = <<<BLAH
                 <div $sTrAttrs>
-                    <div class="bx-form-caption">
-                        $sCaption
-                        $sRequired
-                    </div>
-
+                    $sCaptionCode
                     <div class="bx-form-value$sClassAdd">
                         <div class="bx-clear"></div>
@@ -312 +343 @@
         $aAttrs = empty($aInput['attrs']) ? '' : $aInput['attrs'];
         $aNextTbodyAdd = false; // need to have some default
+
+        if (!$aInput['caption']) {
+            $sCode = $this->getCloseSection();
+            $aAttrs['class'] = "bx-form-section-divider bx-def-margin-top " . (isset($aAttrs['class']) ? ' ' . $aAttrs['class'] : '');
+            $sAttrs = $this->convertArray2Attrs($aAttrs);
+            $sCode .=  "<div $sAttrs></div>";
+            $sCode .= $this->getOpenSection(false);
+            return $sCode;
+        }
 
         if (isset($aInput['collapsable']) and $aInput['collapsable']) {
@@ -327 +367 @@
         }
 
-        $aAttrs['class'] = "bx-form-section-header bx-def-margin-sec" .
+        $aAttrs['class'] = "bx-form-section-header bx-def-margin-top bx-def-padding-sec-top bx-def-padding-sec-bottom bx-def-font-grayed bx-def-font-h3" .
             (isset($aAttrs['class']) ? ' ' . $aAttrs['class'] : '') .
             (isset($sClassAdd) ? ' ' . $sClassAdd  : '');
@@ -336 +376 @@
 
         $sCode .= $this->getCloseSection();
-
-        $sCode .=  "<div $sAttrs>" . bx_process_output($aInput['caption']) . " <a href=\"javascript:void(0)\" onclick=\"javascript:$(this).parent().next().toggle()\">Toggle</a></div>\n";
+        
+        $sCode .=  "<div $sAttrs>" . bx_process_output($aInput['caption']);
+        if (isset($aInput['collapsable']) and $aInput['collapsable'])
+            $sCode .=  $this->genToggleElement($aInput);
+        $sCode .=  "</div>\n";
 
         $sCode .= $this->getOpenSection($aNextTbodyAdd);
@@ -358 +401 @@
      * @return string Output HTML Code
      */
-    function genInput(&$aInput) {
-
-        $sDivider = isset($aInput['dv']) ? $aInput['dv'] : ' ';
+    function genInput(&$aInput) {        
 
         switch ($aInput['type']) {
@@ -411 +452 @@
             case 'input_set': // numeric array of inputs
                 $sInput = '';
-
+                $sDivider = isset($aInput['dv']) ? $aInput['dv'] : ' ';
                 foreach ($aInput as $iKey => $aSubInput) {
                     if (!is_int($iKey) or !$aSubInput)
@@ -529 +570 @@
         $aAttrs['type'] = $aInput['type'];
         if (isset($aInput['name'])) $aAttrs['name'] = $aInput['name'];
-        if (isset($aInput['value'])) $aAttrs['value'] = $aInput['value'];
 
         $sAttrs = $this->convertArray2Attrs($aAttrs);
@@ -605 +645 @@
 
     /**
+     * Generate Select Box Element
+     *
+     * @param array $aInput
+     * @return string
+     */
+    function genInputSelectBox(&$aInput, $sInfo = '', $sError = '') {
+
+        $aNewInput = $aInput;
+
+        $aNewInput['type'] = 'select';
+        $aNewInput['name'] .= '[]';
+
+        $sInput = $this->genInput($aNewInput);
+        return <<<BLAH
+                <div class="bx-form-input-wrapper input-wrapper-{$aInput['type']}">
+                   $sInput
+                </div>
+                $sInfo
+                $sError
+BLAH;
+
+    }
+
+    /**
+     * Generate Select Box Element
+     *
+     * @param array $aInput
+     * @return string
+     */
+    function genInputFiles(&$aInput, $sInfo = '', $sError = '') {
+
+        $sUniqId = genRndPwd (8, false);
+        $sUploaders = '';
+        $oUploader = null;
+        foreach ($aInput['uploaders'] as $sUploaderObject) {
+            bx_import('BxDolUploader');
+            $oUploader = BxDolUploader::getObjectInstance($sUploaderObject, $aInput['storage_object'], $sUniqId);
+            if (!$oUploader)
+                continue;
+
+            $sGhostTemplate = false;
+            if (isset($aInput['ghost_template']) && is_object($aInput['ghost_template'])) { // form is not submitted and ghost template is BxDolFormNested object
+
+                $oFormNested = $aInput['ghost_template'];
+                if ($oFormNested instanceof BxDolFormNested)
+                    $sGhostTemplate = $oFormNested->getCode();
+
+            } elseif (isset($aInput['ghost_template']) && is_array($aInput['ghost_template']) && isset($aInput['ghost_template']['inputs'])) { // form is not submitted and ghost template is form array
+
+                bx_import('BxDolFormNested');
+                $oFormNested = new BxDolFormNested($aInput['name'], $aInput['ghost_template'], $this->aParams['db']['submit_name'], $this->oTemplate);
+                $sGhostTemplate = $oFormNested->getCode();
+
+            } elseif (isset($aInput['ghost_template']) && is_array($aInput['ghost_template']) && $aInput['ghost_template']) { // form is submitted and ghost template is array of BxDolFormNested objects
+
+                bx_import('BxDolFormNested');
+                $sGhostTemplate = array ();
+                foreach ($aInput['ghost_template'] as $iFileId => $oFormNested)
+                    if (is_object($oFormNested) && $oFormNested instanceof BxDolFormNested)
+                        $sGhostTemplate[$iFileId] = $oFormNested->getCode();
+
+            } elseif (isset($aInput['ghost_template']) && is_string($aInput['ghost_template'])) { // ghost template is just string template, without nested form
+
+                $sGhostTemplate = $aInput['ghost_template'];
+
+            }
+            $aParams = array();
+            if (isset($aInput['images_transcoder']) && $aInput['images_transcoder'])
+                $aParams = array('images_transcoder' => bx_js_string($aInput['images_transcoder']));
+            $sUploaders .= $oUploader->getUploaderButton($sGhostTemplate, isset($aInput['multiple']) ? $aInput['multiple'] : true, $aParams);
+        }                
+
+        return $this->oTemplate->parseHtmlByName('form_field_uploader.html', array(
+            'uploaders_buttons' => $sUploaders,
+            'info' => $sInfo,
+            'id_container_errors' => $oUploader->getIdContainerErrors(),
+            'id_container_result' => $oUploader->getIdContainerResult(),
+            'uploader_instance_name' => $oUploader->getNameJsInstanceUploader(),
+            'is_init_ghosts' => isset($aInput['init_ghosts']) && !$aInput['init_ghosts'] ? 0 : 1,
+        ));
+    }
+
+    /**
      * Generate Select Element
      *
@@ -611 +734 @@
      */
     function genInputSelect(&$aInput) {
+        $sCurValue = isset($aInput['value']) ? $aInput['value'] : '';
+        return $this->_genInputSelect(&$aInput, false, $sCurValue, '_isSelected');
+    }
+
+    /**
+     * Generate Multiple Select Element
+     *
+     * @param array $aInput
+     * @return string
+     */
+    function genInputSelectMultiple(&$aInput) {
+        $aCurValues = array();
+        if (isset($aInput['value']) && $aInput['value'])
+            $aCurValues = is_array($aInput['value']) ? $aInput['value'] : array($aInput['value']);
+        return $this->_genInputSelect(&$aInput, true, $aCurValues, '_isSelectedMultiple');
+    }
+
+    /**
+     * Generate Checkbox Set Element
+     *
+     * @param array $aInput
+     * @return string
+     */
+    function genInputCheckboxSet(&$aInput) {
+        $aCurValues = array();
+        if (isset($aInput['value']) && $aInput['value'])
+            $aCurValues = is_array($aInput['value']) ? $aInput['value'] : array($aInput['value']);
+        return $this->_genInputsSet($aInput, 'checkbox', $aCurValues, '_isSelectedMultiple', '[]');
+    }
+    /**
+     * Generate Radiobuttons Set Element
+     *
+     * @param array $aInput
+     * @return string
+     */
+    function genInputRadioSet(&$aInput) {
+        $sCurValue = isset($aInput['value']) ? $aInput['value'] : '';
+        return $this->_genInputsSet($aInput, 'radio', $sCurValue, '_isSelected');
+    }
+
+    function _isSelected ($sValue, $sCurValue) {
+        return ((string)$sValue === (string)$sCurValue);
+    }
+
+    function _isSelectedMultiple ($sValue, $aCurValues) {
+        return in_array($sValue, $aCurValues);
+    }
+
+    function _genInputSelect(&$aInput, $isMultiple, $mixedCurrentVal, $sIsSelectedFunc) {
 
         $aAttrs = empty($aInput['attrs']) ? array() : $aInput['attrs'];
@@ -618 +790 @@
 
         $aAttrs['name'] = $aInput['name'];
+        if ($isMultiple) {
+            $aAttrs['name'] .= '[]';
+            $aAttrs['multiple'] = 'multiple';
+        }
 
         // for inputs with labels generate id
@@ -626 +802 @@
 
         // generate options
-        $sCurValue = $aInput['value'];
         $sOptions = '';
-
-
         if (isset($aInput['values']) and is_array($aInput['values'])) {
             foreach ($aInput['values'] as $sValue => $sTitle) {
@@ -639 +812 @@
                 $sTitleC = bx_process_output($sTitle);
 
-                $sSelected = ((string)$sValue === (string)$sCurValue) ? 'selected="selected"' : '';
+                $sSelected = $this->$sIsSelectedFunc($sValue, $mixedCurrentVal) ? 'selected="selected"' : '';
 
                 $sOptions .= <<<BLAH
@@ -658 +831 @@
     }
 
-    /**
-     * Generate Select Box Element
-     *
-     * @param array $aInput
-     * @return string
-     */
-    function genInputSelectBox(&$aInput, $sInfo = '', $sError = '') {
-
-        $aNewInput = $aInput;
-
-        $aNewInput['type'] = 'select';
-        $aNewInput['name'] .= '[]';
-
-        $sInput = $this->genInput($aNewInput);
-        return <<<BLAH
-                <div class="bx-form-input-wrapper input-wrapper-{$aInput['type']}">
-                   $sInput
-                </div>
-                $sInfo
-                $sError
-BLAH;
-
-    }
-
-    /**
-     * Generate Select Box Element
-     *
-     * @param array $aInput
-     * @return string
-     */
-    function genInputFiles(&$aInput, $sInfo = '', $sError = '') {
-
-        $sUniqId = genRndPwd (8, false);
-        $sUploaders = '';
-        $oUploader = null;
-        foreach ($aInput['uploaders'] as $sUploaderObject) {
-            bx_import('BxDolUploader');
-            $oUploader = BxDolUploader::getObjectInstance($sUploaderObject, $aInput['storage_object'], $sUniqId);
-            if (!$oUploader)
-                continue;
-
-            $sGhostTemplate = false;
-            if (isset($aInput['ghost_template']) && is_object($aInput['ghost_template'])) { // form is not submitted and ghost template is BxDolFormNested object
-
-                $oFormNested = $aInput['ghost_template'];
-                if ($oFormNested instanceof BxDolFormNested)
-                    $sGhostTemplate = $oFormNested->getCode();
-
-            } elseif (isset($aInput['ghost_template']) && is_array($aInput['ghost_template']) && isset($aInput['ghost_template']['inputs'])) { // form is not submitted and ghost template is form array
-
-                bx_import('BxDolFormNested');
-                $oFormNested = new BxDolFormNested($aInput['name'], $aInput['ghost_template'], $this->aParams['db']['submit_name'], $this->oTemplate);
-                $sGhostTemplate = $oFormNested->getCode();
-
-            } elseif (isset($aInput['ghost_template']) && is_array($aInput['ghost_template']) && $aInput['ghost_template']) { // form is submitted and ghost template is array of BxDolFormNested objects
-
-                bx_import('BxDolFormNested');
-                $sGhostTemplate = array ();
-                foreach ($aInput['ghost_template'] as $iFileId => $oFormNested)
-                    if (is_object($oFormNested) && $oFormNested instanceof BxDolFormNested)
-                        $sGhostTemplate[$iFileId] = $oFormNested->getCode();
-
-            } elseif (isset($aInput['ghost_template']) && is_string($aInput['ghost_template'])) { // ghost template is just string template, without nested form
-
-                $sGhostTemplate = $aInput['ghost_template'];
-
-            }
-            $aParams = array();
-            if (isset($aInput['images_transcoder']) && $aInput['images_transcoder'])
-                $aParams = array('images_transcoder' => bx_js_string($aInput['images_transcoder']));
-            $sUploaders .= $oUploader->getUploaderButton($sGhostTemplate, isset($aInput['multiple']) ? $aInput['multiple'] : true, $aParams);
-        }                
-
-        return $this->oTemplate->parseHtmlByName('form_field_uploader.html', array(
-            'uploaders_buttons' => $sUploaders,
-            'info' => $sInfo,
-            'id_container_errors' => $oUploader->getIdContainerErrors(),
-            'id_container_result' => $oUploader->getIdContainerResult(),
-            'uploader_instance_name' => $oUploader->getNameJsInstanceUploader(),
-            'is_init_ghosts' => isset($aInput['init_ghosts']) && !$aInput['init_ghosts'] ? 0 : 1,
-        ));
-    }
-
-    /**
-     * Generate Multiple Select Element
-     *
-     * @param array $aInput
-     * @return string
-     */
-    function genInputSelectMultiple(&$aInput) {
-        $aAttrs = $aInput['attrs'];
+    function _genInputsSet(&$aInput, $sType, $mixedCurrentVal, $sIsCheckedFunc, $sNameAppend = '') {
+        $aAttrs = empty($aInput['attrs']) ? array() : $aInput['attrs'];
 
         // add default className to attributes
         $aAttrs['class'] = "bx-form-input-{$aInput['type']}" . (isset($aAttrs['class']) ? (' ' . $aAttrs['class']) : '');
 
-        $aAttrs['name']     = $aInput['name'] . '[]';
-        $aAttrs['multiple'] = 'multiple';
+        $aAttrs['name']  = $aInput['name'];
 
         // for inputs with labels generate id
@@ -763 +846 @@
 
         // generate options
-        $aCurValues = $aInput['value'] ? (is_array($aInput['value']) ? $aInput['value'] : array($aInput['value'])) : array();
+        $sDivider = isset($aInput['dv']) ? $aInput['dv'] : $this->_sDivider;
+
         $sOptions = '';
 
         if (isset($aInput['values']) and is_array($aInput['values'])) {
-            foreach ($aInput['values'] as $sValue => $sTitle) {
-                $sValueC = bx_html_attribute($sValue);
-                $sTitleC = bx_process_output($sTitle);
-
-                $sSelected = in_array($sValue, $aCurValues) ? 'selected="selected"' : '';
-
-                $sOptions .= <<<BLAH
-                   <option value="$sValueC" $sSelected>$sTitleC</option>
-BLAH;
-
-            }
-        }
-
-        // generate element
-        $sCode = <<<BLAH
-            <select $sAttrs>
-                $sOptions
-            </select>
-BLAH;
-
-        return $sCode;
-    }
-
-    /**
-     * Generate Checkbox Set Element
-     *
-     * @param array $aInput
-     * @return string
-     */
-    function genInputCheckboxSet(&$aInput) {
-        $aAttrs = empty($aInput['attrs']) ? array() : $aInput['attrs'];
-
-        // add default className to attributes
-        $aAttrs['class'] = "bx-form-input-{$aInput['type']}" . (isset($aAttrs['class']) ? (' ' . $aAttrs['class']) : '');
-
-        $aAttrs['name']  = $aInput['name'];
-
-        // for inputs with labels generate id
-        if (isset($aInput['label']))
-            $aAttrs['id'] = $this->getInputId($aInput);
-
-        $sAttrs = $this->convertArray2Attrs($aAttrs);
-
-        // generate options
-        $sDivider = isset($aInput['dv']) ? $aInput['dv'] : ' ';
-        $aCurValues = $aInput['value'] ? (is_array($aInput['value']) ? $aInput['value'] : array($aInput['value'])) : array();
-
-        $sOptions = '';
-
-        if (isset($aInput['values']) and is_array($aInput['values'])) {
-            if (count($aInput['values']) > 3 && $sDivider == ' ')
-                $sDivider = '<br />';
+            if (count($aInput['values']) > 3 && $sDivider == $this->_sDivider)
+                $sDivider = $this->_sDividerAlt;
             // generate complex input using simple standard inputs
             foreach ($aInput['values'] as $sValue => $sLabel) {
                 // create new simple input
                 $aNewInput = array(
-                    'type' => 'checkbox',
-                    'name' => $aInput['name'] . '[]',
-                    'value' => $sValue,
-                    'checked' => in_array($sValue, $aCurValues),
-                    'label' => $sLabel,
+                    'type'    => $sType,
+                    'name'    => $aInput['name'] . $sNameAppend,
+                    'value'   => $sValue,
+                    'checked' => $this->$sIsCheckedFunc($sValue, $mixedCurrentVal),
+                    'label'   => $sLabel,
                 );
 
@@ -846 +880 @@
         return $sCode;
     }
-    /**
-     * Generate Radiobuttons Set Element
-     *
-     * @param array $aInput
-     * @return string
-     */
-    function genInputRadioSet(&$aInput) {
+
+    function genInputCaptcha(&$aInput) {
+
         $aAttrs = empty($aInput['attrs']) ? array() : $aInput['attrs'];
 
@@ -858 +888 @@
         $aAttrs['class'] = "bx-form-input-{$aInput['type']}" . (isset($aAttrs['class']) ? (' ' . $aAttrs['class']) : '');
 
-        $aAttrs['name']  = $aInput['name'];
+        //$aAttrs['name']  = $aInput['name'];
 
         // for inputs with labels generate id
@@ -866 +896 @@
         $sAttrs = $this->convertArray2Attrs($aAttrs);
 
-        // generate options
-        $sDivider = isset($aInput['dv']) ? $aInput['dv'] : ' ';
-        $sCurValue = $aInput['value'];
-
-        $sOptions = '';
-
-        if (isset($aInput['values']) and is_array($aInput['values'])) {
-            if (count($aInput['values']) > 3 && $sDivider == ' ')
-                $sDivider = '<br />';
-            // generate complex input using simple standard inputs
-            foreach ($aInput['values'] as $sValue => $sLabel) {
-                // create new simple input
-                $aNewInput = array(
-                    'type'    => 'radio',
-                    'name'    => $aInput['name'],
-                    'value'   => $sValue,
-                    'checked' => ((string)$sValue === (string)$sCurValue),
-                    'label'   => $sLabel,
-                );
-
-                $sNewInput  = $this->genInput($aNewInput);
-
-                // attach new input to complex
-                $sOptions .= ($sNewInput . $sDivider);
-            }
-        }
-
-        // generate element
-        $sCode = <<<BLAH
-            <div $sAttrs>
-                $sOptions
-            </div>
-BLAH;
-
-        return $sCode;
-    }
-
-    function genInputCaptcha(&$aInput) {
-
-        $aAttrs = empty($aInput['attrs']) ? array() : $aInput['attrs'];
-
-        // add default className to attributes
-        $aAttrs['class'] = "bx-form-input-{$aInput['type']}" . (isset($aAttrs['class']) ? (' ' . $aAttrs['class']) : '');
-
-        //$aAttrs['name']  = $aInput['name'];
-
-        // for inputs with labels generate id
-        if (isset($aInput['label']))
-            $aAttrs['id'] = $this->getInputId($aInput);
-
-        $sAttrs = $this->convertArray2Attrs($aAttrs);
-
         $sSimgUrl = BX_DOL_URL_ROOT . 'simg/simg.php';
-        $sDivider = isset($aInput['dv']) ? $aInput['dv'] : '<br />';
+        $sDivider = isset($aInput['dv']) ? $aInput['dv'] : $this->_sDividerAlt;
 
         $aTextInput = array(
@@ -961 +939 @@
      * Convert array to attributes string
      *
-     * <code>
+     * @code
      * $a = array('name' => 'test', 'value' => 5);
      * $s = $this->convertArray2Attrs($a);
      * echo $s;
-     * </code>
+     * @endcode
      *
      * Output:
@@ -991 +969 @@
     }
 
+    function genToggleElement($aInput) {
+
+        $sJs = '';
+        if (!self::$_isToggleJsAdded) {
+            $sJs = "\n<script>
+                function bx_form_section_toggle(e) {
+                    var eSection = $(e).parent().parent().next();                
+                    if ('none' == eSection.css('display')) {
+                        $(e).find('u').removeClass('collapsed');
+                        eSection.slideDown();
+                    } else {
+                        $(e).find('u').addClass('collapsed');
+                        eSection.slideUp();
+                    }
+                }
+            </script>\n";
+            self::$_isToggleJsAdded = true;
+        }
+
+        $sClass = '';
+        if (isset($aInput['collapsed']) and $aInput['collapsed'])
+            $sClass = 'collapsed';
+
+        return $sJs . '<div class="bx-form-section-toggle"><a class="bx-btn bx-btn-small bx-btn-symbol-small" href="javascript:void(0)" onclick="bx_form_section_toggle(this)"><u class="' . $sClass . '"></u></a></div>';
+    }
+
     function genInfoIcon($sInfo) {
-        return '<div class="bx-form-info">' . bx_process_output($sInfo) . '</div>';
+        return '<div class="bx-form-info bx-def-font-grayed bx-def-font-small">' . bx_process_output($sInfo) . '</div>';
     }
 
@@ -1009 +1013 @@
 
             if ($aAttrs and is_array($aAttrs)) {
-                $aAttrs['class'] = "bx-form-section bx-def-padding bx-def-color-bg-sec" . (isset($aAttrs['class']) ? (' ' . $aAttrs['class']) : '');
+                $aAttrs['class'] = "bx-form-section bx-def-padding-top bx-def-border-top" . (isset($aAttrs['class']) ? (' ' . $aAttrs['class']) : '');
                 $sAttrs = $this->convertArray2Attrs($aAttrs);
             } else {
-                $sAttrs = ' class="bx-form-section bx-def-padding bx-def-color-bg-sec" ';
+                $sAttrs = ' class="bx-form-section bx-def-padding-top bx-def-border-top" ';
             }
 
@@ -1040 +1044 @@
     function addCssJs () {
 
-        if (isset($GLOBALS['glBxFormIsCssJsAdded']) && $GLOBALS['glBxFormIsCssJsAdded'])
+        if (self::$_isCssJsAdded)
             return;
 
@@ -1074 +1078 @@
         $this->oTemplate->addCss($aCss);
 
-        $GLOBALS['glBxFormIsCssJsAdded'] = true;
+        self::$_isCssJsAdded = true;
     }
 }

trunk/templates/base/uploader_button_html5.html

@@ -1 @@
-    <a href="javascript:void(0);" onclick="__uploader_instance_name__.showUploaderForm();" class="bx-btn bx-def-margin-sec-left"><bx_text:_sys_uploader_html5_button_name /></a>
+    <a href="javascript:void(0);" onclick="__uploader_instance_name__.showUploaderForm();" class="bx-btn bx-btn-small bx-def-margin-sec-left"><bx_text:_sys_uploader_html5_button_name /></a>
     <script>
         $(document).ready(function(){

trunk/templates/base/uploader_button_simple.html

@@ -1 @@
-    <a href="javascript:void(0);" onclick="__uploader_instance_name__.showUploaderForm();" class="bx-btn bx-def-margin-sec-left"><bx_text:_sys_uploader_simple_button_name /></a>
+    <a href="javascript:void(0);" onclick="__uploader_instance_name__.showUploaderForm();" class="bx-btn bx-btn-small bx-def-margin-sec-left"><bx_text:_sys_uploader_simple_button_name /></a>
     <script>
         $(document).ready(function(){

trunk/templates/base/uploader_nested_form_wrapper.html

@@ -1 @@
-<div id="bx-uploader-file-{file_id}" class="bx-uploader-ghost bx-def-border-bottom bx-def-padding-bottom">
+<div id="bx-uploader-file-{file_id}" class="bx-uploader-ghost">
     <div class="bx-uploader-ghost-preview bx-def-padding-right bx-def-padding-top">
         <img src="{file_icon}" class="bx-def-border" />
     </div>
-    <div class="bx-uploader-ghost-form">
-        <div class="bx-uploader-ghost-form-filename bx-def-padding-left bx-def-padding-top bx-def-font-grayed">{file_name}</div>
+    <div class="bx-uploader-ghost-form ">
+        <div class="bx-uploader-ghost-form-filename bx-def-padding-top bx-def-padding-bottom bx-def-font-grayed">{file_name}</div>
         __nested_form__
-        <div class="bx-uploader-ghost-form-actions bx-def-padding-left"><a href="javascript:void(0);" onclick="{js_instance_name}.deleteGhost('{file_id}')"><bx_text:_Delete /></a></div>
+        <div class="bx-uploader-ghost-form-actions bx-def-margin-top"><a class="bx-btn bx-btn-small" href="javascript:void(0);" onclick="{js_instance_name}.deleteGhost('{file_id}')"><bx_text:_Delete /></a></div>
     </div>
     <div class="bx-clear"></div>