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

// Fixing problems with blocklayered and flag

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12363 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-01-11 15:56:18 +00:00
parent 5fcd8d762e
commit 53d4262cbf
1 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blocklayered/blocklayered.php
+41 -16
View File
@@ -548,7 +548,8 @@ class BlockLayered extends Module
<div class="margin-form"> <div class="margin-form">
<script type="text/javascript"> <script type="text/javascript">
flag_fields += \'¤url_name¤meta_title\'; flag_fields += \'¤url_name¤meta_title\';
</script>'; </script>
<div class="translatable">';
foreach ($languages as $language) foreach ($languages as $language)
$return .= ' $return .= '
<div id="url_name_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $default_form_language ? 'block' : 'none').'; float: left;"> <div id="url_name_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $default_form_language ? 'block' : 'none').'; float: left;">
@@ -556,20 +557,26 @@ class BlockLayered extends Module
<span class="hint" name="help_box">'.$this->l('Invalid characters:').' <>;=#{}_<span class="hint-pointer">&nbsp;</span></span> <span class="hint" name="help_box">'.$this->l('Invalid characters:').' <>;=#{}_<span class="hint-pointer">&nbsp;</span></span>
<p style="clear: both">'.$this->l('Specific format in url block layered generation').'</p> <p style="clear: both">'.$this->l('Specific format in url block layered generation').'</p>
</div>'; </div>';
$return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'url_name', true, true); if (version_compare(_PS_VERSION_,'1.5','<'))
$return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'url_name', true, true);
$return .= ' $return .= '
</div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<label>'.$this->l('Meta title:').' </label> <label>'.$this->l('Meta title:').' </label>
<div class="margin-form">'; <div class="margin-form">
<div class="translatable">';
foreach ($languages as $language) foreach ($languages as $language)
$return .= ' $return .= '
<div id="meta_title_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $default_form_language ? 'block' : 'none').'; float: left;"> <div id="meta_title_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $default_form_language ? 'block' : 'none').'; float: left;">
<input size="33" type="text" name="meta_title_'.$language['id_lang'].'" value="'.Tools::safeOutput(@$langValue[$language['id_lang']]['meta_title'], true).'" /> <input size="33" type="text" name="meta_title_'.$language['id_lang'].'" value="'.Tools::safeOutput(@$langValue[$language['id_lang']]['meta_title'], true).'" />
<p style="clear: both">'.$this->l('Specific format for meta title').'</p> <p style="clear: both">'.$this->l('Specific format for meta title').'</p>
</div>'; </div>';
$return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'meta_title', true, true);
if (version_compare(_PS_VERSION_,'1.5','<'))
$return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'meta_title', true, true);
$return .= ' $return .= '
</div>
<div class="clear"></div> <div class="clear"></div>
</div>'; </div>';
return $return; return $return;
@@ -620,7 +627,8 @@ class BlockLayered extends Module
<div class="margin-form"> <div class="margin-form">
<script type="text/javascript"> <script type="text/javascript">
flag_fields += \'¤url_name¤meta_title\'; flag_fields += \'¤url_name¤meta_title\';
</script>'; </script>
<div class="translatable">';
foreach ($languages as $language) foreach ($languages as $language)
$return .= ' $return .= '
<div id="url_name_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $default_form_language ? 'block' : 'none').'; float: left;"> <div id="url_name_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $default_form_language ? 'block' : 'none').'; float: left;">
@@ -628,20 +636,25 @@ class BlockLayered extends Module
<span class="hint" name="help_box">'.$this->l('Invalid characters:').' <>;=#{}_<span class="hint-pointer">&nbsp;</span></span> <span class="hint" name="help_box">'.$this->l('Invalid characters:').' <>;=#{}_<span class="hint-pointer">&nbsp;</span></span>
<p style="clear: both">'.$this->l('Specific format in url block layered generation').'</p> <p style="clear: both">'.$this->l('Specific format in url block layered generation').'</p>
</div>'; </div>';
$return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'url_name', true, true); if (version_compare(_PS_VERSION_,'1.5','<'))
$return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'url_name', true, true);
$return .= ' $return .= '
</div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<label>'.$this->l('Meta title:').' </label> <label>'.$this->l('Meta title:').' </label>
<div class="margin-form">'; <div class="margin-form">
<div class="translatable">';
foreach ($languages as $language) foreach ($languages as $language)
$return .= ' $return .= '
<div id="meta_title_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $default_form_language ? 'block' : 'none').'; float: left;"> <div id="meta_title_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $default_form_language ? 'block' : 'none').'; float: left;">
<input size="33" type="text" name="meta_title_'.$language['id_lang'].'" value="'.Tools::safeOutput(@$langValue[$language['id_lang']]['meta_title'], true).'" /> <input size="33" type="text" name="meta_title_'.$language['id_lang'].'" value="'.Tools::safeOutput(@$langValue[$language['id_lang']]['meta_title'], true).'" />
<p style="clear: both">'.$this->l('Specific format for meta title').'</p> <p style="clear: both">'.$this->l('Specific format for meta title').'</p>
</div>'; </div>';
$return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'meta_title', true, true); if (version_compare(_PS_VERSION_,'1.5','<'))
$return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'meta_title', true, true);
$return .= ' $return .= '
</div>
<div class="clear"></div> <div class="clear"></div>
</div>'; </div>';
return $return; return $return;
@@ -733,7 +746,8 @@ class BlockLayered extends Module
<div class="margin-form"> <div class="margin-form">
<script type="text/javascript"> <script type="text/javascript">
flag_fields += \'¤url_name¤meta_title\'; flag_fields += \'¤url_name¤meta_title\';
</script>'; </script>
<div class="translatable">';
foreach ($languages as $language) foreach ($languages as $language)
$return .= ' $return .= '
<div id="url_name_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $default_form_language ? 'block' : 'none').'; float: left;"> <div id="url_name_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $default_form_language ? 'block' : 'none').'; float: left;">
@@ -741,20 +755,25 @@ class BlockLayered extends Module
<span class="hint" name="help_box">'.$this->l('Invalid characters:').' <>;=#{}_<span class="hint-pointer">&nbsp;</span></span> <span class="hint" name="help_box">'.$this->l('Invalid characters:').' <>;=#{}_<span class="hint-pointer">&nbsp;</span></span>
<p style="clear: both">'.$this->l('Specific format in url block layered generation').'</p> <p style="clear: both">'.$this->l('Specific format in url block layered generation').'</p>
</div>'; </div>';
$return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'url_name', true, true); if (version_compare(_PS_VERSION_,'1.5','<'))
$return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'url_name', true, true);
$return .= ' $return .= '
</div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<label>'.$this->l('Meta title:').' </label> <label>'.$this->l('Meta title:').' </label>
<div class="margin-form">'; <div class="margin-form">
<div class="translatable">';
foreach ($languages as $language) foreach ($languages as $language)
$return .= ' $return .= '
<div id="meta_title_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $default_form_language ? 'block' : 'none').'; float: left;"> <div id="meta_title_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $default_form_language ? 'block' : 'none').'; float: left;">
<input size="33" type="text" name="meta_title_'.$language['id_lang'].'" value="'.Tools::safeOutput(@$langValue[$language['id_lang']]['meta_title'], true).'" /> <input size="33" type="text" name="meta_title_'.$language['id_lang'].'" value="'.Tools::safeOutput(@$langValue[$language['id_lang']]['meta_title'], true).'" />
<p style="clear: both">'.$this->l('Specific format for meta title').'</p> <p style="clear: both">'.$this->l('Specific format for meta title').'</p>
</div>'; </div>';
$return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'meta_title', true, true); if (version_compare(_PS_VERSION_,'1.5','<'))
$return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'meta_title', true, true);
$return .= ' $return .= '
</div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<label>'.$this->l('Indexable:').' </label> <label>'.$this->l('Indexable:').' </label>
@@ -793,7 +812,8 @@ class BlockLayered extends Module
<div class="margin-form"> <div class="margin-form">
<script type="text/javascript"> <script type="text/javascript">
flag_fields += \'¤url_name¤meta_title\'; flag_fields += \'¤url_name¤meta_title\';
</script>'; </script>
<div class="translatable">';
foreach ($languages as $language) foreach ($languages as $language)
$return .= ' $return .= '
<div id="url_name_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $default_form_language ? 'block' : 'none').'; float: left;"> <div id="url_name_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $default_form_language ? 'block' : 'none').'; float: left;">
@@ -801,20 +821,25 @@ class BlockLayered extends Module
<span class="hint" name="help_box">'.$this->l('Invalid characters:').' <>;=#{}_<span class="hint-pointer">&nbsp;</span></span> <span class="hint" name="help_box">'.$this->l('Invalid characters:').' <>;=#{}_<span class="hint-pointer">&nbsp;</span></span>
<p style="clear: both">'.$this->l('Specific format in url block layered generation').'</p> <p style="clear: both">'.$this->l('Specific format in url block layered generation').'</p>
</div>'; </div>';
$return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'url_name', true, true); if (version_compare(_PS_VERSION_,'1.5','<'))
$return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'url_name', true, true);
$return .= ' $return .= '
</div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<label>'.$this->l('Meta title:').' </label> <label>'.$this->l('Meta title:').' </label>
<div class="margin-form">'; <div class="margin-form">
<div class="translatable">';
foreach ($languages as $language) foreach ($languages as $language)
$return .= ' $return .= '
<div id="meta_title_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $default_form_language ? 'block' : 'none').'; float: left;"> <div id="meta_title_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $default_form_language ? 'block' : 'none').'; float: left;">
<input size="33" type="text" name="meta_title_'.$language['id_lang'].'" value="'.Tools::safeOutput(@$langValue[$language['id_lang']]['meta_title'], true).'" /> <input size="33" type="text" name="meta_title_'.$language['id_lang'].'" value="'.Tools::safeOutput(@$langValue[$language['id_lang']]['meta_title'], true).'" />
<p style="clear: both">'.$this->l('Specific format for meta title').'</p> <p style="clear: both">'.$this->l('Specific format for meta title').'</p>
</div>'; </div>';
$return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'meta_title', true, true); if (version_compare(_PS_VERSION_,'1.5','<'))
$return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'meta_title', true, true);
$return .= ' $return .= '
</div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<label>'.$this->l('Indexable:').' </label> <label>'.$this->l('Indexable:').' </label>