diff --git a/modules/basket/class/class_admin_basket_Abstract.php b/modules/basket/class/class_admin_basket_Abstract.php
index 35f72b161ef52404ce5ef7d43b7b30cb1a50d446..ab3446a746667a1dd872c6add8dabb84c4207dc0 100755
--- a/modules/basket/class/class_admin_basket_Abstract.php
+++ b/modules/basket/class/class_admin_basket_Abstract.php
@@ -132,6 +132,7 @@ abstract class admin_basket_Abstract extends Database
if ($mode == "add") {
$_SESSION['m_admin']['basket']['coll_id'] = $_SESSION['collections'][0]['id'];
+ $_SESSION['m_admin']['basket']['color'] = '#666666';
}
// If mode "Up", Loading the informations of the basket in session
@@ -154,6 +155,11 @@ abstract class admin_basket_Abstract extends Database
$line = $stmt->fetchObject();
$_SESSION['m_admin']['basket']['desc'] = functions::show_string($line->basket_desc);
$_SESSION['m_admin']['basket']['name'] = functions::show_string($line->basket_name);
+ if (empty($line->color)) {
+ $_SESSION['m_admin']['basket']['color'] = '#666666';
+ } else {
+ $_SESSION['m_admin']['basket']['color'] = functions::show_string($line->color);
+ }
$_SESSION['m_admin']['basket']['clause'] = functions::show_string($line->basket_clause);
$_SESSION['m_admin']['basket']['is_generic'] = functions::show_string($line->is_generic);
$_SESSION['m_admin']['basket']['is_visible'] = functions::show_string($line->is_visible);
@@ -248,6 +254,11 @@ abstract class admin_basket_Abstract extends Database
<label><?php echo _BASKET;?> : </label>
<input name="basketname" type="text" id="basketname" value="<?php functions::xecho($_SESSION['m_admin']['basket']['name']);?>" />
</p>
+ <p>
+ <label>Couleur : </label>
+ <input name="color" type="color" id="color" style="width: 38%;" value="<?php functions::xecho($_SESSION['m_admin']['basket']['color']);?>" />
+ <a title="Réinitialiser la couleur" style="cursor: pointer" onclick="$j('#color')[0].value = '#666666'"><i class="fa fa-magic"></i></a>
+ </p>
<p>
<label><?php echo _DESC;?> : </label>
<textarea cols="30" rows="4" name="basketdesc" style="width:200px;" id="basketdesc" ><?php functions::xecho($_SESSION['m_admin']['basket']['desc']);?></textarea>
@@ -446,6 +457,10 @@ abstract class admin_basket_Abstract extends Database
{
$_SESSION['m_admin']['basket']['name'] = $this->wash($_REQUEST['basketname'], "no", _THE_BASKET, 'yes', 0, 255);
}
+ if(!empty($_REQUEST['color']))
+ {
+ $_SESSION['m_admin']['basket']['color'] = $this->wash($_REQUEST['color'], "no", _THE_BASKET, 'yes', 0, 255);
+ }
if (isset($_REQUEST['basketdesc']) && !empty($_REQUEST['basketdesc']))
{
$_SESSION['m_admin']['basket']['desc'] = $this->wash($_REQUEST['basketdesc'], "no", _THE_DESC, 'yes', 0, 255);
@@ -544,8 +559,8 @@ abstract class admin_basket_Abstract extends Database
exit();
}
$db->query(
- "INSERT INTO ".$_SESSION['tablename']['bask_baskets']." ( coll_id, basket_id, basket_name, basket_desc , basket_clause, is_visible, is_folder_basket, flag_notif ) "
- ."VALUES (?,?,?,?,?,?,?,?)", array($_SESSION['m_admin']['basket']['coll_id'],$_SESSION['m_admin']['basket']['basketId'],$_SESSION['m_admin']['basket']['name'],$_SESSION['m_admin']['basket']['desc'],$tmp,$_SESSION['m_admin']['basket']['is_visible'],$_SESSION['m_admin']['basket']['is_folder_basket'],$_SESSION['m_admin']['basket']['flag_notif']));
+ "INSERT INTO ".$_SESSION['tablename']['bask_baskets']." ( coll_id, basket_id, basket_name, basket_desc , basket_clause, is_visible, is_folder_basket, flag_notif, color) "
+ ."VALUES (?,?,?,?,?,?,?,?,?)", array($_SESSION['m_admin']['basket']['coll_id'],$_SESSION['m_admin']['basket']['basketId'],$_SESSION['m_admin']['basket']['name'],$_SESSION['m_admin']['basket']['desc'],$tmp,$_SESSION['m_admin']['basket']['is_visible'],$_SESSION['m_admin']['basket']['is_folder_basket'],$_SESSION['m_admin']['basket']['flag_notif'], $_SESSION['m_admin']['basket']['color']));
$this->load_db();
// Log in database if required
@@ -594,7 +609,7 @@ abstract class admin_basket_Abstract extends Database
exit();
}
- $db->query("UPDATE ".$_SESSION['tablename']['bask_baskets']." set basket_name = ? , coll_id = ? , basket_desc = ? ,basket_clause = ?, is_folder_basket = ?, is_visible = ?, flag_notif = ? where basket_id = ?",array($name,$_SESSION['m_admin']['basket']['coll_id'],$desc, $tmp, $_SESSION['m_admin']['basket']['is_folder_basket'], $_SESSION['m_admin']['basket']['is_visible'], $_SESSION['m_admin']['basket']['flag_notif'], $_SESSION['m_admin']['basket']['basketId']));
+ $db->query("UPDATE baskets set basket_name = ? , coll_id = ? , basket_desc = ? ,basket_clause = ?, is_folder_basket = ?, is_visible = ?, flag_notif = ?, color = ? where basket_id = ?",array($name,$_SESSION['m_admin']['basket']['coll_id'],$desc, $tmp, $_SESSION['m_admin']['basket']['is_folder_basket'], $_SESSION['m_admin']['basket']['is_visible'], $_SESSION['m_admin']['basket']['flag_notif'], $_SESSION['m_admin']['basket']['color'], $_SESSION['m_admin']['basket']['basketId']));
$this->load_db();
// Log in database if required
diff --git a/modules/basket/class/class_modules_tools_Abstract.php b/modules/basket/class/class_modules_tools_Abstract.php
index 078743e28ca85022866acf2bd33eb90447e3db25..c1b05be7481cba463c78b4fdb80bc3b771abe623 100755
--- a/modules/basket/class/class_modules_tools_Abstract.php
+++ b/modules/basket/class/class_modules_tools_Abstract.php
@@ -795,7 +795,7 @@ abstract class basket_Abstract extends Database
$secCtrl = new SecurityControler();
$stmt = $db->query(
"select basket_id, coll_id, basket_name, basket_desc, "
- . "basket_clause, is_visible, is_generic, is_folder_basket from "
+ . "basket_clause, is_visible, is_generic, is_folder_basket, color from "
. BASKET_TABLE . " where basket_id = ? and enabled = 'Y'",array($basketId));
$res = $stmt->fetchObject();
$tab['id'] = $res->basket_id;
@@ -811,6 +811,7 @@ abstract class basket_Abstract extends Database
$tab['is_generic'] = $res->is_generic;
$tab['desc'] = $this->show_string($res->basket_desc);
$tab['name'] = $this->show_string($res->basket_name);
+ $tab['color'] = $this->show_string($res->color);
$tab['clause'] = $res->basket_clause;
$tab['is_visible'] = $res->is_visible;
$tab['is_folder_basket'] = $res->is_folder_basket;
diff --git a/modules/basket/display_basket_list.php b/modules/basket/display_basket_list.php
index 1cbfbc3d25cff2f754f130461cd26042cc1e88ec..54b3487193c72038ada3cbd1018e64a7e6f375dc 100755
--- a/modules/basket/display_basket_list.php
+++ b/modules/basket/display_basket_list.php
@@ -132,7 +132,7 @@ if ($core_tools->test_service('display_basket_list','basket', false)) {
. '" name="nb_' . $_SESSION['user']['baskets'][$i]['id']
. '"><i class="fa-li fa fa-spinner fa-spin" style="margin-left: -10px;position: inherit;margin-right: -7px;"></i>'
. '</span></b> <i class="fa-li fa fa-folder" style="padding-top: 5px;padding-bottom: 5px;"></i>'
- . functions::xssafe($_SESSION['user']['baskets'][$i]['name'])
+ . '<span style="color: ' .$_SESSION['user']['baskets'][$i]['color'] . '">' . functions::xssafe($_SESSION['user']['baskets'][$i]['name']) . '</span>'
. ' </a></li>';
} else {
echo '<li style="padding-top: 5px;padding-bottom: 5px;"><a title="'.$_SESSION['user']['baskets'][$i]['desc'].'" href="'
@@ -143,7 +143,7 @@ if ($core_tools->test_service('display_basket_list','basket', false)) {
. '" name="nb_' . $_SESSION['user']['baskets'][$i]['id']
. '"><i class="fa-li fa fa-spinner fa-spin" style=";margin-left: -10px;position: inherit;margin-right: -7px;"></i>'
. '</span></b> <i class="fa-li fa fa-tasks" style="padding-top: 5px;padding-bottom: 5px;"></i> '
- . functions::xssafe($_SESSION['user']['baskets'][$i]['name'])
+ . '<span style="color: ' .$_SESSION['user']['baskets'][$i]['color'] . '">' . functions::xssafe($_SESSION['user']['baskets'][$i]['name']) . '</span>'
. ' </a></li>';
}
}
diff --git a/modules/basket/xml/IVS/validation_rules.xml b/modules/basket/xml/IVS/validation_rules.xml
index 61cc7445af06fc1f8d606762686f65655f68bf36..a7dd2a1c52fbcbc565b36c8970d203eaf042e8c9 100755
--- a/modules/basket/xml/IVS/validation_rules.xml
+++ b/modules/basket/xml/IVS/validation_rules.xml
@@ -18,6 +18,7 @@
<parameter name="collection" type="collection_list" />
<parameter name="basketId" type="identifier" />
<parameter name="basketname" type="string" />
+ <parameter name="color" type="string" />
<parameter name="basketdesc" type="string" />
<parameter name="basketclause" type="string" />
<parameter name="Submit" type="string" />
diff --git a/sql/17_xx.sql b/sql/17_xx.sql
index d08837a236bc3c77b7ceb386a6b9d57b8847c560..9b2eac3305e704fa43bf876860842678d30927c2 100755
--- a/sql/17_xx.sql
+++ b/sql/17_xx.sql
@@ -102,4 +102,8 @@ ALTER TABLE sendmail ADD COLUMN res_version_att_id_list character varying(255);
/*SALT*/
UPDATE users set password = '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', change_password = 'Y' WHERE user_id != 'superadmin';
-UPDATE users set password = '$2y$10$Vq244c5s2zmldjblmMXEN./Q2qZrqtGVgrbz/l1WfsUJbLco4E.e.' where user_id = 'superadmin';
\ No newline at end of file
+UPDATE users set password = '$2y$10$Vq244c5s2zmldjblmMXEN./Q2qZrqtGVgrbz/l1WfsUJbLco4E.e.' where user_id = 'superadmin';
+
+/*BASKETS COLOR*/
+ALTER TABLE baskets DROP COLUMN IF EXISTS color;
+ALTER TABLE baskets ADD color character varying(16);