Merge branch 'release/3.12.4'

uccser · Oct 31, 2022 · 5029e92 · 5029e92
2 parents 9a2b5a8 + f11ab72
commit 5029e92
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 5 deletions.
diff --git 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
 

diff --git 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"
diff --git 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
@@ -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(

diff --git 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
 

diff --git 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 <https://github.com/uccser/cs-field-guide/releases/>`__
 
+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
 ==============================================================================