Skip to content

Commit 81790d0

Browse files
eldyeldy
committed
Debug v23
1 parent cca679c commit 81790d0

File tree

6 files changed

+48
-27
lines changed

6 files changed

+48
-27
lines changed

‎htdocs/comm/action/card.php‎

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1445,8 +1445,12 @@ function setdatefields()
14451445

14461446
print dol_get_fiche_head();
14471447

1448+
print '<div class="divcreate">';
14481449
print '<table class="border centpercent nobottom">';
14491450

1451+
// Title
1452+
print '<tr><td'.(getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? ' class="fieldrequired"' : ' class="fieldrequired titlefieldcreate"').'>'.$langs->trans("Title").'</td><td><input type="text" id="label" name="label" class="soixantepercent" value="'.GETPOST('label').'"></td></tr>';
1453+
14501454
// Type of event
14511455
if (getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
14521456
print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Type").'</span></b></td><td>';
@@ -1457,12 +1461,12 @@ function setdatefields()
14571461
print '</td></tr>';
14581462
}
14591463

1460-
// Title
1461-
print '<tr><td'.(getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? '' : ' class="fieldrequired titlefieldcreate"').'>'.$langs->trans("Title").'</td><td><input type="text" id="label" name="label" class="soixantepercent" value="'.GETPOST('label').'"></td></tr>';
1462-
14631464
// Full day
14641465
print '<tr><td><span class="fieldrequired">'.$langs->trans("Date").'</span></td>';
1465-
print '<td class="valignmiddle height30"><input class="valignmiddle" type="checkbox" id="fullday" name="fullday" '.(GETPOST('fullday') ? ' checked' : '').'><label for="fullday" class="valignmiddle small">'.$langs->trans("EventOnFullDay").'</label>';
1466+
print '<td class="valignmiddle height30">';
1467+
print '<div>';
1468+
print '<input class="valignmiddle" type="checkbox" id="fullday" name="fullday" '.(GETPOST('fullday') ? ' checked' : '').'><label for="fullday" class="valignmiddle small">'.$langs->trans("EventOnFullDay").'</label>';
1469+
print '</div>';
14661470
print '</td></tr>';
14671471

14681472
$datep = ($datep ? $datep : (is_null($object->datep) ? '' : $object->datep));
@@ -1482,23 +1486,26 @@ function setdatefields()
14821486
// Date start
14831487
print '<tr><td class="nowrap">';
14841488
print '</td><td>';
1489+
print '<div class="inline-block">';
14851490
if (GETPOST("afaire") == 1) {
14861491
print $form->selectDate($datep, 'ap', 1, 1, 0, "action", 1, 2, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuserrel'); // Empty value not allowed for start date and hours if "todo"
14871492
} else {
14881493
print $form->selectDate($datep, 'ap', 1, 1, 1, "action", 1, 2, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuserrel');
14891494
}
14901495
print ' <span class="hideonsmartphone">&nbsp; &nbsp; - &nbsp; &nbsp;</span><br class="showonsmartphone"> ';
1491-
print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 2, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuserrel');
1492-
print '</td></tr>';
1496+
print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuserrel');
1497+
print '</div>';
1498+
1499+
//print '</td></tr>';
14931500

14941501
// Recurring event
14951502
$userepeatevent = (getDolGlobalInt('MAIN_DISABLE_RECURRING_EVENTS') ? 0 : 1);
14961503
if ($userepeatevent) {
1497-
print '<tr><td></td><td>';
1504+
//print '<tr><td></td><td>';
1505+
print '<div class="clearbothonsmartphone hideonsmartphone inline-block"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</div>';
14981506

14991507
// Repeat
1500-
//print ' &nbsp; &nbsp; &nbsp; &nbsp; ';
1501-
print '<div class="inline-block small">';
1508+
print '<div class="inline-block small" data-html="repeat">';
15021509
print '<span class="opacitymedium">';
15031510
print img_picto($langs->trans("Recurrence"), 'recurring', 'style="margin-left: 3px" class="paddingright"');
15041511
print '<input type="hidden" name="recurid" value="'.(empty($object->recurid) ? '' : $object->recurid).'">';
@@ -1522,7 +1529,7 @@ function setdatefields()
15221529
$selectedrecurrulebyday = (int) $reg[1];
15231530
}
15241531

1525-
print $form->selectarray('recurrulefreq', $arrayrecurrulefreq, $selectedrecurrulefreq, 0, 0, 0, '', 0, 0, 0, '', 'marginrightonly minwidth100');
1532+
print $form->selectarray('recurrulefreq', $arrayrecurrulefreq, $selectedrecurrulefreq, 0, 0, 0, '', 0, 0, 0, '', 'marginrightonly minwidth125 maxwidth150');
15261533
print '</span>';
15271534
// print '<script>console.log("recurrule: " +'.$object->recurrule.')</script>';
15281535
// For recursive event
@@ -1582,22 +1589,29 @@ function init_repeat()
15821589
});
15831590
</script>';
15841591
print '</div>';
1585-
print '</td></tr>';
1592+
//print '</td></tr>';
15861593
}
15871594

