From 578eb98b3332a4c14af91c97546f486ab1d1ba88 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 May 2017 13:13:33 +0200 Subject: [PATCH] Better user interface --- htdocs/adherents/type.php | 8 ++++++-- htdocs/admin/defaultvalues.php | 7 +++---- htdocs/admin/ihm.php | 26 ++++++++++++-------------- htdocs/admin/translation.php | 4 +++- htdocs/langs/en_US/modulebuilder.lang | 4 ++-- 5 files changed, 26 insertions(+), 23 deletions(-) diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index ab6bfcc070471..fb147750e0baf 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -82,9 +82,11 @@ // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('membertypecard','globalcard')); + /* * Actions */ + if ($action == 'add' && $user->rights->adherent->configurer) { if (! $cancel) @@ -308,12 +310,13 @@ $head = member_type_prepare_head($object); - dol_fiche_head($head, 'card', $langs->trans("MemberType"), 0, 'group'); + dol_fiche_head($head, 'card', $langs->trans("MemberType"), -1, 'group'); $linkback = ''.$langs->trans("BackToList").''; dol_banner_tab($object, 'rowid', $linkback); + print '
'; print '
'; print ''; @@ -342,7 +345,8 @@ } print '
'; - + print '
'; + dol_fiche_end(); diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php index dd37e4987e539..013be811b5bba 100644 --- a/htdocs/admin/defaultvalues.php +++ b/htdocs/admin/defaultvalues.php @@ -172,9 +172,6 @@ - - - /* * View */ @@ -323,7 +320,9 @@ print ''; print ''; } -print ''; +$disabled=''; +if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) $disabled=' disabled="disabled"'; +print ''; print "\n"; print ''; diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 739a6fa4c884b..cfa08f003eaaf 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -362,13 +362,6 @@ print ' '; print ''; - // Hide helpcenter link on login page - print ''.$langs->trans("DisableLinkToHelpCenter").''; - print $form->selectyesno('MAIN_HELPCENTER_DISABLELINK',isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0,1); - print ''; - print ' '; - print ''; - // Message of the day on home page print ''.$langs->trans("MessageOfDay").''; @@ -393,8 +386,14 @@ $doleditor->Create(); print ''."\n"; - // Background + // Hide helpcenter link on login page + print ''.$langs->trans("DisableLinkToHelpCenter").''; + print $form->selectyesno('MAIN_HELPCENTER_DISABLELINK',isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0,1); + print ''; + print ' '; + print ''; + // Background print ''; print '
'; print ''; @@ -531,11 +530,6 @@ // Link to wiki help print ''.$langs->trans("DisableLinkToHelp",img_picto('',DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/helpdoc.png','',1)).''; print yn((isset($conf->global->MAIN_HELP_DISABLELINK)?$conf->global->MAIN_HELP_DISABLELINK:0),1); - print ''; - - // Link to help center - print ''.$langs->trans("DisableLinkToHelpCenter").''; - print yn((isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0),1); print ''; // Message of the day @@ -558,8 +552,12 @@ else print ' '; print ''."\n"; + // Link to help center + print ''.$langs->trans("DisableLinkToHelpCenter").''; + print yn((isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0),1); + print ''; + // Background login - print ''.$langs->trans("BackgroundImageLogin").''; print '
'; print $conf->global->MAIN_LOGIN_BACKGROUND; diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index c51d1c2435dd8..44387bc2041bc 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -264,7 +264,9 @@ print ''; print ''; //} - print ''; + $disabled=''; + if (empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION)) $disabled=' disabled="disabled"'; + print ''; print "\n"; print ''; diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang index 81a34b66b85e8..da734ea135614 100644 --- a/htdocs/langs/en_US/modulebuilder.lang +++ b/htdocs/langs/en_US/modulebuilder.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - loan ModuleBuilderDesc=This tools give you utilites to build or edit your own module. -ModuleBuilderDesc2=Path were modules are generated/edited (first alternative directory defined into %s): %s. -ModuleBuilderDesc3=Modules found: %s (they are detected as editable when the file %s exists in root of module directory). +ModuleBuilderDesc2=Path were modules are generated/edited (first alternative directory defined into %s): %s +ModuleBuilderDesc3=Generated/editable modules found: %s (they are detected as editable when the file %s exists in root of module directory). NewModule=New module ModuleKey=Key for new module