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

// merge 1.4 (5397)

Browse Source
This commit is contained in:
fBrignoli
2011-04-22 16:00:58 +00:00
parent 0cd5856fe5
commit ff49083fb6
126 changed files with 3390 additions and 1430 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/tabs/AdminEmployees.php
+4 -3
View File
@@ -90,7 +90,7 @@ class AdminEmployees extends AdminTab
return;
$profiles = Profile::getProfiles((int)($cookie->id_lang));
echo '<script type="text/javascript" src="../js/jquery/jquery-colorpicker.js"></script>
echo '<script type="text/javascript" src="'._PS_JS_DIR_.'/jquery/jquery-colorpicker.js"></script>
<script type="text/javascript">
var employeePage = true;
</script>
@@ -118,8 +118,9 @@ class AdminEmployees extends AdminTab
<input type="text" size="33" name="email" value="'.htmlentities($this->getFieldValue($obj, 'email'), ENT_COMPAT, 'UTF-8').'" /> <sup>*</sup>
</div><div class="clear">&nbsp;</div>
<label>'.$this->l('Back office color:').' </label>
<div class="margin-form">
<input type="color" data-hex="true" class="color mColorPickerInput" name="bo_color" value="'.htmlentities($this->getFieldValue($obj, 'bo_color'), ENT_COMPAT, 'UTF-8').'" />
<div class="margin-form">';
// Note : width= fix Firefox 4 display bug related to colorpicker librarie
echo '<input type="color" width="50px" data-hex="true" class="color mColorPickerInput" name="bo_color" value="'.htmlentities($this->getFieldValue($obj, 'bo_color'), ENT_COMPAT, 'UTF-8').'" />
<p>'.$this->l('Back office background will be displayed in this color. HTML colors only (e.g.,').' "lightblue", "#CC6600")</p>
</div><div class="clear">&nbsp;</div>
<label>'.$this->l('Language:').' </label>