Changeset 15674 for trunk/templates

Timestamp:

11/14/11 20:25:08 (6 months ago)

Author:

Alexander Trofimov

Message:

Grid

Location:

trunk/templates

Files:

• base/css/default.css (modified) (1 diff)
• base/css/grid.css (added)
• base/grid.html (added)
• base/scripts/BxBaseFormView.php (modified) (19 diffs)
• base/scripts/BxBaseGrid.php (added)
• tmpl_uni/scripts/BxTemplGrid.php (added)

trunk/templates/base/css/default.css

@@ -101 +101 @@
 
 .bx-def-color-bg-sec {
-    background:#f2f2f2;
+    background-color:#f2f2f2;
 }
 

trunk/templates/base/scripts/BxBaseFormView.php

@@ -109 +109 @@
 BLAH;
         } else {
-            // add default className to attributes
-            $this->aFormAttrs['class'] = 'bx-form-advanced' . (isset($this->aFormAttrs['class']) ? (' ' . $this->aFormAttrs['class']) : '');
-
-            $sFormAttrs = $this->convertArray2Attrs($this->aFormAttrs);
+            $sFormAttrs = bx_convert_array2attrs($this->aFormAttrs, 'bx-form-advanced');
 
             $sForm = <<<BLAH
@@ -227 +224 @@
         $sErrorIcon = $this->genErrorIcon(empty($aInput['error']) ? '' : $aInput['error']);
 
-        $aInput['tr_attrs']['class'] = "bx-form-element-wrapper bx-def-margin-top" . (isset($aInput['tr_attrs']['class']) ? ' ' . $aInput['tr_attrs']['class'] : '');
         if (isset($aInput['name']))
             $aInput['tr_attrs']['id'] = "bx-form-element-" . $aInput['name'];
-        $sTrAttrs = $this->convertArray2Attrs($aInput['tr_attrs']);
+        $sTrAttrs = bx_convert_array2attrs(isset($aInput['tr_attrs']) && is_array($aInput['tr_attrs']) ? $aInput['tr_attrs'] : array(), "bx-form-element-wrapper bx-def-margin-top");
 
         if ($aInput['type'] == 'captcha') {
@@ -281 +277 @@
 
     function genWrapperInput($aInput, $sContent) {
-        $sAttr = isset($aInput['attrs_wrapper']) && is_array($aInput['attrs_wrapper']) ? $this->convertArray2Attrs($aInput['attrs_wrapper']) : '';
+        $sAttr = isset($aInput['attrs_wrapper']) && is_array($aInput['attrs_wrapper']) ? bx_convert_array2attrs($aInput['attrs_wrapper']) : '';
 
         $sCode = <<<BLAH
@@ -310 +306 @@
         $sInput = $this->$sCustomMethod($aInput, $sInfoIcon, $sErrorIcon);
 
-        $aInput['tr_attrs']['class'] = "bx-form-element-wrapper bx-def-margin-top" . (isset($aInput['tr_attrs']['class']) ? ' ' . $aInput['tr_attrs']['class'] : '');
         if (isset($aInput['name']))
             $aInput['tr_attrs']['id'] = "bx-form-element-" . $aInput['name'];
-        $sTrAttrs = $this->convertArray2Attrs(empty($aInput['tr_attrs']) ? array() : $aInput['tr_attrs']);
+        $sTrAttrs = bx_convert_array2attrs(empty($aInput['tr_attrs']) ? array() : $aInput['tr_attrs'], "bx-form-element-wrapper bx-def-margin-top");
 
         $sCaptionCode = '';
@@ -346 +341 @@
         if (empty($aInput['caption'])) {
             $sCode = $this->getCloseSection();
-            $aAttrs['class'] = "bx-form-section-divider bx-def-margin-top " . (isset($aAttrs['class']) ? ' ' . $aAttrs['class'] : '');
-            $sAttrs = $this->convertArray2Attrs($aAttrs);
+            $sAttrs = bx_convert_array2attrs($aAttrs, "bx-form-section-divider bx-def-margin-top");
             $sCode .=  "<div $sAttrs></div>";
             $sCode .= $this->getOpenSection(false);
@@ -365 +359 @@
             $sClassAdd = '';
             $aNextTbodyAdd = false;
-        }
-
-        $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  : '');
-
-        $sAttrs = $this->convertArray2Attrs($aAttrs);
+        }        
+
+        $sAttrs = bx_convert_array2attrs($aAttrs, "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" . (empty($sClassAdd) ? '' : ' ' . $sClassAdd));
 
         $sCode = '';
@@ -537 +527 @@
 
         // add default className to attributes
-        $aAttrs['class'] = "bx-def-font-inputs bx-form-input-{$aInput['type']}" . (isset($aAttrs['class']) ? ' ' . $aAttrs['class'] : '');
         $aAttrs['type'] = $aInput['type'];
         if (isset($aInput['name'])) $aAttrs['name'] = $aInput['name'];
@@ -550 +539 @@
             $aAttrs['checked'] = 'checked';
 
-        $sAttrs = $this->convertArray2Attrs($aAttrs);
+        $sAttrs = bx_convert_array2attrs($aAttrs, "bx-def-font-inputs bx-form-input-{$aInput['type']}");
 
         return  "<input $sAttrs />\n";
@@ -567 +556 @@
 
         // add default className to attributes
-        $aAttrs['class'] = "bx-def-font-inputs bx-form-input-{$aInput['type']} bx-btn" . ('submit' == $aInput['type'] ? ' bx-btn-primary' : '') . (isset($aAttrs['class']) ? ' ' . $aAttrs['class'] : '');
         $aAttrs['type'] = $aInput['type'];
         if (isset($aInput['value']))
@@ -574 +562 @@
         if (isset($aInput['name'])) $aAttrs['name'] = $aInput['name'];
 
-        $sAttrs = $this->convertArray2Attrs($aAttrs);
+        $sAttrs = bx_convert_array2attrs($aAttrs, "bx-def-font-inputs bx-form-input-{$aInput['type']} bx-btn" . ('submit' == $aInput['type'] ? ' bx-btn-primary' : ''));
 
         return  "<button $sAttrs>" . $aInput['value'] . "</button>\n";
@@ -589 +577 @@
         // clone attributes for system use ;)
         $aAttrs = empty($aInput['attrs']) ? array() : $aInput['attrs'];
-
-        // add default className to attributes
-        $aAttrs['class'] =
-            "bx-form-input-{$aInput['type']}" .
-            (isset($aAttrs['class']) ? (' ' . $aAttrs['class']) : '') .
-            ((isset($aInput['html']) and $aInput['html'] and $this->addHtmlEditor($aInput['html'], $aInput)) ? ' bx-form-input-html' : '');
 
         $aAttrs['name'] = $aInput['name'];
@@ -602 +584 @@
             $aAttrs['id'] = $this->getInputId($aInput);
 
-        $sAttrs = $this->convertArray2Attrs($aAttrs);
+        $sAttrs = bx_convert_array2attrs($aAttrs, "bx-form-input-{$aInput['type']}" . ((isset($aInput['html']) and $aInput['html'] and $this->addHtmlEditor($aInput['html'], $aInput)) ? ' bx-form-input-html' : ''));
 
         $sValue = isset($aInput['value']) ? bx_process_output($aInput['value']) : '';
@@ -789 +771 @@
         $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'];
         if ($isMultiple) {
@@ -802 +781 @@
             $aAttrs['id'] = $this->getInputId($aInput);
 
-        $sAttrs = $this->convertArray2Attrs($aAttrs);
+        $sAttrs = bx_convert_array2attrs($aAttrs, "bx-form-input-{$aInput['type']}");
 
         // generate options
@@ -837 +816 @@
         $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'];
 
@@ -846 +822 @@
             $aAttrs['id'] = $this->getInputId($aInput);
 
-        $sAttrs = $this->convertArray2Attrs($aAttrs);
+        $sAttrs = bx_convert_array2attrs($aAttrs, "bx-form-input-{$aInput['type']}");
 
         // generate options
@@ -888 +864 @@
         $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);
+        $sAttrs = bx_convert_array2attrs($aAttrs, "bx-form-input-{$aInput['type']}");
 
         $sSimgUrl = BX_DOL_URL_ROOT . 'simg/simg.php';
@@ -939 +910 @@
     }
 