1588-
print '<tr style="height: 10px"><td style="height: 10px;" colspan="2"></td></tr>';
1595+
print '</td></tr>';
1596+
15891597

15901598
// Location
15911599
if (!getDolGlobalString('AGENDA_DISABLE_LOCATION')) {
1592-
print '<tr><td>'.$langs->trans("Location").'</td><td>';
1600+
print '<tr><td class="titlefieldcreate">'.$langs->trans("Location").'</td><td>';
15931601
print img_picto('', 'map-marker-alt', 'class="pictofixedwidth"');
15941602
print '<input type="text" name="location" class="minwidth300 maxwidth150onsmartphone" value="'.(GETPOST('location') ? GETPOST('location') : $object->location).'"></td></tr>';
15951603
}
15961604

1597-
print '<tr style="height: 10px"><td style="height: 10px;" colspan="2"></td></tr>';
1605+
print '</table>';
1606+
print '</div>';
1607+
1608+
print '<br>';
1609+
1610+
print '<div class="divcreate">';
1611+
print '<table class="border centpercent nobottom">';
15981612

15991613
// Assigned to user
1600-
print '<tr><td class="tdtop nowrap"><span>'.$langs->trans("ActionAffectedTo").'</span></td><td>';
1614+
print '<tr><td class="tdtop nowrap titlefieldcreate"><span>'.$langs->trans("ActionAffectedTo").'</span></td><td>';
16011615
$listofuserid = [];
16021616
$listofcontactid = [];
16031617
$listofotherid = [];
@@ -1665,11 +1679,12 @@ function init_repeat()
16651679
}
16661680

16671681
print '</table>';
1682+
print '</div>';
16681683

16691684

1670-
print '<hr>';
1671-
1685+
print '<br>';
16721686

1687+
print '<div class="divcreate">';
16731688
print '<table class="border centpercent nobottom">';
16741689

16751690
// Status
@@ -1850,7 +1865,7 @@ function init_repeat()
18501865
}
18511866

18521867
print '</table>';
1853-
1868+
print '</div>';
18541869

18551870
if ($enablereminders) {
18561871
//checkbox create reminder

‎htdocs/comm/action/index.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@
655655
// Holiday calendar
656656
if ($user->hasRight("holiday", "read")) {
657657
$s .= '
658-
<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_holiday" name="check_holiday" value="1" class="check_holiday"' . ($check_holiday
658+
<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_holiday" name="check_holiday" value="1" class="marginleftonly check_holiday"' . ($check_holiday
659659
? ' checked' : '') . '>
660660
<label for="check_holiday" class="labelcalendar">
661661
<span class="check_holiday_text">' . $langs->trans("Holidays") . '</span>
@@ -694,20 +694,20 @@
694694

695695
$tooltip = $langs->trans("Cache").' '.round($DELAYFORCACHE / 60).'mn';
696696

697-
$s .= '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_ext'.$htmlname.'" name="check_ext'.$htmlname.'" value="1" '.$default.'><label for="check_ext'.$htmlname.'" title="'.dol_escape_htmltag($tooltip).'" class="labelcalendar">'.dol_escape_htmltag($val['name']).'</label> &nbsp; </div>';
697+
$s .= '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_ext'.$htmlname.'" class="marginleftonly check_ext_'.$htmlname.'" name="check_ext'.$htmlname.'" value="1" '.$default.'><label for="check_ext'.$htmlname.'" title="'.dol_escape_htmltag($tooltip).'" class="labelcalendar">'.dol_escape_htmltag($val['name']).'</label> &nbsp; </div>';
698698
}
699699
}
700700

