diff --git a/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html b/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html
index 3369c546f6..12072a4d96 100644
--- a/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html
@@ -67,7 +67,3 @@ {% trans "Project history" %}
{% endif %}
{% endblock %}
-
-{% block extra_js %}
-
-{% endblock %}
diff --git a/hypha/apply/dashboard/templates/dashboard/contracting_dashboard.html b/hypha/apply/dashboard/templates/dashboard/contracting_dashboard.html
index d782514516..8cf04750f0 100644
--- a/hypha/apply/dashboard/templates/dashboard/contracting_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/contracting_dashboard.html
@@ -38,6 +38,5 @@ {% trans "PAF waiting for assignee" %}
{% block extra_js %}
-
{% endblock %}
diff --git a/hypha/apply/dashboard/templates/dashboard/dashboard.html b/hypha/apply/dashboard/templates/dashboard/dashboard.html
index beb08b907d..9502418782 100644
--- a/hypha/apply/dashboard/templates/dashboard/dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/dashboard.html
@@ -126,7 +126,6 @@ {% trans "Active Invoices" %}
{{ my_reviewed.filterset.form.media.js }}
-
{% endblock %}
diff --git a/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html b/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html
index a95b0f681f..6e3c4ee54c 100644
--- a/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html
@@ -97,5 +97,4 @@ {% trans "PAF waiting for assignee" %}
{{ my_reviewed.filterset.form.media.js }}
-
{% endblock %}
diff --git a/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html b/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html
index 83011ccd6d..8ee8ef3493 100644
--- a/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html
@@ -91,6 +91,5 @@ {% trans "Submission history" %}
{{ filter.form.media.js }}
-
{% endblock %}
diff --git a/hypha/apply/funds/tables.py b/hypha/apply/funds/tables.py
index 947f990e81..480d9ad0af 100644
--- a/hypha/apply/funds/tables.py
+++ b/hypha/apply/funds/tables.py
@@ -1,6 +1,5 @@
import json
import re
-import textwrap
import django_filters as filters
import django_tables2 as tables
@@ -59,7 +58,7 @@ def render_title(record):
title = record.title
except AttributeError:
title = record.submission.title
- return textwrap.shorten(title, width=30, placeholder="...")
+ return title
def render_reviewer_link(record):
@@ -68,7 +67,26 @@ def render_reviewer_link(record):
class SubmissionsTable(tables.Table):
"""Base table for listing submissions, do not include admin data to this table"""
- title = tables.LinkColumn('funds:submissions:detail', text=render_title, args=[A('pk')], orderable=True, attrs={'td': {'data-title-tooltip': lambda record: record.title, 'class': 'js-title'}})
+
+ title = tables.LinkColumn(
+ 'funds:submissions:detail',
+ text=render_title,
+ args=[A('pk')],
+ orderable=True,
+ attrs={
+ 'td': {
+ 'class': 'js-title',
+ },
+ 'a': {
+ 'data-tippy-content': lambda record: record.title,
+ 'data-tippy-placement': 'top',
+
+ # Use after:content-[''] after:block to hide the default browser tooltip on Safari
+ # https://stackoverflow.com/a/43915246
+ 'class': "truncate inline-block w-[calc(100%-2rem)] after:content-[''] after:block",
+ }
+ },
+ )
submit_time = tables.DateColumn(verbose_name=_('Submitted'))
phase = tables.Column(verbose_name=_('Status'), order_by=('status',), attrs={'td': {'data-actions': render_actions, 'class': 'js-actions'}})
stage = tables.Column(verbose_name=_('Type'), order_by=('status',))
@@ -544,7 +562,26 @@ class Meta:
class ReviewerLeaderboardDetailTable(tables.Table):
- title = tables.LinkColumn('funds:submissions:reviews:review', text=render_title, args=[A('submission_id'), A('pk')], orderable=True, verbose_name=_('Submission'), attrs={'td': {'data-title-tooltip': lambda record: record.submission.title, 'class': 'title js-title'}})
+ title = tables.LinkColumn(
+ 'funds:submissions:reviews:review',
+ text=render_title,
+ args=[A('submission_id'), A('pk')],
+ orderable=True,
+ verbose_name=_('Submission'),
+ attrs={
+ 'td': {
+ 'class': 'js-title',
+ },
+ 'a': {
+ 'data-tippy-content': lambda record: record.submission.title,
+ 'data-tippy-placement': 'top',
+
+ # Use after:content-[''] after:block to hide the default browser tooltip on Safari
+ # https://stackoverflow.com/a/43915246
+ 'class': 'truncate inline-block w-[calc(100%-2rem)] after:content-[''] after:block',
+ }
+ },
+ )
class Meta:
model = Review
diff --git a/hypha/apply/funds/templates/funds/base_submissions_table.html b/hypha/apply/funds/templates/funds/base_submissions_table.html
index 5a8b49d368..0ac905ba2e 100644
--- a/hypha/apply/funds/templates/funds/base_submissions_table.html
+++ b/hypha/apply/funds/templates/funds/base_submissions_table.html
@@ -23,7 +23,6 @@
-
diff --git a/hypha/apply/funds/templates/funds/grouped_application_list.html b/hypha/apply/funds/templates/funds/grouped_application_list.html
index 03bc7b1b3b..ff7e3c8f84 100644
--- a/hypha/apply/funds/templates/funds/grouped_application_list.html
+++ b/hypha/apply/funds/templates/funds/grouped_application_list.html
@@ -23,7 +23,6 @@
-
diff --git a/hypha/apply/funds/templates/funds/rounds.html b/hypha/apply/funds/templates/funds/rounds.html
index 2037d39cf3..410d9e6507 100644
--- a/hypha/apply/funds/templates/funds/rounds.html
+++ b/hypha/apply/funds/templates/funds/rounds.html
@@ -27,5 +27,4 @@
{{ filter.form.media.js }}
-
{% endblock %}
diff --git a/hypha/apply/projects/templates/application_projects/overview.html b/hypha/apply/projects/templates/application_projects/overview.html
index 9e55563bda..e55190b017 100644
--- a/hypha/apply/projects/templates/application_projects/overview.html
+++ b/hypha/apply/projects/templates/application_projects/overview.html
@@ -77,7 +77,6 @@
-
{% endblock %}
diff --git a/hypha/public/partner/tables.py b/hypha/public/partner/tables.py
index 7f1c540372..5cb2f6cc8f 100644
--- a/hypha/public/partner/tables.py
+++ b/hypha/public/partner/tables.py
@@ -95,7 +95,7 @@ def make_row_class(record):
class InvestmentTable(tables.Table):
"""Table for listing investments."""
- partner = tables.Column(verbose_name=_('Partner'), linkify=True, attrs={'td': {'data-title-tooltip': lambda record: record.partner, 'class': 'js-title title'}})
+ partner = tables.Column(verbose_name=_('Partner'), linkify=True, attrs={'td': {'class': 'js-title title'}})
year = tables.Column(verbose_name=_('Year'))
status = tables.Column(accessor='partner__status', verbose_name=_('Status'))
amount_committed = tables.Column(verbose_name=_('Amount Committed'))
diff --git a/hypha/static_src/src/javascript/apply/batch-actions.js b/hypha/static_src/src/javascript/apply/batch-actions.js
index 304d79f0d1..38dfd263d4 100644
--- a/hypha/static_src/src/javascript/apply/batch-actions.js
+++ b/hypha/static_src/src/javascript/apply/batch-actions.js
@@ -101,8 +101,9 @@
let selectedIDs = [];
$checkbox.filter(':checked').each(function () {
- const href = $(this).parents('tr').find('.js-title').find('a').attr('href');
- const title = $(this).parents('tr').find('.js-title').data('title-tooltip');
+ const link = $(this).parents('tr').find('.js-title').find('a');
+ const href = link.attr('href');
+ const title = link.data('tippy-content');
$batchTitlesList.append(`
diff --git a/hypha/static_src/src/javascript/apply/submission-tooltips.js b/hypha/static_src/src/javascript/apply/submission-tooltips.js
deleted file mode 100644
index 2aa9fd46d0..0000000000
--- a/hypha/static_src/src/javascript/apply/submission-tooltips.js
+++ /dev/null
@@ -1,26 +0,0 @@
-(function ($) {
-
- 'use strict';
-
- function generateTooltips() {
-
- // get the submisttions titles
- const titles = Array.prototype.slice.call(document.querySelectorAll('.js-title'));
-
- // if the tile has been truncated...
- titles.forEach(function (title) {
- if (title.textContent.indexOf('...') >= 0) {
- addToolTip(title);
- }
- });
-
- // ...add a tooltip class
- function addToolTip(title) {
- title.classList.add('has-tooltip');
- }
- }
-
- // Add tooltips to truncated titles on submissions overview table
- generateTooltips();
-
-})(jQuery);
diff --git a/hypha/static_src/src/sass/apply/components/_all-reviews-table.scss b/hypha/static_src/src/sass/apply/components/_all-reviews-table.scss
index 666499c496..0055370182 100644
--- a/hypha/static_src/src/sass/apply/components/_all-reviews-table.scss
+++ b/hypha/static_src/src/sass/apply/components/_all-reviews-table.scss
@@ -37,34 +37,6 @@
display: table-cell;
}
- &.has-tooltip {
- @include media-query($table-breakpoint) {
- &::before {
- position: absolute;
- top: 50px;
- left: 45px;
- z-index: -1;
- width: 200px;
- padding: 5px;
- font-size: 12px;
- font-weight: $weight--normal;
- white-space: normal;
- background: $color--sky-blue;
- border: 1px solid $color--marine;
- content: attr(data-title-tooltip);
- opacity: 0;
- transition: opacity $transition;
- }
-
- &:hover {
- &::before {
- z-index: 10;
- opacity: 1;
- }
- }
- }
- }
-
a {
color: $color--primary;
}
diff --git a/hypha/static_src/src/sass/apply/components/_all-submissions-table.scss b/hypha/static_src/src/sass/apply/components/_all-submissions-table.scss
index 5b2346cb7b..cc061139d8 100644
--- a/hypha/static_src/src/sass/apply/components/_all-submissions-table.scss
+++ b/hypha/static_src/src/sass/apply/components/_all-submissions-table.scss
@@ -84,34 +84,6 @@
@include media-query(desktop) {
display: table-cell;
}
-
- &.has-tooltip {
- @include media-query($table-breakpoint) {
- &::before {
- position: absolute;
- top: 75px;
- left: 45px;
- z-index: -1;
- width: 200px;
- padding: 5px;
- font-size: 12px;
- font-weight: $weight--normal;
- white-space: normal;
- background: $color--sky-blue;
- border: 1px solid $color--marine;
- content: attr(data-title-tooltip);
- opacity: 0;
- transition: opacity $transition;
- }
-
- &:hover {
- &::before {
- z-index: 10;
- opacity: 1;
- }
- }
- }
- }
}
// project status label
@@ -178,7 +150,7 @@
@include triangle(right, $color--primary, 6px);
position: relative;
display: inline-block;
- margin-right: 15px;
+ margin-right: 10px;
transform: rotate(0);
transition: transform $transition;