Skip to content

Commit

Permalink
Merge branch 'ui-v2' of https://github.com/IGS/gEAR into ui-v2
Browse files Browse the repository at this point in the history
  • Loading branch information
@adkinsrs
adkinsrs committed Aug 2, 2024
2 parents ca32daf + cb5c453 commit 9f03496
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 14 deletions.
5 changes: 3 additions & 2 deletions www/include/dataset-collection-selector/dataset-collection-selector.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ const fetchDatasetCollections = async (includeMembers=false) => {

try {
dataset_collection_data = await apiCallsMixin.fetchDatasetCollections({includeMembers, layoutShareId});

document.querySelector('#dropdown-dc').classList.remove('is-loading');
document.querySelector('#dropdown-dc').classList.remove('is-disabled');

Expand Down Expand Up @@ -172,8 +173,8 @@ const setActiveDCCategory = (category) => {

// sort the data by label before iterating
data.sort((a, b) => {
if (a.label < b.label) {return -1}
if (a.label > b.label) {return 1}
if (a.label.toUpperCase() < b.label.toUpperCase()) {return -1}
if (a.label.toUpperCase() > b.label.toUpperCase()) {return 1}
return 0;
});

Expand Down
22 changes: 11 additions & 11 deletions www/include/primary_nav.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<ul class="menu-list">
<li>
<span class="icon-text is-align-items-center is-flex">
<a class="icon-link-part" tool="workspace" href="./index.html">
<a class="icon-link-part" tool="workspace" href="/index.html">
<span class="icon icon-image-part is-medium"><i class="mdi mdi-24px mdi-monitor"></i></span>
<span class="icon-text-part">My Workspace</span>
</a>
Expand All @@ -39,23 +39,23 @@
<ul class="menu-list">
<li>
<span class="icon-text is-align-items-center is-flex">
<a class="icon-link-part" tool="search_expression" href="./expression.html">
<a class="icon-link-part" tool="search_expression" href="/expression.html">
<span class="icon icon-image-part is-medium"><i class="mdi mdi-24px mdi-test-tube"></i></span>
<span class="icon-text-part">Gene Expression</span>
</a>
</span>
</li>
<li>
<span class="icon-text is-align-items-center is-flex">
<a class="icon-link-part" tool="projection" href="./projection.html">
<a class="icon-link-part" tool="projection" href="/projection.html">
<span class="icon icon-image-part is-medium"><i class="mdi mdi-24px mdi-hexagon-multiple"></i></span>
<span class="icon-text-part">Projection Tool</span>
</a>
</span>
</li>
<li>
<span class="icon-text is-align-items-center is-flex">
<a class="icon-link-part" tool="search_datasets" href="./dataset_explorer.html">
<a class="icon-link-part" tool="search_datasets" href="/dataset_explorer.html">
<span class="icon icon-image-part is-medium"><i class="mdi mdi-24px mdi-table-search"></i></span>
<span class="icon-text-part">Datasets</span>
</a>
Expand All @@ -68,7 +68,7 @@
<ul class="menu-list">
<li>
<span class="icon-text is-align-items-center is-flex">
<a class="icon-link-part" tool="sc_workbench" href="./sc_workbench.html">
<a class="icon-link-part" tool="sc_workbench" href="/sc_workbench.html">
<!--<a class="icon-link-part" tool="sc_workbench" href="./sc_workbench.html">-->
<span class="icon icon-image-part is-medium"><i class="mdi mdi-24px mdi-chart-line"></i></span>
<span class="icon-text-part">Single Cell Workbench</span>
Expand All @@ -77,23 +77,23 @@
</li>
<li>
<span class="icon-text is-align-items-center is-flex">
<a class="icon-link-part" tool="compare" href="./compare_datasets.html">
<a class="icon-link-part" tool="compare" href="/compare_datasets.html">
<span class="icon icon-image-part is-medium"><i class="mdi mdi-24px mdi-compare-horizontal"></i></span>
<span class="icon-text-part">Comparison Tool</span>
</a>
</span>
</li>
<li>
<span class="icon-text is-align-items-center is-flex">
<a class="icon-link-part" tool="sg_curator" href="./dataset_curator.html">
<a class="icon-link-part" tool="sg_curator" href="/dataset_curator.html">
<span class="icon icon-image-part is-medium"><i class="mdi mdi-24px mdi-chart-box-outline"></i></span>
<span class="icon-text-part">Single-gene Displays</span>
</a>
</span>
</li>
<li>
<span class="icon-text is-align-items-center is-flex">
<a class="icon-link-part" tool="mg_displays" href="./multigene_curator.html">
<a class="icon-link-part" tool="mg_displays" href="/multigene_curator.html">
<span class="icon icon-image-part is-medium"><i class="mdi mdi-24px mdi-chart-box-multiple-outline"></i></span>
<span class="icon-text-part">Multi-gene Displays</span>
</a>
Expand All @@ -114,15 +114,15 @@
<ul class="menu-list">
<li>
<span class="icon-text is-align-items-center is-flex">
<a class="icon-link-part" tool="manage_dataset" href="./dataset_explorer.html">
<a class="icon-link-part" tool="manage_dataset" href="/dataset_explorer.html">
<span class="icon icon-image-part is-medium"><i class="mdi mdi-24px mdi-folder-open-outline"></i></span>
<span class="icon-text-part">Dataset Collections</span>
</a>
</span>
</li>
<li>
<span class="icon-text is-align-items-center is-flex">
<a class="icon-link-part" tool="manage_genes" href="./gene_list_manager.html">
<a class="icon-link-part" tool="manage_genes" href="/gene_list_manager.html">
<span class="icon icon-image-part is-medium"><i class="mdi mdi-18px mdi-folder-text-outline"></i></span>
<span class="icon-text-part">Gene Lists</span>
</a>
Expand All @@ -137,7 +137,7 @@
</a>
</span>
</li>
-->
-->
</ul>
<p class="menu-label mb-0 is-capitalized has-text-primary-light">
<span class="menu-label-text">Support</span>
Expand Down
13 changes: 12 additions & 1 deletion www/js/common.v2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,18 @@ document.addEventListener('DOMContentLoaded', () => {

const logoSmall = document.getElementById('navbar-logo-small');
logoSmall.src = "/img/by_domain/" + SITE_PREFS.domain_label + "/logo-main-small.png"
console.debug("Set logo to: " + logoNormal.src);

// Load analytics
const head = document.getElementsByTagName('head')[0];
const ga_script = document.createElement('script');
ga_script.src = "https://www.googletagmanager.com/gtag/js?id=" + SITE_PREFS['google_analytics_4_measurement_id'];
ga_script.async = true;
head.append(ga_script)

window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', SITE_PREFS['google_analytics_4_measurement_id']);
});

// set the active primary nav element, deselect the rest
Expand Down

0 comments on commit 9f03496

Please sign in to comment.