From f794cf2acaa2f38be0b5ce9c8d43f61f8c76f116 Mon Sep 17 00:00:00 2001 From: "S. Paquette" Date: Tue, 12 Nov 2024 21:53:05 -0800 Subject: [PATCH] -> Various items from #1401 --- static/css/search.css | 2 ++ static/js/cohorts/export-manifest.js | 1 - static/js/explore.js | 25 +++++++++++++------------ static/js/tables.js | 18 ++++++++---------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/static/css/search.css b/static/css/search.css index ddc419537..af1740403 100644 --- a/static/css/search.css +++ b/static/css/search.css @@ -535,6 +535,8 @@ tr { .filter-url { display: inline-block; vertical-align: top; + max-width: 95%; + padding: 3px; } table { diff --git a/static/js/cohorts/export-manifest.js b/static/js/cohorts/export-manifest.js index 1fe389af4..b5c7bc3ac 100644 --- a/static/js/cohorts/export-manifest.js +++ b/static/js/cohorts/export-manifest.js @@ -93,7 +93,6 @@ require([ $('.modal-title').text("Export Cart Manifest"); $('#export-manifest-form').append('') $('#export-manifest-form').find('input[name="from_cart"]').val("True"); - $('#export-manifest-form').append('') $('#export-manifest-form').find('input[name="filtergrp_list"]').val(JSON.stringify(filtergrp_list)); $('#export-manifest-form').append('') diff --git a/static/js/explore.js b/static/js/explore.js index 9c1021002..175f93fcc 100644 --- a/static/js/explore.js +++ b/static/js/explore.js @@ -305,9 +305,9 @@ require([ allowHTML:true, theme:'light', placement:'right', - content: '
All series from this collection are in the cart
'+ - '
Some series from this collection are in the cart
' + - '
No series from this collection are in the cart
'+ + content: '
All series from this collection are in the cart
'+ + '
Some series from this collection are in the cart
' + + '
No series from this collection are in the cart
'+ '
Note: clicking the cart icons only add or remove series belonging to studies with the given collection that match the current filter
' }); @@ -317,9 +317,9 @@ require([ allowHTML:true, theme:'light', placement:'right', - content: '
All series from this case are in the cart
'+ - '
Some series from this case are in the cart
' + - '
No series from this case are in the cart
'+ + content: '
All series from this case are in the cart
'+ + '
Some series from this case are in the cart
' + + '
No series from this case are in the cart
'+ '
Note: clicking the cart icons only add or remove series belonging to studies within the given case that match the current filter
' }); @@ -329,9 +329,9 @@ require([ allowHTML:true, theme:'light', placement:'right', - content: '
All series from this study are in the cart
'+ - '
Some series from this study are in the cart
' + - '
No series from this study are in the cart
' + content: '
All series from this study are in the cart
'+ + '
Some series from this study are in the cart
' + + '
No series from this study are in the cart
' }); tippy.delegate('#series_table_head', { @@ -340,8 +340,8 @@ require([ allowHTML:true, theme:'light', placement:'right', - content: '
This series is in the cart
'+ - '
This series is not the cart
' + content: '
This series is in the cart
'+ + '
This series is not the cart
' }); tippy('.case-info', { @@ -419,7 +419,7 @@ require([ maxWidth: 130 }); - window.sqlinstance = tippy('.bq-string-copy',{ + tippy('.bq-string-copy',{ content: 'Copied!', theme: 'blue', placement: 'right', @@ -433,6 +433,7 @@ require([ }, maxWidth: 85 }); + tippy.delegate('.series-table', { content: 'Copied!', theme: 'blue', diff --git a/static/js/tables.js b/static/js/tables.js index d6aa58acf..7b506605f 100644 --- a/static/js/tables.js +++ b/static/js/tables.js @@ -275,14 +275,13 @@ define(['cartutils','filterutils','tippy','jquery', 'base'], function(cartutils, var caret_col= { "type": "html", "orderable": false, render: function (data) { if (('state' in window.selProjects[data]) && ('view' in window.selProjects[data]['state']) && (window.selProjects[data]['state']['view'] )) { return ''+ - '' + - '' - + '' + + '' } else { return ''+ - '' + - '' + '' + + '' } }, createdCell: function(td) { @@ -292,7 +291,7 @@ define(['cartutils','filterutils','tippy','jquery', 'base'], function(cartutils, }; var cart_col = {"type": "html", "orderable": false, render: function () { - return '' + return '' } }; var cartnum_col={"type": "html", "orderable": false, render: function(){return ('0');}}; @@ -672,7 +671,7 @@ define(['cartutils','filterutils','tippy','jquery', 'base'], function(cartutils, }; var cart_col = {"type": "html", "orderable": false, render: function () { - return '' + return '' } }; @@ -1254,7 +1253,7 @@ define(['cartutils','filterutils','tippy','jquery', 'base'], function(cartutils, "type": "html", "orderable": false, render: function () { - return '' + return '' } }, { @@ -1585,7 +1584,7 @@ define(['cartutils','filterutils','tippy','jquery', 'base'], function(cartutils, ], "columns": [ {"type": "html", "orderable": false, render: function () { - return '' + return '' } }, @@ -1962,7 +1961,6 @@ define(['cartutils','filterutils','tippy','jquery', 'base'], function(cartutils, $(row).find('.shopping-cart').parent()[0]._tippy.setContent("add series to the cart"); if ('someInCart' in window.selProjects[projid]) { - delete (window.selProjects[projid]['someInCart']); } if ('extraInCart' in window.selProjects[projid]) {