dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source
This commit is contained in:
Kevin Granger
2013-09-18 17:10:59 +02:00
parent 806e628997 4413d04525
commit ac1b9fd96e
28 changed files with 366 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/themes/helpers/options/options.tpl
+15 -6
View File
@@ -27,13 +27,22 @@
{block name="field"}
{if $field['type'] == 'theme'}
{if $field['can_display_themes']}
{foreach $field.themes as $theme}
<div class="select_theme {if $theme->id == $field['id_theme']}select_theme_choice{/if}" onclick="$(this).find('input').attr('checked', true); $('.select_theme').removeClass('select_theme_choice'); $(this).toggleClass('select_theme_choice');">
{$theme->name}<br />
<img src="../themes/{$theme->directory}/preview.jpg" alt="{$theme->directory}" /><br />
<input type="radio" name="id_theme" value="{$theme->id}" {if $theme->id == $field['id_theme']}checked="checked"{/if} />
<div class="col-lg-12">
<div class="row">
{foreach $field.themes as $theme}
<div class="col-lg-2 {if $theme->id == $field['id_theme']}select_theme_choice{/if}" onclick="$(this).find('input').attr('checked', true); $('.select_theme').removeClass('select_theme_choice'); $(this).toggleClass('select_theme_choice');">
<div class="radio">
<label>
<input type="radio" name="id_theme" value="{$theme->id}" {if $theme->id == $field['id_theme']}checked="checked"{/if} /> {$theme->name}
</label>
</div>
<div class="theme_container">
<img class="thumbnail" src="../themes/{$theme->directory}/preview.jpg" alt="{$theme->directory}" />
</div>
</div>
{/foreach}
</div>
{/foreach}
</div>
{/if}
{else}
{$smarty.block.parent}
admin-dev/themes/default/template/helpers/list/list_content.tpl
+6 -6
View File
@@ -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 {$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}
{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}
</td>
{/if}
{foreach $fields_display AS $key => $params}
{block name="open_td"}
<td
admin-dev/themes/default/template/helpers/list/list_header.tpl
+6 -5
View File
@@ -254,8 +254,10 @@
>
<thead>
<tr class="nodrag nodrop">
<th class="center">
{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}">
@@ -308,12 +310,11 @@
</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}>