Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Static #192

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed sum of nodes and added files back into repo
mnarang13 committed Jul 16, 2019
commit 0f8cefecd7db8170828e99c71c94f85a53802472
10,946 changes: 10,946 additions & 0 deletions web/src/main/resources/static-mn/data/msk-impact-oncotree.csv

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion web/src/main/resources/static-mn/data/tumor_types.json

Large diffs are not rendered by default.

77 changes: 9 additions & 68 deletions web/src/main/resources/static-mn/index.html
Original file line number Diff line number Diff line change
@@ -3,39 +3,18 @@
<head>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
<link type="text/css" rel="stylesheet" href="css/bootstrap.min.css?03132019"/>
<link type="text/css" rel="stylesheet" href="open-iconic/font/css/open-iconic-bootstrap.min.css?04182018"/>
<link rel="stylesheet" type="text/css" href="css/jquery.qtip.min.css?04182018">
<link type="text/css" rel="stylesheet" href="css/style.css?03272019"/>
<script type="text/javascript" src="js/jquery-3.3.1.min.js?04182018"></script>
<script type="text/javascript" src="js/d3.v3.min.js?04182018"></script>
<script type="text/javascript" src="js/popper.min.js?03132019""></script>
<script type="text/javascript" src="js/bootstrap.min.js?03132019""></script>
<script type="text/javascript" src="js/jquery.qtip.min.js?04182018"></script>
<script type="text/javascript" src="js/clipboard.min.js?04182018"></script>
<script type="text/javascript" src="js/showdown-1.8.6.min.js?02072018"></script>
<script type="text/javascript" src="js/tree.js?02072018"></script>
<script type="text/javascript" src="js/main.js?02072018"></script>
<!-- <script type="text/javascript" src="js/load-markdown.js?03272019"></script>-->
<link type="text/css" rel="stylesheet" href="open-iconic/font/css/open-iconic-bootstrap.min.css"/>
<link rel="stylesheet" type="text/css" href="css/jquery.qtip.min.css">
<link type="text/css" rel="stylesheet" href="css/style.css"/>
<script type="text/javascript" src="js/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="js/d3.v3.min.js"></script>
<script type="text/javascript" src="js/jquery.qtip.min.js"></script>
<script type="text/javascript" src="js/clipboard.min.js"></script>
<script type="text/javascript" src="js/main.js"></script>
<script type = "text/javascript" src="js/tree.js"></script>
</head>
<body>
<div id="body" class="container">
<!-- start of tabs nav div-->
<ul class="nav nav-tabs" id="tabs" role="tablist">
<li class="nav-item">
<a class="nav-link active" href="#tree" id="tree-tab" data-toggle="tab" role="tab" aria-controls="tree">Home</a>
</li>
<!-- <li class="nav-item">-->
<!-- <a class="nav-link" href="#mapping" id="mapping-tab" data-toggle="tab" role="tab" aria-controls="mapping">Mapping Tools</a>-->
<!-- </li>-->
<!-- <li class="nav-item">-->
<!-- <a class="nav-link" href="#news" id="news-tab" data-toggle="tab" role="tab" aria-controls="news">News</a>-->
<!-- </li>-->
<!-- <li class="nav-item">-->
<!-- <a class="nav-link" href="#api" id="api-tab" data-toggle="tab" role="tab" aria-controls="api">API</a>-->
<!-- </li>-->
</ul>
<!-- end of tabs nav div -->
<!-- start of tabs content div -->
<div class="tab-content">
<!-- tree tab -->
<div class="tab-pane fade show active" id="tree" role="tabpanel">
@@ -59,13 +38,6 @@ <h4 class="alert-heading">
</div>
</div>
<div class="row">
<!-- <div class="col-lg-3 col-md-3 col-sm-4 col-xs-4">-->
<!-- <div class="dropdown" id="other-version">-->
<!-- <a href="#" class="btn btn-outline-secondary dropdown-toggle" id="versionMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Change OncoTree version</a>-->
<!-- <ul class="other-version-content dropdown-menu" aria-labelledby="versionMenuButton">-->
<!-- </ul>-->
<!-- </div>-->
<!-- </div>-->
<div class="col-lg-4 col-md-5 col-sm-5 col-xs-5 has-addon-feedback">
<div class="input-group" id='tumor_search'>
<input type="text" class="form-control" placeholder="Search Tumor Type" />
@@ -103,37 +75,6 @@ <h4 class="alert-heading">
</span>
</div>

<!-- mapping tab -->
<!-- <div class="tab-pane fade" id='mapping' role="tabpanel">-->
<!-- <div class="row">-->
<!-- <div class="col-md-12">-->
<!-- <h3>Mapping Tools</h3>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="row">-->
<!-- <div class="col-md-12">-->
<!-- <div class="card bg-light mb-3">-->
<!-- <div class="card-body">-->
<!-- <div id='oncotree-mapping-tool'>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- end mapping tab div -->

<!-- news tab -->
<div class="tab-pane fade" id='news' role="tabpanel">
</div>

<!-- api tab -->
<!-- <div class="tab-pane fade" id='api' role="tabpanel">-->
<!-- <div class="embed-responsive embed-responsive-16by9" style='margin: 30px' id='api-embed-dev'>-->
<!-- <iframe class="embed-responsive-item swagger-frame" src="swagger-ui.html"></iframe>-->
<!-- </div>-->
<!-- </div>-->

</div>
<!-- end of tabs content div -->
<div>
7 changes: 0 additions & 7 deletions web/src/main/resources/static-mn/js/bootstrap.min.js

This file was deleted.

31 changes: 0 additions & 31 deletions web/src/main/resources/static-mn/js/load-markdown.js

This file was deleted.

