Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
This commit is contained in:
@@ -36,7 +36,7 @@
|
||||
<input type="hidden" name="{$identifier}" id="{$identifier}" value="{$form_id}" />
|
||||
{/if}
|
||||
{foreach $fields as $f => $fieldset}
|
||||
<fieldset id="fieldset_{$f}" class="col-lg-12">
|
||||
<fieldset id="fieldset_{$f}">
|
||||
{foreach $fieldset.form as $key => $field}
|
||||
{if $key == 'legend'}
|
||||
<h3>
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
|
||||
{if !$simple_header}
|
||||
<form method="post" action="{$action}" class="form-horizontal">
|
||||
<fieldset class="col-lg-12">
|
||||
<fieldset>
|
||||
{block name="override_header"}{/block}
|
||||
|
||||
{if $show_filters}
|
||||
@@ -90,13 +90,13 @@
|
||||
{/if}
|
||||
{/if}
|
||||
<table
|
||||
class="table table-hover"
|
||||
class="table"
|
||||
name="list_table"
|
||||
{if $table_id} id={$table_id}{/if}
|
||||
class="table {if $table_dnd}tableDnD{/if} {$table}"
|
||||
>
|
||||
<thead>
|
||||
<tr class="nodrag nodrop">
|
||||
<tr>
|
||||
<th class="center">
|
||||
</th>
|
||||
{foreach $fields_display AS $key => $params}
|
||||
@@ -150,7 +150,7 @@
|
||||
{/if}
|
||||
</tr>
|
||||
{if !$simple_header && $show_filters}
|
||||
<tr class="nodrag nodrop filter {if $row_hover}row_hover{/if}">
|
||||
<tr class="filter {if $row_hover}row_hover{/if}">
|
||||
<td class="center">
|
||||
{if $has_bulk_actions}
|
||||
--
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
{/foreach}
|
||||
</table>
|
||||
{else}
|
||||
<table border="0" cellpadding="0" cellspacing="5" class="table table-striped table-hover">
|
||||
<table class="table">
|
||||
<tr>
|
||||
<td>
|
||||
<div class="alert alert-block">{l s='No modules available in this section.'}</div>
|
||||
@@ -51,5 +51,4 @@
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
</fieldset>
|
||||
@@ -41,7 +41,7 @@
|
||||
enctype="multipart/form-data" class="form-horizontal">
|
||||
{foreach $option_list AS $category => $categoryData}
|
||||
{if isset($categoryData['top'])}{$categoryData['top']}{/if}
|
||||
<fieldset {if isset($categoryData['class'])}class="{$categoryData['class']}"{/if} class="col-lg-12">
|
||||
<fieldset {if isset($categoryData['class'])}class="{$categoryData['class']}"{/if}>
|
||||
{* Options category title *}
|
||||
<h3>
|
||||
<i class="icon-cogs"></i>
|
||||
|
||||
Reference in New Issue
Block a user