From 4ecc8945ed2141e7bd4c76d54b0767b4e967d521 Mon Sep 17 00:00:00 2001 From: Jack Morgan Date: Sat, 29 Oct 2022 23:03:33 +1300 Subject: [PATCH 1/5] Disable healthcheck on task Docker swarm ends it as it doesn't respond when running command. --- docker-compose.prod.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 9a4009f323..827248a91d 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -71,6 +71,8 @@ services: - node.labels.role==apps restart_policy: condition: none + healthcheck: + disable: true networks: - backend From 0f1db566b051603de8102a6fc92b3e9ec1cd1b35 Mon Sep 17 00:00:00 2001 From: Jack Morgan Date: Mon, 31 Oct 2022 15:15:36 +1300 Subject: [PATCH 2/5] Add ability to preset initial zoom of pixel-viewer interactive --- csfieldguide/static/interactives/pixel-viewer/README.md | 1 + .../static/interactives/pixel-viewer/js/pixel-viewer.js | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/csfieldguide/static/interactives/pixel-viewer/README.md b/csfieldguide/static/interactives/pixel-viewer/README.md index 7375dea1ee..33c0031e0e 100644 --- a/csfieldguide/static/interactives/pixel-viewer/README.md +++ b/csfieldguide/static/interactives/pixel-viewer/README.md @@ -33,6 +33,7 @@ The interactive has the following optional parameters to configure the interacti - `hide-colour-code-picker` - Hides the option to change between colour code formats. - `hide-config-selector` - Hides the option to change between modes. - `no-pixel-fill` - Displays pixels without background fill from start (also doesn't show initial image with transition). +- `preset-zoom` - Sets the initial zoom of the interactive, skipping the establishing zoom animation. Must be a value between 0.01 and 4. - `pixelmania` - (for Pixelmania 2020) Shows a small Pixelmania logo above the title in the menu. ## Required files diff --git a/csfieldguide/static/interactives/pixel-viewer/js/pixel-viewer.js b/csfieldguide/static/interactives/pixel-viewer/js/pixel-viewer.js index 30547f89c2..aca2438952 100644 --- a/csfieldguide/static/interactives/pixel-viewer/js/pixel-viewer.js +++ b/csfieldguide/static/interactives/pixel-viewer/js/pixel-viewer.js @@ -137,7 +137,7 @@ $( document ).ready(function() { $("input[id='rgb-colour-code']").prop('checked', true); } - // Check if custom zoom parameters are given, otherwise default to 0,0. + // Check if custom zoom position parameters are given, otherwise default to 0,0. try { image_position_top = images[image_filename]["image_position"]["top"]; } catch (e) { @@ -158,6 +158,10 @@ $( document ).ready(function() { $('#pixel-viewer-interactive-show-pixel-fill').prop('checked', false); $("#pixel-viewer-interactive-loader").hide(); $("#pixel-viewer-interactive-buttons").css({opacity: 1}); + } else if (searchParameters.has('preset-zoom')){ + scroller.zoomTo(searchParameters.get('preset-zoom')); + $("#pixel-viewer-interactive-loader").hide(); + $("#pixel-viewer-interactive-buttons").css({opacity: 1}); } else { $("#pixel-viewer-interactive-original-image").show(); $("#pixel-viewer-interactive-original-image").delay(1000).animate( From 75f46a29c0830393a1b1a2d8caa6dec73cde41f2 Mon Sep 17 00:00:00 2001 From: Jack Morgan Date: Mon, 31 Oct 2022 15:31:27 +1300 Subject: [PATCH 3/5] Remove broken documentation link --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 7daab68091..d5a45ff341 100644 --- a/README.md +++ b/README.md @@ -25,9 +25,7 @@ and can also be built from the documentation source within the `docs/` directory ## Contributing We would love your help to make this guide the best it can be! -Please read our -[contribution guide](http://cs-field-guide.readthedocs.io/en/latest/getting_started/contributing_guide.html) -to get started. +Please read the [documentation](http://cs-field-guide.readthedocs.io/en/latest/) to get started. ## License From ae76b0a5bb0d2db6a81e022301d0448e6aa8c991 Mon Sep 17 00:00:00 2001 From: Jack Morgan Date: Mon, 31 Oct 2022 15:33:01 +1300 Subject: [PATCH 4/5] Increment version number --- csfieldguide/config/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csfieldguide/config/__init__.py b/csfieldguide/config/__init__.py index a664eb9acf..36a4bae81d 100644 --- a/csfieldguide/config/__init__.py +++ b/csfieldguide/config/__init__.py @@ -1,3 +1,3 @@ """Module for Django system configuration.""" -__version__ = "3.12.3" +__version__ = "3.12.4" From f11ab72bca298b945d57beef8c32b62e28c76833 Mon Sep 17 00:00:00 2001 From: Jack Morgan Date: Mon, 31 Oct 2022 15:35:41 +1300 Subject: [PATCH 5/5] Update changelog --- docs/changelog.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 7c83d4f9a4..15a596743d 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -18,6 +18,17 @@ All notable changes to this project will be documented in this file. We have listed major changes for each release below. `All downloads are available on GitHub `__ +3.12.4 +============================================================================== + +**Release date:** 31st October 2022 + +**Changelog:** + +- Add abiltiy to set initial zoom level in pixel-viewer interactive via URL parameter. +- Remove broken documentation link. +- Disable healthcheck on Docker task service to prevent deletion while running. + 3.12.3 ==============================================================================