131 changes: 50 additions & 81 deletions web/src/main/resources/static-mn/js/main.js
Original file line number Diff line number Diff line change
@@ -30,94 +30,63 @@ $(document).ready(function(){
$('#tree-tab').click(function (e) {
window.location.hash = "/home";
})
// $('#mapping-tab').click(function (e) {
// window.location.hash = "/home?tab=mapping";
// })
// $('#news-tab').click(function (e) {
// window.location.hash = "/home?tab=news";
// })
// $('#api-tab').click(function (e) {
// window.location.hash = "/home?tab=api";
// })
});

// function loadVersions(callback) {
// $.get('api/versions')
// .done(function(data) {
// if (data instanceof Array) {
// available_versions = data.reduce(
// function(acc, cur) {
// acc[cur.api_identifier] = cur;
// return acc;
// },
// {}
// );
// }
// })
// .fail(function() {
// // Error handling
// }).always(function() {
// if (callback instanceof Function) {
// callback();
// }
// })
// }
function initVersionsLink() {
var option_list_html = [];
var sorted_version_list = Object.keys(available_versions);
sorted_version_list.sort(
function(a,b) {
if (available_versions[a].visible && !available_versions[b].visible) {
return -1;
}
if (available_versions[b].visible && !available_versions[a].visible) {
return 1;
}
return available_versions[b].release_date.localeCompare(available_versions[a].release_date);
});
var previous_version_was_visible = false;
sorted_version_list.forEach(
function(item) {
var _hash = '#/home?version=' + item;
var selected_class = '';
if (displayed_version === item) {
selected_class = ' active';
}
var option = '<li><a href="#" class="dropdown-item' + selected_class + '" data-desc="' + available_versions[item].description + '" hash="' + _hash + '">' + item + '</a></li>';
var this_item_is_visible = available_versions[item].visible;
if (!this_item_is_visible && previous_version_was_visible) {
option_list_html.push('<li class="dropdown-submenu"><a class="dropdown-item dropdown-toggle" href="#">More</a><ul class="dropdown-menu">');
}
option_list_html.push(option);
previous_version_was_visible = this_item_is_visible;
});
option_list_html.push('</li></ul>'); // end submenu

// function initVersionsLink() {
// var option_list_html = [];
// var sorted_version_list = Object.keys(available_versions);
// sorted_version_list.sort(
// function(a,b) {
// if (available_versions[a].visible && !available_versions[b].visible) {
// return -1;
// }
// if (available_versions[b].visible && !available_versions[a].visible) {
// return 1;
// }
// return available_versions[b].release_date.localeCompare(available_versions[a].release_date);
// });
// var previous_version_was_visible = false;
// sorted_version_list.forEach(
// function(item) {
// var _hash = '#/home?version=' + item;
// var selected_class = '';
// if (displayed_version === item) {
// selected_class = ' active';
// }
// var option = '<li><a href="#" class="dropdown-item' + selected_class + '" data-desc="' + available_versions[item].description + '" hash="' + _hash + '">' + item + '</a></li>';
// var this_item_is_visible = available_versions[item].visible;
// if (!this_item_is_visible && previous_version_was_visible) {
// option_list_html.push('<li class="dropdown-submenu"><a class="dropdown-item dropdown-toggle" href="#">More</a><ul class="dropdown-menu">');
// }
// option_list_html.push(option);
// previous_version_was_visible = this_item_is_visible;
// });
// option_list_html.push('</li></ul>'); // end submenu
//
// $('#other-version .other-version-content').html(option_list_html.join(''));
// $('#oncotree-version-label').append($("#other-version .other-version-content .active").text());
// $('#oncotree-version-note').append($("#other-version .other-version-content .active").data("desc"));
// $('#other-version .dropdown-item').not('.dropdown-toggle').click(function() {
// var _hash = $(this)[0].attributes['hash'].value;
// window.location.hash = _hash;
// window.location.reload();
// })
// }
$('#other-version .other-version-content').html(option_list_html.join(''));
$('#oncotree-version-label').append($("#other-version .other-version-content .active").text());
$('#oncotree-version-note').append($("#other-version .other-version-content .active").data("desc"));
$('#other-version .dropdown-item').not('.dropdown-toggle').click(function() {
var _hash = $(this)[0].attributes['hash'].value;
window.location.hash = _hash;
window.location.reload();
})
}

function initEvents() {
// submenu JS and CSS comes from here:
// https://stackoverflow.com/questions/18023493/bootstrap-dropdown-sub-menu-missing/18024991
// $('.dropdown-menu a.dropdown-toggle').on('click', function(e) {
// var $subMenu = $(this).next(".dropdown-menu");
// $subMenu.toggleClass('show');
// return false;
// });
// $('.dropdown a.dropdown-toggle').first().on('click', function(e) {
// // when you click on the main menu
// // make sure submenu is closed
// $(this).next().children('.dropdown-submenu').first().children('.dropdown-menu').first().removeClass("show");
// return true;
// });
$('.dropdown-menu a.dropdown-toggle').on('click', function(e) {
var $subMenu = $(this).next(".dropdown-menu");
$subMenu.toggleClass('show');
return false;
});
$('.dropdown a.dropdown-toggle').first().on('click', function(e) {
// when you click on the main menu
// make sure submenu is closed
$(this).next().children('.dropdown-submenu').first().children('.dropdown-menu').first().removeClass("show");
return true;
});
$('#tumor_search button').click(function() {
OutJS.search();
});
5 changes: 0 additions & 5 deletions web/src/main/resources/static-mn/js/popper.min.js

This file was deleted.

3 changes: 0 additions & 3 deletions web/src/main/resources/static-mn/js/showdown-1.8.6.min.js

This file was deleted.

Loading