diff --git a/admin-dev/header.inc.php b/admin-dev/header.inc.php index 9f7c750b4..4f0b986ad 100644 --- a/admin-dev/header.inc.php +++ b/admin-dev/header.inc.php @@ -65,6 +65,24 @@ echo ' color:'.(Tools::getBrightness(empty(Context::getContext()->employee->bo_color) ? '#FFFFFF' : Context::getContext()->employee->bo_color) < 128 ? 'white' : '#383838').' } + employee->bo_color)) ? 'style="background:'.Tools::htmlentitiesUTF8(Context::getContext()->employee->bo_color).'"' : '').'>
diff --git a/admin-dev/tabs/AdminCategories.php b/admin-dev/tabs/AdminCategories.php index 2152741a7..3ace735f2 100644 --- a/admin-dev/tabs/AdminCategories.php +++ b/admin-dev/tabs/AdminCategories.php @@ -202,7 +202,7 @@ class AdminCategories extends AdminTab echo '
id) ? ' onkeyup="copy2friendlyURL();"' : '').' /> * - '.$this->l('Invalid characters:').' <>;=#{}'.($obj->id ? '
'.$this->youEditFieldFor() : '').'  + '.$this->l('Invalid characters:').' <>;=#{} 
'; echo '

@@ -246,7 +246,7 @@ class AdminCategories extends AdminTab echo '
- '.$this->l('Forbidden characters:').' <>;=#{}'.($obj->id ? '
'.$this->youEditFieldFor() : '').'  + '.$this->l('Forbidden characters:').' <>;=#{} 
'; echo '

@@ -255,7 +255,7 @@ class AdminCategories extends AdminTab foreach ($this->_languages AS $language) echo '
- '.$this->l('Forbidden characters:').' <>;=#{}'.($obj->id ? '
'.$this->youEditFieldFor() : '').'  + '.$this->l('Forbidden characters:').' <>;=#{} 
'; echo '

@@ -265,7 +265,7 @@ class AdminCategories extends AdminTab echo '
- '.$this->l('Forbidden characters:').' <>;=#{}'.($obj->id ? '
'.$this->youEditFieldFor() : '').'  + '.$this->l('Forbidden characters:').' <>;=#{} 
'; echo '

@@ -274,7 +274,7 @@ class AdminCategories extends AdminTab foreach ($this->_languages AS $language) echo '
* - '.$this->l('Only letters and the minus (-) character are allowed').($obj->id ? '
'.$this->youEditFieldFor() : '').'  + '.$this->l('Only letters and the minus (-) character are allowed').' 
'; echo '

diff --git a/admin-dev/tabs/AdminPayment.php b/admin-dev/tabs/AdminPayment.php index 20b993074..e6a054ef7 100644 --- a/admin-dev/tabs/AdminPayment.php +++ b/admin-dev/tabs/AdminPayment.php @@ -140,7 +140,7 @@ class AdminPayment extends AdminTab
'.$title.' -

'.$desc.'
'.$this->youEditFieldFor().'

+

'.$desc.'

'; diff --git a/admin-dev/tabs/AdminProducts.php b/admin-dev/tabs/AdminProducts.php index 590e8e23c..1a47d5eec 100644 --- a/admin-dev/tabs/AdminProducts.php +++ b/admin-dev/tabs/AdminProducts.php @@ -2184,7 +2184,7 @@ class AdminProducts extends AdminTab echo '
id) ? ' onkeyup="if (isArrowKey(event)) return; copy2friendlyURL();"' : '').' onkeyup="if (isArrowKey(event)) return; updateCurrentText();" onchange="updateCurrentText();" /> * - '.$this->l('Invalid characters:').' <>;=#{}'.($obj->id ? '
'.$this->youEditFieldFor() : '').'  + '.$this->l('Invalid characters:').' <>;=#{} 
'; echo ' @@ -2695,7 +2695,7 @@ class AdminProducts extends AdminTab echo '
- '.$this->l('Forbidden characters:').' <>;=#{}'.($obj->id ? '
'.$this->youEditFieldFor() : '').'  + '.$this->l('Forbidden characters:').' <>;=#{} 
'; echo ' @@ -2706,7 +2706,7 @@ class AdminProducts extends AdminTab echo '
- '.$this->l('Forbidden characters:').' <>;=#{}'.($obj->id ? '
'.$this->youEditFieldFor() : '').'  + '.$this->l('Forbidden characters:').' <>;=#{} 
'; echo ' @@ -2785,7 +2785,7 @@ class AdminProducts extends AdminTab echo '
- '.$this->l('Forbidden characters:').' <>;=#{}'.($obj->id ? '
'.$this->youEditFieldFor() : '').'  + '.$this->l('Forbidden characters:').' <>;=#{} 
'; echo '

'.$this->l('Product page title; leave blank to use product name').'

@@ -2797,7 +2797,7 @@ class AdminProducts extends AdminTab echo '
- '.$this->l('Forbidden characters:').' <>;=#{}'.($obj->id ? '
'.$this->youEditFieldFor() : '').'  + '.$this->l('Forbidden characters:').' <>;=#{} 
'; echo '

'.$this->l('A single sentence for HTML header').'

@@ -2809,7 +2809,7 @@ class AdminProducts extends AdminTab echo '
- '.$this->l('Forbidden characters:').' <>;=#{}'.($obj->id ? '
'.$this->youEditFieldFor() : '').'  + '.$this->l('Forbidden characters:').' <>;=#{} 
'; echo '

'.$this->l('Keywords for HTML header, separated by a comma').'

@@ -2822,7 +2822,7 @@ class AdminProducts extends AdminTab echo '
* - '.$this->l('Only letters and the "less" character are allowed').($obj->id ? '
'.$this->youEditFieldFor() : '').'  + '.$this->l('Only letters and the "less" character are allowed').' 
'; } echo '

'.''.$this->l('Generate').' '.$this->l('Friendly-url from product\'s name.').'

'; @@ -2840,7 +2840,7 @@ class AdminProducts extends AdminTab echo '

'; - echo '

'.($obj->id ? $this->youEditFieldFor() : '').'

+ echo '

@@ -2850,7 +2850,7 @@ class AdminProducts extends AdminTab echo '
'; - echo '

'.($obj->id ? $this->youEditFieldFor() : '').'

+ echo '

'; echo ' diff --git a/classes/AdminTab.php b/classes/AdminTab.php index 2a2e1e8cd..25d4ee943 100644 --- a/classes/AdminTab.php +++ b/classes/AdminTab.php @@ -2405,14 +2405,6 @@ EOF; echo $html; } - protected function youEditFieldFor() - { - if (!Shop::isMultiShopActivated()) - return; - - return $this->l('This field will be changed for the shop:').' '.Context::getContext()->shop->name; - } - /** * Get current URL * diff --git a/js/admin.js b/js/admin.js index e152a7350..6112155a2 100644 --- a/js/admin.js +++ b/js/admin.js @@ -829,10 +829,8 @@ function trackClickOnHelp(label, doc_version) $(document).ready(function() { - $('.isInvisible input, .isInvisible select, .isInvisible textarea').each(function(k, v) - { - $(v).attr('disabled', true); - }); + $('.isInvisible input, .isInvisible select, .isInvisible textarea').attr('disabled', true); + $('.isInvisible label.conf_title').addClass('isDisabled'); // Disable options fields for each row with a multishop default checkbox $('.preference_default_multishop input[type=checkbox]').each(function(k, v)
'.$title.'