From bf1b2242ea94f4408c3569ab382678ed015b0848 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 20 Oct 2019 13:22:29 +0200 Subject: [PATCH] Fix no focus if we are on edit mode directly --- htdocs/admin/accountant.php | 4 +-- htdocs/admin/company.php | 2 +- htdocs/admin/openinghours.php | 68 ++++++++++++++--------------------- htdocs/langs/en_US/other.lang | 1 + 4 files changed, 30 insertions(+), 45 deletions(-) diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php index e48f122c4b0..bfde50618cc 100644 --- a/htdocs/admin/accountant.php +++ b/htdocs/admin/accountant.php @@ -114,7 +114,7 @@ print ''.$langs // Name print ''; -print ''."\n"; +print 'global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"').'>'."\n"; // Address print ''; @@ -156,7 +156,7 @@ print ''."\n"; // Code print ''; -print ''."\n"; +print ''."\n"; // Note print ''; diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index e6ea9a2cb17..912995d7817 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -409,7 +409,7 @@ print ''.$langs->trans( // Name print ''; -print ''."\n"; +print 'global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"').'>'."\n"; // Addresse diff --git a/htdocs/admin/openinghours.php b/htdocs/admin/openinghours.php index d931cdbf230..c29f6816a05 100644 --- a/htdocs/admin/openinghours.php +++ b/htdocs/admin/openinghours.php @@ -29,7 +29,7 @@ $action=GETPOST('action', 'aZ09'); $contextpage=GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'adminaccoutant'; // To manage different context of search // Load translation files required by the page -$langs->loadLangs(array('admin', 'companies')); +$langs->loadLangs(array('admin', 'companies', 'other')); if (! $user->admin) accessforbidden(); @@ -66,6 +66,8 @@ if ( ($action == 'update' && ! GETPOST("cancel", 'alpha')) * View */ +$form = new Form($db); + $help_url=''; llxHeader('', $langs->trans("CompanyFoundation"), $help_url); @@ -75,12 +77,10 @@ $head = company_admin_prepare_head(); dol_fiche_head($head, 'openinghours', $langs->trans("Company"), -1, 'company'); -$form=new Form($db); - print ''.$langs->trans("OpeningHoursDesc")."
\n"; print "
\n"; -if ($action == 'edit' || $action == 'updateedit') +if (empty($action) || $action == 'edit' || $action == 'updateedit') { /** * Edit parameters @@ -92,66 +92,50 @@ if ($action == 'edit' || $action == 'updateedit') print ''; print ''."\n"; - print ''."\n"; + print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; print '
'.$langs->trans("Day").''.$langs->trans("Value").'
'; - print '
'; + print $form->textwithpicto($langs->trans("Monday"), $langs->trans("OpeningHoursFormatDesc")); + print ''; + print 'global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"').'>
'; + print '
'; + print $form->textwithpicto($langs->trans("Tuesday"), $langs->trans("OpeningHoursFormatDesc")); + print ''; print '
'; + print '
'; + print $form->textwithpicto($langs->trans("Wednesday"), $langs->trans("OpeningHoursFormatDesc")); + print ''; print '
'; + print '
'; + print $form->textwithpicto($langs->trans("Thursday"), $langs->trans("OpeningHoursFormatDesc")); + print ''; print '
'; + print '
'; + print $form->textwithpicto($langs->trans("Friday"), $langs->trans("OpeningHoursFormatDesc")); + print ''; print '
'; + print '
'; + print $form->textwithpicto($langs->trans("Saturday"), $langs->trans("OpeningHoursFormatDesc")); + print ''; print '
'; + print '
'; + print $form->textwithpicto($langs->trans("Sunday"), $langs->trans("OpeningHoursFormatDesc")); + print ''; print '
'; print '
'; print ''; - print '     '; - print ''; print '
'; print '
'; print ''; } -else -{ - /* - * Show parameters - */ - - print '
'; - print ''; - print ''; - - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - - print '
'.$langs->trans("Day").''.$langs->trans("Value").'
'.$langs->trans("Monday").'' . (empty($conf->global->MAIN_INFO_OPENINGHOURS_MONDAY)?'':$conf->global->MAIN_INFO_OPENINGHOURS_MONDAY) . '
'.$langs->trans("Tuesday").'' . (empty($conf->global->MAIN_INFO_OPENINGHOURS_TUESDAY)?'':$conf->global->MAIN_INFO_OPENINGHOURS_TUESDAY) . '
'.$langs->trans("Wednesday").'' . (empty($conf->global->MAIN_INFO_OPENINGHOURS_WEDNESDAY)?'':$conf->global->MAIN_INFO_OPENINGHOURS_WEDNESDAY) . '
'.$langs->trans("Thursday").'' . (empty($conf->global->MAIN_INFO_OPENINGHOURS_THURSDAY)?'':$conf->global->MAIN_INFO_OPENINGHOURS_THURSDAY) . '
'.$langs->trans("Friday").'' . (empty($conf->global->MAIN_INFO_OPENINGHOURS_FRIDAY)?'':$conf->global->MAIN_INFO_OPENINGHOURS_FRIDAY) . '
'.$langs->trans("Saturday").'' . (empty($conf->global->MAIN_INFO_OPENINGHOURS_SATURDAY)?'':$conf->global->MAIN_INFO_OPENINGHOURS_SATURDAY) . '
'.$langs->trans("Sunday").'' . (empty($conf->global->MAIN_INFO_OPENINGHOURS_SUNDAY)?'':$conf->global->MAIN_INFO_OPENINGHOURS_SUNDAY) . '
'; - print "
"; - - print ''; - - // Actions buttons - print '
'; - print '
'.$langs->trans("Modify").'
'; - print '
'; -} llxFooter(); diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index 34590a924be..6e9b6d66f32 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -252,6 +252,7 @@ ThirdPartyCreatedByEmailCollector=Third party created by email collector from em ContactCreatedByEmailCollector=Contact/address created by email collector from email MSGID %s ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s +OpeningHoursFormatDesc=Use a - to separate opening and closing hours.
Use a space to enter different ranges.
Example: 8-12 14-18 ##### Export ##### ExportsArea=Exports area