-
Notifications
You must be signed in to change notification settings - Fork 306
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #529 from camicroscope/develop
For 3.9.4
- Loading branch information
Showing
26 changed files
with
1,485 additions
and
864 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,11 +29,11 @@ | |
| <script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" | ||
| integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" | ||
| crossorigin="anonymous"></script> | ||
| <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" | ||
| integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" | ||
| crossorigin="anonymous"></script> | ||
| <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" | ||
| integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous"> | ||
| <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" | ||
| rel="stylesheet" | ||
| integrity="sha384-wEmeIV1mKuiNpC+IOBjI7aAzPcEZeedi5yW5f2yOq55WWLwNGmvvx4Um1vskeMj0" | ||
| crossorigin="anonymous"> | ||
| <link rel="stylesheet" href="../common/stacktable.css"> | ||
| <style> | ||
| html, | ||
|
|
@@ -53,35 +53,37 @@ | |
| <body> | ||
| <div class="page-container"> | ||
| <div> | ||
| <nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark" style="position: sticky;"> | ||
| <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation"> | ||
| <span class="navbar-toggler-icon"></span> | ||
| </button> | ||
| <div class="collapse navbar-collapse" id="navbarCollapse"> | ||
| <ul class="navbar-nav mr-auto"> | ||
| <li class="nav-item link"> | ||
| <a class="nav-link" href="landing/landing.html"> <i class="fas fa-home"></i> Home</a> | ||
| </li> | ||
| <li class="nav-item link"> | ||
| <a class="nav-link" href="table.html"> <i class="fas fa-list-ul"></i> Slides</a> | ||
| </li> | ||
| <li class="nav-item active link"> | ||
| <a class="nav-link" href="Info.html"> <i class="fas fa-info-circle"></i> Info</a> | ||
| </li> | ||
| <li class="nav-item link"> | ||
| <a class="nav-link" href="./dev-workbench/workbench.html"> <i class="fas fa-pencil-ruler"></i> Workbench</a> | ||
| </li> | ||
| </ul> | ||
| <ul class="navbar-nav"> | ||
| <li class="nav-item link" style="font-family: sans-serif;"> | ||
| <a class="nav-link" href="./signup/signup.html"> <i class="fas fa-user-plus"></i> Signup</a> | ||
| </li> | ||
| <li class="nav-item link"> | ||
| <a class="nav-link" target="_blank" href="https://docs.google.com/forms/d/e/1FAIpQLScL91LxrpAZjU88GBZP9gmcdgdf8__uNUwhws2lzU6Lr4qNwA/viewform"> <i class="fas fa-comment"></i> Feedback</a> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| </nav> | ||
| <nav class="navbar navbar-expand-lg navbar-dark fixed-top bg-dark" style="position: sticky; margin-top: -4em;"> | ||
| <div class="container-fluid"> | ||
| <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> | ||
| <span class="navbar-toggler-icon"></span> | ||
| </button> | ||
| <div class="collapse navbar-collapse" id="navbarSupportedContent" > | ||
| <ul class="navbar-nav mr-auto"> | ||
| <li class="nav-item link" style="font-family: sans-serif;"> | ||
| <a class="nav-link" href="landing/landing.html"> <i class="fas fa-home"></i> Home</a> | ||
| </li> | ||
| <li class="nav-item active link" style="font-family: sans-serif;"> | ||
| <a class="nav-link" href="table.html"> <i class="fas fa-list-ul"></i> Slides</a> | ||
| </li> | ||
| <li class="nav-item link"> | ||
| <a class="nav-link" href="Info.html"> <i class="fas fa-info-circle"></i> Info</a> | ||
| </li> | ||
| <li class="nav-item link"> | ||
| <a class="nav-link" href="./dev-workbench/workbench.html"> <i class="fas fa-pencil-ruler"></i> Workbench</a> | ||
| </li> | ||
| </ul> | ||
| <ul class="navbar-nav ms-auto"> | ||
| <li class="nav-item link" style="font-family: sans-serif;"> | ||
| <a class="nav-link" href="./signup/signup.html"> <i class="fas fa-user-plus"></i> Signup</a> | ||
| </li> | ||
| <li class="nav-item link" style="font-family: sans-serif;"> | ||
| <a class="nav-link" target="_blank" href="https://docs.google.com/forms/d/e/1FAIpQLScL91LxrpAZjU88GBZP9gmcdgdf8__uNUwhws2lzU6Lr4qNwA/viewform"> <i class="fas fa-comment"></i> Feedback</a> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| </nav> | ||
|
|
||
| <div class="header text-center text-white bg-info p-4"> | ||
| <h1 class="h1">caMicroscope</h1> | ||
|
|
@@ -94,7 +96,6 @@ <h1 class="h1">caMicroscope</h1> | |
| </div> | ||
| </div> | ||
|
|
||
|
|
||
| <div class="modal fade" id="detail-dialog" tabindex="-1" role="dialog" | ||
| aria-labelledby="title-of-dialog" aria-hidden="true" data-backdrop="static" data-keyboard="false" > | ||
| <div class="modal-dialog modal-dialog-centered modal-dialog-scrollable modal-lg" role="document" style="margin-top:8vh;"> | ||
|
|
@@ -171,7 +172,7 @@ <h3 class="text-center h3 mb-2" style="margin-top:8px;margin-bottom:10px;">Infor | |
| <p class="p">Copyright © 2021 caMicroscope</p> | ||
| </footer> | ||
| </div> | ||
|
|
||
| <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-p34f1UUtsS3wqzfto5wAAmdvj+osOnFyQFpp4Ua3gs/ZVWx6oOypYoCJhGGScy+8" crossorigin="anonymous"></script> | ||
| </body> | ||
| <script> | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,22 @@ | ||
| const pathConfig = { | ||
| 'collection': '../collection/collection.html', | ||
| 'user': '../user/user.html', | ||
|
|
||
| }; | ||
|
|
||
| function calculateMainHeight() { | ||
| const height = $(window).height() - $('#nav-bar').height(); | ||
| $('#main').height(height); | ||
| const height = $(window).height() - $('#nav-bar').height(); | ||
| $('#main').height(height); | ||
| } | ||
| calculateMainHeight(); | ||
| $(window).resize(function () { | ||
| calculateMainHeight(); | ||
| }); | ||
| $(window).resize(function() { | ||
| calculateMainHeight(); | ||
| }); | ||
|
|
||
| function redirectPath(link, url) { | ||
| // | ||
| // console.log(this); | ||
| $('#sidebarMenu .nav-link').each((idx, link)=>$(link).removeClass('active')); | ||
| $(link).addClass('active'); | ||
| $('#main iframe').attr('src', url); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.