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

[*] MO : homeSlider - Added translations/changed size of URL and removed description from the required fields

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8279 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone
2011-08-31 10:02:44 +00:00
parent ef9bc292b8
commit 6c92e8ee82
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/homeslider/HomeSlide.php
+2 -3
View File
@@ -44,7 +44,7 @@ class HomeSlide extends ObjectModel
'active', 'active',
'position' 'position'
); );
protected $fieldsRequiredLang = array('title', 'description', 'url', 'legend'); protected $fieldsRequiredLang = array('title', 'url', 'legend');
protected $fieldsSizeLang = array( protected $fieldsSizeLang = array(
'description' => 4000, 'description' => 4000,
'title' => 255, 'title' => 255,
@@ -53,7 +53,7 @@ class HomeSlide extends ObjectModel
'image' => 255 'image' => 255
); );
protected $fieldsValidateLang = array( protected $fieldsValidateLang = array(
'title' => 'isName', 'title' => 'isCleanHtml',
'description' => 'isCleanHtml', 'description' => 'isCleanHtml',
'url' => 'isUrl', 'url' => 'isUrl',
'legend' => 'isCleanHtml', 'legend' => 'isCleanHtml',
@@ -100,7 +100,6 @@ class HomeSlide extends ObjectModel
INSERT INTO `'._DB_PREFIX_.'homeslider` (`id_shop`, `id_slide`) INSERT INTO `'._DB_PREFIX_.'homeslider` (`id_shop`, `id_slide`)
VALUES('.(int)$id_shop.', '.(int)$this->id.')' VALUES('.(int)$id_shop.', '.(int)$this->id.')'
); );
return $res; return $res;
} }
modules/homeslider/homeslider.php
+9 -9
View File
@@ -262,7 +262,7 @@ class HomeSlider extends Module
<br /> <br />
<legend><img src="'._PS_ADMIN_IMG_.'add.gif" alt="" />1 - '.$this->l('Upload your slide').'</legend>'; <legend><img src="'._PS_ADMIN_IMG_.'add.gif" alt="" />1 - '.$this->l('Upload your slide').'</legend>';
/* Image */ /* Image */
$this->_html .= '<label>'.$this->l('Select a file').':</label><div class="margin-form">'; $this->_html .= '<label>'.$this->l('Select a file').' * :</label><div class="margin-form">';
foreach ($languages as $language) foreach ($languages as $language)
{ {
$this->_html .= '<div id="image_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $defaultLanguage ? 'block' : 'none').';float: left;">'; $this->_html .= '<div id="image_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $defaultLanguage ? 'block' : 'none').';float: left;">';
@@ -293,7 +293,7 @@ class HomeSlider extends Module
/* Form content */ /* Form content */
/* Title */ /* Title */
$this->_html .= '<br /><label>'.$this->l('Title:').'</label><div class="margin-form">'; $this->_html .= '<br /><label>'.$this->l('Title').' * : </label><div class="margin-form">';
foreach ($languages as $language) foreach ($languages as $language)
{ {
$this->_html .= ' $this->_html .= '
@@ -305,7 +305,7 @@ class HomeSlider extends Module
$this->_html .= '</div><br /><br />'; $this->_html .= '</div><br /><br />';
/* URL */ /* URL */
$this->_html .= '<label>'.$this->l('URL:').'</label><div class="margin-form">'; $this->_html .= '<label>'.$this->l('URL').' * : </label><div class="margin-form">';
foreach ($languages as $language) foreach ($languages as $language)
{ {
$this->_html .= ' $this->_html .= '
@@ -317,7 +317,7 @@ class HomeSlider extends Module
$this->_html .= '</div><br /><br />'; $this->_html .= '</div><br /><br />';
/* Legend */ /* Legend */
$this->_html .= '<label>'.$this->l('Legend:').'</label><div class="margin-form">'; $this->_html .= '<label>'.$this->l('Legend').' * :</label><div class="margin-form">';
foreach ($languages as $language) foreach ($languages as $language)
{ {
$this->_html .= ' $this->_html .= '
@@ -330,7 +330,7 @@ class HomeSlider extends Module
/* Description */ /* Description */
$this->_html .= ' $this->_html .= '
<label>'.$this->l('Description:').'</label> <label>'.$this->l('Description').' :</label>
<div class="margin-form">'; <div class="margin-form">';
foreach ($languages as $language) foreach ($languages as $language)
{ {
@@ -350,6 +350,7 @@ class HomeSlider extends Module
<label class="t" for="active_on">'.$this->l('Yes').'</label> <label class="t" for="active_on">'.$this->l('Yes').'</label>
<img src="../img/admin/disabled.gif" alt="No" title="No" style="margin-left: 10px;" /> <img src="../img/admin/disabled.gif" alt="No" title="No" style="margin-left: 10px;" />
<input type="radio" name="active_slide" id="active_off" '.(($slide AND (isset($slide->active) AND (int)$slide->active == 0)) ? 'checked="checked" ' : '').' value="0" /> <input type="radio" name="active_slide" id="active_off" '.(($slide AND (isset($slide->active) AND (int)$slide->active == 0)) ? 'checked="checked" ' : '').' value="0" />
<label class="t" for="active_off">'.$this->l('No').'</label>
</div>'; </div>';
/* Save */ /* Save */
@@ -361,6 +362,7 @@ class HomeSlider extends Module
/* End of fieldset & form */ /* End of fieldset & form */
$this->_html .= ' $this->_html .= '
<p>*'.$this->l('Required fields').'</p>
</fieldset> </fieldset>
</form>'; </form>';
} }
@@ -405,9 +407,9 @@ class HomeSlider extends Module
$errors[] = $this->l('Title is too long'); $errors[] = $this->l('Title is too long');
if (strlen(Tools::getValue('legend_'.$language['id_lang'])) > 40) if (strlen(Tools::getValue('legend_'.$language['id_lang'])) > 40)
$errors[] = $this->l('Legend is too long'); $errors[] = $this->l('Legend is too long');
if (strlen(Tools::getValue('url_'.$language['id_lang'])) > 40) if (strlen(Tools::getValue('url_'.$language['id_lang'])) > 200)
$errors[] = $this->l('URL is too long'); $errors[] = $this->l('URL is too long');
if (strlen(Tools::getValue('description_'.$language['id_lang'])) > 200) if (strlen(Tools::getValue('description_'.$language['id_lang'])) > 400)
$errors[] = $this->l('Description is too long'); $errors[] = $this->l('Description is too long');
if (strlen(Tools::getValue('url_'.$language['id_lang'])) > 0 && !Validate::isUrl(Tools::getValue('url_'.$language['id_lang']))) if (strlen(Tools::getValue('url_'.$language['id_lang'])) > 0 && !Validate::isUrl(Tools::getValue('url_'.$language['id_lang'])))
$errors[] = $this->l('URL format is not correct'); $errors[] = $this->l('URL format is not correct');
@@ -425,8 +427,6 @@ class HomeSlider extends Module
$errors[] = $this->l('Legend is not set'); $errors[] = $this->l('Legend is not set');
if (strlen(Tools::getValue('url_'.$defaultLanguage)) == 0) if (strlen(Tools::getValue('url_'.$defaultLanguage)) == 0)
$errors[] = $this->l('URL is not set'); $errors[] = $this->l('URL is not set');
if (strlen(Tools::getValue('description_'.$defaultLanguage)) == 0)
$errors[] = $this->l('Description is not set');
if (Tools::getValue('image_'.$defaultLanguage) == "" AND !Validate::isFileName(Tools::getValue('image_'.$defaultLanguage)) AND !Tools::getValue('image_old_'.defaultLanguage)) if (Tools::getValue('image_'.$defaultLanguage) == "" AND !Validate::isFileName(Tools::getValue('image_'.$defaultLanguage)) AND !Tools::getValue('image_old_'.defaultLanguage))
$errors[] = $this->l("Image is not set"); $errors[] = $this->l("Image is not set");
if (Tools::getValue('image_old_'.$defaultLanguage) AND !Validate::isFileName(Tools::getValue('image_old_'.$defaultLanguage))) if (Tools::getValue('image_old_'.$defaultLanguage) AND !Validate::isFileName(Tools::getValue('image_old_'.$defaultLanguage)))