diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 1cce5388f90..8e50380e2ae 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -104,6 +104,8 @@ if ($action == 'set') {
$resultCreat = $defaultValues->create($user);
if ($resultCreat < 0) {
setEventMessages($defaultValues->error, $defaultValues->errors, 'errors');
+ } else {
+ setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
}
} elseif ($action == 'specimen') { // For orders
$modele = GETPOST('module', 'alpha');
@@ -316,6 +318,16 @@ print '
| '."\n";
print ''.$langs->trans("Value").' | '."\n";
print ''."\n";
+// AGENDA_DEFAULT_VIEW
+print ''."\n";
+$htmltext = $langs->trans("ThisValueCanOverwrittenOnUserLevel", $langs->transnoentitiesnoconv("UserGUISetup"));
+print '| '.$form->textwithpicto($langs->trans("AGENDA_DEFAULT_VIEW"), $htmltext).' | '."\n";
+print ' | '."\n";
+print ''."\n";
+$tmplist = array(''=>' ', 'show_list'=>$langs->trans("ViewList"), 'show_month'=>$langs->trans("ViewCal"), 'show_week'=>$langs->trans("ViewWeek"), 'show_day'=>$langs->trans("ViewDay"), 'show_peruser'=>$langs->trans("ViewPerUser"));
+print $form->selectarray('AGENDA_DEFAULT_VIEW', $tmplist, $conf->global->AGENDA_DEFAULT_VIEW);
+print ' |
'."\n";
+
// Manual or automatic
print ''."\n";
@@ -340,16 +352,6 @@ if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
print '
'."\n";
}
-// AGENDA_DEFAULT_VIEW
-print ''."\n";
-$htmltext = $langs->trans("ThisValueCanOverwrittenOnUserLevel", $langs->transnoentitiesnoconv("UserGUISetup"));
-print '| '.$form->textwithpicto($langs->trans("AGENDA_DEFAULT_VIEW"), $htmltext).' | '."\n";
-print ' | '."\n";
-print ''."\n";
-$tmplist = array(''=>' ', 'show_list'=>$langs->trans("ViewList"), 'show_month'=>$langs->trans("ViewCal"), 'show_week'=>$langs->trans("ViewWeek"), 'show_day'=>$langs->trans("ViewDay"), 'show_peruser'=>$langs->trans("ViewPerUser"));
-print $form->selectarray('AGENDA_DEFAULT_VIEW', $tmplist, $conf->global->AGENDA_DEFAULT_VIEW);
-print ' |
'."\n";
-
// AGENDA_EVENT_DEFAULT_STATUS
print ''."\n";
print '| '.$langs->trans("AGENDA_EVENT_DEFAULT_STATUS").' | '."\n";
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 63f18d2c046..5577e97a5ba 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1000,7 +1000,7 @@ if ($action == 'create') {
print '
| global->AGENDA_USE_EVENT_TYPE) ? ' class="fieldrequired titlefieldcreate"' : '').'>'.$langs->trans("Label").' | |
';
// Full day
- print '| '.$langs->trans("EventOnFullDay").' | |
';
+ print ' | |
';
$datep = ($datep ? $datep : (is_null($object->datep) ? '' : $object->datep));
if (GETPOST('datep', 'int', 1)) {
@@ -1311,7 +1311,7 @@ if ($action == 'create') {
print '';
- if ($conf->global->AGENDA_REMINDER_EMAIL || $conf->global->AGENDA_REMINDER_BROWSER) {
+ if (getDolGlobalString('AGENDA_REMINDER_EMAIL') || getDolGlobalString('AGENDA_REMINDER_BROWSER')) {
//checkbox create reminder
print '
';
print '
';
@@ -1336,10 +1336,11 @@ if ($action == 'create') {
print '';
//Mail Model
- print '| '.$langs->trans("EMailTemplates").' | ';
- print $form->selectModelMail('actioncommsend', 'actioncomm_send', 1, 1);
- print ' |
';
-
+ if (getDolGlobalString('AGENDA_REMINDER_EMAIL')) {
+ print '| '.$langs->trans("EMailTemplates").' | ';
+ print $form->selectModelMail('actioncommsend', 'actioncomm_send', 1, 1);
+ print ' |
';
+ }
print '';
print '';
diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php
index 77b0416956b..597031945f1 100644
--- a/htdocs/core/get_menudiv.php
+++ b/htdocs/core/get_menudiv.php
@@ -121,12 +121,13 @@ print '
display: none;
}
- a.alilevel0 {
+ a.alilevel0, span.spanlilevel0 {
background-image: url(\''.DOL_URL_ROOT.'/theme/'.urlencode($conf->theme).'/img/next.png\') !important;
background-repeat: no-repeat !important;
background-position-x: 10px;
background-position-y: 16px;
padding: 1em 15px 1em 40px;
+ display: block;
}
li.lilevel0 font.vsmenudisabled {
background-repeat: no-repeat !important;
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 35186e423ef..5b426199a6e 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -317,7 +317,7 @@ class MenuManager
print '';
}
if ($val['enabled'] == 2) {
- print '