bug fixing: options display (text lower than input), adding a new

backgorund color in options and sorting options by name
This commit is contained in:
franzz committed 2014-12-13 03:53:55 +01:00
1 parent 0e4b1a3e6d
commit b098615095
6 files changed
+22 -22

No files matched your search

+15 -9
View File
@@ -130,7 +130,8 @@ class Databap extends PhpObject
const OPT_SELECT = 'S'; const OPT_SELECT = 'S';
const OPT_NICKNAME = 1; const OPT_NICKNAME = 1;
const OPT_BG = 2; const OPT_BG = 2;
const OPT_BRIGHT_BG = 3; const OPT_BG_2 = 11;
const OPT_BG_3 = 3;
const OPT_HOVER = 4; const OPT_HOVER = 4;
const OPT_IMAGE_CHAT = 6; const OPT_IMAGE_CHAT = 6;
const OPT_STATUS = 7; const OPT_STATUS = 7;
@@ -355,7 +356,8 @@ class Databap extends PhpObject
$sOptionValueIdCol = MySqlManager::getId(self::OPTVAL_TABLE); $sOptionValueIdCol = MySqlManager::getId(self::OPTVAL_TABLE);
$this->oMySql->insertRow(self::OPTNAME_TABLE, array($sOptionNameIdCol=>self::OPT_NICKNAME, $sOptionNameCol=>'pseudo du chat', 'type'=>self::OPT_TEXT, 'language'=>self::LANG_FR)); $this->oMySql->insertRow(self::OPTNAME_TABLE, array($sOptionNameIdCol=>self::OPT_NICKNAME, $sOptionNameCol=>'pseudo du chat', 'type'=>self::OPT_TEXT, 'language'=>self::LANG_FR));
$this->oMySql->insertRow(self::OPTNAME_TABLE, array($sOptionNameIdCol=>self::OPT_BG, $sOptionNameCol=>'couleur de fond', 'type'=>self::OPT_TEXT, 'language'=>self::LANG_FR)); $this->oMySql->insertRow(self::OPTNAME_TABLE, array($sOptionNameIdCol=>self::OPT_BG, $sOptionNameCol=>'couleur de fond', 'type'=>self::OPT_TEXT, 'language'=>self::LANG_FR));
$this->oMySql->insertRow(self::OPTNAME_TABLE, array($sOptionNameIdCol=>self::OPT_BRIGHT_BG, $sOptionNameCol=>'couleur de fond 2 (claire)', 'type'=>self::OPT_TEXT, 'language'=>self::LANG_FR)); $this->oMySql->insertRow(self::OPTNAME_TABLE, array($sOptionNameIdCol=>self::POT_BG_2, $sOptionNameCol=>'couleur de fond 2', 'type'=>self::OPT_TEXT, 'language'=>self::LANG_FR));
$this->oMySql->insertRow(self::OPTNAME_TABLE, array($sOptionNameIdCol=>self::OPT_BG_3, $sOptionNameCol=>'couleur de fond 3', 'type'=>self::OPT_TEXT, 'language'=>self::LANG_FR));
$this->oMySql->insertRow(self::OPTNAME_TABLE, array($sOptionNameIdCol=>self::OPT_HOVER, $sOptionNameCol=>'couleur de survol', 'type'=>self::OPT_TEXT, 'language'=>self::LANG_FR)); $this->oMySql->insertRow(self::OPTNAME_TABLE, array($sOptionNameIdCol=>self::OPT_HOVER, $sOptionNameCol=>'couleur de survol', 'type'=>self::OPT_TEXT, 'language'=>self::LANG_FR));
$this->oMySql->insertRow(self::OPTNAME_TABLE, array($sOptionNameIdCol=>self::OPT_IMAGE_CHAT, $sOptionNameCol=>'image du chat', 'type'=>self::OPT_TEXT, 'language'=>self::LANG_FR)); $this->oMySql->insertRow(self::OPTNAME_TABLE, array($sOptionNameIdCol=>self::OPT_IMAGE_CHAT, $sOptionNameCol=>'image du chat', 'type'=>self::OPT_TEXT, 'language'=>self::LANG_FR));
$this->oMySql->insertRow(self::OPTNAME_TABLE, array($sOptionNameIdCol=>self::OPT_STATUS, $sOptionNameCol=>'mission en cours', 'type'=>self::OPT_TEXT, 'language'=>self::LANG_FR)); $this->oMySql->insertRow(self::OPTNAME_TABLE, array($sOptionNameIdCol=>self::OPT_STATUS, $sOptionNameCol=>'mission en cours', 'type'=>self::OPT_TEXT, 'language'=>self::LANG_FR));
@@ -366,7 +368,8 @@ class Databap extends PhpObject
//Select and Default Option values //Select and Default Option values
$asDefaultValues = array( self::OPT_CONSOLE=>array(self::OPT_VAL_YES=>false, self::OPT_VAL_NO=>true), $asDefaultValues = array( self::OPT_CONSOLE=>array(self::OPT_VAL_YES=>false, self::OPT_VAL_NO=>true),
self::OPT_BG=>array('#04357B'=>true), self::OPT_BG=>array('#04357B'=>true),
self::OPT_BRIGHT_BG=>array('#D9E5F2'=>true), self::OPT_BG_2=>array('#88B2F0'=>true),
self::OPT_BG_3=>array('#D9E5F2'=>true),
self::OPT_HOVER=>array('#EFAB00'=>true), self::OPT_HOVER=>array('#EFAB00'=>true),
self::OPT_IMAGE_CHAT=>array('images/sap_gold_332.jpg'=>true), self::OPT_IMAGE_CHAT=>array('images/sap_gold_332.jpg'=>true),
self::OPT_STATUS=>array('aucune mission en cours'=>true), self::OPT_STATUS=>array('aucune mission en cours'=>true),
@@ -1299,10 +1302,12 @@ class Databap extends PhpObject
$asSelectedOptions = array(); $asSelectedOptions = array();
foreach($asAvailableOptions as $sOptNameId=>$asOption) foreach($asAvailableOptions as $sOptNameId=>$asOption)
{ {
$asSelectedOptions[$sOptNameId]['option_name'] = self::getDescriptionFormat($asOption[$sOptNameTextCol]); $sOptionName = self::getDescriptionFormat($asOption[$sOptNameTextCol]);
$asSelectedOptions[$sOptNameId]['user_value_id'] = array_key_exists($sOptNameId, $asUserOptions)?$asUserOptions[$sOptNameId][$sOptValueIdCol]:0; $asSelectedOptions[$sOptionName]['option_id'] = $sOptNameId;
$asSelectedOptions[$sOptNameId]['user_value'] = array_key_exists($sOptNameId, $asUserOptions)?$asUserOptions[$sOptNameId][$sOptionTextCol]:''; $asSelectedOptions[$sOptionName]['option_name'] = $sOptionName;
$asSelectedOptions[$sOptNameId]['type'] = $asOption['type']; $asSelectedOptions[$sOptionName]['user_value_id'] = array_key_exists($sOptNameId, $asUserOptions)?$asUserOptions[$sOptNameId][$sOptValueIdCol]:0;
$asSelectedOptions[$sOptionName]['user_value'] = array_key_exists($sOptNameId, $asUserOptions)?$asUserOptions[$sOptNameId][$sOptionTextCol]:'';
$asSelectedOptions[$sOptionName]['type'] = $asOption['type'];
if($asOption['type']==self::OPT_SELECT) if($asOption['type']==self::OPT_SELECT)
{ {
$asOptionValuesInfo = array('select'=>array($sOptValueIdCol, $sOptValueTextCol), $asOptionValuesInfo = array('select'=>array($sOptValueIdCol, $sOptValueTextCol),
@@ -1310,9 +1315,10 @@ class Databap extends PhpObject
'constraint'=>array('language'=>$this->sLanguage, 'constraint'=>array('language'=>$this->sLanguage,
MySqlManager::getId(self::OPTNAME_TABLE)=>$sOptNameId), MySqlManager::getId(self::OPTNAME_TABLE)=>$sOptNameId),
'orderBy'=>array('led'=>'ASC')); 'orderBy'=>array('led'=>'ASC'));
$asSelectedOptions[$sOptNameId]['select'] = $this->oMySql->selectRows($asOptionValuesInfo, true, $sOptValueIdCol); $asSelectedOptions[$sOptionName]['select'] = $this->oMySql->selectRows($asOptionValuesInfo, true, $sOptValueIdCol);
} }
} }
ksort($asSelectedOptions);
return $this->jsonExport($asSelectedOptions); return $this->jsonExport($asSelectedOptions);
} }
@@ -2669,7 +2675,7 @@ class Databap extends PhpObject
public function getStyleSheet() public function getStyleSheet()
{ {
$sStyle = file_get_contents(self::STYLE_PATH); $sStyle = file_get_contents(self::STYLE_PATH);
$asStyleParams = array(self::OPT_BG, self::OPT_BRIGHT_BG, self::OPT_HOVER, self::OPT_IMAGE_CHAT); $asStyleParams = array(self::OPT_BG, self::OPT_BG_2, self::OPT_BG_3, self::OPT_HOVER, self::OPT_IMAGE_CHAT);
//Inserting Color Anchors //Inserting Color Anchors
$asDefaultValues = $this->getDefaultOptionValues($asStyleParams, false); $asDefaultValues = $this->getDefaultOptionValues($asStyleParams, false);
+2 -1
View File
@@ -58,8 +58,9 @@ databap.onResize = function()
self.setScrollBarSize('maximize'); self.setScrollBarSize('maximize');
}; };
function addOption(optNameId, optInfo, $Box) function addOption(iArrayId, optInfo, $Box)
{ {
var optNameId = optInfo.option_id;
$Box = $Box || $('#options_input'); $Box = $Box || $('#options_input');
var selected = ''; var selected = '';
var $Option = $('<div>', {'class':'option_line'}).append($('<p>').text(optInfo.option_name)); var $Option = $('<div>', {'class':'option_line'}).append($('<p>').text(optInfo.option_name));
+1 -1
View File
@@ -1,5 +1,5 @@
@CHARSET "UTF-8";/*! @CHARSET "UTF-8";/*!
* Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome * Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/@font-face{font-family:'FontAwesome';src:url("style/fontawesome-webfont.eot?v=4.2.0");src:url("style/fontawesome-webfont.eot?#iefix&v=4.2.0") format("embedded-opentype"),url("style/fontawesome-webfont.woff?v=4.2.0") format("woff"),url("style/fontawesome-webfont.ttf?v=4.2.0") format("truetype"),url("style/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular") format("svg");font-weight:normal;font-style:normal}.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:0.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:0.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid 0.08em #eeeeee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:spin 2s infinite linear;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear}@-moz-keyframes spin{0%{-moz-transform:rotate(0deg)}100%{-moz-transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0deg)}100%{-o-transform:rotate(359deg)}}@keyframes spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1, 1);-moz-transform:scale(-1, 1);-ms-transform:scale(-1, 1);-o-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1, -1);-moz-transform:scale(1, -1);-ms-transform:scale(1, -1);-o-transform:scale(1, -1);transform:scale(1, -1)}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#ffffff}.fa-inline{margin-right:5px}.fa-10{font-size:1.1111111111111111em;line-height:0.9166666666666666em;vertical-align:-5%}.fa-20{font-size:1.2222222222222222em;line-height:0.8333333333333333em;vertical-align:-10%}.fa-30{font-size:1.3333333333333333em;line-height:0.75em;vertical-align:-15%}.fa-40{font-size:1.4444444444444444em;line-height:0.6666666666666666em;vertical-align:-20%}.fa-60,a.button .fa{font-size:1.6666666666666666em;line-height:0.5em;vertical-align:-30%}.fa-c-c:before,.fa-c-code:before{content:"\f121"}.fa-c-procedure:before,.fa-c-proc:before,.fa-c-p:before{content:"\f0cb"}.fa-c-table:before,.fa-c-t:before{content:"\f0ce"}.fa-c-documentation:before,.fa-c-doc:before,.fa-c-d:before{content:"\f15b"}.fa-c-article:before,.fa-c-art:before,.fa-c-a:before{content:"\f14c"}.fa-c-note:before{content:"\f0fa"}.fa-c-list:before{content:"\f02d"}.fa-c-profile:before{content:"\f007"}.fa-c-chat:before{content:"\f086"}.fa-c-news:before{content:"\f0e7"}.fa-c-version:before{content:"\f005"}.fa-c-details:before{content:"\f112"}.fa-c-bug:before{content:"\f188"}.fa-c-date:before{content:"\f073"}.fa-c-git:before{content:"\f1d3"}.fa-c-afk:before{content:"\f017"}.fa-c-comment{color:#04357B}.fa-c-comment:before{content:"\f075"}.fa-c-options:before{content:"\f085"}.fa-c-param:before{content:"\f1de"}.fa-c-wip:before{content:"\f013"}.fa-c-rss:before{content:"\f09e"}.fa-c-logmeout:before,.fa-c-logout:before{content:"\f08b"}.fa-c-fold{color:#04357B}.fa-c-fold:before{content:"\f191"}.fa-c-success:before,.fa-c-ok:before,.available .fa:before{content:"\f00c"}.fa-c-warning{color:orange}.fa-c-warning:before{content:"\f071"}.fa-c-error{color:red}.fa-c-error:before{content:"\f071"}.fa-c-ko{color:red}.fa-c-ko:before,.unavailable .fa:before{content:"\f00d"}.fa-c-search:before{content:"\f002"}.fa-c-welcome:before{content:"\f015"}.fa-c-loading:bLine truncated */@font-face{font-family:'FontAwesome';src:url("style/fontawesome-webfont.eot?v=4.2.0");src:url("style/fontawesome-webfont.eot?#iefix&v=4.2.0") format("embedded-opentype"),url("style/fontawesome-webfont.woff?v=4.2.0") format("woff"),url("style/fontawesome-webfont.ttf?v=4.2.0") format("truetype"),url("style/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular") format("svg");font-weight:normal;font-style:normal}.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:0.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:0.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid 0.08em #eeeeee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:spin 2s infinite linear;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear}@-moz-keyframes spin{0%{-moz-transform:rotate(0deg)}100%{-moz-transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0deg)}100%{-o-transform:rotate(359deg)}}@keyframes spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1, 1);-moz-transform:scale(-1, 1);-ms-transform:scale(-1, 1);-o-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1, -1);-moz-transform:scale(1, -1);-ms-transform:scale(1, -1);-o-transform:scale(1, -1);transform:scale(1, -1)}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#ffffff}.fa-inline{margin-right:5px}.fa-10{font-size:1.1111111111111111em;line-height:0.9166666666666666em;vertical-align:-5%}.fa-20{font-size:1.2222222222222222em;line-height:0.8333333333333333em;vertical-align:-10%}.fa-30{font-size:1.3333333333333333em;line-height:0.75em;vertical-align:-15%}.fa-40{font-size:1.4444444444444444em;line-height:0.6666666666666666em;vertical-align:-20%}.fa-60,a.button .fa{font-size:1.6666666666666666em;line-height:0.5em;vertical-align:-30%}.fa-c-c:before,.fa-c-code:before{content:"\f121"}.fa-c-procedure:before,.fa-c-proc:before,.fa-c-p:before{content:"\f0cb"}.fa-c-table:before,.fa-c-t:before{content:"\f0ce"}.fa-c-documentation:before,.fa-c-doc:before,.fa-c-d:before{content:"\f15b"}.fa-c-article:before,.fa-c-art:before,.fa-c-a:before{content:"\f14c"}.fa-c-note:before{content:"\f0fa"}.fa-c-list:before{content:"\f02d"}.fa-c-profile:before{content:"\f007"}.fa-c-chat:before{content:"\f086"}.fa-c-news:before{content:"\f0e7"}.fa-c-version:before{content:"\f005"}.fa-c-details:before{content:"\f112"}.fa-c-bug:before{content:"\f188"}.fa-c-date:before{content:"\f073"}.fa-c-git:before{content:"\f1d3"}.fa-c-afk:before{content:"\f017"}.fa-c-comment{color:#04357B}.fa-c-comment:before{content:"\f075"}.fa-c-options:before{content:"\f085"}.fa-c-param:before{content:"\f1de"}.fa-c-wip:before{content:"\f013"}.fa-c-rss:before{content:"\f09e"}.fa-c-logmeout:before,.fa-c-logout:before{content:"\f08b"}.fa-c-fold{color:#04357B}.fa-c-fold:before{content:"\f191"}.fa-c-success:before,.fa-c-ok:before,.available .fa:before{content:"\f00c"}.fa-c-warning{color:orange}.fa-c-warning:before{content:"\f071"}.fa-c-error{color:red}.fa-c-error:before{content:"\f071"}.fa-c-ko{color:red}.fa-c-ko:before,.unavailable .fa:before{content:"\f00d"}.fa-c-search:before{content:"\f002"}.fa-c-welcome:before{content:"\f015"}.fa-c-loading:bLine truncated
/*# sourceMappingURL=databap.css.map */ /*# sourceMappingURL=databap.css.map */
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"version": 3, "version": 3,
"mappings": "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 truncated "mappings": "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 truncated
"sources": ["_variables.scss","_fa.scss","_fa-custom.scss","_lightbox.scss","_common.scss","databap.scss"], "sources": ["_variables.scss","_fa.scss","_fa-custom.scss","_lightbox.scss","_common.scss","databap.scss"],
"names": [], "names": [],
"file": "databap.css" "file": "databap.css"
+1
View File
@@ -1042,6 +1042,7 @@
border-width:1px; border-width:1px;
font-size:$size_vbig; font-size:$size_vbig;
padding:5px; padding:5px;
margin-top:6px;
float:right; float:right;
} }
+2 -10
View File
@@ -54,15 +54,7 @@ Testing
- LOAD DATA LOCAL INFILE '/var/www/databap/test.csv' INTO TABLE tables CHARACTER SET UTF8 FIELDS TERMINATED BY ',' ENCLOSED BY '"' ESCAPED BY '\\'; - LOAD DATA LOCAL INFILE '/var/www/databap/test.csv' INTO TABLE tables CHARACTER SET UTF8 FIELDS TERMINATED BY ',' ENCLOSED BY '"' ESCAPED BY '\\';
- Rebuild search : ?a=build_index - Rebuild search : ?a=build_index
MEP 1.1 MEP 1.2
------- -------
ALTER TABLE option_values add default_value tinyint(1) default 0 after option_value; -
update option_values set default_value = 1 where id_option_value = 2;
insert into option_names (id_option_name, option_name, type, language) values (10, 'Chat: nombre de jours d\'historique', 'T', 'FR');
insert into option_values (id_option_name, option_value, default_value, language) values (2, '#04357B', 1, 'FR');
insert into option_values (id_option_name, option_value, default_value, language) values (3, '#D9E5F2', 1, 'FR');
insert into option_values (id_option_name, option_value, default_value, language) values (4, '#EFAB00', 1, 'FR');
insert into option_values (id_option_name, option_value, default_value, language) values (6, 'images/sap_gold_332.jpg', 1, 'FR');
insert into option_values (id_option_name, option_value, default_value, language) values (7, 'aucune mission en cours', 1, 'FR');
insert into option_values (id_option_name, option_value, default_value, language) values (10, '0', 1, 'FR');