Ticket #367 - Related changes in core files.

template/css/grid.css

@@ -3,7 +3,7 @@
     width:100%;
     border-collapse:collapse;
 }
-
+.bx-grid-header .bx-def-hr, 
 .bx-grid-table-wrapper .bx-def-hr {
     margin:0;
 }

template/grid.html

@@ -1,28 +1,22 @@
-
 <div id="__id_wrap__">
-
     <bx_if:display_header>
-        <div class="bx-grid-header bx-clearfix">
-
-            <bx_if:filter>
-                <div style="float:left;">
-                    __controls__
-                </div>  
-            </bx_if:filter>
-
-            <bx_if:actions_independent>
-                <div class="bx-def-margin-thd-neg" style="float:right;">
-                    __actions_independent__
-                </div>
-            </bx_if:actions_independent>
-
+        <div class="bx-grid-header">
+        	<div class="bx-grid-header-cnt bx-def-padding-sec-bottom bx-clearfix">
+	            <bx_if:filter>
+	                <div style="float:left;">
+	                    __controls__
+	                </div>  
+	            </bx_if:filter>
+	            <bx_if:actions_independent>
+	                <div class="bx-def-margin-thd-neg" style="float:right;">
+	                    __actions_independent__
+	                </div>
+	            </bx_if:actions_independent>
+			</div>
+			<hr class="bx-def-hr" />
         </div>
     </bx_if:display_header>
-
-    <div id="__id_cont__" class="bx-grid-table-wrapper bx-def-margin-top">
-        
-        <hr class="bx-def-hr" />
-
+    <div id="__id_cont__" class="bx-grid-table-wrapper">
         <table id="__id_table__" class="bx-grid-table">
         	<bx_if:display_head>
 	            <thead>
@@ -44,23 +38,23 @@
                     </bx_repeat:rows_data>
             </tbody>
         </table>
-
-        <hr class="bx-def-hr" />
-
-        <div class="bx-grid-footer bx-def-margin-bottom bx-def-margin-sec-top bx-clearfix">
-            <bx_if:actions_bulk>
-                <div style="float:left;">
-                    __actions_bulk__
-                </div>
-            </bx_if:actions_bulk>
-
-            <div style="float:right;">
-                __paginate__
-            </div>
-        </div>
-
+		<bx_if:display_footer>
+	        <div class="bx-grid-footer ">
+	        	<hr class="bx-def-hr" />
+	        	<div class="bx-grid-footer-cnt bx-def-padding-sec-top bx-def-margin-thd-neg bx-clearfix">
+		            <bx_if:actions_bulk>
+		                <div style="float:left;">
+		                    __actions_bulk__
+		                </div>
+		            </bx_if:actions_bulk>
+		
+		            <div class="bx-def-margin-thd" style="float:right;">
+		                __paginate__
+		            </div>
+				</div>
+	        </div>
+		</bx_if:display_footer>
     </div>
-
 </div>
 
 <script>

template/scripts/BxBaseGrid.php

@@ -194,7 +194,6 @@ class BxBaseGrid extends BxDolGrid
         		)
         	),
             'bx_repeat:rows_data' => $this->_getRowsDataDesign ($aData),
-            'paginate' => $sPaginate,
             'paginate_get_start' => $this->_aOptions['paginate_get_start'],
             'paginate_get_per_page' => $this->_aOptions['paginate_get_per_page'],
             'start' => $iStart,
@@ -206,12 +205,18 @@ class BxBaseGrid extends BxDolGrid
             'query_append' => $sQueryAppend,
             'confirm_messages' => $sConfirmMessages,
             'columns' => count($this->_aOptions['fields']),
-            'bx_if:actions_bulk' => array (
-                'condition' => !empty($this->_aOptions['actions_bulk']),
-                'content' => array(
-                    'actions_bulk' => $this->_getActions ('bulk'),
-                ),
-            ),
+            'bx_if:display_footer' => array(
+        		'condition' => !empty($this->_aOptions['actions_bulk']) || !empty($sPaginate),
+        		'content' => array(
+		            'bx_if:actions_bulk' => array (
+		                'condition' => !empty($this->_aOptions['actions_bulk']),
+		                'content' => array(
+		                    'actions_bulk' => $this->_getActions ('bulk'),
+		                ),
+		            ),
+		            'paginate' => $sPaginate,
+				)
+			),
             'bx_if:display_header' => array (
                 'condition' => $isDisplayHeader,
                 'content' => array (