diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php index 36ebaf07c94..4eab81ea49f 100644 --- a/htdocs/accountancy/index.php +++ b/htdocs/accountancy/index.php @@ -64,26 +64,33 @@ if ($conf->accounting->enabled) { $step = 0; - $resultboxes=FormOther::getBoxesArea($user, "27"); // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb) + $resultboxes=FormOther::getBoxesArea($user, "27"); // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb) - print load_fiche_titre($langs->trans("AccountancyArea"), $resultboxes['selectboxlist'], 'accountancy'); + $helpisexpanded = empty($resultboxes['boxactivated']); // If there is no widget, the tooltip help is expanded by default. + $showtutorial = ''; - print '
'; - print img_picto('', 'chevron-down'); - print ' ' . $langs->trans("ShowFAQ"); - print '
'; + if (! $helpisexpanded) + { + $showtutorial = '
'; + $showtutorial .= img_picto('', 'chevron-down'); + $showtutorial .= ' ' . $langs->trans("ShowTutorial"); + $showtutorial .= '
'; - print ''; + $showtutorial .= ''; + } - print '
'; // hideobject is to start hidden + + print load_fiche_titre($langs->trans("AccountancyArea"), $showtutorial . $resultboxes['selectboxlist'], 'accountancy'); + + print '
'; // hideobject is to start hidden print "
\n"; print ''.$langs->trans("AccountancyAreaDescIntro")."
\n"; print "
\n";print "
\n"; @@ -201,6 +208,8 @@ if ($conf->accounting->enabled) print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescAnalyze", chr(64+$step))."
\n"; print "
\n"; + print '
'; + print '
'; print '
'; diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php index 0c918783e39..a187e58cac1 100644 --- a/htdocs/core/class/infobox.class.php +++ b/htdocs/core/class/infobox.class.php @@ -39,7 +39,10 @@ class InfoBox if (empty($conf->global->MAIN_FEATURES_LEVEL) || $conf->global->MAIN_FEATURES_LEVEL < 2) { - return array(0 => 'Home'); + return array( + 0 => 'Home', + 27 => 'Accountancy Home' + ); } else { @@ -71,7 +74,7 @@ class InfoBox 24 => 'expensereportindex', 25 => 'mailingindex', 26 => 'opensurveyindex', - 27 => 'accountancyindex' + 27 => 'Accountancy Home' ); } } diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index 30b060fb4d3..a76e79aa701 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -257,7 +257,7 @@ ListOfProductsWithoutAccountingAccount=List of products not bound to any account ChangeBinding=Change the binding Accounted=Accounted in ledger NotYetAccounted=Not yet accounted in ledger -ShowFAQ=Show FAQ +ShowTutorial=Show Tutorial ## Admin ApplyMassCategories=Apply mass categories