Skip to content

Commit

Permalink
timeline gantt dropdown ui fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
ctanveer committed Jan 7, 2025
1 parent 15babcc commit 2de8440
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 11 deletions.
20 changes: 10 additions & 10 deletions app/Domain/Tickets/Js/ticketsController.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,19 +102,19 @@ export const initGanttChart = function (tasks, viewMode, readonly) {
var popUpHTML = '<div class="details-container" style="min-width:600px;"> ';

if (task.projectName !== undefined) {
popUpHTML += '<h3><b>' + task.projectName + '</b></h3>';
popUpHTML += '<h2><b>' + task.projectName + '</b></h2>';
}
popUpHTML += '<small>' + task.type + ' #' + task.id + ' </small>';
popUpHTML += '<h2>' + task.type + ' #' + task.id + ' </h2>';

if (task.type === 'milestone') {
popUpHTML += '<h4><a href="#/tickets/editMilestone/' + task.id + '" >' + htmlEntities(task.name) + '</a></h4><br /> ' +
popUpHTML += '<h3><a href="#/tickets/editMilestone/' + task.id + '" >' + htmlEntities(task.name) + '</a></h3><br /> ' +
'<p>' + window.leantime.i18n.__("text.expected_to_finish_by") + ' <strong>' + dateTime + '</strong><br /> ' +
'' + Math.round(task.progress) + '%</p> ' +
'<a href="#/tickets/editMilestone/' + task.id + '" ><span class="fa fa-map"></span> ' + window.leantime.i18n.__("links.edit_milestone") + '</a> | ' +
'<a href="' + appUrl + '/tickets/showKanban?milestone=' + task.id + '"><span class="fa-pushpin"></span> ' + window.leantime.i18n.__("links.view_todos") + '</a> ';
'<a class="link" href="#/tickets/editMilestone/' + task.id + '" ><span class="fa fa-map"></span> ' + window.leantime.i18n.__("links.edit_milestone") + '</a> | ' +
'<a class="link" href="' + appUrl + '/tickets/showKanban?milestone=' + task.id + '"><span class="fa-pushpin"></span> ' + window.leantime.i18n.__("links.view_todos") + '</a> ';
} else {
popUpHTML += '<h4><a href="#/tickets/showTicket/' + task.id + '">' + htmlEntities(task.name) + '</a></h4><br /> ' +
'<a href="#/tickets/showTicket/' + task.id + '"><span class="fa fa-thumb-tack"></span> ' + window.leantime.i18n.__("links.edit_todo") + '</a> ';
popUpHTML += '<h4><a class="link" href="#/tickets/showTicket/' + task.id + '">' + htmlEntities(task.name) + '</a></h4><br /> ' +
'<a class="link" href="#/tickets/showTicket/' + task.id + '"><span class="fa fa-thumb-tack"></span> ' + window.leantime.i18n.__("links.edit_todo") + '</a> ';
}

popUpHTML += '</div>';
Expand Down Expand Up @@ -173,11 +173,11 @@ export const initGanttChart = function (tasks, viewMode, readonly) {
// dates and progress value
var end_date = task._end;
return '<div class="details-container"> ' +
'<small><b>' + task.projectName + '</b></small>' +
'<h4>' + htmlEntities(task.name) + '</h4><br /> ' +
'<h2><b>' + task.projectName + '</b></h2>' +
'<h3>' + htmlEntities(task.name) + '</h3><br /> ' +
'<p>' + window.leantime.i18n.__("text.expected_to_finish_by") + ' <strong>' + end_date + '</strong><br /> ' +
'' + Math.round(task.progress) + '%</p> ' +
'<a href="#/tickets/showKanban&milestone=' + task.id + '"><span class="fa-pushpin"></span> ' + window.leantime.i18n.__("links.view_todos") + '</a> ' +
'<a class="link" href="#/tickets/showKanban&milestone=' + task.id + '"><span class="fa-pushpin"></span> ' + window.leantime.i18n.__("links.view_todos") + '</a> ' +

'</div>';
},
Expand Down
18 changes: 17 additions & 1 deletion public/assets/css/components/gantt-overwrites.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ body .gantt-container {

.gantt .bar-label {
text-anchor: start;
font-weight: normal;
}

body .gantt .bar-label,
Expand Down Expand Up @@ -44,10 +45,25 @@ body .gantt #details .details-container {
background-color:var(--secondary-background);
padding:10px;
box-shadow:var(--regular-shadow);
margin-left: -10px;
margin-left: -5px;
opacity:0;
min-width:100px;
max-width:300px;
border-radius:var(--box-radius);
font-size: small;

}

.gantt-container .popup-wrapper h2 {
font-size: 1.1rem;
margin-bottom: 0.5rem;
font-weight: 500;
}

.gantt-container .popup-wrapper h3 {
font-size: 0.9rem;
margin-bottom: 0.5rem;
font-weight: 300;
}

.gantt-container .bar-wrapper {
Expand Down

0 comments on commit 2de8440

Please sign in to comment.