';
@@ -338,6 +341,7 @@ if ($resql) {
print load_fiche_titre($langs->trans("MembersDocModules"), '', '');
+print '
";
print dol_get_fiche_end();
diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index 06796ef193c..bb320e9f48a 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -172,6 +172,7 @@ print '
';
print '
';
@@ -262,7 +264,7 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
//$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current
print '
';
print ajax_autoselect('publicurlmember');
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index 6ea6d195040..7cc9ae3e3be 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -178,6 +178,7 @@ print dol_get_fiche_head($head, 'reception', $langs->trans("Receptions"), -1, 'r
print load_fiche_titre($langs->trans("ReceptionsNumberingModules"));
+print '
';
print '
';
print '';
print ''.$langs->trans("Name").' ';
@@ -272,8 +273,10 @@ foreach ($dirmodels as $reldir) {
}
}
-print '
';
+print '';
+print '
';
+print '
';
/*
* Documents models for Receptions Receipt
@@ -302,6 +305,7 @@ if ($resql) {
dol_print_error($db);
}
+print '
';
print '
';
print '';
print ''.$langs->trans("Name").' ';
@@ -417,6 +421,8 @@ foreach ($dirmodels as $reldir) {
}
print '
';
+print '
';
+
print '
';
diff --git a/htdocs/admin/resource.php b/htdocs/admin/resource.php
index b8bb566c79b..06ae59d64a3 100644
--- a/htdocs/admin/resource.php
+++ b/htdocs/admin/resource.php
@@ -74,6 +74,7 @@ print '
';
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 0dccf65e5e7..83649d46a28 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -126,6 +126,7 @@ $head = user_admin_prepare_head();
print dol_get_fiche_head($head, 'card', $langs->trans("MenuUsersAndGroups"), -1, 'user');
+print '
';
print '
';
print '';
print ''.$langs->trans("Parameter").' ';
@@ -171,6 +172,7 @@ if ($conf->use_javascript_ajax) {
print ' ';
print '
';
+print '
';
print '
';
@@ -197,6 +199,7 @@ if ($resql) {
print load_fiche_titre($langs->trans("UsersDocModules"), '', '');
+print '
';
print '
';
print '';
print ''.$langs->trans("Name").' ';
@@ -306,7 +309,9 @@ foreach ($dirmodels as $reldir) {
}
print '
';
-print "
";
+print '
';
+
+print '
';
print dol_get_fiche_end();
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 303382f285b..ae260171a0b 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1545,6 +1545,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
print '
';
}
+ print '
';
print '
';
print '';
print ''.$langs->trans("Description").' ';
@@ -1715,6 +1716,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
}
}
print '
';
+ print '
';
if (!empty($strictw3c) && $strictw3c == 1) {
print '
';
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 6c705c62489..4468c36a7da 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -633,6 +633,9 @@ th .button {
.quatrevingtquinzepercent {
width: 95%;
}
+.quatrevingtpercentminusx {
+ width: calc(80% - 52px);
+}
textarea.centpercent {
width: 96%;
}
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 407a38ea320..f1fb649f4af 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -780,6 +780,9 @@ th .button {
textarea.centpercent {
width: 96%;
}
+.quatrevingtpercentminusx {
+ width: calc(80% - 52px);
+}
.small, small {
font-size: 85%;
}
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index d5df7ced259..693590ff7d2 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -188,7 +188,7 @@ if ($mode == 'employee') {
accessforbidden();
}
} else {
- if (!$user->rights->user->user->lire && !$user->admin) {
+ if (empty($user->rights->user->user->lire) && empty($user->admin)) {
accessforbidden();
}
}