Skip to content

Resolve overflow issue, apply Bootstrap styling, optimize performance, and clean up code #936

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.

Sign up for GitHub

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

Merged
birm merged 2 commits into from
Apr 1, 2024
Merged

Resolve overflow issue, apply Bootstrap styling, optimize performance, and clean up code #936

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b4c3e2
fix(feat: prevent content overflow in card)
Lochipi Mar 31, 2024
f6569e8
Merge branch 'develop' into textOverflowreducer
Lochipi Mar 31, 2024
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
52 changes: 27 additions & 25 deletions apps/Info.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<meta name="keywords" content="camicroscope, quip" />
<meta charset='utf-8'>
<meta http-equiv='X-UA-Compatible' content='IE=edge'>

<meta name='viewport'
content='width=device-width, initial-scale=1, minimum-scale=1.0, maximum-scale=2.0'>
<!-- common -->
Expand All @@ -13,22 +14,9 @@
<!-- Font Awesome -->
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css">

<script src='../common/authChecker.js'></script>
<script>
__auth_check(1)
</script>

<script src='../core/Store.js'></script>
<script src='../common/util.js'></script>
<script src='../common/ajv.js'></script>
<script src='../components/loading/loading.js'></script>
<script src="./loader/loader.js"></script>
<script src="./loader/chunked_upload.js"></script>
<title>CaMicroscope Data Table</title>

<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js"
integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n"
crossorigin="anonymous"></script>
<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script>

<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
rel="stylesheet"
Expand Down Expand Up @@ -106,21 +94,24 @@ <h4 class="modal-title" id="title-of-dialog">Slide Information Details</h4>
<div class="modal-body">
<div>
<div id="content">
<div class="alert alert-info" role="alert">

<h4 style="text-align:center">Synopsis</h4><hr style="margin-top:0px;">
<table id="detailtable">
</table>
<div class="card alert alert-info" role="alert">
<div class="card-body">
<h4 class="card-title text-center">Synopsis</h4><hr class="mt-0">
<div class="table-responsive">
<table id="detailtable">
</table>
</div>
</div>
</div>
<div class="alert alert-info" role="alert">

<h4 style="text-align:center">Annotations</h4><hr style="margin-top:0px;">
<h4 style="text-align:center">Annotations</h4><hr class="mt-0">
<table id="annotationtable">
</table>
</div>
<div class="alert alert-info" role="alert">

<h4 style="text-align:center">Heatmaps</h4><hr style="margin-top:0px;">
<h4 style="text-align:center">Heatmaps</h4><hr class="mt-0">
<table id="heatmaptable">
</table>
</div>
Expand Down Expand Up @@ -152,10 +143,6 @@ <h3 class="text-center h3 mb-2" style="margin-top:8px;margin-bottom:10px;">Infor
<input id="search-table" type="text" class="form-control" placeholder="Search">
</div>





<div class="table-responsive" id="summary">
<table class="table table-striped">
<thead id="infothead"></thead>
Expand All @@ -170,9 +157,24 @@ <h3 class="text-center h3 mb-2" style="margin-top:8px;margin-bottom:10px;">Infor
<footer id="footer-layout"></footer>
</div>


<!-- script to call a footer(layout footer in the common > utils folder) function -->
<script> insertFooterLayout(); </script>

<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-p34f1UUtsS3wqzfto5wAAmdvj+osOnFyQFpp4Ua3gs/ZVWx6oOypYoCJhGGScy+8" crossorigin="anonymous"></script>

<script src='../common/authChecker.js'></script>

<script>
__auth_check(1)
</script>

<script src='../core/Store.js'></script>
<script src='../common/util.js'></script>
<script src='../common/ajv.js'></script>
<script src='../components/loading/loading.js'></script>
<script src="./loader/loader.js"></script>
<script src="./loader/chunked_upload.js"></script>
</body>
<script>

Expand Down