Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/nih-cfde/dashboard
Browse files Browse the repository at this point in the history
  • Loading branch information
mschor authored and mschor committed Aug 20, 2021
2 parents 5354a9a + 39357bb commit 56a44b8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
13 changes: 6 additions & 7 deletions pdashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,12 @@

<main class="main">

<div class="top_content">
<div class="top_content_section_left">
<div class="section_left_page_info">
<div class="top_content">
<div class="top_content_section_left">
<div class="section_left_page_info">
<h1>Common Fund Data Ecosystem</h1>
<h2>Dashboard</h2>
</div>
</div>
</div>
</div>
<div class="top_content_section_right">
<table id="data_preview_table" class="data_preview">
</table>
Expand Down Expand Up @@ -202,7 +201,7 @@ <h5>Choose how you wish to export this chart</h5>
<script src="js/stacked-bar-graph.js?ts=1619448056"></script>
<script src="js/lz-string.min.js?ts=1607186913"></script>
<script src="js/config.js?ts=1619458908"></script>
<script src="js/pdashboard.js?ts=1628708183"></script>
<script src="js/pdashboard.js?ts=1629436408"></script>


</body>
Expand Down
2 changes: 1 addition & 1 deletion udashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h1>Common Fund Data Ecosystem</h1>
<h2>Dashboard</h2>
</div>
<div class="alert alert-warning alert-dismissible fade2 show" role="alert">
<strong>You are viewing the generic dashboard!</strong> Please <a href="https://app.globus.org/groups/962d5add-ff9a-11eb-8932-d71f8cc57c67/join">register</a> or click the Log In button to view your peronalized dashboard.
<strong>You are viewing the generic dashboard!</strong> Please <a href="https://app.globus.org/groups/962d5add-ff9a-11eb-8932-d71f8cc57c67/join">register</a> or click the Log In button to view your personalized dashboard.
<button type="button" class="close2" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
Expand Down

0 comments on commit 56a44b8

Please sign in to comment.