diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php index 7cd4f79b8c5..df69c5274d5 100644 --- a/htdocs/adherents/admin/website.php +++ b/htdocs/adherents/admin/website.php @@ -198,7 +198,7 @@ if (getDolGlobalString('MEMBER_ENABLE_PUBLIC')) { print ''; print ajax_autoselect('publicurlmember'); - print '
'; + print '

'; print '
'; print ''; @@ -248,7 +248,7 @@ if (getDolGlobalString('MEMBER_ENABLE_PUBLIC')) { print '\n"; // Show the table of all available membership types. If not, show a form (as the default was for Dolibarr <=16.0) @@ -256,7 +256,7 @@ if (getDolGlobalString('MEMBER_ENABLE_PUBLIC')) { print '\n"; // Show "vote allowed" setting for membership types @@ -264,7 +264,7 @@ if (getDolGlobalString('MEMBER_ENABLE_PUBLIC')) { print '\n"; // Jump to an online payment page diff --git a/htdocs/core/boxes/box_dolibarr_state_board.php b/htdocs/core/boxes/box_dolibarr_state_board.php index 73631c07bc9..4de552b0b0d 100644 --- a/htdocs/core/boxes/box_dolibarr_state_board.php +++ b/htdocs/core/boxes/box_dolibarr_state_board.php @@ -299,7 +299,7 @@ class box_dolibarr_state_board extends ModeleBoxes $this->info_box_contents[0][0] = array( 'tr' => 'class="nohover"', - 'td' => 'class="tdwidgetstate"', + 'td' => 'class="tdwidgetstate center"', 'textnoformat' => $boxstat ); } diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 8bc5cd14656..c99ff449dce 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -3309,7 +3309,9 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_ $stringforfirstkey .= ' CTL +'; } - $searchform .= $form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, 'accesskey="s"', 1, 0, (!getDolGlobalString('MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY') ? 1 : 0), 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1, $stringforfirstkey.' s'); + //$textsearch = $langs->trans("Search"); + $textsearch = ''; + $searchform .= $form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, 'accesskey="s"', 1, 0, (!getDolGlobalString('MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY') ? 1 : 0), 'vmenusearchselectcombo', 1, $textsearch, 1, $stringforfirstkey.' s'); } else { if (is_array($arrayresult)) { foreach ($arrayresult as $key => $val) { diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php index bbe3657ac21..300e659b53b 100644 --- a/htdocs/societe/index.php +++ b/htdocs/societe/index.php @@ -335,7 +335,7 @@ if ($result) { $lastmodified .= '
'; print $langs->trans("MemberCountersArePublic"); print ''; - print $form->selectyesno("MEMBER_COUNTERS_ARE_PUBLIC", getDolGlobalInt('MEMBER_COUNTERS_ARE_PUBLIC'), 1); + print $form->selectyesno("MEMBER_COUNTERS_ARE_PUBLIC", getDolGlobalInt('MEMBER_COUNTERS_ARE_PUBLIC'), 1, false, 0, 1); print "
'; print $langs->trans("MembersShowMembershipTypesTable"); print ''; - print $form->selectyesno("MEMBER_SHOW_TABLE", !$skiptable, 1); // Reverse the logic "hide -> show" for retrocompatibility + print $form->selectyesno("MEMBER_SHOW_TABLE", !$skiptable, 1, false, 0, 1); // Reverse the logic "hide -> show" for retrocompatibility print "
'; print $langs->trans("MembersShowVotesAllowed"); print ''; - print $form->selectyesno("MEMBER_SHOW_VOTE_ALLOWED", !$hidevoteallowed, 1); // Reverse the logic "hide -> show" for retrocompatibility + print $form->selectyesno("MEMBER_SHOW_VOTE_ALLOWED", !$hidevoteallowed, 1, false, 0, 1); // Reverse the logic "hide -> show" for retrocompatibility print "
'; //$lastmodified .= img_picto('', 'company', 'class="pictofixedwidth"'); - $lastmodified .= $transRecordedType; + $lastmodified .= ''.$transRecordedType.''; $lastmodified .= ''; $lastmodified .= '...'; $lastmodified .= ''; @@ -458,7 +458,7 @@ if ($result) { $lastmodifiedcontact .= '
'; //$lastmodifiedcontact .= img_picto('', 'contact', 'class="pictofixedwidth"'); - $lastmodifiedcontact .= $transRecordedType; + $lastmodifiedcontact .= ''.$transRecordedType.''; $lastmodifiedcontact .= ''; //$lastmodifiedcontact .= img_picto($langs->trans("FullList"), 'contact'); $lastmodifiedcontact .= '...';