-    /**
-     * Convert array to attributes string
-     *
-     * @code
-     * $a = array('name' => 'test', 'value' => 5);
-     * $s = $this->convertArray2Attrs($a);
-     * echo $s;
-     * @endcode
-     *
-     * Output:
-     * name="test" value="5"
-     *
-     * @param array $a
-     * @return string
-     */
-    function convertArray2Attrs($a) {
-        $sRet = '';
-
-        if (is_array($a)) {
-            foreach ($a as $sKey => $sValue) {
-
-                if (!isset($sValue) || is_null($sValue)) // pass NULL values
-                    continue;
-
-                $sValueC = bx_html_attribute($sValue);
-
-                $sRet .= " $sKey=\"$sValueC\"";
-            }
-        }
-
-        return $sRet;
-    }
 
     function genToggleElement($aInput) {
@@ -1011 +950 @@
     }
 
-    function getOpenSection($aAttrs = false) {
+    function getOpenSection($aAttrs = array()) {
 
         if (!$this->_isSectionOpened) {
 
-            if ($aAttrs and is_array($aAttrs)) {
-                $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-top bx-def-border-top" ';
-            }
+            if (!$aAttrs || !is_array($aAttrs))
+                $aAttrs = array();
+            $sAttrs = bx_convert_array2attrs($aAttrs, "bx-form-section bx-def-padding-top bx-def-border-top");
 
             $this->_isSectionOpened = true;