From ff3306bb4c3024acfd6f5e06df2127f198905994 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 6 Jan 2008 14:15:28 +0000
Subject: [PATCH] New: Marque les options experimental et dev comme tel
---
htdocs/admin/const.php | 11 +++---
htdocs/admin/ihm.php | 66 +++++++++++++++++++++++----------
htdocs/langs/en_US/other.lang | 1 +
htdocs/langs/fr_FR/other.lang | 1 +
mysql/migration/2.2.0-2.4.0.sql | 7 +++-
5 files changed, 59 insertions(+), 27 deletions(-)
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 7392d0368d2..d6cee2ccde1 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2003 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
@@ -17,7 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
- * $Source$
*/
/**
@@ -83,11 +82,11 @@ print '<input type="hidden" name="action" value="add">';
print "<tr $bc[$var] class=value><td><input type=\"text\" class=\"flat\" size=\"24\" name=\"constname\" value=\"\"></td>\n";
print '<td>';
-print '<input type="text" class="flat" size="32" name="constvalue" value="">';
+print '<input type="text" class="flat" size="24" name="constvalue" value="">';
print '</td><td>';
$form->select_array('consttype',array('yesno','texte','chaine'),2);
print '</td><td>';
-print '<input type="text" class="flat" size="24" name="constnote" value="">';
+print '<input type="text" class="flat" size="32" name="constnote" value="">';
print '</td><td align="center">';
print '<input type="submit" class="button" value="'.$langs->trans("Add").'" name="Button"><br>';
print "</td>\n";
@@ -139,14 +138,14 @@ if ($result)
}
else
{
- print '<input type="text" class="flat" size="32" name="constvalue" value="'.stripslashes($obj->value).'">';
+ print '<input type="text" class="flat" size="24" name="constvalue" value="'.stripslashes($obj->value).'">';
print '</td><td>';
$form->select_array('consttype',array('yesno','texte','chaine'),2);
}
print '</td><td>';
// Note
- print '<input type="text" class="flat" size="24" name="constnote" value="'.stripslashes(nl2br($obj->note)).'">';
+ print '<input type="text" class="flat" size="32" name="constnote" value="'.stripslashes(nl2br($obj->note)).'">';
print '</td><td align="center">';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="button"> ';
print '<a href="const.php?rowid='.$obj->rowid.'&action=delete">'.img_delete().'</a>';
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 2f2c18995c8..37b8f5c6225 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -93,49 +93,68 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
$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>';
+ print '<td width="20"> </td>';
+ print '</tr>';
// Langue par defaut
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DefaultLanguage").'</td><td>';
$html->select_lang($conf->global->MAIN_LANG_DEFAULT,'main_lang_default',1);
- print '</td></tr>';
+ print '</td>';
+ print '<td width="20"> </td>';
+ print '</tr>';
// Taille max des listes
$var=!$var;
- print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMaxSizeList").'</td><td><input class="flat" name="main_size_liste_limit" size="4" value="' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '"></td></tr>';
+ print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMaxSizeList").'</td><td><input class="flat" name="main_size_liste_limit" size="4" value="' . $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("EnableMultilangInterface").'</td><td>';
print $html->selectyesno('main_multilangs',$conf->global->MAIN_MULTILANGS,1);
- print '</td></tr>';
+ print '</td>';
+ print '<td width="20"> </td>';
+ print '</tr>';
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("ShowBugTrackLink").'</td><td>';
print $html->selectyesno('main_show_bugtrack_link',$conf->global->MAIN_SHOW_BUGTRACK_LINK,1);
- print '</td></tr>';
+ print '</td>';
+ print '<td width="20"> </td>';
+ print '</tr>';
// D�sactiver javascript
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DisableJavascript").'</td><td>';
print $html->selectyesno('main_disable_javascript',isset($conf->global->MAIN_DISABLE_JAVASCRIPT)?$conf->global->MAIN_DISABLE_JAVASCRIPT:0,1);
- print '</td></tr>';
+ print '</td>';
+ print '<td width="20"> </td>';
+ print '</tr>';
// D�sactiver ajax
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DisableAjax").'</td><td>';
print $html->selectyesno('main_disable_ajax',isset($conf->global->MAIN_DISABLE_AJAX)?$conf->global->MAIN_DISABLE_AJAX:1,1);
print ' ('.$langs->trans("AutomaticIfJavascriptDisabled").')';
- print '</td></tr>';
+ print '</td>';
+ print '<td width="20"> </td>';
+ print '</tr>';
// Confirmation par popup ajax
- $var=!$var;
- print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("ConfirmAjax").'</td><td>';
- print $html->selectyesno('main_confirm_ajax',isset($conf->global->MAIN_CONFIRM_AJAX)?$conf->global->MAIN_CONFIRM_AJAX:0,1);
- print ' ('.$langs->trans("AvailableOnlyIfJavascriptAndAjaxNotDisabled").')';
- print '</td></tr>';
-
+ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
+ {
+ $var=!$var;
+ print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("ConfirmAjax").'</td><td>';
+ print $html->selectyesno('main_confirm_ajax',isset($conf->global->MAIN_CONFIRM_AJAX)?$conf->global->MAIN_CONFIRM_AJAX:0,1);
+ print ' ('.$langs->trans("AvailableOnlyIfJavascriptAndAjaxNotDisabled").')';
+ print '</td>';
+ print '<td width="20">'.$html->textwithhelp('',$langs->trans("FeatureDevelopment")).'</td>';
+ print '</tr>';
+ }
+
// D�sactiver le calendrier popup
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("UsePopupCalendar").'</td><td>';
@@ -145,13 +164,17 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
'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></tr>';
+ 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 $html->selectyesno('main_use_preview_tabs',isset($conf->global->MAIN_USE_PREVIEW_TABS)?$conf->global->MAIN_USE_PREVIEW_TABS:1,1);
- print '</td></tr>';
+ print '</td>';
+ print '<td width="20"> </td>';
+ print '</tr>';
print '</table><br>';
@@ -252,11 +275,14 @@ else
else print yn(isset($conf->global->MAIN_DISABLE_AJAX)?$conf->global->MAIN_DISABLE_AJAX:1)."</td></tr>";
// Confirm ajax
- $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>";
-
+ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
+ {
+ $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>";
+ }
+
// Calendrier en popup
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("UsePopupCalendar").'</td><td>';
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index e18df43f4f2..863dc7c3b1a 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -62,6 +62,7 @@ ClosedBy=Closed by %s
FileWasRemoved=File was deleted
FeatureNotYetAvailable=Feature not yet available in this version
FeatureExperimental=Experimental feature. Not stable in this version
+FeatureDevelopment=Development feature. Not stable in this version
FeaturesSupported=Features supported
Width=Width
Height=Height
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index cfd45c0ce62..65f6ef48787 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -62,6 +62,7 @@ ClosedBy=Clotur
FileWasRemoved=Le fichier a �t� supprim�
FeatureNotYetAvailable=Fonctionnalit� pas encore disponible dans cette version
FeatureExperimental=Fonctionnalit� exp�rimentale. Non stable dans cette version
+FeatureDevelopment=Fonctionnalit� en d�veloppement. Non stable dans cette version
FeaturesSupported=Fonctionnalit�s support�es
Width=Largeur
Height=Hauteur
diff --git a/mysql/migration/2.2.0-2.4.0.sql b/mysql/migration/2.2.0-2.4.0.sql
index a1a4b33cffc..dd163689291 100644
--- a/mysql/migration/2.2.0-2.4.0.sql
+++ b/mysql/migration/2.2.0-2.4.0.sql
@@ -11,4 +11,9 @@ ALTER TABLE llx_societe_adresse_livraison ADD COLUMN tel varchar(20) after fk_pa
ALTER TABLE llx_societe_adresse_livraison ADD COLUMN fax varchar(20) after tel;
alter table llx_c_barcode_type modify coder varchar(16) NOT NULL;
-update llx_c_barcode_type set coder = 0 where coder in (1,2);
\ No newline at end of file
+update llx_c_barcode_type set coder = 0 where coder in (1,2);
+
+update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_ALL' and value='MAIN_FORCE_SETLOCALE_LC_ALL';
+update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_MONETARY' and value='MAIN_FORCE_SETLOCALE_LC_MONETARY';
+update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_NUMERIC' and value='MAIN_FORCE_SETLOCALE_LC_NUMERIC';
+update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_TIME' and value='MAIN_FORCE_SETLOCALE_LC_TIME';
--
GitLab