From 6f5f554c04c5d97e300b60135d0ee780833b039f Mon Sep 17 00:00:00 2001 From: Rajit Sarkar Date: Thu, 22 Aug 2024 13:51:00 -0400 Subject: [PATCH 1/3] CONCD-903 More padding is needed between How To Guide button and Quick Tips link. --- concordia/static/scss/base.scss | 1 + concordia/templates/transcriptions/asset_detail/editor.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/concordia/static/scss/base.scss b/concordia/static/scss/base.scss index 807139b54..a6ee8572f 100644 --- a/concordia/static/scss/base.scss +++ b/concordia/static/scss/base.scss @@ -1133,6 +1133,7 @@ $card-progress-height: 12px; /* How to Guide */ #open-guide { border-radius: 0; + margin: 0 5px 0 9px; white-space: nowrap; } diff --git a/concordia/templates/transcriptions/asset_detail/editor.html b/concordia/templates/transcriptions/asset_detail/editor.html index 2a7d1528c..de98041c7 100644 --- a/concordia/templates/transcriptions/asset_detail/editor.html +++ b/concordia/templates/transcriptions/asset_detail/editor.html @@ -50,7 +50,7 @@

Campaign Tips {% if guides %} - + {% endif %} {% endif %} From e2195f1dea0c66275e514b69b07a8a8623290f66 Mon Sep 17 00:00:00 2001 From: Rajit Sarkar Date: Thu, 22 Aug 2024 15:20:22 -0400 Subject: [PATCH 2/3] CONCD-903 When How To is open, clicking the button again should close it. --- concordia/static/js/src/guide.js | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/concordia/static/js/src/guide.js b/concordia/static/js/src/guide.js index 9dd729920..09f772af6 100644 --- a/concordia/static/js/src/guide.js +++ b/concordia/static/js/src/guide.js @@ -2,16 +2,20 @@ function openOffcanvas() { let guide = document.getElementById('guide-sidebar'); - guide.classList.remove('offscreen'); - guide.style.borderWidth = '0 0 thick thick'; - guide.style.borderStyle = 'solid'; - guide.style.borderColor = '#0076ad'; - document.addEventListener('keydown', function (event) { - if (event.key == 'Escape') { - closeOffcanvas(); - } - }); - document.getElementById('open-guide').style.background = '#002347'; + if (guide.classList.contains('offscreen')) { + guide.classList.remove('offscreen'); + guide.style.borderWidth = '0 0 thick thick'; + guide.style.borderStyle = 'solid'; + guide.style.borderColor = '#0076ad'; + document.addEventListener('keydown', function (event) { + if (event.key == 'Escape') { + closeOffcanvas(); + } + }); + document.getElementById('open-guide').style.background = '#002347'; + } else { + closeOffcanvas(); + } } function closeOffcanvas() { From be2ac5bfa91cd7adc30aa9a910397b1d6d8c17d9 Mon Sep 17 00:00:00 2001 From: Rajit Sarkar Date: Thu, 22 Aug 2024 15:47:35 -0400 Subject: [PATCH 3/3] CONCD-903 Allow How To button to work even on a page that is reserved by another user --- concordia/static/js/src/contribute.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/concordia/static/js/src/contribute.js b/concordia/static/js/src/contribute.js index 3b287bb56..26a54619d 100644 --- a/concordia/static/js/src/contribute.js +++ b/concordia/static/js/src/contribute.js @@ -9,7 +9,7 @@ function lockControls($container) { // Locks all of the controls in the provided jQuery element $container.find('input, textarea').attr('readonly', 'readonly'); $container.find('input:checkbox').attr('disabled', 'disabled'); - $container.find('button').attr('disabled', 'disabled'); + $container.find('button:not(#open-guide)').attr('disabled', 'disabled'); } function unlockControls($container) {