Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2024-03-16 12:21:10 +01:00
commit bcb68d8924
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/class/html.formmail.class.php
View File

@ -1455,7 +1455,8 @@ class FormMail extends Form
$out .= '<td>';
$out .= '<input type="text" class="quatrevingtpercent" id="ai_instructions" name="instruction" placeholder="'.$langs->trans("EnterYourAIPromptHere").'..." />';
$out .= '<input id="generate_button" type="button" class="button smallpaddingimp" value="'.$langs->trans('Generate').'"/>';
$out .= '<div id="ai_status_message" class="fieldrequired hideobject" >'.$langs->trans("AIProcessingPleaseWait").'</div>';
$out .= '<div id="ai_status_message" class="fieldrequired hideobject marginrightonly" >';
$out .= '<i class="fa fa-spinner fa-spin fa-2x fa-fw"></i>'.$langs->trans("AIProcessingPleaseWait").'</div>';
$out .= "</td></tr>\n";
$out .= "<script type='text/javascript'>
@ -1472,6 +1473,7 @@ class FormMail extends Form
var instructions = $('#ai_instructions').val();
$('#ai_status_message').show();
$('.icon-container .loader').show();
//editor on readonly
if (CKEDITOR.instances.".$htmlContent.") {
@ -1499,7 +1501,9 @@ class FormMail extends Form
// remove readonly
$('#ai_instructions').val('');
$('#ai_status_message').hide();
setTimeout(function() {
$('#ai_status_message').hide();
}, 3000);
},
error: function(xhr, status, error) {
alert(error);

4
htdocs/theme/eldy/global.inc.php
View File

@ -8153,8 +8153,6 @@ table.jPicker {
margin-top: 30px;
}
}
@media only screen and (max-width: 320px)
{
.dropdown dd ul {
@ -8206,3 +8204,5 @@ div.flot-text .flot-tick-label .tickLabel, .fa-color-unset {
color: unset;
}