lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Error with jmobile

Browse Source
This commit is contained in:
Laurent Destailleur 2013-05-26 05:01:28 +02:00
parent 2cac1f4c9c
commit f3f4dec96e
1 changed files with 59 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
htdocs/core/class/html.formother.class.php
View File

@ -544,68 +544,73 @@ class FormOther
*/ */
function selectColor($set_color='', $prefix='f_color', $form_name='objForm', $showcolorbox=1, $arrayofcolors='', $morecss='') function selectColor($set_color='', $prefix='f_color', $form_name='objForm', $showcolorbox=1, $arrayofcolors='', $morecss='')
{ {
global $langs; global $langs,$conf;
$out=''; $out='';
if (! is_array($arrayofcolors) || count($arrayofcolors) < 1) if (! is_array($arrayofcolors) || count($arrayofcolors) < 1)
{ {
$langs->load("other"); $langs->load("other");
$out.= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />'; if (empty($conf->dol_use_jmobile))
$out.= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>'; {
$out.= '<script type="text/javascript"> $out.= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';
jQuery(document).ready(function(){ $out.= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';
$(\'#colorpicker'.$prefix.'\').jPicker( { $out.= '<script type="text/javascript">
window: { jQuery(document).ready(function(){
title: \''.dol_escape_js($langs->trans("SelectAColor")).'\', /* any title for the jPicker window itself - displays "Drag Markers To Pick A Color" if left null */ $(\'#colorpicker'.$prefix.'\').jPicker( {
effects: window: {
{ title: \''.dol_escape_js($langs->trans("SelectAColor")).'\', /* any title for the jPicker window itself - displays "Drag Markers To Pick A Color" if left null */
type: \'show\', /* effect used to show/hide an expandable picker. Acceptable values "slide", "show", "fade" */ effects:
speed: {
{ type: \'show\', /* effect used to show/hide an expandable picker. Acceptable values "slide", "show", "fade" */
show: \'fast\', /* duration of "show" effect. Acceptable values are "fast", "slow", or time in ms */ speed:
hide: \'fast\' /* duration of "hide" effect. Acceptable values are "fast", "slow", or time in ms */ {
} show: \'fast\', /* duration of "show" effect. Acceptable values are "fast", "slow", or time in ms */
}, hide: \'fast\' /* duration of "hide" effect. Acceptable values are "fast", "slow", or time in ms */
position: }
{ },
x: \'screenCenter\', /* acceptable values "left", "center", "right", "screenCenter", or relative px value */ position:
y: \'center\' /* acceptable values "top", "bottom", "center", or relative px value */ {
}, x: \'screenCenter\', /* acceptable values "left", "center", "right", "screenCenter", or relative px value */
}, y: \'center\' /* acceptable values "top", "bottom", "center", or relative px value */
images: { },
clientPath: \''.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/images/\', },
picker: { file: \'../../../../../theme/common/colorpicker.png\', width: 14, height: 14 } images: {
}, clientPath: \''.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/images/\',
localization: // alter these to change the text presented by the picker (e.g. different language) picker: { file: \'../../../../../theme/common/colorpicker.png\', width: 14, height: 14 }
{ },
text: localization: // alter these to change the text presented by the picker (e.g. different language)
{ {
title: \''.dol_escape_js($langs->trans("SelectAColor")).'\', text:
newColor: \''.dol_escape_js($langs->trans("New")).'\', {
currentColor: \''.dol_escape_js($langs->trans("Current")).'\', title: \''.dol_escape_js($langs->trans("SelectAColor")).'\',
ok: \''.dol_escape_js($langs->trans("Save")).'\', newColor: \''.dol_escape_js($langs->trans("New")).'\',
cancel: \''.dol_escape_js($langs->trans("Cancel")).'\' currentColor: \''.dol_escape_js($langs->trans("Current")).'\',
} ok: \''.dol_escape_js($langs->trans("Save")).'\',
} cancel: \''.dol_escape_js($langs->trans("Cancel")).'\'
} ); }); }
</script>'; }
} ); });
</script>';
}
$out.= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss?' '.$morecss:'').'" type="text" value="'.$set_color.'" />'; $out.= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss?' '.$morecss:'').'" type="text" value="'.$set_color.'" />';
} }
else // In most cases, this is not used. We used instead function with no specific list of colors else // In most cases, this is not used. We used instead function with no specific list of colors
{ {
$out.= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />'; if (empty($conf->dol_use_jmobile))
$out.= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>'; {
$out.= '<script type="text/javascript"> $out.= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';
jQuery(document).ready(function(){ $out.= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';
jQuery(\'#colorpicker'.$prefix.'\').colorpicker({ $out.= '<script type="text/javascript">
size: 14, jQuery(document).ready(function(){
label: \'\', jQuery(\'#colorpicker'.$prefix.'\').colorpicker({
hide: true size: 14,
}); label: \'\',
}); hide: true
</script>'; });
});
</script>';
}
$out.= '<select id="colorpicker'.$prefix.'" class="flat'.($morecss?' '.$morecss:'').'" name="'.$prefix.'">'; $out.= '<select id="colorpicker'.$prefix.'" class="flat'.($morecss?' '.$morecss:'').'" name="'.$prefix.'">';
//print '<option value="-1">&nbsp;</option>'; //print '<option value="-1">&nbsp;</option>';
foreach ($arrayofcolors as $val) foreach ($arrayofcolors as $val)
@ -1005,7 +1010,7 @@ class FormOther
} }
if (empty($conf->browser->phone)) if (empty($conf->browser->phone))
{ {
$emptybox->box_id='A'; $emptybox->box_id='A';
$emptybox->info_box_head=array(); $emptybox->info_box_head=array();
$emptybox->info_box_contents=array(); $emptybox->info_box_contents=array();
@ -1036,7 +1041,7 @@ class FormOther
} }
if (empty($conf->browser->phone)) if (empty($conf->browser->phone))
{ {
$emptybox->box_id='B'; $emptybox->box_id='B';
$emptybox->info_box_head=array(); $emptybox->info_box_head=array();
$emptybox->info_box_contents=array(); $emptybox->info_box_contents=array();