diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index 56c9605c460..1e924699cd5 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -144,23 +144,23 @@ print ''."\n";
print '
'.$langs->trans("Phone").' ';
print img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright');
-print ' ';
+print ' ';
print ''."\n";
print ''.$langs->trans("Fax").' ';
print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright');
-print ' ';
+print ' ';
print ''."\n";
print ''.$langs->trans("EMail").' ';
print img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright');
-print ' ';
+print ' ';
print ''."\n";
// Web
print ''.$langs->trans("Web").' ';
print img_picto('', 'globe', '', false, 0, 0, '', 'paddingright');
-print ' ';
+print ' ';
print ''."\n";
// Code
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index ae33ef3b6fa..56971457f76 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -422,7 +422,7 @@ foreach ($boxactivated as $key => $box) {
$hasnext = ($key < (count($boxactivated) - 1));
$hasprevious = ($key != 0);
print ''.($key + 1).' ';
- print '';
+ print ' ';
print ($hasnext ? ''.img_down().' ' : '');
print ($hasprevious ? ''.img_up().' ' : '');
print ' ';
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 0c6da346285..804ed9934bf 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -418,7 +418,7 @@ print ''.$langs->trans("Country").' ';
print img_picto('', 'globe-americas', 'class="paddingrightonly"');
-print $form->select_country($mysoc->country_id, 'country_id');
+print $form->select_country($mysoc->country_id, 'country_id', '', 0);
if ($user->admin) {
print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
}
@@ -441,25 +441,25 @@ print ' '."\n";
// Phone
print ''.$langs->trans("Phone").' ';
print img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright');
-print ' ';
+print ' ';
print ''."\n";
// Fax
print ''.$langs->trans("Fax").' ';
print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright');
-print ' ';
+print ' ';
print ''."\n";
// Email
print ''.$langs->trans("EMail").' ';
print img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright');
-print ' ';
+print ' ';
print ''."\n";
// Web
print ''.$langs->trans("Web").' ';
print img_picto('', 'globe', '', false, 0, 0, '', 'paddingright');
-print ' ';
+print ' ';
print ''."\n";
// Barcode
@@ -467,19 +467,19 @@ if (!empty($conf->barcode->enabled)) {
print '';
print ''.$langs->trans("Gencod").' ';
print ' ';
- print ' ';
+ print ' ';
print '';
}
// Logo
print ''.$form->textwithpicto($langs->trans("Logo"), 'png, jpg').' ';
-print '';
-print '
';
+print '
';
+print ' ';
print '
';
if (!empty($mysoc->logo_small)) {
if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
print '
';
- print '
';
+ print '
';
print '
';
} elseif (!empty($mysoc->logo)) {
if (!file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) {
@@ -487,10 +487,12 @@ if (!empty($mysoc->logo_small)) {
}
$imgThumbSmall = vignette($conf->mycompany->dir_output.'/logos/'.$mysoc->logo, $maxwidthmini, $maxheightmini, '_small', $quality);
print '
';
- print '
';
+ print '
';
print '
';
}
- print '
';
+ print '
';
} elseif (!empty($mysoc->logo)) {
if (file_exists($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
print '
';
@@ -508,8 +510,8 @@ print '
';
// Logo (squarred)
print ''.$form->textwithpicto($langs->trans("LogoSquarred"), 'png, jpg').' ';
-print '';
-print '
';
+print '
';
+print ' ';
print '
';
if (!empty($mysoc->logo_squarred_small)) {
if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_small)) {
@@ -551,20 +553,21 @@ print '';
print '
';
// IDs of the company (country-specific)
+print '
';
// Fiscal year start
diff --git a/htdocs/admin/company_socialnetworks.php b/htdocs/admin/company_socialnetworks.php
index 93c6739d37d..4809a418861 100644
--- a/htdocs/admin/company_socialnetworks.php
+++ b/htdocs/admin/company_socialnetworks.php
@@ -104,6 +104,8 @@ print '
';
// Social networks
print '
';
+
+print '
';
print '
';
print '';
print ''.$langs->trans("SocialNetworksInformation").' '.$langs->trans("Url").' '.$langs->trans("SocialNetworkId").' ';
@@ -116,17 +118,18 @@ foreach ($listofnetworks as $key => $value) {
print ''.$langs->trans(ucfirst($key)).' ';
$networkconstname = 'MAIN_INFO_SOCIETE_'.strtoupper($key).'_URL';
$networkconstid = 'MAIN_INFO_SOCIETE_'.strtoupper($key);
- print ' ';
+ print ' ';
print ' ';
print '';
print ' ';
print ' ';
- print ''.dol_print_socialnetworks((!empty($conf->global->$networkconstid) ? dol_escape_htmltag($conf->global->$networkconstid) : ''), 0, 0, $key, $listofnetworks).' ';
+ print ''.dol_print_socialnetworks((!empty($conf->global->$networkconstid) ? dol_escape_htmltag($conf->global->$networkconstid) : ''), 0, 0, $key, $listofnetworks).' ';
print ' '."\n";
}
}
print "
";
+print '
';
print '
';
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 0ac40741ab3..f4ea09966fc 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -476,7 +476,7 @@ $disabled = '';
if (!empty($conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND)) {
$disabled = ' disabled="disabled"';
}
-print '
';
+print '
';
if ($disabled) {
print '('.$langs->trans("DisabledByOptionADD_UNSPLASH_LOGIN_BACKGROUND").') ';
}
@@ -484,7 +484,7 @@ if (!empty($conf->global->MAIN_LOGIN_BACKGROUND)) {
print '
'.img_delete($langs->trans("Delete")).' ';
if (file_exists($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_LOGIN_BACKGROUND)) {
print ' ';
- print '
';
+ print '
';
}
} else {
print '
';
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index 4d9c85a69f9..5a155d11411 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -314,14 +314,14 @@ if ($conf->use_javascript_ajax) {
$entry .= '
'.img_edit('default', 0, 'class="menuEdit" id="edit'.$menu['rowid'].'"').' ';
$entry .= '
'.img_edit_add('default').' ';
$entry .= '
'.img_delete('default').' ';
- $entry .= ' ';
+ $entry .= ' ';
$entry .= '
'.img_picto("Up", "1uparrow").' '.img_picto("Down", "1downarrow").' ';
$entry .= '
';
$buttons = ''.img_edit('default', 0, 'class="menuEdit" id="edit'.$menu['rowid'].'"').' ';
$buttons .= ''.img_edit_add('default').' ';
$buttons .= ''.img_delete('default').' ';
- $buttons .= ' ';
+ $buttons .= ' ';
$buttons .= ''.img_picto("Up", "1uparrow").' '.img_picto("Down", "1downarrow").' ';
$data[] = array(
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index b1dd28956dc..e94dd6bad39 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -39,9 +39,11 @@ if (!$user->admin) {
// Allow/Disallow change to clear passwords once passwords are crypted
$allow_disable_encryption = true;
+
/*
* Actions
*/
+
if ($action == 'setgeneraterule') {
if (!dolibarr_set_const($db, 'USER_PASSWORD_GENERATED', $_GET["value"], 'chaine', 0, '', $conf->entity)) {
dol_print_error($db);
@@ -215,6 +217,7 @@ if (is_resource($handle)) {
}
asort($arrayhandler);
+print '';
print '
';
print '';
print ''.$langs->trans("RuleForGeneratedPasswords").' ';
@@ -266,6 +269,8 @@ foreach ($arrayhandler as $key => $module) {
}
}
print '
';
+print '
';
+
print '';
//if($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK == 1)
@@ -273,45 +278,47 @@ print '';
if ($conf->global->USER_PASSWORD_GENERATED == "Perso") {
$tabConf = explode(";", $conf->global->USER_PASSWORD_PATTERN);
print ' ';
+
+ print '';
print '
';
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 362b29c0163..3fa2e5d0af9 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -296,19 +296,8 @@ if ($mode == 'overwrite') {
print '
';
print ' ';
print ' ';
- // Limit to superadmin
- /*if (! empty($conf->multicompany->enabled) && !$user->entity)
- {
- print '
';
- print ' ';
- print ' ';
- print '
';
- }
- else
- {*/
- print ' ';
- print ' ';
- //}
+ print ' ';
+ print ' ';
print ' ';
print " \n";
print '';
@@ -500,7 +489,7 @@ if ($mode == 'searchkey') {
//}
print '';
// Action column
- print '
';
+ print ' ';
$searchpicto = $form->showFilterAndCheckAddButtons(!empty($massactionbutton) ? 1 : 0, 'checkforselect', 1);
print $searchpicto;
print ' ';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index ebda2face9e..4fb48a8dbf1 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8494,7 +8494,7 @@ class Form
*/
public function showFilterButtons()
{
- $out = '
';
+ $out = '
';
$out .= ' ';
$out .= ' ';
$out .= '
';
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index 255bc47d9a9..fda21e28a21 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -162,10 +162,9 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
print "\n".'
';
if ($showfk) {
print '';
- print ' ';
- print $tab[$x]['title'];
- print ' (fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
- print ' ';
+ print ''.$tab[$x]['title'].' ';
+ print ' (fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].') ';
+ print ' ';
print $tab[$x]['buttons'];
print '
';
} else {
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 70e5229ba28..e039779c96d 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1481,6 +1481,10 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
display: inline-block;
}
+ input.maxwidthinputfileonsmartphone {
+ width: 175px;
+ }
+
.logopublicpayment #dolpaymentlogo {
max-width: 260px;
}
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 7dd19673b5e..2c91aa0299b 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1511,6 +1511,10 @@ table[summary="list_of_modules"] .fa-cog {
display: inline-block;
}
+ input.maxwidthinputfileonsmartphone {
+ width: 175px;
+ }
+
.poweredbyimg {
width: 48px;
}