From 8922b93395b6e0e62992874c89f605ee37e23c32 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 2 Nov 2009 18:53:26 +0000 Subject: [PATCH] Fix: Bad W3C New: Add link to download skin page --- htdocs/admin/ihm.php | 14 +++++++------- htdocs/langs/en_US/admin.lang | 1 + htdocs/langs/fr_FR/admin.lang | 1 + htdocs/lib/usergroups.lib.php | 17 +++++++++++++---- htdocs/main.inc.php | 2 +- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 3398b0d757a..737d6f5703d 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -64,7 +64,7 @@ if (isset($_POST["action"]) && $_POST["action"] == 'update') dolibarr_set_const($db, "MAIN_POPUP_CALENDAR", $_POST["main_popup_calendar"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_USE_PREVIEW_TABS", $_POST["main_use_preview_tabs"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_START_WEEK", $_POST["MAIN_START_WEEK"],'chaine',0,'',$conf->entity); - + dolibarr_set_const($db, "MAIN_THEME", $_POST["main_theme"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_SEARCHFORM_CONTACT", $_POST["MAIN_SEARCHFORM_CONTACT"],'chaine',0,'',$conf->entity); @@ -90,7 +90,7 @@ if (isset($_POST["action"]) && $_POST["action"] == 'update') * View */ -$wikihelp='EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones'; +$wikihelp='EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones'; llxHeader($langs->trans("Setup"),'',$wikihelp); $html=new Form($db); @@ -111,7 +111,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') // Edit clearstatcache(); $var=true; - print ''; + print '
'; print ''; print ''; print ''; @@ -190,7 +190,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') // Edit print ''; print ''; print ''; - + print '
'.$langs->trans("Parameter").''.$langs->trans("Value").' 
 

'; @@ -200,7 +200,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') // Edit // Liste des zone de recherche permanantes supportees - print ''; + print '
'; print ''; $var=True; foreach ($searchform as $key => $value) @@ -214,7 +214,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') // Edit print '
'; $var=true; - print '
'.$langs->trans("PermanentLeftSearchForm").''.$langs->trans("Activated").'
'; + print '
'; print ''; // Hide help link on login page @@ -365,7 +365,7 @@ else // Show foreach ($searchform as $key => $value) { $var=!$var; - print ''; + print ''; print ''; } diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index e179f08784d..f1b7fbde3d1 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -728,6 +728,7 @@ WeekStartOnDay=First day of week RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Programs version %s differs from database version %s) YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user %s. YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP +DownloadMoreSkins=More skins to download ##### Module password generation PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase. diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 34a8dc1991a..e30a6d7610e 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -728,6 +728,7 @@ WeekStartOnDay=Premier jour de la semaine RunningUpdateProcessMayBeRequired=Le lancement du processus de mise a jour semble requis (La version des programme %s differe de la version de la base %s) YouMustRunCommandFromCommandLineAfterLoginToUser=Vous devez exécuter la commande sous un shell après vous etres logués avec le compte %s. YourPHPDoesNotHaveSSLSupport=Fonctions SSL non présentes dans votre PHP +DownloadMoreSkins=Plus de thèmes à télécharger ##### Module password generation = undefined PasswordGenerationStandard = Renvoie un mot de passe généré selon algorithme interne Dolibarr: 8 caractères, chiffres et caractères en minuscules mélangés. diff --git a/htdocs/lib/usergroups.lib.php b/htdocs/lib/usergroups.lib.php index 86666306f7d..19e947e1ddc 100644 --- a/htdocs/lib/usergroups.lib.php +++ b/htdocs/lib/usergroups.lib.php @@ -125,25 +125,34 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) $thumbsbyrow=6; print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$searchformtitle[$key].''.yn($searchformconst[$key]).'
'.$searchformtitle[$key].''.yn($searchformconst[$key]).''.$langs->trans("IfModuleEnabled",$langs->transnoentitiesnoconv($searchformmodule[$key])); print '
'; + + // Title if ($foruserprofile) { print ''; print ''; + print ''; } else { - print ''; + print ''; + print ''; } - print ''; $var=false; if ($foruserprofile) { - print ''; + print ''; + print ''; print ''; print ''; - print ''; + print ''; + print ''; } if ($edit) print ''; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 27a6524ccb6..5c91ec8c148 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1041,7 +1041,7 @@ function left_menu($menu_array, $helppagename='', $moresearchform='') { print '
'; print 'trans("PageWiki").' "'.dol_escape_htmltag(strtr($helppage,'_',' ')).'"'; print '" href="'; print sprintf($helpbaseurl,$helppage); print '">';
'.$langs->trans("Parameter").''.$langs->trans("DefaultValue").' 
'.$langs->trans("DefaultSkin").'
'.$langs->trans("DefaultSkin").''; + print ''; + print $langs->trans('DownloadMoreSkins'); + print ''; + print '
'.$langs->trans("DefaultSkin").'
'.$langs->trans("DefaultSkin").''.$conf->global->MAIN_THEME.' '.$langs->trans("UsePersonalValue").'