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

// fix tags in helper

Browse Source
This commit is contained in:
Kevin Granger
2013-07-24 11:42:47 +02:00
parent 5b804d3628
commit f7d1743c8a
6 changed files with 357 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/codekit-config.json
+335 -335
View File
File diff suppressed because it is too large Load Diff
admin-dev/themes/default/css/admin-theme.css
+3 -3
View File
@@ -5075,7 +5075,7 @@ body.fixed-top {
-webkit-box-shadow: #b4ac9c 0 0 0 4px;
box-shadow: #b4ac9c 0 0 0 4px; }
#content fieldset {
padding-bottom: 20px;
padding: 20px;
margin-bottom: 10px;
border: solid 1px #cac4b9;
background-color: #f6f5f3;
@@ -5088,8 +5088,8 @@ body.fixed-top {
box-shadow: rgba(0, 0, 0, 0.1) 0 0 7px, white 0 0 0 4px inset; }
#content form legend {
float: left;
padding: 0 0 0 10px;
margin: 20px 0 15px 0;
padding: 0 0 0 0;
margin: 5px 0 15px 0;
color: #bfb8b3;
font-weight: 300; }
#content form .alert {
admin-dev/themes/default/css/admin-theme.sass
+3 -3
View File
@@ -46,7 +46,7 @@ body.fixed-top
background-image: url('../img/patterns/bedge_grunge.png')
@include box-shadow(darken($bg-content-color,30%) 0 0 0 4px)
fieldset
padding-bottom: 20px
padding: 20px
margin-bottom: 10px
border: solid 1px darken($bg-content-color,20%)
background-color: $bg-content-color
@@ -54,8 +54,8 @@ body.fixed-top
@include box-shadow(rgba(black,0.10) 0 0 7px, white 0 0 0 4px inset)
form legend
float: left
padding: 0 0 0 10px
margin: 20px 0 15px 0
padding: 0 0 0 0
margin: 5px 0 15px 0
color: darken(#D6D2CF,10%)
font-weight: 300
form .alert
admin-dev/themes/default/template/header.tpl
+1 -1
View File
@@ -248,7 +248,7 @@
<ul id="menu">
<li class="maintab">
<a href="{$link->getAdminLink('AdminHome')|escape:'htmlall':'UTF-8'}" class="title">
<i class="icon-AdminDashboard"></i> Dashboard
<i class="icon-AdminDashboard"></i> {l s='Dashboard'}
</a>
</li>
{foreach $tabs AS $t}
admin-dev/themes/default/template/helpers/form/form.tpl
+13 -35
View File
@@ -78,12 +78,22 @@
{assign var='value_text' value=$fields_value[$input.name][$language.id_lang]}
<div class="input-group col-lg-12 translatable-field lang-{$language.id_lang}" style="{if $language.id_lang != $defaultFormLanguage}display:none{/if}">
{if $input.type == 'tags'}
tags
{literal}
<script type="text/javascript">
$().ready(function () {
var input_id = '{/literal}{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}{literal}';
$('#'+input_id).tagify({addTagPrompt: '{/literal}{l s='Add tag' js=1}{literal}'});
$({/literal}'#{$table}{literal}_form').submit( function() {
$(this).find('#'+input_id).val($('#'+input_id).tagify('serialize'));
});
});
</script>
{/literal}
{/if}
<input type="text"
id="{$input_name}_{$language.id_lang}"
name="{$input_name}_{$language.id_lang}"
class="{if $input.type == 'tags'}tagify {/if}{if isset($input.class)}{$input.class}{/if}"
name="{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}"
id="{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}"
value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'htmlall':'UTF-8'}{else}{$value_text|escape:'htmlall':'UTF-8'}{/if}"
onkeyup="if (isArrowKey(event)) return ;updateFriendlyURL();"
{if isset($input.size)}size="{$input.size}"{/if}
@@ -106,38 +116,6 @@
</div>
{/foreach}
</div>
<!-- <div class="translatable">
{foreach $languages as $language}
<div class="lang_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}">
{if $input.type == 'tags'}
{literal}
<script type="text/javascript">
$().ready(function () {
var input_id = '{/literal}{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}{literal}';
$('#'+input_id).tagify({addTagPrompt: '{/literal}{l s='Add tag' js=1}{literal}'});
$({/literal}'#{$table}{literal}_form').submit( function() {
$(this).find('#'+input_id).val($('#'+input_id).tagify('serialize'));
});
});
</script>
{/literal}
{/if}
{assign var='value_text' value=$fields_value[$input.name][$language.id_lang]}
<input type="text"
name="{$input.name}_{$language.id_lang}"
id="{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}"
value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'htmlall':'UTF-8'}{else}{$value_text|escape:'htmlall':'UTF-8'}{/if}"
class="{if $input.type == 'tags'}tagify {/if}{if isset($input.class)}{$input.class}{/if}"
{if isset($input.size)}size="{$input.size}"{/if}
{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
{if isset($input.readonly) && $input.readonly}readonly="readonly"{/if}
{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if}
{if isset($input.autocomplete) && !$input.autocomplete}autocomplete="off"{/if} />
</div>
{/foreach}
</div> -->
{else}
{if $input.type == 'tags'}
{literal}
controllers/admin/AdminAttributesGroupsController.php
+2 -9
View File
@@ -100,7 +100,6 @@ class AdminAttributesGroupsControllerCore extends AdminController
$this->fields_list = array(
'id_attribute' => array(
'title' => $this->l('ID'),
'width' => 40,
'align' => 'center'
),
'name' => array(
@@ -113,13 +112,11 @@ class AdminAttributesGroupsControllerCore extends AdminController
if ($obj->group_type == 'color')
$this->fields_list['color'] = array(
'title' => $this->l('Color'),
'width' => 40,
'filter_key' => 'b!color'
);
$this->fields_list['position'] = array(
'title' => $this->l('Position'),
'width' => 40,
'filter_key' => 'a!position',
'position' => 'position'
);
@@ -187,7 +184,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Attributes'),
'image' => '../img/admin/asterisk.gif'
'icon' => 'icon-info-sign'
),
'input' => array(
array(
@@ -195,7 +192,6 @@ class AdminAttributesGroupsControllerCore extends AdminController
'label' => $this->l('Name:'),
'name' => 'name',
'lang' => true,
'size' => 33,
'required' => true,
'hint' => $this->l('Invalid characters:').' <>;=#{}'
),
@@ -204,7 +200,6 @@ class AdminAttributesGroupsControllerCore extends AdminController
'label' => $this->l('Public name:'),
'name' => 'public_name',
'lang' => true,
'size' => 33,
'required' => true,
'hint' => $this->l('Invalid characters:').' <>;=#{}',
'desc' => $this->l('Group name displayed to the customer')
@@ -254,7 +249,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Values'),
'image' => '../img/admin/asterisk.gif',
'icon' => 'icon-info-sign'
),
'input' => array(
array(
@@ -274,7 +269,6 @@ class AdminAttributesGroupsControllerCore extends AdminController
'label' => $this->l('Value:'),
'name' => 'name',
'lang' => true,
'size' => 33,
'required' => true,
'hint' => $this->l('Invalid characters:').' <>;=#{}'
)
@@ -306,7 +300,6 @@ class AdminAttributesGroupsControllerCore extends AdminController
'type' => 'color',
'label' => $this->l('Color:'),
'name' => 'color',
'size' => 33,
'desc' => $this->l('Choose a color with the color picker, or enter an HTML color (e.g. "lightblue", "#CC6600")')
);