Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

FIX : Ergonomic fail part02 (#29373)

Browse Source 
* Fix ergo fail

* Fix read more

* Fix read more

* Update functions.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
This commit is contained in:
John BOTELLA
2024-04-22 14:32:07 +02:00
committed by GitHub
parent 6303bceecd
commit cbed0292d1
3 changed files with 56 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
htdocs/core/lib/functions.lib.php
View File

@@ -13351,7 +13351,23 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = '', $n
&& $actionstatic->code != 'AC_TICKET_MODIFY' && $actionstatic->code != 'AC_TICKET_MODIFY'
) { ) {
$out .= '<div class="timeline-body" >'; $out .= '<div class="timeline-body" >';
$truncateLines = getDolGlobalInt('MAIN_TRUNCATE_TIMELINE_MESSAGE', 3);
$truncatedText = dolGetFirstLineOfText($histo[$key]['message'], $truncateLines);
if ($truncateLines > 0 && strlen($histo[$key]['message']) > strlen($truncatedText)) {
$out .= '<div class="readmore-block --closed" >';
$out .= ' <div class="readmore-block__excerpt" >';
$out .= $truncatedText ;
$out .= ' <a class="read-more-link" data-read-more-action="open" href="'.DOL_MAIN_URL_ROOT.'/comm/action/card.php?id='.$actionstatic->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?'.$param).'" >'.$langs->trans("ReadMore").' <span class="fa fa-chevron-right" aria-hidden="true"></span></a>';
$out .= ' </div>';
$out .= ' <div class="readmore-block__full-text" >';
$out .= $histo[$key]['message']; $out .= $histo[$key]['message'];
$out .= ' <a class="read-less-link" data-read-more-action="close" href="#" ><span class="fa fa-chevron-up" aria-hidden="true"></span> '.$langs->trans("ReadLess").'</a>';
$out .= ' </div>';
$out .= '</div>';
} else {
$out .= $histo[$key]['message'];
}
$out .= '</div>'; $out .= '</div>';
} }
@@ -13447,6 +13463,26 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = '', $n
$out .= "</ul>\n"; $out .= "</ul>\n";
$out .= '<script>
jQuery(document).ready(function () {
$(document).on("click", "[data-read-more-action]", function(e){
let readMoreBloc = $(this).closest(".readmore-block");
if(readMoreBloc.length > 0){
e.preventDefault();
if($(this).attr("data-read-more-action") == "close"){
readMoreBloc.addClass("--closed").removeClass("--open");
$("html, body").animate({
scrollTop: readMoreBloc.offset().top - 200
}, 100);
}else{
readMoreBloc.addClass("--open").removeClass("--closed");
}
}
});
});
</script>';
if (empty($histo)) { if (empty($histo)) {
$out .= '<span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span>'; $out .= '<span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span>';
} }

2
htdocs/langs/en_US/agenda.lang
View File

@@ -202,3 +202,5 @@ BookingSuccessfullyBooked=Your booking has been saved
BookingReservationHourAfter=We confirm the reservation of our meeting at the date %s BookingReservationHourAfter=We confirm the reservation of our meeting at the date %s
BookcalBookingTitle=Online appointment BookcalBookingTitle=Online appointment
Transparency = Transparency Transparency = Transparency
ReadMore = Read more
ReadLess = Read less

17
htdocs/theme/eldy/timeline.inc.php
View File

@@ -217,6 +217,23 @@ a.timeline-btn:hover
width: 100px; width: 100px;
} }
.readmore-block.--closed .readmore-block__full-text, .readmore-block.--open .readmore-block__excerpt{
display: none;
}
.read-less-link, .read-more-link{
font-weight: bold;
}
.read-less-link{
display: block;
text-align: center;
}
.read-less-link .fa, .read-more-link .fa{
color: inherit;
}
/* Force values for small screen 767 */ /* Force values for small screen 767 */
@media only screen and (max-width: 767px) @media only screen and (max-width: 767px)