Skip to content

Commit 4c78b25

Browse files
rohit053rohit053
authored
Merge pull request #82 from wdammak/patch-2
Fix path Feature Logo
2 parents 994dbfe + f567ac9 commit 4c78b25

1 file changed

Lines changed: 19 additions & 19 deletions

File tree

‎controllers/admin/AdminFeaturesController.php‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,10 @@ public function renderForm()
175175
$image = "<img class='img-thumbnail img-responsive' style='max-width:100px' src='".$img_url."'>";
176176
}
177177

178-
$this->toolbar_title = $this->l('Add a new feature');
178+
$this->toolbar_title = $this->l('Add a new room feature');
179179
$this->fields_form = array(
180180
'legend' => array(
181-
'title' => $this->l('Feature'),
181+
'title' => $this->l('Room feature'),
182182
'icon' => 'icon-info-sign'
183183
),
184184
'input' => array(
@@ -188,16 +188,16 @@ public function renderForm()
188188
'name' => 'name',
189189
'lang' => true,
190190
'size' => 33,
191-
'hint' => $this->l('Enter a name for the feature. Invalid characters:').' <>;=#{}',
191+
'hint' => $this->l('Enter a name for the room feature. Invalid characters:').' <>;=#{}',
192192
'required' => true
193193
),
194194
array(
195195
'type' => 'file',
196-
'label' => $this->l('Feature Logo'),
196+
'label' => $this->l('Room Feature Logo'),
197197
'name' => 'logo',
198198
'image' => $img_exist ? $image : false,
199199
'display_image' => true,
200-
'hint' => $this->l('Upload a feature logo.'),
200+
'hint' => $this->l('Upload a room feature logo.'),
201201
'required' => true
202202
)
203203
)
@@ -223,21 +223,21 @@ public function initPageHeaderToolbar()
223223
if (empty($this->display)) {
224224
$this->page_header_toolbar_btn['new_feature'] = array(
225225
'href' => self::$currentIndex.'&addfeature&token='.$this->token,
226-
'desc' => $this->l('Add new feature', null, null, false),
226+
'desc' => $this->l('Add new room feature', null, null, false),
227227
'icon' => 'process-icon-new'
228228
);
229229

230230
$this->page_header_toolbar_btn['new_feature_value'] = array(
231231
'href' => self::$currentIndex.'&addfeature_value&id_feature='.(int)Tools::getValue('id_feature').'&token='.$this->token,
232-
'desc' => $this->l('Add new feature value', null, null, false),
232+
'desc' => $this->l('Add new room feature value', null, null, false),
233233
'icon' => 'process-icon-new'
234234
);
235235
}
236236

237237
if ($this->display == 'view') {
238238
$this->page_header_toolbar_btn['new_feature_value'] = array(
239239
'href' => self::$currentIndex.'&addfeature_value&id_feature='.(int)Tools::getValue('id_feature').'&token='.$this->token,
240-
'desc' => $this->l('Add new feature value', null, null, false),
240+
'desc' => $this->l('Add new room feature value', null, null, false),
241241
'icon' => 'process-icon-new'
242242
);
243243
}
@@ -283,7 +283,7 @@ public function initToolbar()
283283
case 'view':
284284
$this->toolbar_btn['newAttributes'] = array(
285285
'href' => self::$currentIndex.'&addfeature_value&id_feature='.(int)Tools::getValue('id_feature').'&token='.$this->token,
286-
'desc' => $this->l('Add new feature values')
286+
'desc' => $this->l('Add new room feature values')
287287
);
288288
$this->toolbar_btn['back'] = array(
289289
'href' => self::$currentIndex.'&token='.$this->token,
@@ -301,12 +301,12 @@ public function initToolbarTitle()
301301

302302
switch ($this->display) {
303303
case 'edit':
304-
$bread_extended[] = $this->l('Edit New Feature');
304+
$bread_extended[] = $this->l('Edit New Room Feature');
305305
$this->addMetaTitle($bread_extended[count($bread_extended) - 1]);
306306
break;
307307

308308
case 'add':
309-
$bread_extended[] = $this->l('Add New Feature');
309+
$bread_extended[] = $this->l('Add New Room Feature');
310310
$this->addMetaTitle($bread_extended[count($bread_extended) - 1]);
311311
break;
312312

@@ -351,13 +351,13 @@ public function initFormFeatureValue()
351351

352352
$this->fields_form[0]['form'] = array(
353353
'legend' => array(
354-
'title' => $this->l('Feature value'),
354+
'title' => $this->l('Room feature value'),
355355
'icon' => 'icon-info-sign'
356356
),
357357
'input' => array(
358358
array(
359359
'type' => 'select',
360-
'label' => $this->l('Feature'),
360+
'label' => $this->l('Room feature'),
361361
'name' => 'id_feature',
362362
'options' => array(
363363
'query' => Feature::getFeatures($this->context->language->id),
@@ -425,7 +425,7 @@ public function initFormFeatureValue()
425425
$helper->allow_employee_form_lang = $this->allow_employee_form_lang;
426426
$helper->fields_value = $this->getFieldsValue($feature_value);
427427
$helper->toolbar_btn = $this->toolbar_btn;
428-
$helper->title = $this->l('Add a new feature value');
428+
$helper->title = $this->l('Add a new room feature value');
429429
$this->content .= $helper->generateForm($this->fields_form);
430430
}
431431

@@ -464,7 +464,7 @@ public function initContent()
464464
}
465465
} else {
466466
$url = '<a href="index.php?tab=AdminPerformance&token='.Tools::getAdminTokenLite('AdminPerformance').'#featuresDetachables">'.$this->l('Performance').'</a>';
467-
$this->displayWarning(sprintf($this->l('This feature has been disabled. You can activate it here: %s.'), $url));
467+
$this->displayWarning(sprintf($this->l('This room feature has been disabled. You can activate it here: %s.'), $url));
468468
}
469469

470470
$this->context->smarty->assign(
@@ -615,7 +615,7 @@ public function processSave()
615615
// upload feature image
616616
$imgPath = _PS_IMG_DIR_.'rf/'.$objFeature->id.'.png';
617617
if (!ImageManager::resize($featureImage['tmp_name'], $imgPath)) {
618-
$this->errors[] = $this->l('Some error occurred while uploding feature image. Please try again.');
618+
$this->errors[] = $this->l('Some error occurred while uploding room feature image. Please try again.');
619619
}
620620
}
621621

@@ -695,12 +695,12 @@ public function ajaxProcessUpdatePositions()
695695
if (isset($pos[2]) && (int)$pos[2] === $idFeature) {
696696
if ($feature = new Feature((int)$pos[2])) {
697697
if (isset($position) && $feature->updatePosition($way, $position, $idFeature)) {
698-
echo 'ok position '.(int)$position.' for feature '.(int)$pos[1].'\r\n';
698+
echo 'ok position '.(int)$position.' for room feature '.(int)$pos[1].'\r\n';
699699
} else {
700-
echo '{"hasError" : true, "errors" : "Can not update feature '.(int)$idFeature.' to position '.(int)$position.' "}';
700+
echo '{"hasError" : true, "errors" : "Can not update room feature '.(int)$idFeature.' to position '.(int)$position.' "}';
701701
}
702702
} else {
703-
echo '{"hasError" : true, "errors" : "This feature ('.(int)$idFeature.') can t be loaded"}';
703+
echo '{"hasError" : true, "errors" : "This room feature ('.(int)$idFeature.') can t be loaded"}';
704704
}
705705

706706
break;

0 commit comments

Comments
 (0)