Changeset 15533 for trunk/templates

Timestamp:

09/30/11 01:31:31 (8 months ago)

Author:

Alexander Trofimov

Message:

forms fixes

Location:

trunk/templates/base

Files:

• css/common.css (modified) (2 diffs)
• scripts/BxBaseFormView.php (modified) (6 diffs)

trunk/templates/base/css/common.css

@@ -262 +262 @@
 
     height:38px; 
+    margin:0;
     padding:0px 12px 0px 12px;
 
@@ -312 +313 @@
     padding-top:0px;
     padding-bottom:0px;
-    float:none;
-    margin:0;
     font-size:14px;
 }

trunk/templates/base/scripts/BxBaseFormView.php

@@ -233 +233 @@
 
                     <div class="bx-form-value$sClassAdd">
-                        <div class="clear_both"></div>
+                        <div class="bx-clear"></div>
                         $sInputCode
                         $sButtonAdd
@@ -239 +239 @@
                         $sInfoIcon
                         $sInputCodeExtra
-                        <div class="clear_both"></div>
+                        <div class="bx-clear"></div>
                     </div>
                 </div>
@@ -292 +292 @@
 
                     <div class="bx-form-value$sClassAdd">
-                        <div class="clear_both"></div>
+                        <div class="bx-clear"></div>
                             $sInput
-                        <div class="clear_both"></div>
+                        <div class="bx-clear"></div>
                     </div>
                 </div>
@@ -380 +380 @@
             case 'doublerange':
             case 'hidden':
+                $sInput = $this->genInputStandard($aInput);
+            break;
+
             case 'button':
             case 'reset':
             case 'submit':
-                $sInput = $this->genInputStandard($aInput);
+                $sInput = $this->genInputButton($aInput);
             break;
 
@@ -493 +496 @@
 
         // add default className to attributes
-        $aAttrs['class'] = "bx-def-font-inputs bx-form-input-{$aInput['type']}" . ('submit' == $aInput['type'] ? ' bx-btn bx-btn-primary' : '') . (isset($aAttrs['class']) ? ' ' . $aAttrs['class'] : '');
+        $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'];
@@ -508 +511 @@
         $sAttrs = $this->convertArray2Attrs($aAttrs);
 
-        if ('submit' == $aInput['type'])
-            return  "<button $sAttrs>" . $aInput['value'] . "</button>\n";
-        else
-            return  "<input $sAttrs />\n";
+        return  "<input $sAttrs />\n";
+    }
+
+    /**
+     * Generate Button Input Element
+     *
+     * @param array $aInput
+     * @return string
+     */
+    function genInputButton(&$aInput) {
+
+        // clone attributes for system use ;)
+        $aAttrs = empty($aInput['attrs']) ? array() : $aInput['attrs'];
+
+        // 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['name'])) $aAttrs['name'] = $aInput['name'];
+        if (isset($aInput['value'])) $aAttrs['value'] = $aInput['value'];
+
+        $sAttrs = $this->convertArray2Attrs($aAttrs);
+
+        return  "<button $sAttrs>" . $aInput['value'] . "</button>\n";
     }