diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 2bd51b87f98..c681395f5af 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -165,7 +165,8 @@ class ModeleBoxes // Can't be abtract as it is instanciated to build "empty"
print '
';
// The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object
print img_picto($langs->trans("MoveBox",$this->box_id),'grip','class="boxhandle hideonsmartphone" style="cursor:move;"');
- print img_picto($langs->trans("Close",$this->box_id),'close','class="boxclose" style="cursor:pointer;" id="imgclose'.$this->box_id.'"');
+ print img_picto($langs->trans("Close",$this->box_id),'close','class="boxclose" rel="x:y" style="cursor:pointer;" id="imgclose'.$this->box_id.'"');
+ print '';
print '
';
}
print '';
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 8a964c9d846..a0d63e42b4a 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -952,8 +952,10 @@ class FormOther
jQuery(".boxclose").click(function() {
var self = this; // because JQuery can modify this
- var boxid=self.id.substring(8);
- jQuery(\'#boxto_\'+boxid).remove();
+ var boxid=self.id.substring(8);
+ var label=jQuery(\'#boxlabelentry\'+boxid).val();
+ jQuery(\'#boxto_\'+boxid).remove();
+ // TODO Add id, label into combo list
updateBoxOrder(1);
});
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_comments.key.sql b/htdocs/install/mysql/tables/llx_opensurvey_comments.key.sql
new file mode 100755
index 00000000000..33365f1ab20
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_opensurvey_comments.key.sql
@@ -0,0 +1,22 @@
+-- ============================================================================
+-- Copyright (C) 2013 Laurent Destailleur
+--
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see .
+-- ============================================================================
+
+ALTER TABLE llx_opensurvey_comments ADD INDEX idx_id_comment (id_comment);
+ALTER TABLE llx_opensurvey_comments ADD INDEX idx_id_sondage (id_sondage);
+
+
+
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_comments.sql b/htdocs/install/mysql/tables/llx_opensurvey_comments.sql
new file mode 100755
index 00000000000..613627c46aa
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_opensurvey_comments.sql
@@ -0,0 +1,25 @@
+-- ============================================================================
+-- Copyright (C) 2013 Laurent Destailleur
+--
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see .
+-- ============================================================================
+
+CREATE TABLE llx_opensurvey_comments (
+ id_comment INTEGER unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
+ id_sondage CHAR(16) NOT NULL,
+ comment text NOT NULL,
+ tms timestamp,
+ usercomment text
+) ENGINE=InnoDB;
+
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_sondage.key.sql b/htdocs/install/mysql/tables/llx_opensurvey_sondage.key.sql
new file mode 100755
index 00000000000..3bf5771811e
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_opensurvey_sondage.key.sql
@@ -0,0 +1,19 @@
+-- ============================================================================
+-- Copyright (C) 2013 Laurent Destailleur
+--
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see .
+-- ============================================================================
+
+ALTER TABLE llx_opensurvey_sondage ADD INDEX idx_id_sondage_admin (id_sondage_admin);
+ALTER TABLE llx_opensurvey_sondage ADD INDEX idx_date_fin (date_fin);
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql b/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
new file mode 100755
index 00000000000..1704938a6f7
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
@@ -0,0 +1,33 @@
+-- ============================================================================
+-- Copyright (C) 2013 Laurent Destailleur
+--
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see .
+-- ============================================================================
+
+CREATE TABLE llx_opensurvey_sondage (
+ id_sondage VARCHAR(16) PRIMARY KEY,
+ id_sondage_admin CHAR(24),
+ commentaires text,
+ mail_admin VARCHAR(128),
+ nom_admin VARCHAR(64),
+ titre text,
+ date_fin datetime,
+ format VARCHAR(2),
+ mailsonde varchar(2) DEFAULT '0',
+ survey_link_visible integer DEFAULT 1,
+ canedit integer DEFAULT 0,
+ origin varchar(64),
+ tms timestamp,
+ sujet TEXT
+) ENGINE=InnoDB;
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_user_studs.key.sql b/htdocs/install/mysql/tables/llx_opensurvey_user_studs.key.sql
new file mode 100755
index 00000000000..041b2d0593d
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_opensurvey_user_studs.key.sql
@@ -0,0 +1,20 @@
+-- ============================================================================
+-- Copyright (C) 2013 Laurent Destailleur
+--
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see .
+-- ============================================================================
+
+ALTER TABLE llx_opensurvey_user_studs ADD INDEX idx_id_users (id_users);
+ALTER TABLE llx_opensurvey_user_studs ADD INDEX idx_nom (nom);
+ALTER TABLE llx_opensurvey_user_studs ADD INDEX idx_id_sondage (id_sondage);
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql b/htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql
new file mode 100755
index 00000000000..78d7fa69c4d
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql
@@ -0,0 +1,24 @@
+-- ============================================================================
+-- Copyright (C) 2013 Laurent Destailleur
+--
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see .
+-- ============================================================================
+
+CREATE TABLE llx_opensurvey_user_studs (
+ id_users INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY,
+ nom VARCHAR(64) NOT NULL,
+ id_sondage VARCHAR(16) NOT NULL,
+ reponses VARCHAR(100) NOT NULL,
+ tms timestamp
+) ENGINE=InnoDB;