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 
Conflicts:
	admin-dev/themes/default/template/controllers/images/content.tpl
This commit is contained in:
Kevin Granger
2013-10-22 10:07:03 +02:00
parent eb82297f45 3ba337f19a
commit aa95454c4e
37 changed files with 58 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/images/content.tpl
+5 -6
View File
@@ -76,20 +76,19 @@
</div>
</div>
<div class="form-group">
{foreach $types AS $k => $type}
<label class="control-label col-lg-3 second-select format_{$k}" style="display:none;">{l s='Select a format'}</label>
<div class="col-lg-9 second-select margin-form format_{$k}" style="display:none;">
<select class="second-select format_{$k}" name="format_{$k}">
<div class="form-group second-select format_{$k}" style="display:none;">
<label class="control-label col-lg-3">{l s='Select a format'}</label>
<div class="col-lg-9 margin-form">
<select name="format_{$k}">
<option value="all">{l s='All'}</option>
{foreach $formats[$k] AS $format}
<option value="{$format['id_image_type']}">{$format['name']}</option>
{/foreach}
</select>
</div>
{/foreach}
</div>
{/foreach}
<script>
function changeFormat(elt)
{ldelim}
admin-dev/themes/default/template/helpers/options/options.tpl
+1 -1
View File
@@ -362,7 +362,7 @@
type="submit"
id="{$table}_form_submit_btn"
name="{if isset($categoryData['submit']['name'])}{$categoryData['submit']['name']}{else}submitOptions{$table}{/if}"
class="btn btn-default {if isset($categoryData['submit']['class'])}{$categoryData['submit']['class']}{else}btn btn-default{/if}"
class="{if isset($categoryData['submit']['class'])}{$categoryData['submit']['class']}{else}btn btn-default{/if}"
>
{if isset($categoryData['submit']['title'])}{$categoryData['submit']['title']}{else}{l s='Save'}{/if}
</button>