From cce9f482b0b7a82a183e326f51f5499f00899461 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 6 Jan 2008 15:39:47 +0000
Subject: [PATCH] Simplification des options activation ajax/javascript
---
htdocs/admin/ihm.php | 48 ++++++++++++++++++++++++-----------
htdocs/langs/en_US/admin.lang | 3 +--
htdocs/langs/fr_BE/admin.lang | 3 +--
htdocs/langs/fr_FR/admin.lang | 3 +--
4 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 48b9a81cb51..273aee6cab3 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -75,6 +75,8 @@ if (isset($_POST["action"]) && $_POST["action"] == 'update')
llxHeader();
+$html=new Form($db);
+
print_fiche_titre($langs->trans("GUISetup"),'','setup');
print $langs->trans("DisplayDesc")."<br>\n";
@@ -83,8 +85,6 @@ print "<br>\n";
if (isset($_GET["action"]) && $_GET["action"] == 'edit')
{
- $html=new Form($db);
-
print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="action" value="update">';
@@ -150,8 +150,10 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("UsePopupCalendar").'</td><td>';
$liste_popup_calendar=array(
'0'=>$langs->trans("No"),
- 'eldy'=>$langs->trans("Yes").' (style eldy)',
- 'andre'=>$langs->trans("Yes").' (style andre)');
+ 'eldy'=>$langs->trans("Yes")
+ //'eldy'=>$langs->trans("Yes").' (style eldy)',
+ //'andre'=>$langs->trans("Yes").' (style andre)'
+ );
$html->select_array('main_popup_calendar',$liste_popup_calendar,$conf->global->MAIN_POPUP_CALENDAR);
print ' ('.$langs->trans("AvailableOnlyIfJavascriptNotDisabled").')';
print '</td>';
@@ -238,25 +240,35 @@ else
$var=true;
print '<table class="noborder" width="100%">';
- print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+ print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td><td> </td></tr>';
$var=!$var;
- print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DefaultLanguage").'</td><td>' . ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$conf->global->MAIN_LANG_DEFAULT) . '</td></tr>';
+ print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DefaultLanguage").'</td><td>' . ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$conf->global->MAIN_LANG_DEFAULT) . '</td>';
+ print '<td width="20"> </td>';
+ print "</tr>";
$var=!$var;
- print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("EnableMultilangInterface").'</td><td>' . yn($conf->global->MAIN_MULTILANGS) . '</td></tr>';
+ print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("EnableMultilangInterface").'</td><td>' . yn($conf->global->MAIN_MULTILANGS) . '</td>';
+ print '<td width="20"> </td>';
+ print "</tr>";
$var=!$var;
- print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMaxSizeList").'</td><td>' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '</td></tr>';
+ print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMaxSizeList").'</td><td>' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '</td>';
+ print '<td width="20"> </td>';
+ print "</tr>";
$var=!$var;
print '<tr '.$bc[$var].'"><td width="35%">'.$langs->trans("ShowBugTrackLink").'</td><td>';
- print yn($conf->global->MAIN_SHOW_BUGTRACK_LINK)."</td></tr>";
+ print yn($conf->global->MAIN_SHOW_BUGTRACK_LINK)."</td>";
+ print '<td width="20"> </td>';
+ print "</tr>";
// Disable javascript
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DisableJavascript").'</td><td>';
- print yn($conf->global->MAIN_DISABLE_JAVASCRIPT)."</td></tr>";
+ print yn($conf->global->MAIN_DISABLE_JAVASCRIPT)."</td>";
+ print '<td width="20"> </td>';
+ print "</tr>";
// Confirm ajax
if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
@@ -264,20 +276,26 @@ else
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("ConfirmAjax").'</td><td>';
if ($conf->global->MAIN_DISABLE_JAVASCRIPT) print $langs->trans("No").' ('.$langs->trans("JavascriptDisabled").')';
- else print yn(isset($conf->global->MAIN_CONFIRM_AJAX)?$conf->global->MAIN_CONFIRM_AJAX:0)."</td></tr>";
+ else print yn(isset($conf->global->MAIN_CONFIRM_AJAX)?$conf->global->MAIN_CONFIRM_AJAX:0)."</td>";
+ print '<td width="20">'.$html->textwithhelp('',$langs->trans("FeatureDevelopment")).'</td>';
+ print "</tr>";
}
// Calendrier en popup
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("UsePopupCalendar").'</td><td>';
if ($conf->global->MAIN_DISABLE_JAVASCRIPT) print $langs->trans("No").' ('.$langs->trans("JavascriptDisabled").')';
- else print ($conf->global->MAIN_POPUP_CALENDAR?$langs->trans("Yes").' (style '.$conf->global->MAIN_POPUP_CALENDAR.')':$langs->trans("No"));
- print "</td></tr>";
+ else print ($conf->global->MAIN_POPUP_CALENDAR?$langs->trans("Yes"):$langs->trans("No"));
+ print "</td>";
+ print '<td width="20"> </td>';
+ print "</tr>";
// Activer onglet preview
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("UsePreviewTabs").'</td><td>';
- print yn(isset($conf->global->MAIN_USE_PREVIEW_TABS)?$conf->global->MAIN_USE_PREVIEW_TABS:1)."</td></tr>";
+ print yn(isset($conf->global->MAIN_USE_PREVIEW_TABS)?$conf->global->MAIN_USE_PREVIEW_TABS:1)."</td>";
+ print '<td width="20"> </td>';
+ print "</tr>";
print '</table><br>';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index c3dce260779..a318778b902 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -22,8 +22,7 @@ SecuritySetup=Security setup
ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
ErrorDecimalLargerThanAreForbidden=Error, precision higher than <b>%s</b> are not supported.
DictionnarySetup=Dictionnary setup
-DisableJavascript=Disable JavaScript functions
-DisableAjax=Disable Ajax functions
+DisableJavascript=Disable JavaScript and Ajax functions
ConfirmAjax=Use Ajax confirmation popups
UseSearchToSelectCompany=Use a search form to choose a company (intead of using a list box)
ViewFullDateActions=Show full dates actions in the third sheet
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
index 59e0c519d4c..d2b0cc939b0 100644
--- a/htdocs/langs/fr_BE/admin.lang
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -15,8 +15,7 @@ SetupArea=Zone de configuration
SecuritySetup=Configuration de s�curit�
ErrorModuleRequirePHPVersion=Erreur, ce module n�cessite PHP version %s ou sup�rieure
DictionnarySetup=Dictionnaires
-DisableJavascript=D�sactiver les fonctions JavaScript
-DisableAjax=D�sactiver les fonctions AJAX
+DisableJavascript=D�sactiver les fonctions JavaScript et Ajax
UseSearchToSelectProduct=Utiliser un formulaire de recherche pour choisir un produit (plut�t que d'utiliser une liste d�roulante)
NotAvailableWhenAjaxDisabled=Non disponible quand AJAX est d�sactiv�
JavascriptDisabled=JavaScript d�sactiv�
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 1b9add175af..f0a8ec2fca6 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -22,8 +22,7 @@ SecuritySetup=Configuration de la s
ErrorModuleRequirePHPVersion=Erreur, ce module requiert une version %s ou sup�rieure de PHP
ErrorDecimalLargerThanAreForbidden=Erreur, les pr�cisions sup�rieures � <b>%s</b> ne sont pas support�es.
DictionnarySetup=Dictionnaires
-DisableJavascript=D�sactiver les fonctions Javascript
-DisableAjax=D�sactiver les fonctions Ajax
+DisableJavascript=D�sactiver les fonctions Javascript et Ajax
ConfirmAjax=Utiliser les popups de confirmation Ajax
UseSearchToSelectCompany=Utiliser un formulaire de recherche pour choix d'un tiers (plut�t que liste d�roulante)
ViewFullDateActions=Visualiser les dates des actions en entier dans la fiche tiers
--
GitLab