Changeset 15855 for trunk

Timestamp:

01/09/12 00:44:13 (5 months ago)

Author:

Alexander Trofimov

Message:

Form - one line view for checkbox and switcher elements

Location:

trunk/templates/base

Files:

• css/forms.css (modified) (1 diff)
• scripts/BxBaseFormView.php (modified) (6 diffs)

trunk/templates/base/css/forms.css

@@ -364 +364 @@
 }
 
+.bx-form-value-oneline,
+.bx-form-caption-oneline {
+    float:left;
+}
+
+.bx-form-caption-oneline-switcher {
+    line-height:26px;
+}
+
 /* extra features */
 

trunk/templates/base/scripts/BxBaseFormView.php

@@ -210 +210 @@
                 $sRow = $this->genRowCustom($aInput, 'genInputFiles');
             break;
+    
+            case 'switcher':
+            case 'checkbox':
+                $sRow = $this->genRowStandard($aInput, true);
+            break;
 
             default:
@@ -224 +229 @@
      * @return string
      */
-    function genRowStandard(&$aInput) {
+    function genRowStandard(&$aInput, $isOneLine = false) {
 
         $sCaption = isset($aInput['caption']) ? bx_process_output($aInput['caption']) : '';
@@ -250 +255 @@
         }
 
+        $sClassOneLineCaption = '';
+        $sClassOneLineValue = '';
+        if ($isOneLine) {
+            $sClassOneLineCaption = ' bx-form-caption-oneline bx-form-caption-oneline-' . $aInput['type'] . ' bx-def-margin-sec-left';
+            $sClassOneLineValue = ' bx-form-value-oneline bx-form-value-oneline-' . $aInput['type'];
+            $aInput['attrs']['id'] = $this->getInputId($aInput);
+            if ($sCaption)
+                $sCaption = '<label for="' . $aInput['attrs']['id'] . '">' . $sCaption . '</label>';
+        }
+
         $sInput = $this->genInput($aInput);
 
         $sCaptionCode = '';
         if ($sCaption)
-            $sCaptionCode = '<div class="bx-form-caption">' . $sCaption . $sRequired . '</div>';
+            $sCaptionCode = '<div class="bx-form-caption' . $sClassOneLineCaption . '">' . $sCaption . $sRequired . '</div>';
         else
-            $sInput .= $sRequired; // TODO: maybe some other way to show required item
+            $sInput .= $sRequired; 
 
         $sInputCode = $this->genWrapperInput($aInput, $sInput);
@@ -267 +282 @@
         if (empty($sErrorIcon)) $sErrorIcon = '';
 
-        $sCode = <<<BLAH
-                <div $sTrAttrs>
-                    $sCaptionCode
-                    <div class="bx-form-value$sClassAdd">
+        $sValueCode = <<<BLAH
+                    <div class="bx-form-value{$sClassAdd}{$sClassOneLineValue}">
                         <div class="bx-clear"></div>
                         $sInputCode
@@ -279 +292 @@
                         <div class="bx-clear"></div>
                     </div>
-                </div>
 BLAH;
-
-
-        return $sCode;
+    
+        if ($isOneLine)
+            $sCode = $sValueCode . $sCaptionCode . '<div class="bx-clear"></div>';
+        else 
+            $sCode = $sCaptionCode . $sValueCode;
+
+        return "<div $sTrAttrs>" . $sCode . "</div>";
     }
 
@@ -565 +581 @@
         $aInput['type'] = 'checkbox';
         $sCheckbox = $this->genInputStandard(&$aInput);
+        $aInput['type'] = 'switcher';
 
         $sClass = 'off';