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

// Color picker

Browse Source
This commit is contained in:
Jerome Nadaud
2013-09-16 18:17:29 +02:00
parent 4ef7bd0b77
commit a4103265e5
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/helpers/form/form.tpl
+2 -2
View File
@@ -464,14 +464,14 @@
{elseif $input.type == 'asso_shop' && isset($asso_shop) && $asso_shop}
{$asso_shop}
{elseif $input.type == 'color'}
<div class="input-group col-lg-2">
<input type="color"
data-hex="true"
{if isset($input.class)}class="{$input.class}"
{else}class="color mColorPickerInput"{/if}
name="{$input.name}"
value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
</div>
{elseif $input.type == 'date'}
<div class="row">
<div class="input-group col-lg-4">
admin-dev/themes/default/template/helpers/options/options.tpl
+4 -2
View File
@@ -173,8 +173,10 @@
<input type="file" name="{$key}" />
</div>
{elseif $field['type'] == 'color'}
<div class="col-lg-9">
<input type="color" size="{$field['size']}" data-hex="true" {if isset($input.class)}class="{$field['class']}" {else}class="color mColorPickerInput"{/if} name="{$field['name']}" class="{if isset($field['class'])}{$field['class']}{/if}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />
<div class="col-lg-2">
<div class="input-group">
<input type="color" size="{$field['size']}" data-hex="true" {if isset($input.class)}class="{$field['class']}" {else}class="color mColorPickerInput"{/if} name="{$field['name']}" class="{if isset($field['class'])}{$field['class']}{/if}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />
</div>
</div>
{elseif $field['type'] == 'price'}
<div class="input-group col-lg-9">
js/jquery/plugins/jquery.colorpicker.js
+1 -1
View File
@@ -154,7 +154,7 @@
}).css({
'color': $.fn.mColorPicker.textColor($('#' + id).css('background-color'))
}).after(
'<span style="cursor:pointer;" id="icp_' + id + '" class="mColorPickerTrigger"><img src="' + $o.imageFolder + 'color.png" style="border:0;margin:0 0 0 3px" align="absmiddle"></span>'
'<span style="cursor:pointer;" id="icp_' + id + '" class="mColorPickerTrigger input-group-addon"><img src="' + $o.imageFolder + 'color.png" style="border:0;margin:0 0 0 3px" align="absmiddle"></span>'
).addClass('mColorPickerInput');
}