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 Dec 6, 2023
2 parents 3c35a0f + 27768c6 commit 5a3ee9b
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 27 deletions.
53 changes: 26 additions & 27 deletions www/include/primary_nav.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@
</p>
<ul class="menu-list">
<li>

<span class="icon-text is-align-items-center is-flex">
<span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="My Workspace"><i class="mdi mdi-24px mdi-monitor"></i></span>
<span class="icon-text-part"><a class="is-active" tool="workspace" href="./index.html">My Workspace</a></span>
<span class="icon icon-image-part is-medium"><i class="mdi mdi-24px mdi-monitor"></i></span>
<span class="icon-text-part"><a class="icon-link-part is-active" tool="workspace" href="./index.html">My Workspace</a></span>
</span>
</a>
</li>
Expand All @@ -23,14 +22,14 @@
<ul class="menu-list">
<li>
<span class="icon-text is-align-items-center is-flex">
<span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Gene Expression"><i class="mdi mdi-24px mdi-test-tube"></i></span>
<span class="icon-text-part"><a tool="search_expression">Gene Expression</a></span>
<span class="icon icon-image-part is-medium"><i class="mdi mdi-24px mdi-test-tube"></i></span>
<span class="icon-text-part"><a class="icon-link-part" tool="search_expression">Gene Expression</a></span>
</span>
</li>
<li>
<span class="icon-text is-align-items-center is-flex">
<span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Datasets"><i class="mdi mdi-24px mdi-table-search"></i></span>
<span class="icon-text-part"><a tool="search_datasets" href="./dataset_explorer.html">Datasets</a></span>
<span class="icon icon-image-part is-medium"><i class="mdi mdi-24px mdi-table-search"></i></span>
<span class="icon-text-part"><a class="icon-link-part" tool="search_datasets" href="./dataset_explorer.html">Datasets</a></span>
</span>
</li>
</ul>
Expand All @@ -40,32 +39,32 @@
<ul class="menu-list">
<li>
<span class="icon-text is-align-items-center is-flex">
<span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Single Cell Workbench"><i class="mdi mdi-24px mdi-chart-line"></i></span>
<span class="icon-text-part"><a tool="sc_workbench" href="./analyze_dataset.html">Single Cell Workbench</a></span>
<span class="icon icon-image-part is-medium"><i class="mdi mdi-24px mdi-chart-line"></i></span>
<span class="icon-text-part"><a class="icon-link-part" tool="sc_workbench" href="./analyze_dataset.html">Single Cell Workbench</a></span>
</span>
</li>
<li>
<span class="icon-text is-align-items-center is-flex">
<span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Comparison Tool"><i class="mdi mdi-24px mdi-compare-horizontal"></i></span>
<span class="icon-text-part"><a tool="compare" href="./compare_datasets.html">Comparison Tool</a></span>
<span class="icon icon-image-part is-medium"><i class="mdi mdi-24px mdi-compare-horizontal"></i></span>
<span class="icon-text-part"><a class="icon-link-part" tool="compare" href="./compare_datasets.html">Comparison Tool</a></span>
</span>
</li>
<li>
<span class="icon-text is-align-items-center is-flex">
<span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Single-gene Curator"><i class="mdi mdi-24px mdi-chart-box-outline"></i></span>
<span class="icon-text-part"><a tool="sg_curator" href="./dataset_curator.html">Single-gene Curator</a></span>
<span class="icon icon-image-part is-medium"><i class="mdi mdi-24px mdi-chart-box-outline"></i></span>
<span class="icon-text-part"><a class="icon-link-part" tool="sg_curator" href="./dataset_curator.html">Single-gene Curator</a></span>
</span>
</li>
<li>
<span class="icon-text is-align-items-center is-flex">
<span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Multi-gene Displays"><i class="mdi mdi-24px mdi-chart-box-outline"></i></span>
<span class="icon-text-part"><a tool="mg_displays" href="./multigene_curator.html">Multi-gene Displays</a></span>
<span class="icon icon-image-part is-medium"><i class="mdi mdi-24px mdi-chart-box-outline"></i></span>
<span class="icon-text-part"><a class="icon-link-part" tool="mg_displays" href="./multigene_curator.html">Multi-gene Displays</a></span>
</span>
</li>
<li>
<span class="icon-text is-align-items-center is-flex">
<span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Epiviz Panel Designer"><i class="mdi mdi-24px mdi-view-dashboard-outline"></i></span>
<span class="icon-text-part"><a tool="epiviz">Epiviz Panel Designer</a></span>
<span class="icon icon-image-part is-medium"><i class="mdi mdi-24px mdi-view-dashboard-outline"></i></span>
<span class="icon-text-part"><a class="icon-link-part" tool="epiviz">Epiviz Panel Designer</a></span>
</span>
</li>
</ul>
Expand All @@ -75,20 +74,20 @@
<ul class="menu-list">
<li>
<span class="icon-text is-align-items-center is-flex">
<span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Dataset Collections"><i class="mdi mdi-24px mdi-folder-open-outline"></i></span>
<span class="icon-text-part"><a tool="manage_dataset" href="./dataset_explorer.html">Dataset Collections</a></span>
<span class="icon icon-image-part is-medium"><i class="mdi mdi-24px mdi-folder-open-outline"></i></span>
<span class="icon-text-part"><a class="icon-link-part" tool="manage_dataset" href="./dataset_explorer.html">Dataset Collections</a></span>
</span>
</li>
<li>
<span class="icon-text is-align-items-center is-flex">
<span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Gene Collections"><i class="mdi mdi-18px mdi-folder-text-outline"></i></span>
<span class="icon-text-part"><a tool="manage_genes" href="./gene_collection_manager.html">Gene Collections</a></span>
<span class="icon icon-image-part is-medium"><i class="mdi mdi-18px mdi-folder-text-outline"></i></span>
<span class="icon-text-part"><a class="icon-link-part" tool="manage_genes" href="./gene_collection_manager.html">Gene Collections</a></span>
</span>
</li>
<li>
<span class="icon-text is-align-items-center is-flex">
<span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Dataset Uploader"><i class="mdi mdi-24px mdi-cloud-upload-outline"></i></span>
<span class="icon-text-part"><a tool="upload_dataset" href="./upload_dataset.html">Dataset Uploader</a></span>
<span class="icon icon-image-part is-medium"><i class="mdi mdi-24px mdi-cloud-upload-outline"></i></span>
<span class="icon-text-part"><a class="icon-link-part" tool="upload_dataset" href="./upload_dataset.html">Dataset Uploader</a></span>
</span>
</li>
</ul>
Expand All @@ -98,14 +97,14 @@
<ul class="menu-list">
<li>
<span class="icon-text is-align-items-center is-flex">
<span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Help"><i class="mdi mdi-24px mdi-help-circle-outline"></i></span>
<span class="icon-text-part"><a>Help</a></span>
<span class="icon icon-image-part is-medium"><i class="mdi mdi-24px mdi-help-circle-outline"></i></span>
<span class="icon-text-part"><a class="icon-link-part">Help</a></span>
</span>
</li>
<li>
<span class="icon-text is-align-items-center is-flex">
<span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Feedback"><i class="mdi mdi-24px mdi-face-agent"></i></span>
<span class="icon-text-part"><a>Feedback</a></span>
<span class="icon icon-image-part is-medium"><i class="mdi mdi-24px mdi-face-agent"></i></span>
<span class="icon-text-part"><a class="icon-link-part">Feedback</a></span>
</span>
</li>
</ul>
Expand Down
21 changes: 21 additions & 0 deletions www/js/common.v2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,17 @@ document.addEventListener('DOMContentLoaded', () => {

// hide the citation element
document.querySelector("#citation_c").classList.add("is-hidden")

// activate the tooltips since the menu labels are hidden
document.querySelectorAll('span.icon-image-part').forEach(function (element) {
element.classList.add('has-tooltip-right', 'has-tooltip-arrow');
});

// build the tooltips based on the values of the actual menu labels
document.querySelectorAll('span.icon-image-part').forEach(function (element) {
const text = element.parentNode.querySelector('a.icon-link-part').textContent;
element.setAttribute('data-tooltip', text);
});
}

// Function to show elements with animation
Expand All @@ -71,6 +82,16 @@ document.addEventListener('DOMContentLoaded', () => {

// show the citation element
document.querySelector("#citation_c").classList.remove("is-hidden")

// hide the tooltips since the menu labels are visible
document.querySelectorAll('span.icon-image-part').forEach(function (element) {
element.classList.remove('has-tooltip-right', 'has-tooltip-arrow');
});

// remove the menu tooltips since the actual labels are visible
document.querySelectorAll('span.icon-image-part').forEach(function (element) {
element.removeAttribute('data-tooltip');
});
}

const navbar_toggler = document.querySelector('#navbar-toggler');
Expand Down

0 comments on commit 5a3ee9b

Please sign in to comment.