Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
e1c126569b
3 changed files with 16 additions and 6 deletions
|
|
@ -302,6 +302,12 @@ source_file = htdocs/langs/en_US/propal.lang
|
|||
source_lang = en_US
|
||||
type = MOZILLAPROPERTIES
|
||||
|
||||
[o:dolibarr-association:p:dolibarr:r:quickmemo]
|
||||
file_filter = htdocs/langs/<lang>/quickmemo.lang
|
||||
source_file = htdocs/langs/en_US/quickmemo.lang
|
||||
source_lang = en_US
|
||||
type = MOZILLAPROPERTIES
|
||||
|
||||
[o:dolibarr-association:p:dolibarr:r:receiptprinter]
|
||||
file_filter = htdocs/langs/<lang>/receiptprinter.lang
|
||||
source_file = htdocs/langs/en_US/receiptprinter.lang
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
/* Copyright (C) 2004-2017 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2022 Alice Adminson <aadminson@example.com>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024-2026 Frédéric France <frederic.france@free.fr>
|
||||
* Coryright (C) 2024 Alexandre Spangaro <alexandre@inovea-conseil.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -249,7 +249,7 @@ if ($action == 'deleteproperty') {
|
|||
}
|
||||
|
||||
if ($action == 'create') {
|
||||
$out .= '<div class="addcustomprompt">';
|
||||
$out = '<div class="addcustomprompt">';
|
||||
|
||||
$out .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
|
||||
$out .= '<input type="hidden" name="token" value="'.newToken().'">';
|
||||
|
|
|
|||
|
|
@ -130,8 +130,7 @@ llxHeader('', $langs->trans($title), $help_url, '', 0, 0, '', ['quickmemo/css/se
|
|||
|
||||
|
||||
|
||||
|
||||
if ($action == 'edit') : ?>
|
||||
?>
|
||||
<script nonce="<?php print getNonce(); ?>">
|
||||
document.addEventListener('DOMContentLoaded', function () {
|
||||
|
||||
|
|
@ -142,6 +141,11 @@ document.addEventListener('DOMContentLoaded', function () {
|
|||
const colorsContainer = document.getElementById('colorsContainer');
|
||||
const colorsInput = document.getElementById('colorsInput');
|
||||
|
||||
if (!colorPicker || !addColorBtn || !colorsContainer || !colorsInput) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
let colors = [];
|
||||
let draggedElement = null;
|
||||
|
||||
|
|
@ -251,7 +255,7 @@ document.addEventListener('DOMContentLoaded', function () {
|
|||
});
|
||||
});
|
||||
</script>
|
||||
<?php endif;
|
||||
<?php
|
||||
|
||||
// Subheader
|
||||
$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.img_picto($langs->trans("BackToModuleList"), 'back', 'class="pictofixedwidth"').'<span class="hideonsmartphone">'.$langs->trans("BackToModuleList").'</span></a>';
|
||||
|
|
@ -260,7 +264,7 @@ print load_fiche_titre($langs->trans($title), $linkback, 'title_setup');
|
|||
|
||||
// Configuration header
|
||||
$head = quickmemoAdminPrepareHead();
|
||||
print dol_get_fiche_head($head, 'settings', $langs->trans($title), -1, "quickmemo@quickmemo");
|
||||
print dol_get_fiche_head($head, 'settings', $langs->trans($title), -1, "fa-sticky-note_fa");
|
||||
|
||||
// Setup page goes here
|
||||
echo '<span class="opacitymedium">'.$langs->trans("QuickMemoSetupPage").'</span><br><br>';
|
||||
|
|
|
|||
Loading…
Reference in a new issue