';
print ' ';
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 18616b2665c..a70505d66e0 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -1132,10 +1132,16 @@ class Translate
* @param integer $forceloadall 1=Force to load all currencies into cache. We know we need to use all of them. By default read and cache only the requested currency.
* @return string Currency symbol encoded into UTF8
*/
- public function getCurrencySymbol($currency_code, $forceloadall = 0)
+ public function getCurrencySymbol($currency_code = '', $forceloadall = 0)
{
+ global $conf;
+
$currency_sign = ''; // By default return iso code
+ if (empty($currency_code)) {
+ $currency_code = $conf->currency;
+ }
+
if (function_exists("mb_convert_encoding")) {
$this->loadCacheCurrencies($forceloadall ? '' : $currency_code);
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ca42e147137..afd3dc3176b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -15312,7 +15312,7 @@ function showValueWithClipboardCPButton($valuetocopy, $showonlyonhover = 1, $tex
$tag = 'span'; // Using div (like any style of type 'block') does not work when using the js copy code.
- $result = '';
+ $result = '';
if ($texttoshow === 'none') {
$result .= '<' . $tag . ' class="clipboardCPValue hidewithsize">' . dol_escape_htmltag($valuetocopy, 1, 1) . '';
$result .= '';
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index ccc4ecfcee1..7dda992eeff 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -612,6 +612,26 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
print yn(getDolGlobalString('THEME_ELDY_USEBORDERONTABLE'));
}
print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes"), 1, 'help', 'inline-block');
+
+ if (getDolGlobalString('THEME_ELDY_USEBORDERONTABLE')) {
+ $listofborderradius = array(
+ 0 => $langs->transnoentitiesnoconv("No"),
+ 4 => $langs->transnoentitiesnoconv("Size").' 4',
+ 6 => $langs->transnoentitiesnoconv("Size").' 6',
+ 8 => $langs->transnoentitiesnoconv("Size").' 8',
+ 10 => $langs->transnoentitiesnoconv("Size").' 10',
+ 20 => $langs->transnoentitiesnoconv("Size").' 20',
+ );
+
+ print ' ';
+ if ($edit) {
+ print $form->selectarray('THEME_ELDY_BORDER_RADIUS', $listofborderradius, getDolGlobalInt('THEME_ELDY_BORDER_RADIUS'), 0, 0, 0, '', 0, 0, 0, '', 'widthcentpercentminusx maxwidth100');
+ } else {
+ print $listofborderradius[getDolGlobalInt('THEME_ELDY_BORDER_RADIUS')];
+ }
+ //print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes"), 1, 'help', 'inline-block');
+ }
+
print '';
print '';
}
@@ -632,6 +652,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
print '';
}
+ /*
if ($foruserprofile) {
} else {
if (getDolGlobalString('THEME_ELDY_USEBORDERONTABLE') || getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT')) {
@@ -657,6 +678,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
print '';
}
}
+ */
+
// Table line height
/* removed. height of column must use padding of td and not lineheight that has bad side effect
if ($foruserprofile) {
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index e48cac1fa35..17bf865c828 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2448,7 +2448,7 @@ WebhookSetup = Webhook setup
WebhookSetupPage = Webhook setup page. To activate a webhook, go on the %s tab and create targets
ShowQuickAddLink=Show a button to quickly add an element in top right menu
ShowSearchAreaInTopMenu=Show the search area in the top menu
-HashForPing=Hash used for ping
+HashForPing=Public hash used for ping
ReadOnlyMode=Is instance in "Read Only" mode
DEBUGBAR_USE_LOG_FILE=Use the dolibarr.log file to trap Logs
UsingLogFileShowAllRecordOfSubrequestButIsSlower=Use the dolibarr.log file to trap Logs instead of live memory catching. It allows to catch all logs instead of only log of current process (so including the one of ajax subrequests pages) but will make your instance very very slow. Not recommended.
@@ -2541,7 +2541,7 @@ FailedAuth=failed authentications
MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
AllowPasswordResetBySendingANewPassByEmail=If a user A has this permission, and even if the user A is not an "admin" user, A is allowed to reset the password of any other user B, the new password will be send to the email of the other user B but it won't be visible to A. If the user A has the "admin" flag, he will also be able to know what is the new generated password of B so he will be able to take control of the B user account.
AllowAnyPrivileges=If a user A has this permission, he can create a user B with all privileges then use this user B, or grant himself any other group with any permission. So it means user A owns all business privileges (only system access to setup pages will be forbidden)
-ThisValueCanBeReadBecauseInstanceIsNotInProductionMode=This value can be read because your instance is not set in production mode
+ThisValueCanBeReadBecauseInstanceIsNotInProductionMode=This value is readable from user interface because your instance is NOT set in production mode
SeeConfFile=See inside conf.php file on the server
ReEncryptDesc=Reencrypt data if not yet encrypted
PasswordFieldEncrypted=%s new record have this field been encrypted
diff --git a/htdocs/theme/eldy/badges.inc.php b/htdocs/theme/eldy/badges.inc.php
index f9661e906f3..fd1fee2add4 100644
--- a/htdocs/theme/eldy/badges.inc.php
+++ b/htdocs/theme/eldy/badges.inc.php
@@ -52,6 +52,13 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
box-sizing: border-box;
}
+.badge-text {
+ padding: 3px;
+ padding-left: 5px;
+ padding-right: 5px;
+ border-radius: 5px;
+}
+
.badge-status {
font-size: 0.95em;
padding: .19em .35em; /* more than 0.19 generate a change into height of lines */
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 3338e7ea959..fa32ca43b1d 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -430,6 +430,7 @@ input[type=checkbox], input[type=radio] {
background-color: var(--colortextlink, #0a58ca);
}
+/* input fields */
.kanban input.checkforselect {
margin-right: 0px;
margin-top: 5px;
@@ -437,13 +438,15 @@ input[type=checkbox], input[type=radio] {
input {
padding: 5px;
padding-left: 5px;
-
+
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
.liste_titre input {
line-height: 1.3em;
+ padding: 3px;
+ padding-left: 3px;
}
.tableforfield input {
padding-left: 2px;
@@ -516,9 +519,13 @@ div.tabBar textarea:focus:not(.textarea-ai_feature):not(.cke_source) {
input:focus:not(.button):not(.buttonwebsite):not(.buttonreset):not(.select2-search__field):not(#top-bookmark-search-input):not(.search_component_input):not(.input-nobottom),
select:focus, .select2-container--open [aria-expanded="false"].select2-selection--single,
.select2-container--focus span.selection span.select2-selection {
+
+ border: 1px solid #666 !important;
+
border-bottom: 1px solid #666 !important;
border-bottom-left-radius: 0 !important;
border-bottom-right-radius: 0 !important;
+
}
textarea.cke_source:focus
{
@@ -6559,6 +6566,9 @@ table.jPicker tr:first-of-type td {
height: 2px !important;
line-height: 2px;
}
+.jPicker .Icon {
+ margin-left: 2px;
+}
.jPicker .Move {
background: unset !important;
border: unset !important;
@@ -6603,6 +6613,9 @@ span.jPicker {
border-collapse: collapse;
border: none;
}
+.jPicker td.Text input {
+ width: 35px !important;
+}
A.color, A.color:active, A.color:visited {
position : relative;
diff --git a/htdocs/theme/md/badges.inc.php b/htdocs/theme/md/badges.inc.php
index 2b9c26b66e5..5194fd2bfe0 100644
--- a/htdocs/theme/md/badges.inc.php
+++ b/htdocs/theme/md/badges.inc.php
@@ -52,6 +52,13 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
box-sizing: border-box;
}
+.badge-text {
+ padding: 3px;
+ padding-left: 5px;
+ padding-right: 5px;
+ border-radius: 5px;
+}
+
.badge-status {
font-size: 1em;
padding: .19em .35em; /* more than 0.19 generate a change into height of lines */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 989c8f3364f..e88f7b562eb 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -594,7 +594,11 @@ textarea:focus {
input:focus, textarea:focus,
button:focus:not(.button_search_x):not(.button_search):not(.button_removefilter), select:focus,
.select2-container--focus span.selection span.select2-selection {
+
+ border: 1px solid #666 !important;
+
border-bottom: 1px solid #666;
+
}
textarea.cke_source:focus
@@ -6431,6 +6435,9 @@ table.jPicker tr:first-of-type td {
height: 2px !important;
line-height: 2px;
}
+.jPicker .Icon {
+ margin-left: 2px;
+}
.jPicker .Move {
background: unset !important;
border: unset !important;
@@ -6475,6 +6482,9 @@ span.jPicker {
border-collapse: collapse;
border: none;
}
+.jPicker td.Text input {
+ width: 35px !important;
+}
A.color, A.color:active, A.color:visited {
position : relative;
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index e21d0aced86..084a5f2e3bc 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1094,7 +1094,7 @@ if ($action == 'create' || $action == 'adduserldap') {
// Administrator
if (!empty($user->admin)) {
- print '