Skip to content

Commit 93a02ef

Browse files
birmbirm
authored
Merge pull request #529 from camicroscope/develop
For 3.9.4
2 parents 828b8f3 + f7a2b9e commit 93a02ef

26 files changed

+1485
-864
lines changed

‎HISTORY.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2424
* **Version 1**
2525
* [1.0.x](#camicroscope-10)
2626

27-
### caMicroscope [Unreleased](https://github.com/camicroscope/camicroscope/compare/v3.9.2...camicroscope:develop)
27+
### caMicroscope [Unreleased](https://github.com/camicroscope/camicroscope/compare/v3.9.4...camicroscope:develop)
2828
###### TBD
2929

30+
### caMicroscope [3.9.4](https://github.com/camicroscope/camicroscope/compare/v3.9.3...camicroscope:v3.9.4)
31+
###### 2021-06-16
32+
* Github action for ci testing [#514](https://github.com/camicroscope/caMicroscope/pull/514)
33+
* Bootstrap Upgrades [#518](https://github.com/camicroscope/caMicroscope/pull/518), [#519](https://github.com/camicroscope/caMicroscope/pull/519)
34+
* Migrate Additional Links to mongo from conf file
35+
* Table Style Fix for large number of pages
36+
3037
### caMicroscope [3.9.3](https://github.com/camicroscope/camicroscope/compare/v3.9.2...camicroscope:v3.9.3)
3138
###### 2021-04-15
3239
* Bugfix for additional links url

‎apps/Info.html

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js"
3030
integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n"
3131
crossorigin="anonymous"></script>
32-
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
33-
integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6"
34-
crossorigin="anonymous"></script>
35-
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
36-
integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
32+
33+
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0/dist/css/bootstrap.min.css"
34+
rel="stylesheet"
35+
integrity="sha384-wEmeIV1mKuiNpC+IOBjI7aAzPcEZeedi5yW5f2yOq55WWLwNGmvvx4Um1vskeMj0"
36+
crossorigin="anonymous">
3737
<link rel="stylesheet" href="../common/stacktable.css">
3838
<style>
3939
html,
@@ -53,35 +53,37 @@
5353
<body>
5454
<div class="page-container">
5555
<div>
56-
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark" style="position: sticky;">
57-
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
58-
<span class="navbar-toggler-icon"></span>
59-
</button>
60-
<div class="collapse navbar-collapse" id="navbarCollapse">
61-
<ul class="navbar-nav mr-auto">
62-
<li class="nav-item link">
63-
<a class="nav-link" href="landing/landing.html"> <i class="fas fa-home"></i> Home</a>
64-
</li>
65-
<li class="nav-item link">
66-
<a class="nav-link" href="table.html"> <i class="fas fa-list-ul"></i> Slides</a>
67-
</li>
68-
<li class="nav-item active link">
69-
<a class="nav-link" href="Info.html"> <i class="fas fa-info-circle"></i> Info</a>
70-
</li>
71-
<li class="nav-item link">
72-
<a class="nav-link" href="./dev-workbench/workbench.html"> <i class="fas fa-pencil-ruler"></i> Workbench</a>
73-
</li>
74-
</ul>
75-
<ul class="navbar-nav">
76-
<li class="nav-item link" style="font-family: sans-serif;">
77-
<a class="nav-link" href="./signup/signup.html"> <i class="fas fa-user-plus"></i> Signup</a>
78-
</li>
79-
<li class="nav-item link">
80-
<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>
81-
</li>
82-
</ul>
83-
</div>
84-
</nav>
56+
<nav class="navbar navbar-expand-lg navbar-dark fixed-top bg-dark" style="position: sticky; margin-top: -4em;">
57+
<div class="container-fluid">
58+
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
59+
<span class="navbar-toggler-icon"></span>
60+
</button>
61+
<div class="collapse navbar-collapse" id="navbarSupportedContent" >
62+
<ul class="navbar-nav mr-auto">
63+
<li class="nav-item link" style="font-family: sans-serif;">
64+
<a class="nav-link" href="landing/landing.html"> <i class="fas fa-home"></i> Home</a>
65+
</li>
66+
<li class="nav-item active link" style="font-family: sans-serif;">
67+
<a class="nav-link" href="table.html"> <i class="fas fa-list-ul"></i> Slides</a>
68+
</li>
69+
<li class="nav-item link">
70+
<a class="nav-link" href="Info.html"> <i class="fas fa-info-circle"></i> Info</a>
71+
</li>
72+
<li class="nav-item link">
73+
<a class="nav-link" href="./dev-workbench/workbench.html"> <i class="fas fa-pencil-ruler"></i> Workbench</a>
74+
</li>
75+
</ul>
76+
<ul class="navbar-nav ms-auto">
77+
<li class="nav-item link" style="font-family: sans-serif;">
78+
<a class="nav-link" href="./signup/signup.html"> <i class="fas fa-user-plus"></i> Signup</a>
79+
</li>
80+
<li class="nav-item link" style="font-family: sans-serif;">
81+
<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>
82+
</li>
83+
</ul>
84+
</div>
85+
</div>
86+
</nav>
8587

8688
<div class="header text-center text-white bg-info p-4">
8789
<h1 class="h1">caMicroscope</h1>
@@ -94,7 +96,6 @@ <h1 class="h1">caMicroscope</h1>
9496
</div>
9597
</div>
9698

97-
9899
<div class="modal fade" id="detail-dialog" tabindex="-1" role="dialog"
99100
aria-labelledby="title-of-dialog" aria-hidden="true" data-backdrop="static" data-keyboard="false" >
100101
<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
171172
<p class="p">Copyright © 2021 caMicroscope</p>
172173
</footer>
173174
</div>
174-
175+
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-p34f1UUtsS3wqzfto5wAAmdvj+osOnFyQFpp4Ua3gs/ZVWx6oOypYoCJhGGScy+8" crossorigin="anonymous"></script>
175176
</body>
176177
<script>
177178

‎apps/admin/admin.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,3 +120,9 @@ iframe {
120120
font-weight: bold;
121121
margin-left: 3rem;
122122
}
123+
.nav-link {
124+
cursor: pointer;
125+
}
126+
.nav-link:hover{
127+
background-color: #dfdfdf;
128+
}

‎apps/admin/admin.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
66
<meta author="JasoxNaN" />
77
<!-- css files -->
8-
<link rel="stylesheet" href="../common.css"/>
8+
<link rel="stylesheet" href="../common.css" />
99
<link
1010
rel="stylesheet"
1111
href="https://use.fontawesome.com/releases/v5.8.2/css/all.css"
@@ -40,7 +40,8 @@
4040
<title>CaMicroScope Bashboard</title>
4141
</head>
4242
<body>
43-
<header id="nav-bar"
43+
<header
44+
id="nav-bar"
4445
class="navbar navbar-dark sticky-top bg-primary flex-md-nowrap p-0 shadow"
4546
>
4647
<a
@@ -74,14 +75,14 @@
7475
<nav
7576
id="sidebarMenu"
7677
class="col-md-3 col-lg-2 d-md-block bg-light sidebar collapse"
77-
style=""
7878
>
7979
<div class="position-sticky pt-3">
8080
<ul class="nav flex-column">
8181
<li class="nav-item">
8282
<div
8383
class="nav-link active d-flex align-items-center"
8484
aria-current="page"
85+
onclick="redirectPath(this, '../collection/collection.html')"
8586
>
8687
<i class="fa fa-archive"></i>
8788
<div class="title">Collection</div>
@@ -100,6 +101,7 @@
100101
<div
101102
class="nav-link d-flex align-items-center"
102103
aria-current="page"
104+
onclick="redirectPath(this, '../user/user.html')"
103105
>
104106
<i class="fas fa-user"></i>
105107
<div class="title">User</div>
@@ -109,7 +111,7 @@
109111
</div>
110112
</nav>
111113
<main id="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4">
112-
<iframe src="../collection/collection.html" frameborder="0" ></iframe>
114+
<iframe src="../collection/collection.html" frameborder="0"></iframe>
113115
</main>
114116
</div>
115117
</div>

‎apps/admin/admin.js

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,22 @@
1+
const pathConfig = {
2+
'collection': '../collection/collection.html',
3+
'user': '../user/user.html',
4+
5+
};
6+
17
function calculateMainHeight() {
2-
const height = $(window).height() - $('#nav-bar').height();
3-
$('#main').height(height);
8+
const height = $(window).height() - $('#nav-bar').height();
9+
$('#main').height(height);
410
}
511
calculateMainHeight();
6-
$(window).resize(function () {
7-
calculateMainHeight();
8-
});
12+
$(window).resize(function() {
13+
calculateMainHeight();
14+
});
15+
16+
function redirectPath(link, url) {
17+
//
18+
// console.log(this);
19+
$('#sidebarMenu .nav-link').each((idx, link)=>$(link).removeClass('active'));
20+
$(link).addClass('active');
21+
$('#main iframe').attr('src', url);
22+
}

‎apps/collection/collection.css

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
.text-in-line {
1010
margin: 0;
11+
color: #5d5d5d;
1112
}
1213

1314
.has-search .form-control-feedback {
@@ -48,10 +49,6 @@ div.card.col-card:hover {
4849
0 6px 20px 0 rgba(0, 0, 0, 0.38);
4950
}
5051

51-
.text-in-line {
52-
color: #5d5d5d;
53-
}
54-
5552
/* custom tips */
5653
.bs-tooltip-top .arrow::before {
5754
top: -1;

0 commit comments

Comments
 (0)