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 Jan 5, 2024
2 parents 07e034d + 0b96bf8 commit bc9d584
Show file tree
Hide file tree
Showing 4 changed files with 137 additions and 15 deletions.
19 changes: 18 additions & 1 deletion www/css/expression.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,18 @@
Highlighted background color: fbfcfd
Highlighted background border: e9eef1
*/

div#annotation-and-grid-c h3 {
font-weight: normal;
font-size: 90%;
}
div#annotation-and-grid-c h3 span {
font-weight: bold;
}
div.card-content {
background-color: white;
color: black;
min-height: 20em;
}
div#functional-annotation-c h3 {
font-weight: bold;
font-size: 90%;
Expand All @@ -27,6 +31,15 @@ div#results-main-c {
border-top: 1px solid rgb(220, 220, 220);
margin-top: 50px;
}
div#result-panel-grid .card {
/* https://github.com/jgthms/bulma/issues/218 */
height: 100%;
display: flex;
flex-direction: column;
}
div#result-panel-grid .card-content {
height: 100%;
}
section#annotation-panel,
section#result-panel {
background-color: #fbfcfd;
Expand All @@ -36,6 +49,10 @@ section#annotation-panel h4 {
font-weight: bold;
font-size: 90%;
}
span.option-label {
font-weight: bold;
font-size: 90%;
}
ul#gene-result-list {
list-style: none;
}
Expand Down
119 changes: 106 additions & 13 deletions www/expression.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<!--#include virtual="/include/primary_nav.html" -->

<section id="main_c" class="column pl-0">
<section id="main_c" class="column pl-0 pt-0">

<!--#include virtual="/include/header_bar.html" -->

Expand Down Expand Up @@ -246,23 +246,116 @@ <h3 class="mt-0 is-clickable">
</h3>
</div>
</section>
<section id="result-panel" class="pl-3 pr-3 pb-3">
<section id="result-panel" class="p-3">
<div id="result-panel-options">
<div class="field is-horizontal">
<div class="field-label is-small">
<label class="label">Scoring method: </label>
<span class="option-label pr-1">Scoring method: </span>
<div class="control select is-small">
<select>
<option>Gene scope</option>
<option>Tissue scope</option>
<option>Sample scope</option>
</select>
</div>
</div>
<hr class="mt-3 mb-3" \>
<div id="result-panel-grid" class="p-3">

<div class="tile is-ancestor">
<div class="tile is-vertical is-8 mr-0">

<div class="tile is-parent pl-0 pt-0">
<div class="tile is-child">
<div class="card">
<div class="card-header">
<div class="card-header-title">Mouse, inner ear maturation, p1hc_p1sc, rnaSeq (Segil's lab)</div>
<div class="card-header-icon">
<span class="icon"><i class="mdi mdi-18px mdi-dots-vertical"></i></span>
</div>
</div>
<div class="card-content">
Image gets drawn here.
</div>
</div>
</div>
</div>

<div class="tile is-parent pl-0 pt-0">
<div class="tile is-child pr-1">
<div class="card">
<div class="card-header">
<div class="card-header-title">Mouse, inner ear maturation, p1hc_p1sc, rnaSeq (Segil's lab)</div>
<div class="card-header-icon">
<span class="icon"><i class="mdi mdi-18px mdi-dots-vertical"></i></span>
</div>
</div>
<div class="card-content">
Image gets drawn here.
</div>
</div>
</div>
<div class="tile is-child pl-2">
<div class="card">
<div class="card-header">
<div class="card-header-title">Mouse, inner ear maturation, p1hc_p1sc, rnaSeq (Segil's lab)</div>
<div class="card-header-icon">
<span class="icon"><i class="mdi mdi-18px mdi-dots-vertical"></i></span>
</div>
</div>
<div class="card-content">
Image gets drawn here.
</div>
</div>
</div>
</div>

</div>
<div class="field-body">
<div class="field">
<p class="control is-expanded has-icons-left">
<input class="input is-small" type="text" placeholder="Name">
<span class="icon is-small is-left">
<i class="mdi mdi-user"></i>
</span>
</p>
<div class="tile is-parent is-vertical is-4 pl-0 pt-0">
<div class="tile is-child">
<div class="card">
<div class="card-header">
<div class="card-header-title">Mouse, inner ear maturation, p1hc_p1sc, rnaSeq (Segil's lab)</div>
<div class="card-header-icon">
<span class="icon"><i class="mdi mdi-18px mdi-dots-vertical"></i></span>
</div>
</div>
<div class="card-content">
Fancy tall graphic here
</div>
</div>
</div>
</div>

</div> <!-- end ancestor tile-->
<div class="tile is-ancestor">
<div class="tile pr-1">
<div class="card">
<div class="card-header">
<div class="card-header-title">Mouse, inner ear maturation, p1hc_p1sc, rnaSeq (Segil's lab)</div>
<div class="card-header-icon">
<span class="icon"><i class="mdi mdi-18px mdi-dots-vertical"></i></span>
</div>
</div>
<div class="card-content">
Fancy tall graphic here
</div>
</div>
</div>
<div class="tile pl-2 pr-2">
<div class="card">
<div class="card-header">
<div class="card-header-title">Mouse, inner ear maturation, p1hc_p1sc, rnaSeq (Segil's lab)</div>
<div class="card-header-icon">
<span class="icon"><i class="mdi mdi-18px mdi-dots-vertical"></i></span>
</div>
</div>
<div class="card-content">
Fancy tall graphic here
</div>
</div>
</div>

</div>

</div>
</section>
</div>
Expand Down
12 changes: 12 additions & 0 deletions www/js/common.v2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,24 @@ document.addEventListener('DOMContentLoaded', () => {
if (SIDEBAR_COLLAPSED == false) {
hideNavbarElementsWithAnimation();
SIDEBAR_COLLAPSED = true;
Cookies.set('gear_sidebar_collapsed', true, { expires: 7 });
} else {
showNavbarElementsWithAnimation();
SIDEBAR_COLLAPSED = false;
Cookies.set('gear_sidebar_collapsed', false, { expires: 7 });
}
});

// now, if the page was initially loaded check and see if this has already been toggled via a cookie
const sidebar_cookie = Cookies.get('gear_sidebar_collapsed');
if (sidebar_cookie == "true") {
hideNavbarElementsWithAnimation();
SIDEBAR_COLLAPSED = true;
} else {
showNavbarElementsWithAnimation();
SIDEBAR_COLLAPSED = false;
}

/**
* / End controls for the left navbar visibility
*/
Expand Down
2 changes: 1 addition & 1 deletion www/js/expression.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
document.addEventListener('DOMContentLoaded', () => {
// Set the page header title
document.querySelector('#page-header-title').textContent = 'Gene Expression Search';
document.querySelector('#page-header-label').textContent = 'Gene Expression Search';
});

const handlePageSpecificLoginUIUpdates = async (event) => {
Expand Down

0 comments on commit bc9d584

Please sign in to comment.