Changeset 15691 for trunk/templates

Timestamp:

11/22/11 19:00:21 (6 months ago)

Author:

Alexander Trofimov

Message:

Forms - design

Location:

trunk/templates/base

Files:

• css/forms.css (modified) (3 diffs)
• images/icons/control-090.png (added)
• images/icons/control-180.png (added)
• images/icons/control-270.png (added)
• images/icons/control.png (added)
• images/icons/sys-toogler-down.png (deleted)
• scripts/BxBaseFormView.php (modified) (3 diffs)

trunk/templates/base/css/forms.css

@@ -1 +1 @@
 
-.bx-form-advanced-wrapper > .bx-form-section:first-child {
+.bx-form-advanced-wrapper .bx-form-section:first-child {
     margin-top:0;
 }
 
-.bx-form-advanced-wrapper > .bx-form-section-divider:first-child {
-    border-top:none;
-    padding-top:0;
+.bx-form-advanced-wrapper .bx-form-section-divider:first-child {
+    border-top:none; 
+    padding-top:0; 
+}
+
+.bx-form-advanced-wrapper .bx-form-section-divider:first-child .bx-form-section-content {
+    padding-top:0; 
 }
 
 .bx-form-section {
-    padding-left:0;
-    padding-right:0;
+    padding-top:0px;
+    padding-left:0px;
+    padding-right:0px;
 }
 
@@ -24 +29 @@
     position:relative;
     text-transform:uppercase;
-    padding-left:20px;
+}
+
+.bx-form-section-header legend u {
     cursor:pointer;
 }
@@ -59 +66 @@
 
     position:absolute;
-    left:0px;
+    left:-4px;
     top:1px;
     width:16px;
     height:16px;
 
-    background-image:url(../images/icons/sys-toogler-down.png); 
+    background-image:url(../images/icons/control-270.png); 
 
     -moz-transform: rotate(0deg);

trunk/templates/base/scripts/BxBaseFormView.php

@@ -351 +351 @@
         }
 
-        // if section is collapsable, add necessary code
-
-        $sClassAdd = '';
-        if (isset($aInput['collapsable']) and $aInput['collapsable']) {
-            $sClassAdd = 'bx-form-collapsable';
-            if (isset($aInput['collapsed']) and $aInput['collapsed'])
-                $sClassAdd .= ' bx-form-collapsed bx-form-section-hidden';
-        }                
+        // if section is collapsed by default, add necessary code
+
+        $sClassAddCollapsable = 'bx-form-collapsable';
+        if (isset($aInput['collapsed']) and $aInput['collapsed'])
+            $sClassAddCollapsable .= ' bx-form-collapsed bx-form-section-hidden';
 
         // display section with caption
@@ -364 +361 @@
         $sCode = $this->getCloseSection();
     
-        if ($sClassAdd) {
-            if (empty($aAttrs))
-                $aAttrs['class'] = $sClassAdd;
-            else
-                $aAttrs['class'] .= ' ' . $sClassAdd;
-        }
-
-        $sCode .= $this->getOpenSection($aAttrs, '<legend class="bx-def-padding-sec-right bx-def-font-grayed bx-def-font-h3">' . bx_process_output($aInput['caption']) . '</legend>');
+        if (empty($aAttrs))
+            $aAttrs['class'] = 'bx-form-collapsable ' . $sClassAddCollapsable;
+        else
+            $aAttrs['class'] .= ' bx-form-collapsable ' . $sClassAddCollapsable;
+
+        $sCode .= $this->getOpenSection($aAttrs, '<legend class="bx-def-padding-left bx-def-padding-sec-right bx-def-font-grayed bx-def-font-h3"><a href="javascript:void(0);">' . bx_process_output($aInput['caption']) . '</a></legend>');
 
         return $sCode;
@@ -934 +929 @@
                 $sClassesAdd = "bx-form-section-divider";
 
-            $sAttrs = bx_convert_array2attrs($aAttrs, "bx-form-section bx-def-margin-top bx-def-padding-top bx-def-border-top " . $sClassesAdd);
+            $sAttrs = bx_convert_array2attrs($aAttrs, "bx-form-section bx-def-margin-top bx-def-padding-sec-top bx-def-border-top " . $sClassesAdd);
 
             $this->_isSectionOpened = true;
 
-            return "<!-- form header content begins -->\n <fieldset $sAttrs> $sLegend <div class=\"bx-form-section-content\">\n";
+            return "<!-- form header content begins -->\n <fieldset $sAttrs> $sLegend <div class=\"bx-form-section-content bx-def-padding-top bx-def-padding-bottom" . ($sLegend ? ' bx-def-padding-left bx-def-padding-right' : '') . "\">\n";
 
         } else {