Skip to content

Commit

Permalink
-> Various items from #1401
Browse files Browse the repository at this point in the history
  • Loading branch information
@s-paquette
s-paquette committed Nov 13, 2024
1 parent a48b6f5 commit f794cf2
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
2 changes: 2 additions & 0 deletions static/css/search.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,8 @@ tr {
.filter-url {
display: inline-block;
vertical-align: top;
max-width: 95%;
padding: 3px;
}

table {
Expand Down
1 change: 0 additions & 1 deletion static/js/cohorts/export-manifest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ require([
$('.modal-title').text("Export Cart Manifest");
$('#export-manifest-form').append('<input type="hidden" name="from_cart">')
$('#export-manifest-form').find('input[name="from_cart"]').val("True");

$('#export-manifest-form').append('<input type="hidden" name="filtergrp_list">')
$('#export-manifest-form').find('input[name="filtergrp_list"]').val(JSON.stringify(filtergrp_list));
$('#export-manifest-form').append('<input type="hidden" name="partitions">')
Expand Down
25 changes: 13 additions & 12 deletions static/js/explore.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,9 @@ require([
allowHTML:true,
theme:'light',
placement:'right',
content: '<div class="cart-info-div"><span class="cart-info-tip case1"><i class="fa-solid fa-cart-shopping shopping-cart " style="font-family :\'Font Awesome 6 Free\'"></i></span> <span>All series from this collection are in the cart</span></div>'+
'<div class="cart-info-div"><span class="cart-info-tip case2"><i class="fa-solid fa-cart-shopping shopping-cart case2" style="font-family :\'Font Awesome 6 Free\'"></i></span> <span>Some series from this collection are in the cart</span></div>' +
'<div class="cart-info-div"><span class="cart-info-tip case3"><i class="fa-solid fa-cart-shopping shopping-cart case3" style="font-family :\'Font Awesome 6 Free\'"></i></span> <span>No series from this collection are in the cart</span></div>'+
content: '<div class="cart-info-div"><span class="cart-info-tip case1"><i class="fa-solid fa-cart-shopping shopping-cart"></i></span> <span>All series from this collection are in the cart</span></div>'+
'<div class="cart-info-div"><span class="cart-info-tip case2"><i class="fa-solid fa-cart-shopping shopping-cart case2"></i></span> <span>Some series from this collection are in the cart</span></div>' +
'<div class="cart-info-div"><span class="cart-info-tip case3"><i class="fa-solid fa-cart-shopping shopping-cart case3"></i></span> <span>No series from this collection are in the cart</span></div>'+
'<div class="cart-info-div cart-exp">Note: clicking the cart icons only add or remove series belonging to studies with the given collection that match the current filter</div>'
});

Expand All @@ -317,9 +317,9 @@ require([
allowHTML:true,
theme:'light',
placement:'right',
content: '<div class="cart-info-div"><span class="cart-info-tip case1"><i class="fa-solid fa-cart-shopping shopping-cart " style="font-family :\'Font Awesome 6 Free\'"></i></span> <span>All series from this case are in the cart</span></div>'+
'<div class="cart-info-div"><span class="cart-info-tip case2"><i class="fa-solid fa-cart-shopping shopping-cart case2" style="font-family :\'Font Awesome 6 Free\'"></i></span> <span>Some series from this case are in the cart</span></div>' +
'<div class="cart-info-div"><span class="cart-info-tip case3"><i class="fa-solid fa-cart-shopping shopping-cart case3" style="font-family :\'Font Awesome 6 Free\'"></i></span> <span>No series from this case are in the cart</span></div>'+
content: '<div class="cart-info-div"><span class="cart-info-tip case1"><i class="fa-solid fa-cart-shopping shopping-cart "></i></span> <span>All series from this case are in the cart</span></div>'+
'<div class="cart-info-div"><span class="cart-info-tip case2"><i class="fa-solid fa-cart-shopping shopping-cart case2"></i></span> <span>Some series from this case are in the cart</span></div>' +
'<div class="cart-info-div"><span class="cart-info-tip case3"><i class="fa-solid fa-cart-shopping shopping-cart case3"></i></span> <span>No series from this case are in the cart</span></div>'+
'<div class="cart-info-div cart-exp">Note: clicking the cart icons only add or remove series belonging to studies within the given case that match the current filter</div>'
});

Expand All @@ -329,9 +329,9 @@ require([
allowHTML:true,
theme:'light',
placement:'right',
content: '<div class="cart-info-div"><span class="cart-info-tip case1"><i class="fa-solid fa-cart-shopping shopping-cart " style="font-family :\'Font Awesome 6 Free\'"></i></span> <span>All series from this study are in the cart</span></div>'+
'<div class="cart-info-div"><span class="cart-info-tip case2"><i class="fa-solid fa-cart-shopping shopping-cart case2" style="font-family :\'Font Awesome 6 Free\'"></i></span> <span>Some series from this study are in the cart</span></div>' +
'<div class="cart-info-div"><span class="cart-info-tip case3"><i class="fa-solid fa-cart-shopping shopping-cart case3" style="font-family :\'Font Awesome 6 Free\'"></i></span> <span>No series from this study are in the cart</span></div>'
content: '<div class="cart-info-div"><span class="cart-info-tip case1"><i class="fa-solid fa-cart-shopping shopping-cart "></i></span> <span>All series from this study are in the cart</span></div>'+
'<div class="cart-info-div"><span class="cart-info-tip case2"><i class="fa-solid fa-cart-shopping shopping-cart case2"></i></span> <span>Some series from this study are in the cart</span></div>' +
'<div class="cart-info-div"><span class="cart-info-tip case3"><i class="fa-solid fa-cart-shopping shopping-cart case3"></i></span> <span>No series from this study are in the cart</span></div>'
});

tippy.delegate('#series_table_head', {
Expand All @@ -340,8 +340,8 @@ require([
allowHTML:true,
theme:'light',
placement:'right',
content: '<div class="cart-info-div"><span class="cart-info-tip case1"><i class="fa-solid fa-cart-shopping shopping-cart " style="font-family :\'Font Awesome 6 Free\'"></i></span> <span>This series is in the cart</span></div>'+
'<div class="cart-info-div"><span class="cart-info-tip case3"><i class="fa-solid fa-cart-shopping shopping-cart case3" style="font-family :\'Font Awesome 6 Free\'"></i></span> <span>This series is not the cart</span></div>'
content: '<div class="cart-info-div"><span class="cart-info-tip case1"><i class="fa-solid fa-cart-shopping shopping-cart "></i></span> <span>This series is in the cart</span></div>'+
'<div class="cart-info-div"><span class="cart-info-tip case3"><i class="fa-solid fa-cart-shopping shopping-cart case3"></i></span> <span>This series is not the cart</span></div>'
});

tippy('.case-info', {
Expand Down Expand Up @@ -419,7 +419,7 @@ require([
maxWidth: 130
});

window.sqlinstance = tippy('.bq-string-copy',{
tippy('.bq-string-copy',{
content: 'Copied!',
theme: 'blue',
placement: 'right',
Expand All @@ -433,6 +433,7 @@ require([
},
maxWidth: 85
});

tippy.delegate('.series-table', {
content: 'Copied!',
theme: 'blue',
Expand Down
18 changes: 8 additions & 10 deletions static/js/tables.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 '<a role="button" title="Display cases in this collection below.">'+
'<i class="fa fa-solid fa-caret-right is-hidden" style="font-family :\'Font Awesome 6 Free\' !important"></i>' +
'<i class="fa fa-solid fa-caret-down" style="font-family :\'Font Awesome 6 Free\' !important"></i></a>'

'<i class="fa fa-solid fa-caret-right is-hidden"></i>' +
'<i class="fa fa-solid fa-caret-down"></i></a>'
}
else {
return '<a role="button" title="Display cases in this collection below.">'+
'<i class="fa fa-solid fa-caret-right " style="font-family :\'Font Awesome 6 Free\' !important"></i>' +
'<i class="fa fa-solid fa-caret-down is-hidden" style="font-family :\'Font Awesome 6 Free\' !important"></i></a>'
'<i class="fa fa-solid fa-caret-right"></i>' +
'<i class="fa fa-solid fa-caret-down is-hidden"></i></a>'
}
},
createdCell: function(td) {
Expand All @@ -292,7 +291,7 @@ define(['cartutils','filterutils','tippy','jquery', 'base'], function(cartutils,
};

var cart_col = {"type": "html", "orderable": false, render: function () {
return '<i class=" fa-solid fa-cart-shopping shopping-cart style="font-family :\'Font Awesome 6 Free\"></i>'
return '<i class="fa-solid fa-cart-shopping shopping-cart"></i>'
}
};
var cartnum_col={"type": "html", "orderable": false, render: function(){return ('<span class="cartnum cartnum_style">0</span>');}};
Expand Down Expand Up @@ -672,7 +671,7 @@ define(['cartutils','filterutils','tippy','jquery', 'base'], function(cartutils,
};

var cart_col = {"type": "html", "orderable": false, render: function () {
return '<i class=" fa-solid fa-cart-shopping shopping-cart style="font-family :\'Font Awesome 6 Free\"></i>'
return '<i class="fa-solid fa-cart-shopping shopping-cart"></i>'
}
};

Expand Down Expand Up @@ -1254,7 +1253,7 @@ define(['cartutils','filterutils','tippy','jquery', 'base'], function(cartutils,
"type": "html",
"orderable": false,
render: function () {
return '<i class=" fa-solid fa-cart-shopping shopping-cart style="font-family :\'Font Awesome 6 Free\"></i>'
return '<i class="fa-solid fa-cart-shopping shopping-cart"></i>'

}
}, {
Expand Down Expand Up @@ -1585,7 +1584,7 @@ define(['cartutils','filterutils','tippy','jquery', 'base'], function(cartutils,
],
"columns": [
{"type": "html", "orderable": false, render: function () {
return '<i class=" fa-solid fa-cart-shopping shopping-cart style="font-family :\'Font Awesome 6 Free\"></i>'
return '<i class="fa-solid fa-cart-shopping shopping-cart"></i>'

}
},
Expand Down Expand Up @@ -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]) {
Expand Down

0 comments on commit f794cf2

Please sign in to comment.