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

[*] BO : #PSFV-94 - forms now correctly use admin.js::displayFlags function. attributeLang attribute is deprecated in forms

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9787 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean committed 2011-11-02 10:40:57 +00:00
1 parent 181e2c68b6
commit 20b1786c1a
3 files changed
+30 -61
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/template/helper/form/form.tpl
+24 -56
View File
@@ -105,38 +105,22 @@
<div class="margin-form"> <div class="margin-form">
{/block} {/block}
{if $input.type == 'text'} {if $input.type == 'text'}
{if isset($input.lang) && isset($input.attributeLang)} {if isset($input.lang)}
{foreach $languages as $language} <div class="translatable">
<div id="{$input.name}_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}; float: left;"> {foreach $languages as $language}
<input type="text" <div class="lang_{$language.id_lang}" id="{$input.name}_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}; float: left;">
name="{$input.name}_{$language.id_lang}" <input type="text"
value="{$fields_value[$input.name][$language.id_lang]}" name="{$input.name}_{$language.id_lang}"
{if isset($input.size)}size="{$input.size}"{/if} value="{$fields_value[$input.name][$language.id_lang]}"
{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if} {if isset($input.size)}size="{$input.size}"{/if}
{if isset($input.class)}class="{$input.class}"{/if} {if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
{if isset($input.readonly) && $input.readonly}readonly="readonly"{/if} {if isset($input.class)}class="{$input.class}"{/if}
{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if} /> {if isset($input.readonly) && $input.readonly}readonly="readonly"{/if}
{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if} {if isset($input.disabled) && $input.disabled}disabled="disabled"{/if} />
</div> {if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
{/foreach} </div>
{if count($languages) > 1} {/foreach}
<div class="displayed_flag"> </div>
<img src="../img/l/{$defaultFormLanguage}.jpg"
class="pointer"
id="language_current_{$input.name}"
onclick="toggleLanguageFlags(this);" />
</div>
<div id="languages_{$input.name}" class="language_flags">
{l s='Choose language:'}<br /><br />
{foreach $languages as $language}
<img src="../img/l/{$language.id_lang}.jpg"
class="pointer"
alt="{$language.name}"
title="{$language.name}"
onclick="changeLanguage('{$input.name}', '{$input.attributeLang}', {$language.id_lang}, '{$language.iso_code}');" />
{/foreach}
</div>
{/if}
{else} {else}
<input type="text" <input type="text"
name="{$input.name}" name="{$input.name}"
@@ -214,30 +198,14 @@
{if isset($input.br) && $input.br}<br />{/if} {if isset($input.br) && $input.br}<br />{/if}
{/foreach} {/foreach}
{elseif $input.type == 'textarea'} {elseif $input.type == 'textarea'}
{if isset($input.lang) && isset($input.attributeLang)} {if isset($input.lang)}
{foreach $languages as $language} <div class="translatable">
<div id="{$input.name}_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}; float: left;"> {foreach $languages as $language}
<textarea cols="{$input.cols}" rows="{$input.rows}" name="{$input.name}_{$language.id_lang}">{$fields_value[$input.name][$language.id_lang]}</textarea> <div class="lang_{$language.id_lang}" id="{$input.name}_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}; float: left;">
</div> <textarea cols="{$input.cols}" rows="{$input.rows}" name="{$input.name}_{$language.id_lang}">{$fields_value[$input.name][$language.id_lang]}</textarea>
{/foreach} </div>
{if count($languages) > 1} {/foreach}
<div class="displayed_flag"> </div>
<img src="../img/l/{$defaultFormLanguage}.jpg"
class="pointer"
id="language_current_{$input.name}"
onclick="toggleLanguageFlags(this);" />
</div>
<div id="languages_{$input.name}" class="language_flags">
{l s='Choose language:'}<br /><br />
{foreach $languages as $language}
<img src="../img/l/{$language.id_lang}.jpg"
class="pointer"
alt="{$language.name}"
title="{$language.name}"
onclick="changeLanguage('{$input.name}', '{$input.attributeLang}', {$language.id_lang}, '{$language.iso_code}');" />
{/foreach}
</div>
{/if}
{else} {else}
<textarea name="{$input.name}" id="{$input.name}" cols="{$input.cols}" rows="{$input.rows}">{$fields_value[$input.name]}</textarea> <textarea name="{$input.name}" id="{$input.name}" cols="{$input.cols}" rows="{$input.rows}">{$fields_value[$input.name]}</textarea>
{/if} {/if}
controllers/admin/AdminContactsController.php
-2
View File
@@ -61,7 +61,6 @@ class AdminContactsControllerCore extends AdminController
'size' => 33, 'size' => 33,
'required' => true, 'required' => true,
'lang' => true, 'lang' => true,
'attributeLang' => 'name',
'p' => $this->l('Contact name, e.g., Technical Support'), 'p' => $this->l('Contact name, e.g., Technical Support'),
), ),
array( array(
@@ -99,7 +98,6 @@ class AdminContactsControllerCore extends AdminController
'name' => 'description', 'name' => 'description',
'required' => false, 'required' => false,
'lang' => true, 'lang' => true,
'attributeLang' => 'description',
'cols' => 36, 'cols' => 36,
'rows' => 5, 'rows' => 5,
'p' => $this->l('Additional information about this contact'), 'p' => $this->l('Additional information about this contact'),
js/admin.js
+6 -3
View File
@@ -1,5 +1,4 @@
/* /*
* 2007-2011 PrestaShop
* *
* NOTICE OF LICENSE * NOTICE OF LICENSE
* *
@@ -120,8 +119,12 @@ function updateFriendlyURLByName()
} }
function updateFriendlyURL() function updateFriendlyURL()
{ {
$('#link_rewrite_' + id_language).val(str2url($('#link_rewrite_' + id_language).val(), 'UTF-8')); var link = $('#link_rewrite_' + id_language);
$('#seo #friendly-url').text($('#link_rewrite_' + id_language).val()); if (link[0])
{
link.val(str2url($('#link_rewrite_' + id_language).val(), 'UTF-8'));
$('#seo #friendly-url').text(link.val());
}
} }
function toggleLanguageFlags(elt) function toggleLanguageFlags(elt)