diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index b3d2d73b26f..39581bb6421 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -540,7 +540,7 @@ if (empty($reshook) && $action == 'add' && $usercancreate) {
if ($object->recurrule && preg_match('/FREQ=WEEKLY.*BYDAY(\d+)/i', $object->recurrule, $reg3)) {
$selectedrecurrulebyday = (int) $reg3[1];
}
-
+ var_dump($object->recurrule);exit;
// Is event recurrent ?
$eventisrecurring = 0;
$userepeatevent = (getDolGlobalInt('MAIN_FEATURES_LEVEL') == 2 ? 1 : 0);
@@ -1594,7 +1594,7 @@ if ($action == 'create') {
}
if (isModEnabled('resource')) {
- // Categories
+ // Resources
print '
| '.$langs->trans("Resource").' | ';
$listofresourceid = array();
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index f0f6e85b712..34bc19bff68 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2523,7 +2523,10 @@ class Form
if ($showproperties) {
if ($ownerid == $value['id'] && is_array($listofuserid) && count($listofuserid) && in_array($ownerid, array_keys($listofuserid))) {
$out .= ' ';
- $out .= ' - ' . $langs->trans("Availability") . ': ';
+ $out .= ' - ';
+ //$out .= '' . $langs->trans("Availability") . ':';
+ $out .= '';
+ $out .= ' ';
$out .= ' ';
}
}
@@ -2613,7 +2616,10 @@ class Form
if ($showproperties) {
if (is_array($listofresourceid) && count($listofresourceid)) {
$out .= '';
- $out .= ' - ' . $langs->trans("Availability") . ': ';
+ $out .= ' - ';
+ //$out .= '' . $langs->trans("Availability") . ': ';
+ $out .= '';
+ $out .= ' ';
$out .= ' ';
}
}
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index c8238d4770c..f4824e1b64e 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -102,7 +102,7 @@ class FormActions
print ajax_combobox('select'.$htmlname, array(), 0, 0, 'resolve', '-1', $morecss);
if (empty($onlyselect)) {
- print ' = 0) ? '' : ' disabled').'>';
+ print ' = 0) ? '' : ' disabled').'>';
print '%';
}
} else {
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 08003495fdb..b8b43b217c3 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -410,7 +410,8 @@ input[type=submit], input[type=submit]:hover {
margin-left: 5px;
}
input[type=checkbox], input[type=radio] {
- margin: 0 3px 0 1px;
+ margin: 0 5px 0 1px;
+ transform: scale(1.2);
}
.kanban input.checkforselect {
margin-right: 0px;
@@ -7124,6 +7125,13 @@ div.dataTables_length select {
/* Select2 */
/* ============================================================================== */
+.heightofcombo {
+ height: 28px;
+}
+.select2-container .select2-selection--single {
+ height: 28px;
+}
+
span.select2-selection--single.flat[aria-disabled="true"] span.select2-selection__rendered {
opacity: 0.5;
}
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index dde4419ff48..f161a858340 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -952,7 +952,8 @@ input:-webkit-autofill {
}
input[type=checkbox], input[type=radio] {
- margin: 0 3px 0 1px;
+ margin: 0 5px 0 1px;
+ transform: scale(1.2);
}
.kanban input.checkforselect {
margin-right: 0px;
@@ -7033,6 +7034,12 @@ div.dataTables_length select {
/* Select2 */
/* ============================================================================== */
+.heightofcombo {
+ height: 28px;
+}
+.select2-container .select2-selection--single {
+ height: 28px;
+}
input.select2-input {
border-bottom: none ! important;
}
|