+
+--
+-- 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 2 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_actioncomm_extrafields ADD INDEX idx_actioncomm_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_actioncomm_extrafields.sql b/htdocs/install/mysql/tables/llx_actioncomm_extrafields.sql
new file mode 100755
index 00000000000..f0e2809ab64
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_actioncomm_extrafields.sql
@@ -0,0 +1,26 @@
+-- ========================================================================
+-- Copyright (C) 2011 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 2 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_actioncomm_extrafields
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ tms timestamp,
+ fk_object integer NOT NULL,
+ import_key varchar(14) -- import key
+) ENGINE=innodb;
+
diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index 749e7a7f4d6..40585daf1da 100755
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -95,7 +95,7 @@ body {
color:#232323;
font-size:px;
font-family:;
-
+
trans("DIRECTION").";\n"; ?>
}
@@ -215,19 +215,19 @@ form#login img#img_logo {
border-bottom:solid 1px rgba(0,0,0,.3);
box-shadow:1px 1px 6px rgba(0,0,0,.3) inset , 0 0 1px rgba(255,255,255,.6);
}
-
+
form#login input {
padding:6px;
font-size:120%;
}
-
+
form#login label, form#login td b {
vertical-align:middle;
line-height:40px;
color:rgba(0,0,0,.4);
text-shadow:1px 1px 1px rgba(255,255,255,.6);
}
-
+
form#login table.login_table {
margin:10px 0px;
border:none;
@@ -277,7 +277,7 @@ table.login_table .button:hover {
color-stop(0, rgba(0,0,0,.3))
);
}
-
+
table.login_table .vmenu {
color:rgba(0,0,0,.6);
text-shadow:1px 1px 1px rgba(255,255,255,.6);
@@ -370,7 +370,7 @@ div.tmenu li {
div.tmenu li a {color:#cccccc;}
div.tmenu li a:hover {color:rgba(255,255,255,.2);}
-
+
div.tmenu ul li a.tmenusel {/* texte du menu principal sélectionné */
color:#ffffff;
font-weight:bold;
@@ -508,6 +508,25 @@ div.vmenu {
/* Toolbar for ECM or Filemanager */
/* ============================================================================== */
+
+.largebutton {
+ background-image: -o-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important;
+ background-image: -moz-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important;
+ background-image: -webkit-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important;
+ background-image: -ms-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important;
+ background-image: linear-gradient(bottom, rgb() 15%, rgb() 100%) !important;
+ border: 1px solid #CCC !important;
+
+ -moz-border-radius: 5px 5px 5px 5px !important;
+ -webkit-border-radius: 5px 5px 5px 5px !important;
+ border-radius: 5px 5px 5px 5px !important;
+ -moz-box-shadow: 4px 4px 4px #EEE;
+ -webkit-box-shadow: 4px 4px 4px #EEE;
+ box-shadow: 4px 4px 4px #EEE;
+
+ padding: 0 4px 0 4px !important;
+}
+
.toolbar {}
.toolbarbutton {}
@@ -598,26 +617,26 @@ a.tabTitle img {
-webkit-border-top-left-radius:6px;
-webkit-border-top-right-radius:6px;
}
-
+
.tab#active {
color:#232323;
font-weight:bold;
background-color:#ffffff;
border-bottom:solid 1px #ffffff;
}
-
+
.tab:hover {color:#333333;}
/* ============================================================================== */
/* Styles de positionnement des zones */
/* ============================================================================== */
-
+
div.fiche {
margin-: browser->phone) || empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?'20':'24'; ?>px;
margin-: browser->phone)?'12':'6'; ?>px;
}
-
+
div.fichecenter {
width: 100%;
clear: both; /* This is to have div fichecenter that are true rectangles */
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index cac0c269e51..75004e8f6ca 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -755,7 +755,8 @@ a.toolbarbutton {
background: #FFFFFF;*/
}
img.toolbarbutton {
- height: 28px;
+ margin-top: 2px;
+ height: 28px;
}
/* ============================================================================== */
@@ -919,7 +920,6 @@ img.toolbarbutton {
}
.ecm-layout-resizer { /* all 'resizer-bars' */
- background: #EEE;
border: 1px solid #BBB;
border-width: 0;
}
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index 5543e69791c..12de15a702d 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -835,6 +835,7 @@ a.toolbarbutton {
background: #FFFFFF;*/
}
img.toolbarbutton {
+ margin-top: 2px;
height: 28px;
}
@@ -994,7 +995,6 @@ img.toolbarbutton {
}
.ecm-layout-resizer { /* all 'resizer-bars' */
- background: #EEE;
border: 1px solid #BBB;
border-width: 0;
}
diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index 06811782e6b..14f3cb102b3 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -870,7 +870,8 @@ a.toolbarbutton {
background: #FFFFFF;*/
}
img.toolbarbutton {
- height: 28px;
+ margin-top: 2px;
+ height: 28px;
}
@@ -1029,7 +1030,6 @@ img.toolbarbutton {
}
.ecm-layout-resizer { /* all 'resizer-bars' */
- background: #EEE;
border: 1px solid #BBB;
border-width: 0;
}
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index f56c2897927..4da6f7c2fd7 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -988,7 +988,7 @@ td.photo {
/* Toolbar for ECM or Filemanager */
/* ============================================================================== */
-.toolbar {
+.largebutton {
background-image: -o-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important;
background-image: -moz-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important;
@@ -1009,7 +1009,9 @@ td.photo {
box-shadow: 4px 4px 4px #EEE;
padding: 0 4px 0 4px !important;
+}
+.toolbar {
height: 34px !important;
}
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index d5170955162..9ed9c8eb4bf 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -532,7 +532,7 @@ class UserGroup extends CommonObject
// Appel des triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface=new Interfaces($this->db);
- $result=$interface->run_triggers('USER_DELETE',$this,$user,$langs,$conf);
+ $result=$interface->run_triggers('GROUP_DELETE',$this,$user,$langs,$conf);
if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers