2
0
forked from Wavyzz/dolibarr
This commit is contained in:
Laurent Destailleur
2024-06-16 14:58:57 +02:00
parent 048f7e360f
commit e2f8d50082
3 changed files with 14 additions and 8 deletions

View File

@@ -1278,7 +1278,8 @@ if ($action == 'create') {
print '<tr><td'.(!getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? ' class="fieldrequired titlefieldcreate"' : '').'>'.$langs->trans("Label").'</td><td><input type="text" id="label" name="label" class="soixantepercent" value="'.GETPOST('label').'"></td></tr>';
// Full day
print '<tr><td><span class="fieldrequired">'.$langs->trans("Date").'</span></td><td class="valignmiddle height30 small"><input type="checkbox" id="fullday" name="fullday" '.(GETPOST('fullday') ? ' checked' : '').'><label for="fullday">'.$langs->trans("EventOnFullDay").'</label>';
print '<tr><td><span class="fieldrequired">'.$langs->trans("Date").'</span></td>';
print '<td class="valignmiddle height30 small"><input class="valignmiddle" type="checkbox" id="fullday" name="fullday" '.(GETPOST('fullday') ? ' checked' : '').'><label for="fullday" class="valignmiddle">'.$langs->trans("EventOnFullDay").'</label>';
// Recurring event
$userepeatevent = (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1 ? 1 : 0);
@@ -1286,7 +1287,7 @@ if ($action == 'create') {
// Repeat
//print '<tr><td></td><td colspan="3" class="opacitymedium">';
print ' &nbsp; &nbsp; &nbsp; &nbsp; <div class="opacitymedium inline-block">';
print img_picto($langs->trans("Recurrence"), 'recurring', 'class="paddingright2"');
print img_picto($langs->trans("Recurrence"), 'recurring', 'style="margin-left: 6px" class="paddingright2"');
print '<input type="hidden" name="recurid" value="'.(empty($object->recurid) ? '' : $object->recurid).'">';
$selectedrecurrulefreq = 'no';
@@ -1378,7 +1379,7 @@ if ($action == 'create') {
}
if (empty($datef) && !empty($datep)) {
if (GETPOST("actioncode", 'aZ09') == 'AC_RDV' || !getDolGlobalString('AGENDA_USE_EVENT_TYPE_DEFAULT')) {
$datef = dol_time_plus_duree($datep, (!getDolGlobalString('AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS') ? 1 : $conf->global->AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS), 'h');
$datef = dol_time_plus_duree($datep, getDolGlobalInt('AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS', 1), 'h');
}
}
@@ -1390,7 +1391,7 @@ if ($action == 'create') {
} else {
print $form->selectDate($datep, 'ap', 1, 1, 1, "action", 1, 2, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuserrel');
}
print ' <span class="hideonsmartphone">&nbsp; &nbsp; - &nbsp; &nbsp;</span> ';
print ' <span class="hideonsmartphone">&nbsp; &nbsp; - &nbsp; &nbsp;</span><br class="showonsmartphone"> ';
print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 2, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuserrel');
print '</td></tr>';

View File

@@ -322,7 +322,7 @@ input[type=submit], input[type=submit]:hover {
margin-left: 5px;
}
input[type=checkbox], input[type=radio] {
margin: 0 3px 0 3px;
margin: 0 3px 0 1px;
}
.kanban input.checkforselect {
margin-right: 0px;
@@ -1773,6 +1773,7 @@ maxscreenheightless200 {
.clearboth { clear:both; }
.hideobject { display: none; }
.showonsmartphone { display: none; }
.minwidth25 { min-width: 25px; }
.minwidth50 { min-width: 50px; }
.minwidth75 { min-width: 75px; }
@@ -5159,7 +5160,7 @@ div.titre {
color: var(--colortexttitlenotab2);
}
table.table-fiche-title .col-title div.titre, .col-right .btnTitle-icon {
table.table-fiche-title .col-title div.titre, .col-center .btnTitle-icon, .col-right .btnTitle-icon {
line-height: 40px;
}
table.table-fiche-title {

View File

@@ -843,7 +843,7 @@ input:-webkit-autofill {
}
input[type=checkbox], input[type=radio] {
margin: 0 3px 0 3px;
margin: 0 3px 0 1px;
}
.kanban input.checkforselect {
margin-right: 0px;
@@ -1933,8 +1933,12 @@ tr.nobottom td {
/* ============================================================================== */
/* Styles to hide objects */
/* ============================================================================== */
.clearboth { clear:both; }
.hideobject { display: none; }
.showonsmartphone { display: none; }
.minwidth25 { min-width: 25px; }
.minwidth50 { min-width: 50px; }
.minwidth75 { min-width: 75px; }
@@ -5149,7 +5153,7 @@ div.titre {
table.centpercent.notopnoleftnoright.table-fiche-title {
margin-bottom: 10px !important;
}
table.table-fiche-title .col-title div.titre, .col-right .btnTitle-icon {
table.table-fiche-title .col-title div.titre, .col-center .btnTitle-icon, .col-right .btnTitle-icon {
line-height: 40px;
}