// List header fix

admin-dev/themes/default/template/helpers/list/list_content.tpl

@@ -30,17 +30,17 @@
 	class="{if isset($tr.class)} {$tr.class}{/if}"
 	{if isset($tr.color) && $color_on_bg}style="background-color: {$tr.color}"{/if}
 	>
-		{if $has_bulk_actions}
 		<td class="center">
-			{if isset($list_skip_actions.delete)}
-				{if !in_array($tr.$identifier, $list_skip_actions.delete)}
+			{if {$has_bulk_actions}}
+				{if isset($list_skip_actions.delete)}
+					{if !in_array($tr.$identifier, $list_skip_actions.delete)}
+						<input type="checkbox" name="{$table}Box[]" value="{$tr.$identifier}" class="noborder" />
+					{/if}
+				{else}
 					<input type="checkbox" name="{$table}Box[]" value="{$tr.$identifier}" class="noborder" />
 				{/if}
-			{else}
-				<input type="checkbox" name="{$table}Box[]" value="{$tr.$identifier}" class="noborder" />
 			{/if}
 		</td>
-		{/if}
 		{foreach $fields_display AS $key => $params}
 			{block name="open_td"}
 				<td

admin-dev/themes/default/template/helpers/list/list_header.tpl

@@ -254,10 +254,8 @@
 			>
 			<thead>
 				<tr class="nodrag nodrop">
-					{if $has_bulk_actions}
 					<th class="center fixed-width-xs">
 					</th>
-					{/if}
 					{foreach $fields_display AS $key => $params}
 					<th class="{if isset($params.class)}{$params.class}{/if}{if isset($params.align)} {$params.align}{/if}">
 
@@ -310,11 +308,12 @@
 				</tr>
 			{if !$simple_header && $show_filters}
 				<tr class="nodrag nodrop filter {if $row_hover}row_hover{/if}">
-					{if $has_bulk_actions}
 					<td class="center">
-						--
+						{if $has_bulk_actions}
+							--
+						{/if}
 					</td>
-					{/if}
+
 					{* Filters (input, select, date or bool) *}
 					{foreach $fields_display AS $key => $params}
 					<td {if isset($params.align)} class="{$params.align}" {/if}>