Changeset 15711 for trunk/templates

Timestamp:

11/29/11 00:03:24 (6 months ago)

Author:

Alexander Trofimov

Message:

Grid

Location:

trunk/templates/base

Files:

• css/default.css (modified) (1 diff)
• css/grid.css (modified) (2 diffs)
• grid.html (modified) (3 diffs)
• scripts/BxBaseGrid.php (modified) (5 diffs)

trunk/templates/base/css/default.css

@@ -105 +105 @@
 
 .bx-def-color-bg-hl {
-    background-color: #f8f8ff;
+    background-color: rgba(200, 200, 255, 0.2);
 }
 
 .bx-def-color-bg-active {
     background-color: #ffbb33;
+}
+
+/* hr */
+
+.bx-def-hr {
+    margin-left:0;
+    margin-right:0;
+    padding:0;
+    border:none;
+    border-top:1px solid #dddddd;
+    border-bottom:1px solid #ffffff;
+    border-top:1px solid rgba(200, 200, 200, 0.5);
+    border-bottom:1px solid rgba(255, 255, 255, 0.8);
 }
 

trunk/templates/base/css/grid.css

@@ -5 +5 @@
 }
 
+.bx-grid-table-wrapper .bx-def-hr {
+    margin:0;
+}
+
+.bx-grid-table .bx-grid-table-row-hr td:first-child,
+.bx-grid-table .bx-grid-table-row-hr td {
+    padding:0;
+}
 
 .bx-grid-table-row-trans {
@@ -11 +19 @@
    -o-transition:background-color 1s linear;
    transition:background-color 1s linear;
+}
+
+.bx-grid-table .bx-grid-table-row-empty td {
+    text-align:center;
 }
 

trunk/templates/base/grid.html

@@ -21 +21 @@
     </bx_if:display_header>
 
-    <div id="__id_cont__">
+    <div id="__id_cont__" class="bx-grid-table-wrapper bx-def-margin-top">
+        
+        <hr class="bx-def-hr" />
 
-        <table id="__id_table__" class="bx-grid-table bx-def-margin-bottom bx-def-margin-top">
-            <thead class="bx-def-border-bottom bx-def-border-top">
+        <table id="__id_table__" class="bx-grid-table">
+            <thead>
                 <tr>
                     <bx_repeat:row_header>
@@ -30 +32 @@
                     </bx_repeat:row_header>
                 </tr>
-            </thead>
-            <tbody class="bx-def-border-bottom">
+                <tr class="bx-grid-table-row-hr">
+                    <td colspan="__columns__"><hr class="bx-def-hr" /></td>
+                </tr>
+            </thead>            
+            <tbody>
                     <bx_repeat:rows_data>
                         <tr id="__id_row__" class="__row_class__">
@@ -40 +45 @@
         </table>
 
-        <div class="bx-grid-footer bx-def-margin-bottom">
+        <hr class="bx-def-hr" />
+
+        <div class="bx-grid-footer bx-def-margin-bottom bx-def-margin-sec-top">
             <bx_if:actions_bulk>
                 <div style="float:left;">

trunk/templates/base/scripts/BxBaseGrid.php

@@ -256 +256 @@
     protected function _getRowsDataDesign (&$aData) {
         $aGrid = array();
-        foreach ($aData as $aRow) {
-            $sRow = '';
-            foreach ($this->_aOptions['fields'] as $sKey => $aField)
-                $sRow .= $this->_getCellDesign($sKey, $aField, $aRow);
-            $aGrid[] = array('row' => $sRow, 'id_row' => $this->_sObject . '_row_' . $aRow[$this->_aOptions['field_id']], 'row_class' => $this->_isRowDisabled($aRow) ? 'bx-grid-row-disabled bx-def-font-grayed' : '');
-        }            
+        if (empty($aData)) {
+
+            $aGrid[] = array(
+                'row' => '<td class="bx-def-padding-sec-bottom bx-def-padding-sec-top" colspan="' . count($this->_aOptions['fields']) . '">' . _t('_Empty') . '</td>', 
+                'id_row' => 0, 
+                'row_class' => 'bx-grid-table-row-empty',
+            );
+
+        } else {
+
+            foreach ($aData as $aRow) {
+                $sRow = '';
+                foreach ($this->_aOptions['fields'] as $sKey => $aField)
+                    $sRow .= $this->_getCellDesign($sKey, $aField, $aRow);
+
+                $aGrid[] = array(
+                    'row' => $sRow, 
+                    'id_row' => $this->_sObject . '_row_' . $aRow[$this->_aOptions['field_id']], 
+                    'row_class' => $this->_isRowDisabled($aRow) ? 'bx-grid-table-row-disabled bx-def-font-grayed' : '',
+                );
+            }
+        } 
         return $aGrid;
     }
@@ -306 +322 @@
             isset($aField['width']) ? 'width:' . $aField['width'] : false  // add default styles
         );
-        return '<td ' . $sAttr . '>' . $this->_getActions('single', $aRow[$this->_aOptions['field_id']], true, $this->_isRowDisabled($aRow)) . '</td>';
+        return '<td ' . $sAttr . '>' . $this->_getActions('single', $aRow[$this->_aOptions['field_id']], true, $this->_isRowDisabled($aRow), $aRow) . '</td>';
     }
 
@@ -319 +335 @@
     
 
-    protected function _getActions ($sType, $sActionData = false, $isSmall = false, $isDisabled = false) {
+    protected function _getActions ($sType, $sActionData = false, $isSmall = false, $isDisabled = false, $aRow = array()) {
         $sActionsType = 'actions_' . $sType;
         if (empty($this->_aOptions[$sActionsType]) || !is_array($this->_aOptions[$sActionsType]))
@@ -335 +351 @@
                     $a['attr']['bx_grid_action_confirm'] = $a['confirm'] ? 1 : 0;
             }
-            $sRet .= $this->$sFunc($sType, $sKey, $a, $isSmall, $isDisabled);
+            $sRet .= $this->$sFunc($sType, $sKey, $a, $isSmall, $isDisabled, $aRow);
         }
         return $sRet;
     }
     
-    protected function _getActionDefault ($sType, $sKey, $a, $isSmall = false, $isDisabled = false) {
+    protected function _getActionDefault ($sType, $sKey, $a, $isSmall = false, $isDisabled = false, $aRow = array()) {
         $sAttr = $this->_convertAttrs(
             $a, 'attr',
@@ -348 +364 @@
     }
 
-    protected function _getActionDivider ($sType, $sKey, $a, $isSmall = false, $isDisabled = false) {
+    protected function _getActionDivider ($sType, $sKey, $a, $isSmall = false, $isDisabled = false, $aRow = array()) {
         return '<div class="bx-grid-actions-divider bx-def-margin-sec-left"> | </div>';
     }