diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst index 500670884a2..c70dcf4b690 100644 --- a/dev/translation/ignore_translation_keys.lst +++ b/dev/translation/ignore_translation_keys.lst @@ -1004,7 +1004,6 @@ VideoGeneration ##################################################################### ##################################################################### AddService -AnHelpMessage Analytic AnalyticLabel BankId @@ -1036,6 +1035,7 @@ FailedToLogin First GroupCreate GroupUpdate +HelpMessage INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION INVOICE_RETAINED_WARRANTY_LIMITED_TO_SITUATION INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php index 9a74a5cf44b..e920f35f098 100644 --- a/htdocs/core/class/html.formsetup.class.php +++ b/htdocs/core/class/html.formsetup.class.php @@ -945,7 +945,7 @@ class FormSetupItem } /** - * generatec default input field + * Generate default input field * * @return string */ diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php index b245895a586..d7ae0837137 100644 --- a/htdocs/modulebuilder/template/admin/setup.php +++ b/htdocs/modulebuilder/template/admin/setup.php @@ -104,7 +104,7 @@ if (!$user->admin) { // Setup conf for selection of an URL $item = $formSetup->newItem('MYMODULE_MYPARAM1'); -$item->fieldOverride = (empty($_SERVER['HTTPS']) ? 'http://' : 'https://') . $_SERVER['HTTP_HOST']; +$item->fieldAttr['placeholder'] = (empty($_SERVER['HTTPS']) ? 'http://' : 'https://') . $_SERVER['HTTP_HOST']; $item->cssClass = 'minwidth500'; // Setup conf for selection of a simple string input @@ -116,20 +116,20 @@ $item->fieldAttr['placeholder'] = 'A placeholder here'; $item = $formSetup->newItem('MYMODULE_MYPARAM3'); $item->nameText = $item->getNameText().' more html text '; -// Setup conf for a selection of a thirdparty +// Setup conf for a selection of a Thirdparty $item = $formSetup->newItem('MYMODULE_MYPARAM4'); $item->setAsThirdpartyType(); // Setup conf for a selection of a boolean $formSetup->newItem('MYMODULE_MYPARAM5')->setAsYesNo(); -// Setup conf for a selection of an email template of type thirdparty +// Setup conf for a selection of an Email template of type thirdparty $formSetup->newItem('MYMODULE_MYPARAM6')->setAsEmailTemplate('thirdparty'); // Setup conf for a selection of a secured key //$formSetup->newItem('MYMODULE_MYPARAM7')->setAsSecureKey(); -// Setup conf for a selection of a product +// Setup conf for a selection of a Product $formSetup->newItem('MYMODULE_MYPARAM8')->setAsProduct(); // Add a title for a new section @@ -159,15 +159,26 @@ $formSetup->newItem('MYMODULE_CATEGORY_ID_XXX')->setAsCategory('product'); $item = $formSetup->newItem('MYMODULE_MYPARAM10'); $item->setAsColor(); $item->defaultFieldValue = '#FF0000'; -$item->nameText = $item->getNameText().' more html text '; -$item->fieldInputOverride = ''; -$item->helpText = $langs->transnoentities('AnHelpMessage'); //$item->fieldValue = ''; //$item->fieldAttr = array() ; // fields attribute only for compatible fields like input text //$item->fieldOverride = false; // set this var to override field output will override $fieldInputOverride and $fieldOutputOverride too //$item->fieldInputOverride = false; // set this var to override field input //$item->fieldOutputOverride = false; // set this var to override field output +$item = $formSetup->newItem('TEST_MYPARAM11')->setAsHtml(); +$item->nameText = $item->getNameText().' more html text '; +$item->fieldInputOverride = ''; +$item->helpText = $langs->transnoentities('HelpMessage'); +$item->cssClass = 'minwidth500'; + +$item = $formSetup->newItem('TEST_MYPARAM12'); +$item->fieldOverride = "Value forced, can't be modified"; +$item->cssClass = 'minwidth500'; + +//$item = $formSetup->newItem('TEST_MYPARAM13')->setAsDate(); // Not yet implemented + +// End of definition of parameters + $setupnotempty += count($formSetup->items); diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 6a7ca1832e6..03eb1aed0ad 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -6199,7 +6199,7 @@ table.jPicker tr:first-of-type td { table.jPicker { border-radius: 5px; border: 1px solid #bbb !important; - background-color: #f4f4f4 !important; + background-color: var(--colorbackbody) !important; box-shadow: 0px 0px 10px #ccc; } .jPicker .Grid { @@ -6220,6 +6220,13 @@ table.jPicker { .jPicker .Preview div { height: 36px !important; } +.jPicker input[type="button"] { + background: var(--butactionbg); + color: var(--textbutaction); + border-radius: 4px; + border-collapse: collapse; + border: none; +} A.color, A.color:active, A.color:visited { position : relative; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 7c174e4d531..a0cb4407d97 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -6152,7 +6152,7 @@ table.jPicker tr:first-of-type td { table.jPicker { border-radius: 5px; border: 1px solid #bbb !important; - background-color: #f4f4f4 !important; + background-color: var(--colorbackbody) !important; box-shadow: 0px 0px 10px #ccc; } .jPicker .Grid { @@ -6173,6 +6173,13 @@ table.jPicker { .jPicker .Preview div { height: 36px !important; } +.jPicker input[type="button"] { + background: var(--butactionbg); + color: var(--textbutaction); + border-radius: 4px; + border-collapse: collapse; + border: none; +} A.color, A.color:active, A.color:visited { position : relative;