Changeset 15675 for trunk/templates

Timestamp:

11/15/11 22:06:19 (6 months ago)

Author:

Alexander Trofimov

Message:

Grid - design

Location:

trunk/templates/base

Files:

• css/default.css (modified) (1 diff)
• css/grid.css (modified) (3 diffs)
• grid.html (modified) (2 diffs)
• images/icons/grid-drag-handle.png (added)
• scripts/BxBaseGrid.php (modified) (7 diffs)

trunk/templates/base/css/default.css

@@ -104 +104 @@
 }
 
+.bx-def-color-bg-hl {
+    background-color: #f8f8ff;
+}
+
+.bx-def-color-bg-active {
+    background-color: #ffbb33;
+}
+
 /* borders */
 

trunk/templates/base/css/grid.css

@@ -6 +6 @@
 
 
-.bx-grid-table tr:hover {
-    background-color: #eee;
+.bx-grid-table-row-trans {
+   -webkit-transition:background-color 1s linear;
+   -moz-transition:background-color 1s linear;
+   -o-transition:background-color 1s linear;
+   transition:background-color 1s linear;
 }
 
-
+.bx-grid-table th,
 .bx-grid-table td { 
-    padding-top:5px;
-    padding-bottom:5px;
-    text-align:center;
+    padding-left:5px;
+    padding-right:5px;
+    text-align:left;
 }
-.bx-grid-table th { 
-    text-align:center;
+.bx-grid-table th:first-child,
+.bx-grid-table td:first-child {
+    padding-left:10px;
 }
 
@@ -34 +38 @@
 }
 
-.bx-grid-drag-handle {
+div.bx-grid-drag-handle {
     display:none;
+    width:16px;
+    height:16px;    
+  
+    background-image:url(../images/icons/grid-drag-handle.png);  
+
     cursor:move;
 }
 
 
-.bx-grid-gragging-row {
-    background-color:white;
+.bx-grid-gragging-row {    
+
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
 
     -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)"; 
@@ -49 +61 @@
     opacity: 0.9;
 
-    -moz-box-shadow: 0px 10px 10px rgba(51, 51, 51, 0.7);
-    -webkit-box-shadow: 0px 10px 10px rgba(51, 51, 51, 0.7);
-    box-shadow: 0px 10px 10px rgba(51, 51, 51, 0.7);    
+    -moz-box-shadow: 1px 1px 5px rgba(51, 51, 51, 0.5);
+    -webkit-box-shadow: 1px 1px 5px rgba(51, 51, 51, 0.5);
+    box-shadow: 1px 1px 5px rgba(51, 51, 51, 0.5);    
 }
 
-.bx-grid-drag-placeholder td {
-    text-align:left;
+.bx-grid-table .bx-grid-drag-placeholder td {
+    padding-left:0;
 }

trunk/templates/base/grid.html

@@ -23 +23 @@
     <div id="__id_cont__">
 
-        <table id="__id_table__" class="bx-grid-table bx-def-margin-bottom bx-def-margin-top">
+        <table id="__id_table__" class="bx-grid-table bx-def-margin-bottom bx-def-margin-top bx-def-border-bottom bx-def-border-top">
             <thead>
-                <tr>
+                <tr class="bx-def-border-bottom">
                     <bx_repeat:row_header>
                         __header_cell__
@@ -69 +69 @@
                 paginate_get_per_page: '__paginate_get_per_page__',
                 start: __start__,
-                per_page: __per_page__
+                per_page: __per_page__,
+                columns: __columns__
             });
             glGrids.__object__.setSearchInputText ('<bx_text_js:_sys_grid_search />');            

trunk/templates/base/scripts/BxBaseGrid.php

@@ -135 +135 @@
             'start' => $iStart,
             'per_page' => $iPerPage,
+            'columns' => count($this->_aOptions['fields']),
             'bx_if:actions_bulk' => array (
                 'condition' => !empty($this->_aOptions['actions_bulk']),
@@ -203 +204 @@
         $sAttr = $this->_convertAttrs(
             $aField, 'attr_head',
-            false, // don't add default classes
+            'bx-def-padding-sec-bottom bx-def-padding-sec-top', // add default classes
             isset($aField['width']) ? 'width:' . $aField['width'] : false // add default styles
         );
@@ -213 +214 @@
         $sAttr = $this->_convertAttrs(
             $aField, 'attr_head',
-            false, // don't add default classes
+            'bx-def-padding-sec-bottom bx-def-padding-sec-top', // add default classes
             isset($aField['width']) ? 'width:' . $aField['width'] : false // add default styles
         );
@@ -247 +248 @@
         $sAttr = $this->_convertAttrs(
             $aField, 'attr_cell',
-            'rowhandler', // add default class
+            'bx-def-padding-sec-bottom bx-def-padding-sec-top', // add default classes
             isset($aField['width']) ? 'width:' . $aField['width'] : false  // add default styles
         );
@@ -256 +257 @@
         $sAttr = $this->_convertAttrs(
             $aField, 'attr_cell',
-            'rowhandler', // add default class
+            'bx-def-padding-sec-bottom bx-def-padding-sec-top', // add default classes
             isset($aField['width']) ? 'width:' . $aField['width'] : false  // add default styles
         );
-        return '<td ' . $sAttr . '><div id="' . $this->_sObject . '_cell_' . $aRow[$this->_aOptions['field_id']] . '" class="bx-grid-drag-handle">&Xi;</div></td>'; 
+        return '<td ' . $sAttr . '><div id="' . $this->_sObject . '_cell_' . $aRow[$this->_aOptions['field_id']] . '" class="bx-grid-drag-handle"></div></td>';
     }
 
@@ -265 +266 @@
         $sAttr = $this->_convertAttrs(
             $aField, 'attr_cell',
-            'rowhandler', // add default class
+            'bx-def-padding-sec-bottom bx-def-padding-sec-top', // add default classes
             isset($aField['width']) ? 'width:' . $aField['width'] : false  // add default styles
         );
@@ -274 +275 @@
         $sAttr = $this->_convertAttrs(
             $aField, 'attr_cell',
-            false, // don't add default classes
+            'bx-def-padding-sec-bottom bx-def-padding-sec-top', // add default classes
             isset($aField['width']) ? 'width:' . $aField['width'] : false // add default styles
         );