Skip to content
Snippets Groups Projects
Commit 42f61539 authored by Michal Malý's avatar Michal Malý
Browse files

Rename Atlas tab back to Browse

parent 3135b455
No related branches found
No related tags found
No related merge requests found
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
<img src="../imgs/icons/home.svg" class="navtab-icon"> <img src="../imgs/icons/home.svg" class="navtab-icon">
<span class="tab-caption">A- B- Z-</span> <span class="tab-caption">A- B- Z-</span>
</div> </div>
<div class="navtab-pushbutton flex-item-samedim" onclick="openTabNA(event, 'atlas_tab')"> <div class="navtab-pushbutton flex-item-samedim" onclick="openTabNA(event, 'browse_tab')">
<img src="../imgs/icons/globe.svg" class="navtab-icon"> <img src="../imgs/icons/globe.svg" class="navtab-icon">
<span class="tab-caption">Atlas</span> <span class="tab-caption">Browse</span>
</div> </div>
<div class="navtab-pushbutton flex-item-samedim" onclick="openTabNA(event, 'predictions_tab')"> <div class="navtab-pushbutton flex-item-samedim" onclick="openTabNA(event, 'predictions_tab')">
<img src="../imgs/icons/calculator.svg" class="navtab-icon"> <img src="../imgs/icons/calculator.svg" class="navtab-icon">
...@@ -84,14 +84,14 @@ ...@@ -84,14 +84,14 @@
<!-- ATLAS tab --> <!-- ATLAS tab -->
<div id="atlas_tab" class="tabcontent"> <div id="browse_tab" class="tabcontent">
<div class="proportional-layout proportional-layout-responsive-flow-wide shadowed-block"> <div class="proportional-layout proportional-layout-responsive-flow-wide shadowed-block">
<div id="atlas-layout-first"> <div id="browse-layout-first">
<div id='atlas-fragments-table'></div> <div id='browse-fragments-table'></div>
<p id="wva-atlas-status"></p> <p id="wva-browse-status"></p>
</div> </div>
<div id="atlas-layout-second"> <div id="browse-layout-second">
<div id="wva-app-atlas"></div> <div id="wva-app-browse"></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -255,7 +255,7 @@ function openTabNA(evt, tabName) { ...@@ -255,7 +255,7 @@ function openTabNA(evt, tabName) {
openNavTab(evt, tabName); openNavTab(evt, tabName);
CURRENT_ACTIVE_TAB = tabName; CURRENT_ACTIVE_TAB = tabName;
if ([ 'abz_tab', 'atlas_tab', 'predictions_tab' ].includes(tabName)) { if ([ 'abz_tab', 'browse_tab', 'predictions_tab' ].includes(tabName)) {
redraw_molstar(); redraw_molstar();
} }
...@@ -303,11 +303,11 @@ function abz_fragment_clicked(elem, ntc, seq) { ...@@ -303,11 +303,11 @@ function abz_fragment_clicked(elem, ntc, seq) {
/* /*
* Handles a click on a fragment in the Atlas tab * Handles a click on a fragment in the Atlas tab
*/ */
async function atlas_fragment_clicked(elem, ntc, seq) { async function browse_fragment_clicked(elem, ntc, seq) {
const handler = (appId, onError) => { const handler = (appId, onError) => {
watna_fragment_clicked(elem, appId, ntc, seq, REF_DINU_NAME, onError); watna_fragment_clicked(elem, appId, ntc, seq, REF_DINU_NAME, onError);
}; };
structural_in_table_clicked(elem, 'wva-app-atlas', 'wva-app-atlas-viewer', handler); structural_in_table_clicked(elem, 'wva-app-browse', 'wva-app-browse-viewer', handler);
} }
/* /*
...@@ -476,7 +476,7 @@ function mk_seq_ntc_table_code(ntcs, sequences, title, title_collapsed, tainer_i ...@@ -476,7 +476,7 @@ function mk_seq_ntc_table_code(ntcs, sequences, title, title_collapsed, tainer_i
ast = '<span class="asterisk">*</span>'; ast = '<span class="asterisk">*</span>';
has_unreliable = true; has_unreliable = true;
} }
row += `<td class="clickable" id="${fragment_cell_id(mkFragId(ntc, seq), 'atlas')}" onClick='atlas_fragment_clicked(this, "${ntc}", "${seq}");'>${waterCnt}${ast}</td>`; row += `<td class="clickable" id="${fragment_cell_id(mkFragId(ntc, seq), 'browse')}" onClick='browse_fragment_clicked(this, "${ntc}", "${seq}");'>${waterCnt}${ast}</td>`;
} else } else
row += `<td class="disabled">${waterCnt}</td>`; row += `<td class="disabled">${waterCnt}</td>`;
} }
...@@ -531,20 +531,20 @@ function fill_zee_table() { ...@@ -531,20 +531,20 @@ function fill_zee_table() {
} }
} }
function fill_atlas_table() { function fill_browse_table() {
const { code, code_collapsed, has_unreliable } = mk_seq_ntc_table_code( const { code, code_collapsed, has_unreliable } = mk_seq_ntc_table_code(
WATNA_NTCS, watna_sequences(), WATNA_NTCS, watna_sequences(),
'<div><strong>Table 3:</strong> Number of water molecules for each NtC/sequence category.</div>', '<div><strong>Table 3:</strong> Number of water molecules for each NtC/sequence category.</div>',
'<div class="dont-wrap"><strong>Table 3:</strong> ...</div>', '<div class="dont-wrap"><strong>Table 3:</strong> ...</div>',
'atlas-fragments-table' 'browse-fragments-table'
); );
PREGENERATED_TABLES['atlas-fragments-table'] = { PREGENERATED_TABLES['browse-fragments-table'] = {
collapsed: code_collapsed, collapsed: code_collapsed,
expanded: code, expanded: code,
}; };
document.querySelector('#atlas-fragments-table').innerHTML = code; document.querySelector('#browse-fragments-table').innerHTML = code;
} }
function fill_predictions_table() { function fill_predictions_table() {
...@@ -716,8 +716,8 @@ function set_scroll_listeners(tabName) { ...@@ -716,8 +716,8 @@ function set_scroll_listeners(tabName) {
if (tabName === 'abz_tab') { if (tabName === 'abz_tab') {
listen_to_table_scrolled('#primary-fragments-table > .ntc-seq-table', '#abz-layout-first', PRIMARY_NTCS); listen_to_table_scrolled('#primary-fragments-table > .ntc-seq-table', '#abz-layout-first', PRIMARY_NTCS);
listen_to_table_scrolled('#zee-fragments-table > .ntc-seq-table', '#abz-layout-first', ZEE_NTCS); listen_to_table_scrolled('#zee-fragments-table > .ntc-seq-table', '#abz-layout-first', ZEE_NTCS);
} else if (tabName === 'atlas_tab') { } else if (tabName === 'browse_tab') {
listen_to_table_scrolled('#atlas-fragments-table', '#atlas-layout-first', watna_sequences()); listen_to_table_scrolled('#browse-fragments-table', '#browse-layout-first', watna_sequences());
} else if (tabName === 'predictions_tab') { } else if (tabName === 'predictions_tab') {
listen_to_table_scrolled('#predicted-structures-table', '#predictions-layout-first', PRED_TBL_HDRS); listen_to_table_scrolled('#predicted-structures-table', '#predictions-layout-first', PRED_TBL_HDRS);
} }
...@@ -727,13 +727,13 @@ function init_all() { ...@@ -727,13 +727,13 @@ function init_all() {
watna_fetch_data().then(_ => { watna_fetch_data().then(_ => {
fill_primary_table(); fill_primary_table();
fill_zee_table(); fill_zee_table();
fill_atlas_table(); fill_browse_table();
fill_predictions_table(); fill_predictions_table();
set_scroll_listeners('abz_tab'); set_scroll_listeners('abz_tab');
watna_init( watna_init(
'wva-app-atlas', 'wva-app-browse',
{ {
extraStructurePartsName: 'Other structure parts', extraStructurePartsName: 'Other structure parts',
hydrationSitesName: 'Hydration sites', hydrationSitesName: 'Hydration sites',
...@@ -773,7 +773,7 @@ function init_all() { ...@@ -773,7 +773,7 @@ function init_all() {
); );
window.addEventListener('resize', () => { window.addEventListener('resize', () => {
if ([ 'abz_tab', 'atlas_tab', 'predictions_tab' ].includes(CURRENT_ACTIVE_TAB)) { if ([ 'abz_tab', 'browse_tab', 'predictions_tab' ].includes(CURRENT_ACTIVE_TAB)) {
set_scroll_listeners(CURRENT_ACTIVE_TAB); set_scroll_listeners(CURRENT_ACTIVE_TAB);
for (const sh of SCROLL_EVT_HANDLERS) for (const sh of SCROLL_EVT_HANDLERS)
sh.handler(); sh.handler();
...@@ -831,18 +831,18 @@ function init_all() { ...@@ -831,18 +831,18 @@ function init_all() {
throw e; throw e;
}); });
watna_set_on_removed_callback("wva-app-atlas", fragId => { watna_set_on_removed_callback("wva-app-browse", fragId => {
const elem = document.getElementById(fragment_cell_id(fragId, 'atlas')); const elem = document.getElementById(fragment_cell_id(fragId, 'browse'));
if (elem) { if (elem) {
elem.style.removeProperty("background-color"); elem.style.removeProperty("background-color");
elem.style.removeProperty("color"); elem.style.removeProperty("color");
} }
redraw_molstar(); redraw_molstar();
}); });
watna_set_on_colors_changed_callback('wva-app-atlas', fragId => { watna_set_on_colors_changed_callback('wva-app-browse', fragId => {
const elem = document.getElementById(fragment_cell_id(fragId, 'atlas')); const elem = document.getElementById(fragment_cell_id(fragId, 'browse'));
if (elem) { if (elem) {
watna_set_elem_color(elem, 'wva-app-atlas', fragId); watna_set_elem_color(elem, 'wva-app-browse', fragId);
} }
}); });
......
...@@ -43,7 +43,7 @@ td.disabled { ...@@ -43,7 +43,7 @@ td.disabled {
} }
@media screen and (min-width: 100em) { @media screen and (min-width: 100em) {
#atlas-layout-first { #browse-layout-first {
width: min-content; width: min-content;
overflow: scroll; overflow: scroll;
position: relative; position: relative;
...@@ -53,7 +53,7 @@ td.disabled { ...@@ -53,7 +53,7 @@ td.disabled {
} }
@media screen and (max-width: 100em) { @media screen and (max-width: 100em) {
#atlas-layout-first { #browse-layout-first {
flex: 1; flex: 1;
min-height: 6em; min-height: 6em;
overflow: scroll; overflow: scroll;
...@@ -63,29 +63,29 @@ td.disabled { ...@@ -63,29 +63,29 @@ td.disabled {
} }
} }
#atlas-layout-first::-webkit-scrollbar { #browse-layout-first::-webkit-scrollbar {
display: none; display: none;
} }
@media screen and (min-width: 100em) { @media screen and (min-width: 100em) {
#atlas-layout-second { #browse-layout-second {
display: flex; display: flex;
flex: 1; flex: 1;
} }
} }
@media screen and (max-width: 100em) { @media screen and (max-width: 100em) {
#atlas-layout-second { #browse-layout-second {
display: flex; display: flex;
flex: 3; flex: 3;
} }
} }
#atlas-ntc-select { #browse-ntc-select {
flex: 1; flex: 1;
} }
#atlas-seq-select { #browse-seq-select {
flex: 1; flex: 1;
} }
...@@ -186,7 +186,7 @@ td.disabled { ...@@ -186,7 +186,7 @@ td.disabled {
flex: 1; flex: 1;
} }
#wva-app-atlas { #wva-app-browse {
flex: 1; flex: 1;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment