From a86232db6d6cde3f6bb18c49bfde3901a29e7cd2 Mon Sep 17 00:00:00 2001 From: wavehunter1715 Date: Sun, 29 Dec 2024 14:13:53 +0530 Subject: [PATCH 01/19] Add 'Skip to Content' link for accessibility in Info, Landing, and Table pages --- apps/Info.html | 30 ++++++ apps/landing/landing.html | 209 ++++++++++++++++++++------------------ apps/landing/main.css | 18 ++++ apps/table.css | 19 ++++ apps/table.html | 32 +++++- 5 files changed, 208 insertions(+), 100 deletions(-) diff --git a/apps/Info.html b/apps/Info.html index 7f964f635..ce4ba309b 100644 --- a/apps/Info.html +++ b/apps/Info.html @@ -38,9 +38,39 @@ + + +
+ + +
+
+
+
+

caMicroscope

+
+
+ +
+
+ +
+

caMicroscope

+

Use camicroscope to explore and mark slides uploaded. If this is a restricted access + deployment, you will be prompted to log in here.

+ More +
+
+
+ +
+

Documentation

+

Read documentation for using and developing caMicroscope.

+ More +
+
+
-
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - + + + +
+ + + + + + + + + + + - diff --git a/apps/landing/main.css b/apps/landing/main.css index ebd3c424e..695edac41 100644 --- a/apps/landing/main.css +++ b/apps/landing/main.css @@ -10,6 +10,24 @@ /* Reset */ /* addind loader animation */ +.skip-to-content { + position: absolute; + top: 10px; + left: 10px; + background-color: #000; + color: #fff; + padding: 10px; + z-index: 1000; + text-decoration: none; + font-size: 1rem; + transform: translateY(-100%); + transition: transform 0.3s ease-in-out; + } + + .skip-to-content:focus { + transform: translateY(0); + } + .loader { width: 50px; height: 50px; diff --git a/apps/table.css b/apps/table.css index d11cd8d75..2b5c3b1e5 100644 --- a/apps/table.css +++ b/apps/table.css @@ -161,6 +161,25 @@ nav li:not(.active):hover { z-index: 1000; } +.skip-to-content { + position: absolute; + top: 10px; + left: 10px; + background-color: #000; + color: #fff; + padding: 10px; + z-index: 1000; + text-decoration: none; + transform: translateY(-100%); + transition: transform 0.3s ease-in-out; +} + +.skip-to-content:focus { + transform: translateY(0); +} + + + .notification-box { padding: 10px 0px; color: black; diff --git a/apps/table.html b/apps/table.html index ae8075125..4090801d1 100644 --- a/apps/table.html +++ b/apps/table.html @@ -40,9 +40,39 @@ + + +
diff --git a/apps/table.css b/apps/table.css index cbe043650..e6347c323 100644 --- a/apps/table.css +++ b/apps/table.css @@ -6,6 +6,8 @@ body { font-family: Arial, Helvetica, sans-serif; } + + footer { position: relative; bottom: 0; @@ -290,3 +292,117 @@ td { text-align: center; /* Center-align text within buttons */ } } + + + +/* Dark Mode Options */ + +.darkmode-btn{ + background-color: transparent; + box-shadow: inset 0 0 0 2px rgba(144, 144, 144, 0.25); + color: #4d5968 !important; + letter-spacing: 0.05em; + text-transform: uppercase; + -moz-appearance: none; + -webkit-appearance: none; + -ms-appearance: none; + appearance: none; + -moz-transition: background-color 0.2s ease-in-out, color 0.2s ease-in-out; + -webkit-transition: background-color 0.2s ease-in-out, color 0.2s ease-in-out; + -ms-transition: background-color 0.2s ease-in-out, color 0.2s ease-in-out; + transition: background-color 0.2s ease-in-out, color 0.2s ease-in-out; + border-radius: 5px; + border: 0; + cursor: pointer; + display: inline-block; + font-size: 0.8em; + font-weight: 700; + line-height: 3.35em; + padding: 0 2em; + text-align: center; + text-decoration: none; + white-space: nowrap; + + +} + +/* Darkmode button styling */ +.darkmode-btn { + background-color: transparent; /* Override parent styles */ + color: #bcbbbb; + transition: all 0.3s ease; +} + + +/* Dark mode hover effect */ +.dark-mode .darkmode-btn:hover { + background-color: transparent !important; /* No background in dark mode hover */ + color: #ccc; /* Optional: Light gray text on hover in dark mode */ + border-color: #ccc; /* Optional: Adjust border color in dark mode */ + transform: scale(1.05); /* Keep the hover scaling effect */ + box-shadow: none !important; /* Ensure no shadow in dark mode */ +} + + + +/* Dark mode hover effect */ +.dark-mode .darkmode-btn:hover { + background-color: transparent !important; /* No background in dark mode hover */ + color: #ccc; /* Optional: Light gray text on hover in dark mode */ + border-color: #ccc; /* Optional: Adjust border color in dark mode */ + transform: scale(1.05); /* Keep the hover scaling effect */ + box-shadow: none !important; /* Ensure no shadow in dark mode */ +} + +/* Dark Mode Styles */ +.dark-mode { + background-color: black; + color: white; +} + +.dark-mode .page-container{ + background-color: black !important; +} + +.dark-mode .header.text-center.text-white.bg-info.p-4 { + background-color:#17a2b8 !important; +} + +.dark-mode .nav-item.active.link{ + color:black !important; +} + + +.dark-mode .bg-light{ + background-color: black !important; +} + +.dark-mode .has-search .form-control-feedback{ + color: #aaa !important; +} + +.dark-mode h1, +.dark-mode h2, +.dark-mode h3, +.dark-mode p, +.dark-mode span{ + color: white !important; /* Force text to be white */ +} + + +@media screen and (max-width: 736px) { + .dark-mode .posts .post .image { + width: 30%; + min-width: 6em; + } + + .dark-mode .posts .post .content { + width: 70%; + } +} + +@media screen and (max-width: 480px) { + .dark-mode .posts .post .image { + margin-right: 1.5em; + } +} \ No newline at end of file diff --git a/apps/table.html b/apps/table.html index c2da1b157..79bc1b7c3 100644 --- a/apps/table.html +++ b/apps/table.html @@ -70,6 +70,20 @@
  • Signup
    • + +
  • + +
    • + + +
    From d381c38615e2a55b01992373d63343b3daf6c7ec Mon Sep 17 00:00:00 2001 From: chandrikarj Date: Wed, 15 Jan 2025 17:50:26 +0530 Subject: [PATCH 06/19] restore common.css to default --- apps/common.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/common.css b/apps/common.css index f8e32b16c..6757be4d5 100644 --- a/apps/common.css +++ b/apps/common.css @@ -5,7 +5,6 @@ text-overflow: ellipsis; } - /* layout footer styles */ #footer-layout hr { border-bottom-color: #ffffff; @@ -50,4 +49,4 @@ #footer-layout { padding: 2em 2.5em; } -} +} \ No newline at end of file From 592ce194851f8cfcb227dca3471313822fc1e956 Mon Sep 17 00:00:00 2001 From: chandrikarj Date: Thu, 16 Jan 2025 19:35:49 +0530 Subject: [PATCH 07/19] fix changes to make code look neater --- apps/Info.html | 13 ++++++------- apps/dev-workbench/workbench.html | 26 +++++++++++++------------- apps/landing/landing.html | 24 +++--------------------- apps/landing/main.css | 4 ++-- apps/signup/signup.html | 25 ++++++++++++------------- apps/table.html | 26 ++++++++++++-------------- apps/table.js | 21 +++------------------ 7 files changed, 51 insertions(+), 88 deletions(-) diff --git a/apps/Info.html b/apps/Info.html index 71ece094b..022436089 100644 --- a/apps/Info.html +++ b/apps/Info.html @@ -67,13 +67,12 @@ Signup - -
  • - - -
    • + +
  • + +
    • - + +
    - -
    @@ -85,20 +81,6 @@

    caMicroscope

    - - - diff --git a/apps/table.html b/apps/table.html index 79bc1b7c3..8b00fcedf 100644 --- a/apps/table.html +++ b/apps/table.html @@ -70,20 +70,18 @@
  • Signup
    • - -
  • - -
    • - - - + +
  • + +
    • + diff --git a/apps/table.js b/apps/table.js index 68bcc74ce..78447c29b 100644 --- a/apps/table.js +++ b/apps/table.js @@ -714,21 +714,8 @@ function fileNameChange() { const fileName = fileNameInput.val(); let newFileName = fileName.split(' ').join('_'); fileNameInput.val(newFileName); - let fileParts = newFileName.split('.'); - let fileExtension = fileParts.length > 1 ? fileParts.reverse()[0].toLowerCase() : null; - if (!fileExtension) { - fileNameInput.addClass('is-invalid'); - let fDiv = document.createElement('div'); - fDiv.classList.add('invalid-feedback'); - fDiv.id = 'filename-feedback0'; - fDiv.textContent = 'The file name you provided is incompatible. File names should follow this format "filename.ext"'; - if (fileNameInput.parent().children().length === 1) { - fileNameInput.parent().append(fDiv); - } else { - document.getElementById('filename-feedback0').innerHTML = ''; - document.getElementById('filename-feedback0').append(fDiv); - } - } else if (!allowedExtensions.includes(fileExtension)) { + let fileExtension = newFileName.toLowerCase().split('.').reverse()[0]; + if (!allowedExtensions.includes(fileExtension)) { fileNameInput.addClass('is-invalid'); let fDiv = document.createElement('div'); fDiv.classList.add('invalid-feedback'); @@ -747,8 +734,6 @@ function fileNameChange() { } } } - - function switchToFile() { $('.urlUploadClass').css('display', 'none'); $('.fileInputClass').css('display', 'block'); @@ -1062,4 +1047,4 @@ async function setDicomParams() { $('#dicomExplorerBtn').attr('href', uiHostname + ':' + uiPort); $('#dicomServer').attr('value', hostname + ':' + port); } -} +} \ No newline at end of file From b1079401088141047e7f94e9e90b788806b1523c Mon Sep 17 00:00:00 2001 From: Chandrika Date: Thu, 16 Jan 2025 21:41:15 +0530 Subject: [PATCH 08/19] Info.html --- apps/Info.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/Info.html b/apps/Info.html index 022436089..2efa0594a 100644 --- a/apps/Info.html +++ b/apps/Info.html @@ -67,12 +67,12 @@ Signup - -
  • - -
    • + +
  • + +
    • - \ No newline at end of file + From 7209e3271df85964aca49731ad78f5eba3e0c5bf Mon Sep 17 00:00:00 2001 From: Chandrika Date: Thu, 16 Jan 2025 21:43:03 +0530 Subject: [PATCH 09/19] table.js --- apps/table.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/table.js b/apps/table.js index 78447c29b..a84ee48aa 100644 --- a/apps/table.js +++ b/apps/table.js @@ -1047,4 +1047,4 @@ async function setDicomParams() { $('#dicomExplorerBtn').attr('href', uiHostname + ':' + uiPort); $('#dicomServer').attr('value', hostname + ':' + port); } -} \ No newline at end of file +} From 024d9d46f5c21e7a0b90005ee78f790f9e6940d0 Mon Sep 17 00:00:00 2001 From: Chandrika Date: Thu, 16 Jan 2025 21:43:32 +0530 Subject: [PATCH 10/19] package-lock.json --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 0c7c4eeec..ddb02e2b9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8034,4 +8034,4 @@ } } } -} \ No newline at end of file +} From 43994ed8f4869c61fddf6c5d9e68d56093f8d199 Mon Sep 17 00:00:00 2001 From: Chandrika Date: Thu, 16 Jan 2025 21:44:20 +0530 Subject: [PATCH 11/19] package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1277ee073..2dfca9fa0 100644 --- a/package.json +++ b/package.json @@ -29,4 +29,4 @@ "jest": { "testEnvironment": "jest-environment-jsdom" } -} \ No newline at end of file +} From 5a9c451233f75e66f32e23a94de4794cf247a46c Mon Sep 17 00:00:00 2001 From: Chandrika Date: Thu, 16 Jan 2025 21:46:12 +0530 Subject: [PATCH 12/19] common.css --- apps/common.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common.css b/apps/common.css index 6757be4d5..4ac3be01d 100644 --- a/apps/common.css +++ b/apps/common.css @@ -49,4 +49,4 @@ #footer-layout { padding: 2em 2.5em; } -} \ No newline at end of file +} From 9a1a8f94e2a409aac4ee84fd574d5e865b61d000 Mon Sep 17 00:00:00 2001 From: Chandrika Date: Thu, 16 Jan 2025 21:49:57 +0530 Subject: [PATCH 13/19] landing.html --- apps/landing/landing.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/landing/landing.html b/apps/landing/landing.html index fbb09cc5f..75830ec79 100644 --- a/apps/landing/landing.html +++ b/apps/landing/landing.html @@ -12,6 +12,7 @@ + @@ -141,5 +142,5 @@

    Documentation

    - - \ No newline at end of file + + From 95fd2b481c9f7cb5af5f6c07061faa97d73b299c Mon Sep 17 00:00:00 2001 From: Chandrika Date: Thu, 16 Jan 2025 21:53:53 +0530 Subject: [PATCH 14/19] signup.html --- apps/signup/signup.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/signup/signup.html b/apps/signup/signup.html index 13c6f3c4b..debb6c398 100644 --- a/apps/signup/signup.html +++ b/apps/signup/signup.html @@ -28,6 +28,10 @@ src="https://code.jquery.com/jquery-3.4.1.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"> + + + + @@ -146,4 +150,4 @@

    User Signup

      - \ No newline at end of file + From dcb5615e22726b42b07e821967e572ba0b144e1f Mon Sep 17 00:00:00 2001 From: Chandrika Date: Thu, 16 Jan 2025 21:57:59 +0530 Subject: [PATCH 15/19] table.html --- apps/table.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/table.html b/apps/table.html index 8b00fcedf..7de848bf2 100644 --- a/apps/table.html +++ b/apps/table.html @@ -151,7 +151,7 @@

    caMicroscope

    + Reload
    @@ -349,4 +349,4 @@
    From e466fbb63327b065653fe8db36bdf1882c161e10 Mon Sep 17 00:00:00 2001 From: Chandrika Date: Fri, 17 Jan 2025 19:46:52 +0530 Subject: [PATCH 17/19] Update table.css --- apps/table.css | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/table.css b/apps/table.css index e6347c323..c939457a1 100644 --- a/apps/table.css +++ b/apps/table.css @@ -372,9 +372,14 @@ td { color:black !important; } +.dark-mode .form-control { + background-color: #a4a6a837 ; + color: white !important; +} + .dark-mode .bg-light{ - background-color: black !important; + background-color: #343a405c !important; } .dark-mode .has-search .form-control-feedback{ @@ -405,4 +410,4 @@ td { .dark-mode .posts .post .image { margin-right: 1.5em; } -} \ No newline at end of file +} From 18895f79e158839692714c83e1bf70178aa71e3b Mon Sep 17 00:00:00 2001 From: Chandrika Date: Fri, 17 Jan 2025 19:48:17 +0530 Subject: [PATCH 18/19] Update workbench.css --- apps/dev-workbench/workbench.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/dev-workbench/workbench.css b/apps/dev-workbench/workbench.css index d796c33d7..ac648abab 100644 --- a/apps/dev-workbench/workbench.css +++ b/apps/dev-workbench/workbench.css @@ -131,7 +131,8 @@ } .dark-mode .step-content.grey.grey.lighten-3{ - color: black !important; + color: white !important; + background-color: #212529 !important; } @@ -159,4 +160,4 @@ .dark-mode .posts .post .image { margin-right: 1.5em; } -} \ No newline at end of file +} From a05b302e10971b4463de4e98a0c00da39e2ebf36 Mon Sep 17 00:00:00 2001 From: Chandrika Date: Fri, 17 Jan 2025 19:48:59 +0530 Subject: [PATCH 19/19] Update signup.css --- apps/signup/signup.css | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/apps/signup/signup.css b/apps/signup/signup.css index 1cc16fada..d22dd42bb 100644 --- a/apps/signup/signup.css +++ b/apps/signup/signup.css @@ -179,14 +179,37 @@ nav li:not(.active):hover a{ .dark-mode .nav-item.active.link{ color:black !important; - } - + } /* Dark Mode Styles */ .dark-mode { background-color: black; } + .dark-mode .signup-form form { + background: #212529; + + } + + .dark-mode .form-control{ + background-color: #212529 !important; + + } + + + .dark-mode .text-center, .dark-mode .signup-form h2 { + color : rgba(255, 255, 255, 0.844) !important; + } + + + .dark-mode .form-select{ + background-color: #a4a6a84a !important; + color : white !important; + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath fill='%23fff' d='M7.247 11.14l-4.796-5.48A.5.5 0 013.223 5h9.554a.5.5 0 01.372.84l-4.796 5.48a.5.5 0 01-.752 0z'/%3E%3C/svg%3E") !important; + } + + + /* .dark-mode h1, .dark-mode h2, @@ -211,4 +234,4 @@ nav li:not(.active):hover a{ .dark-mode .posts .post .image { margin-right: 1.5em; } - } \ No newline at end of file + }