701701
// Birthdays
702-
$s .= '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_birthday" name="check_birthday" class="check_birthday"><label for="check_birthday" class="labelcalendar"> <span class="check_birthday_text">'.$langs->trans("AgendaShowBirthdayEvents").'</span></label> &nbsp; </div>';
702+
$s .= '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_birthday" name="check_birthday" class="marginleftonly check_birthday"><label for="check_birthday" class="labelcalendar"> <span class="check_birthday_text">'.$langs->trans("AgendaShowBirthdayEvents").'</span></label> &nbsp; </div>';
703703

704704
// Bookcal Calendar
705705
if (isModEnabled("bookcal")) {
706706
if (!empty($bookcalcalendars["calendars"])) {
707707
foreach ($bookcalcalendars["calendars"] as $key => $value) {
708708
$label = $value['label'];
709709
$s .= '<div class="nowrap inline-block minheight30">';
710-
$s .= '<input '.(GETPOST('check_bookcal_calendar_'.$value['id']) ? "checked" : "").' type="checkbox" id="check_bookcal_calendar_'.$value['id'].'" name="check_bookcal_calendar_'.$value['id'].'" class="check_bookcal_calendar_'.$value['id'].'">';
710+
$s .= '<input '.(GETPOST('check_bookcal_calendar_'.$value['id']) ? "checked" : "").' type="checkbox" id="check_bookcal_calendar_'.$value['id'].'" name="check_bookcal_calendar_'.$value['id'].'" class="marginleftonly check_bookcal_calendar_'.$value['id'].'">';
711711
$s .= '<label for="check_bookcal_calendar_'.$value['id'].'" class="labelcalendar">';
712712
$s .= '<span class="check_bookcal_calendar_'.$value['id'].'_text">'.$langs->trans("AgendaShowBookcalCalendar", $label).'</span>';
713713
$s .= '</label> &nbsp; </div>';

‎htdocs/comm/action/pertype.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@
419419
$s .= ' });'."\n";
420420
$s .= '});'."\n";
421421
$s .= '</script>'."\n";
422-
$s .= '<div class="nowrap float"><input type="checkbox" id="check_ext'.$htmlname.'" name="check_ext'.$htmlname.'" checked> '.$val ['name'].' &nbsp; </div>';
422+
$s .= '<div class="nowrap float"><input type="checkbox" id="check_ext'.$htmlname.'" name="check_ext'.$htmlname.'" class="marginleftonly" checked> '.$val ['name'].' &nbsp; </div>';
423423
}
424424
}
425425

‎htdocs/comm/action/peruser.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -589,12 +589,12 @@
589589
$s .= '</script>'."\n";
590590

591591
// Local calendar
592-
$s .= '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_mytasks" name="check_mytasks" value="1" checked disabled><label class="labelcalendar"><span class="check_holiday_text"> '.$langs->trans("LocalAgenda").' &nbsp; </span></label></div>';
592+
$s .= '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_mytasks" name="check_mytasks" value="1" class="check_mytasks" checked disabled><label class="labelcalendar"><span class="check_holiday_text"> '.$langs->trans("LocalAgenda").' &nbsp; </span></label></div>';
593593

594594
// Holiday calendar
595595
if ($user->hasRight("holiday", "read")) {
596596
$s .= '
597-
<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_holiday" name="check_holiday" value="1" class="check_holiday"' . ($check_holiday ? ' checked' : '') . '>
597+
<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_holiday" name="check_holiday" value="1" class="marginleftonly check_holiday"' . ($check_holiday ? ' checked' : '') . '>
598598
<label for="check_holiday" class="labelcalendar">
599599
<span class="check_holiday_text">' . $langs->trans("Holidays") . '</span>
600600
</label> &nbsp;

‎htdocs/theme/eldy/global.inc.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2052,6 +2052,8 @@
20522052
.minwidth25 { min-width: 25px; }
20532053
.minwidth50 { min-width: 50px; }
20542054
.minwidth75 { min-width: 75px; }
2055+
.minwidth100 { min-width: 100px; }
2056+
.minwidth125 { min-width: 125px; }
20552057
.nominwidth { min-width: fit-content !important; }
20562058
/* rule for not too small screen only */
20572059
@media only screen and (min-width: <?php echo getDolGlobalString('THEME_ELDY_WITDHOFFSET_FOR_REDUC3', round($nbtopmenuentries * 47, 0) + 130); ?>px) /* reduction 3 */
@@ -2097,7 +2099,7 @@
20972099
.maxwidth40 { max-width: 40px; }
20982100
.maxwidth50 { max-width: 50px; }
20992101
.maxwidth75 { max-width: 75px; }
2100-
.maxwidthdate { max-width: 95px; }
2102+
.maxwidthdate { max-width: 105px; }
21012103
.maxwidth100 { max-width: 100px; }
21022104
.maxwidth125 { max-width: 125px; }
21032105
.maxwidth150 { max-width: 150px; }
@@ -2353,6 +2355,7 @@
23532355
.maxwidth250onsmartphone { max-width: 250px; }
23542356
.maxwidth300onsmartphone { max-width: 300px; }
23552357
.maxwidth400onsmartphone { max-width: 400px; }
2358+
.minwidth125 { min-width: 100px !important; }
23562359
.minwidth150 { min-width: 110px !important; }
23572360
.minwidth50imp { min-width: 50px !important; }
23582361
.minwidth75imp { min-width: 75px !important; }

‎htdocs/theme/md/style.css.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2181,6 +2181,8 @@
21812181
.minwidth25 { min-width: 25px; }
21822182
.minwidth50 { min-width: 50px; }
21832183
.minwidth75 { min-width: 75px; }
2184+
.minwidth100 { min-width: 75px; }
2185+
.minwidth125 { min-width: 125px; }
21842186
.nominwidth { min-width: fit-content !important; }
21852187
/* rule for not too small screen only */
21862188
@media only screen and (min-width: <?php echo getDolGlobalString('THEME_ELDY_WITDHOFFSET_FOR_REDUC3', round($nbtopmenuentries * 47, 0) + 130); ?>px)
@@ -2226,7 +2228,7 @@
22262228
.maxwidth40 { max-width: 40px; }
22272229
.maxwidth50 { max-width: 50px; }
22282230
.maxwidth75 { max-width: 75px; }
2229-
.maxwidthdate { max-width:95px; }
2231+
.maxwidthdate { max-width: 105px; }
22302232
.maxwidth100 { max-width: 100px; }
22312233
.maxwidth125 { max-width: 125px; }
22322234
.maxwidth150 { max-width: 150px; }
@@ -2466,6 +2468,7 @@
24662468
.maxwidth250onsmartphone { max-width: 250px; }
24672469
.maxwidth300onsmartphone { max-width: 300px; }
24682470
.maxwidth400onsmartphone { max-width: 400px; }
2471+
.minwidth125 { min-width: 100px !important; }
24692472
.minwidth150 { min-width: 110px !important; }
24702473
.minwidth50imp { min-width: 50px !important; }
24712474
.minwidth75imp { min-width: 75px !important; }

0 commit comments

Comments
 (0)