From 6bcdf2ff75c8b9b9e8486dc56c027c656664f05c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 17 Oct 2017 14:03:22 +0200 Subject: [PATCH] Test replacement of img switcher with FA css --- htdocs/admin/defaultvalues.php | 10 ++++++++-- htdocs/admin/translation.php | 18 ++++++++++++++---- htdocs/main.inc.php | 10 +++++++--- htdocs/theme/eldy/style.css.php | 3 +++ htdocs/theme/md/style.css.php | 3 +++ 5 files changed, 35 insertions(+), 9 deletions(-) diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php index e4ba112511e..6b98668b0d3 100644 --- a/htdocs/admin/defaultvalues.php +++ b/htdocs/admin/defaultvalues.php @@ -193,14 +193,20 @@ if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) { // Button off, click to enable $enabledisablehtml.= ''; - $enabledisablehtml.= img_picto($langs->trans("Disabled"),'switch_off'); + //$enabledisablehtml.= img_picto($langs->trans("Disabled"),'switch_off'); + $enabledisablehtml.=''; + if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $enabledisablehtml.=$langs->trans("EnableDefaultValues"); + $enabledisablehtml.=''; $enabledisablehtml.= ''; } else { // Button on, click to disable $enabledisablehtml.= ''; - $enabledisablehtml.= img_picto($langs->trans("Activated"),'switch_on'); + //$enabledisablehtml.= img_picto($langs->trans("Activated"),'switch_on'); + $enabledisablehtml.=''; + if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $enabledisablehtml.=$langs->trans("DisableDefaultValues"); + $enabledisablehtml.=''; $enabledisablehtml.= ''; } diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index 0c02b2efe67..f38406c3df5 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -209,19 +209,26 @@ llxHeader('',$langs->trans("Setup"),$wikihelp); $param='&mode='.$mode; -$enabledisablehtml = $langs->trans("EnableOverwriteTranslation").' '; +$enabledisablehtml=''; +if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $enabledisablehtml.= $langs->trans("EnableOverwriteTranslation").' '; if (empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION)) { // Button off, click to enable $enabledisablehtml.=''; - $enabledisablehtml.=img_picto($langs->trans("Disabled"),'switch_off'); + //$enabledisablehtml.=img_picto($langs->trans("Disabled"),'switch_off'); + $enabledisablehtml.=''; + if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $enabledisablehtml.=$langs->trans("EnableOverwriteTranslation"); + $enabledisablehtml.=''; $enabledisablehtml.=''; } else { // Button on, click to disable $enabledisablehtml.=''; - $enabledisablehtml.=img_picto($langs->trans("Activated"),'switch_on'); + //$enabledisablehtml.=img_picto($langs->trans("Activated"),'switch_on'); + $enabledisablehtml.=''; + if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $enabledisablehtml.=$langs->trans("DisableOverwriteTranslation"); + $enabledisablehtml.=''; $enabledisablehtml.=''; } @@ -262,11 +269,14 @@ if ($mode == 'overwrite') { //print load_fiche_titre($langs->trans("TranslationOverwriteKey"), '', '')."\n"; + print '
'; print img_info().' '.$langs->trans("SomeTranslationAreUncomplete"); $urlwikitranslatordoc='https://wiki.dolibarr.org/index.php/Translator_documentation'; - print ' ('.$langs->trans("SeeAlso").': '.$urlwikitranslatordoc.')
'; + print ' ('.$langs->trans("SeeAlso").': '.$langs->trans("Here").')
'; print $langs->trans("TranslationOverwriteDesc",$langs->transnoentitiesnoconv("Language"),$langs->transnoentitiesnoconv("Key"),$langs->transnoentitiesnoconv("NewTranslationStringToShow"))."\n"; print ' ('.$langs->trans("TranslationOverwriteDesc2").').'."
\n"; + print '
'; + print '
'; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index c19faf054ea..77af64afa3d 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -816,6 +816,10 @@ if (GETPOST('textbrowser','int') || (! empty($conf->browser->name) && $conf->bro { $conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=1; } +elseif (! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) +{ + $conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=$user->conf->MAIN_OPTIMIZEFORTEXTBROWSER; +} // Set terminal output option according to conf->browser. if (GETPOST('dol_hide_leftmenu','int') || ! empty($_SESSION['dol_hide_leftmenu'])) $conf->dol_hide_leftmenu=1; @@ -1093,9 +1097,9 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs $favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1); if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL; if (empty($conf->dol_use_jmobile)) print ''."\n"; // Not required into an Android webview - //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print ''."\n"; - if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print ''."\n"; - if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print ''."\n"; + //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print ''."\n"; + //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print ''."\n"; + //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print ''."\n"; // Displays title $appli=constant('DOL_APPLICATION_TITLE'); diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index f08d51b861b..c38f15f96eb 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -579,6 +579,9 @@ textarea.centpercent { .right { text-align: ; } +.justify { + text-align: justify; +} .nowrap { white-space: ; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 7cec201021e..05b0f306ead 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -584,6 +584,9 @@ textarea.centpercent { .right { text-align: ; } +.justify { + text-align: justify; +} .nowrap { white-space: ; }