j1-template 2022.3.2 → 2022.4.1

data/assets/themes/j1/modules/rangeSlider/css/theme/uno/nouislider.css

@@ -27,6 +27,11 @@
   margin-left: 0;
 }
 
+.range-slider-title {
+    font-size: .95rem;
+    font-weight: 400;
+}
+
 /* Functional styling;
  * These styles are required for noUiSlider to function.
  * You don't need to change these rules to apply your design.

data/assets/themes/j1/modules/rangeSlider/css/theme/uno/nouislider.min.css

@@ -12,4 +12,4 @@
  #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
  # -----------------------------------------------------------------------------
 */
-.range-slider{margin-top:2rem}.range-slider-label{font-size:.75rem;padding-top:.75rem;margin-left:0}.noUi-target,.noUi-target *{-webkit-touch-callout:none;-webkit-tap-highlight-color:rgba(0,0,0,0);-webkit-user-select:none;-ms-touch-action:none;touch-action:none;-ms-user-select:none;-moz-user-select:none;user-select:none;-moz-box-sizing:border-box;box-sizing:border-box}.noUi-target{position:relative;direction:ltr}.noUi-base{width:100%;height:100%;position:relative;z-index:1;background-color:rgba(0,0,0,0.2)}.noUi-connect{position:absolute;right:0;top:0;left:0;bottom:0}.noUi-origin{position:absolute;height:0;width:0}.noUi-handle{position:relative;z-index:1}.noUi-state-tap .noUi-connect,.noUi-state-tap .noUi-origin{-webkit-transition:top .25s,right .25s,bottom .25s,left .25s;transition:top .25s,right .25s,bottom .25s,left .25s}.noUi-state-drag *{cursor:inherit!important}.noUi-handle-touch-area{position:relative;width:44px;height:44px;left:-15px;top:-15px}.noUi-base,.noUi-handle{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.noUi-horizontal{height:18px}.noUi-horizontal .noUi-handle{width:34px;height:28px;left:-17px;top:-6px}.noUi-vertical{width:18px}.noUi-vertical .noUi-handle{width:28px;height:34px;left:-6px;top:-17px}.noUi-target{background:#cdcdcd;border-radius:4px;border:1px solid transparent}.noUi-connect{background:#2196f3;-webkit-transition:background 450ms;transition:background 450ms}.noUi-draggable{cursor:ew-resize}.noUi-vertical .noUi-draggable{cursor:ns-resize}.noUi-handle{border:1px solid #d9d9d9;border-radius:3px;background:#FFF;cursor:default;box-shadow:inset 0 0 1px #FFF,inset 0 1px 7px #ebebeb,0 3px 6px -3px #BBB}.noUi-active{box-shadow:inset 0 0 1px #FFF,inset 0 1px 7px #DDD,0 3px 6px -3px #BBB}.noUi-handle:before,.noUi-handle:after{content:"";display:block;position:absolute;height:14px;width:1px;background:#e8e7e6;left:14px;top:6px}.noUi-handle:after{left:17px}.noUi-vertical .noUi-handle:before,.noUi-vertical .noUi-handle:after{width:14px;height:1px;left:6px;top:14px}.noUi-vertical .noUi-handle:after{top:17px}[disabled] .noUi-connect{background:#b8b8b8}[disabled].noUi-target,[disabled].noUi-handle,[disabled] .noUi-handle{cursor:not-allowed}.noUi-pips,.noUi-pips *{-moz-box-sizing:border-box;box-sizing:border-box}.noUi-pips{position:absolute;color:#999}.noUi-value{position:absolute;text-align:center}.noUi-value-sub{color:#ccc;font-size:10px}.noUi-marker{position:absolute;background:#CCC}.noUi-marker-sub{background:#AAA}.noUi-marker-large{background:#AAA}.noUi-pips-horizontal{padding:10px 0;height:80px;top:100%;left:0;width:100%}.noUi-value-horizontal{-webkit-transform:translate3d(-50%,50%,0);transform:translate3d(-50%,50%,0)}.noUi-marker-horizontal.noUi-marker{margin-left:-1px;width:2px;height:5px}.noUi-marker-horizontal.noUi-marker-sub{height:10px}.noUi-marker-horizontal.noUi-marker-large{height:15px}.noUi-pips-vertical{padding:0 10px;height:100%;top:0;left:100%}.noUi-value-vertical{-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0);padding-left:25px}.noUi-marker-vertical.noUi-marker{width:5px;height:2px;margin-top:-1px}.noUi-marker-vertical.noUi-marker-sub{width:10px}.noUi-marker-vertical.noUi-marker-large{width:15px}.noUi-tooltip{display:block;position:absolute;border:1px solid transparent;border-radius:3px;background:#fff;color:#000;padding:5px;text-align:center}.noUi-horizontal .noUi-tooltip{-webkit-transform:translate(-50%,0);transform:translate(-50%,0);left:50%;bottom:120%}.noUi-vertical .noUi-tooltip{-webkit-transform:translate(0,-50%);transform:translate(0,-50%);top:50%;right:120%}.noUi-target{border:0;border-radius:0}.noUi-horizontal{height:3px}.noUi-vertical{height:100%;width:3px}.noUi-horizontal .noUi-handle,.noUi-vertical .noUi-handle{width:15px;height:15px;border-radius:50%;box-shadow:none;background-color:#2196f3;border:0;left:-5px;top:-6px;transition:width .2s cubic-bezier(0.215,0.610,0.355,1.000),height .2s cubic-bezier(0.215,0.610,0.355,1.000),left .2s cubic-bezier(0.215,0.610,0.355,1.000),top .2s cubic-bezier(0.215,0.610,0.355,1.000)}.noUi-handle:before{content:none}.noUi-handle:after{content:none}.noUi-target .noUi-active.noUi-handle{width:3px;height:3px;left:0;top:0}.noUi-target.noUi-horizontal .noUi-tooltip{position:absolute;height:30px;width:30px;top:-17px;left:-2px;background-color:#2196f3;border-radius:50%;transition:border-radius .25s cubic-bezier(0.215,0.610,0.355,1.000),transform .25s cubic-bezier(0.215,0.610,0.355,1.000);transform:scale(.5) rotate(-45deg);transform-origin:50% 100%}.noUi-target.noUi-horizontal .noUi-active .noUi-tooltip{border-radius:15px 15px 15px 0;transform:rotate(-45deg) translate(23px,-25px)}.noUi-tooltip span{width:100%;text-align:center;color:#fff;font-size:12px;opacity:0;position:absolute;top:6px;left:-1px;transition:opacity .25s cubic-bezier(0.215,0.610,0.355,1.000)}.noUi-horizontal .noUi-tooltip span{transform:rotate(45deg)}.noUi-vertical .noUi-tooltip span{transform:rotate(135deg)}.noUi-target.noUi-vertical .noUi-tooltip{position:absolute;height:30px;width:30px;top:-17px;left:-2px;background-color:#2196f3;border-radius:50%;transition:border-radius .25s cubic-bezier(0.215,0.610,0.355,1.000),transform .25s cubic-bezier(0.215,0.610,0.355,1.000);transform:scale(.5) rotate(-45deg);transform-origin:50% 100%}.noUi-target.noUi-vertical .noUi-active .noUi-tooltip{border-radius:15px 15px 15px 0;transform:rotate(-135deg) translate(35px,-10px)}.noUi-vertical .noUi-tooltip span{width:100%;text-align:center;color:#fff;font-size:12px;transform:rotate(135deg);opacity:0;position:absolute;top:7px;left:-1px;transition:opacity .25s cubic-bezier(0.215,0.610,0.355,1.000)}.noUi-horizontal .noUi-active .noUi-tooltip span,.noUi-vertical .noUi-active .noUi-tooltip span{opacity:1}
+.range-slider{margin-top:2rem}.range-slider-label{font-size:.75rem;padding-top:.75rem;margin-left:0}.range-slider-title{font-size:.95rem;font-weight:400}.noUi-target,.noUi-target *{-webkit-touch-callout:none;-webkit-tap-highlight-color:rgba(0,0,0,0);-webkit-user-select:none;-ms-touch-action:none;touch-action:none;-ms-user-select:none;-moz-user-select:none;user-select:none;-moz-box-sizing:border-box;box-sizing:border-box}.noUi-target{position:relative;direction:ltr}.noUi-base{width:100%;height:100%;position:relative;z-index:1;background-color:rgba(0,0,0,0.2)}.noUi-connect{position:absolute;right:0;top:0;left:0;bottom:0}.noUi-origin{position:absolute;height:0;width:0}.noUi-handle{position:relative;z-index:1}.noUi-state-tap .noUi-connect,.noUi-state-tap .noUi-origin{-webkit-transition:top .25s,right .25s,bottom .25s,left .25s;transition:top .25s,right .25s,bottom .25s,left .25s}.noUi-state-drag *{cursor:inherit !important}.noUi-handle-touch-area{position:relative;width:44px;height:44px;left:-15px;top:-15px}.noUi-base,.noUi-handle{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.noUi-horizontal{height:18px}.noUi-horizontal .noUi-handle{width:34px;height:28px;left:-17px;top:-6px}.noUi-vertical{width:18px}.noUi-vertical .noUi-handle{width:28px;height:34px;left:-6px;top:-17px}.noUi-target{background:#cdcdcd;border-radius:4px;border:1px solid transparent}.noUi-connect{background:#2196f3;-webkit-transition:background 450ms;transition:background 450ms}.noUi-draggable{cursor:ew-resize}.noUi-vertical .noUi-draggable{cursor:ns-resize}.noUi-handle{border:1px solid #d9d9d9;border-radius:3px;background:#FFF;cursor:default;box-shadow:inset 0 0 1px #FFF,inset 0 1px 7px #ebebeb,0 3px 6px -3px #BBB}.noUi-active{box-shadow:inset 0 0 1px #FFF,inset 0 1px 7px #DDD,0 3px 6px -3px #BBB}.noUi-handle:before,.noUi-handle:after{content:"";display:block;position:absolute;height:14px;width:1px;background:#e8e7e6;left:14px;top:6px}.noUi-handle:after{left:17px}.noUi-vertical .noUi-handle:before,.noUi-vertical .noUi-handle:after{width:14px;height:1px;left:6px;top:14px}.noUi-vertical .noUi-handle:after{top:17px}[disabled] .noUi-connect{background:#b8b8b8}[disabled].noUi-target,[disabled].noUi-handle,[disabled] .noUi-handle{cursor:not-allowed}.noUi-pips,.noUi-pips *{-moz-box-sizing:border-box;box-sizing:border-box}.noUi-pips{position:absolute;color:#999}.noUi-value{position:absolute;text-align:center}.noUi-value-sub{color:#ccc;font-size:10px}.noUi-marker{position:absolute;background:#CCC}.noUi-marker-sub{background:#AAA}.noUi-marker-large{background:#AAA}.noUi-pips-horizontal{padding:10px 0;height:80px;top:100%;left:0;width:100%}.noUi-value-horizontal{-webkit-transform:translate3d(-50%,50%,0);transform:translate3d(-50%,50%,0)}.noUi-marker-horizontal.noUi-marker{margin-left:-1px;width:2px;height:5px}.noUi-marker-horizontal.noUi-marker-sub{height:10px}.noUi-marker-horizontal.noUi-marker-large{height:15px}.noUi-pips-vertical{padding:0 10px;height:100%;top:0;left:100%}.noUi-value-vertical{-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0);padding-left:25px}.noUi-marker-vertical.noUi-marker{width:5px;height:2px;margin-top:-1px}.noUi-marker-vertical.noUi-marker-sub{width:10px}.noUi-marker-vertical.noUi-marker-large{width:15px}.noUi-tooltip{display:block;position:absolute;border:1px solid transparent;border-radius:3px;background:#fff;color:#000;padding:5px;text-align:center}.noUi-horizontal .noUi-tooltip{-webkit-transform:translate(-50%,0);transform:translate(-50%,0);left:50%;bottom:120%}.noUi-vertical .noUi-tooltip{-webkit-transform:translate(0,-50%);transform:translate(0,-50%);top:50%;right:120%}.noUi-target{border:0;border-radius:0}.noUi-horizontal{height:3px}.noUi-vertical{height:100%;width:3px}.noUi-horizontal .noUi-handle,.noUi-vertical .noUi-handle{width:15px;height:15px;border-radius:50%;box-shadow:none;background-color:#2196f3;border:0;left:-5px;top:-6px;transition:width .2s cubic-bezier(0.215,0.610,0.355,1.000),height .2s cubic-bezier(0.215,0.610,0.355,1.000),left .2s cubic-bezier(0.215,0.610,0.355,1.000),top .2s cubic-bezier(0.215,0.610,0.355,1.000)}.noUi-handle:before{content:none}.noUi-handle:after{content:none}.noUi-target .noUi-active.noUi-handle{width:3px;height:3px;left:0;top:0}.noUi-target.noUi-horizontal .noUi-tooltip{position:absolute;height:30px;width:30px;top:-17px;left:-2px;background-color:#2196f3;border-radius:50%;transition:border-radius .25s cubic-bezier(0.215,0.610,0.355,1.000),transform .25s cubic-bezier(0.215,0.610,0.355,1.000);transform:scale(.5) rotate(-45deg);transform-origin:50% 100%}.noUi-target.noUi-horizontal .noUi-active .noUi-tooltip{border-radius:15px 15px 15px 0;transform:rotate(-45deg) translate(23px,-25px)}.noUi-tooltip span{width:100%;text-align:center;color:#fff;font-size:12px;opacity:0;position:absolute;top:6px;left:-1px;transition:opacity .25s cubic-bezier(0.215,0.610,0.355,1.000)}.noUi-horizontal .noUi-tooltip span{transform:rotate(45deg)}.noUi-vertical .noUi-tooltip span{transform:rotate(135deg)}.noUi-target.noUi-vertical .noUi-tooltip{position:absolute;height:30px;width:30px;top:-17px;left:-2px;background-color:#2196f3;border-radius:50%;transition:border-radius .25s cubic-bezier(0.215,0.610,0.355,1.000),transform .25s cubic-bezier(0.215,0.610,0.355,1.000);transform:scale(.5) rotate(-45deg);transform-origin:50% 100%}.noUi-target.noUi-vertical .noUi-active .noUi-tooltip{border-radius:15px 15px 15px 0;transform:rotate(-135deg) translate(35px,-10px)}.noUi-vertical .noUi-tooltip span{width:100%;text-align:center;color:#fff;font-size:12px;transform:rotate(135deg);opacity:0;position:absolute;top:7px;left:-1px;transition:opacity .25s cubic-bezier(0.215,0.610,0.355,1.000)}.noUi-horizontal .noUi-active .noUi-tooltip span,.noUi-vertical .noUi-active .noUi-tooltip span{opacity:1}

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
-module J1
-  VERSION = '2022.3.2'
-end
+module J1
+  VERSION = '2022.4.1'
+end

data/lib/starter_web/Gemfile

@@ -53,7 +53,7 @@ gem 'jekyll', '~> 4.2'
 
 # Theme Rubies, default: J1 Template (NOT used for the development system)
 #
-gem 'j1-template', '~> 2022.3.2'
+gem 'j1-template', '~> 2022.4.1'
 
 # ------------------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment

data/lib/starter_web/_config.yml

@@ -53,7 +53,7 @@ environment:                            development
 # ------------------------------------------------------------------------------
 #   Sets the build version of J1 Template Gem
 #
-version:                                2022.3.2
+version:                                2022.4.1
 
 # version
 # ------------------------------------------------------------------------------

data/lib/starter_web/_data/j1_config.yml

@@ -156,23 +156,33 @@ cookies:
 #   Number of milliseconds (ms) the current page is hidden (display: none)
 #   to prevent "DOM flicker" (aka "FOUC": Flash of unstyled content)
 #
-#   TODO: To be checked if needed
+#   values:                           înt
+#   default:                          150
 #
 #   prettify
 #   ----------------------------------------------------------------------------
 #   If set to true, all generated HTML pages (by Liquid|Jekyll) get
 #   formatted "pretty" by layout "default".
 #
-#   NOTE: Used for developent mode ONLY
-#   NOTE: See ~/packages/300_template_src/_layouts/default.html
+#   values:                           [true|false]
+#   default:                          true
+#
 # ------------------------------------------------------------------------------
-flicker_timeout:                        150
-
+#
+#   autoScrollRatio
+#   ----------------------------------------------------------------------------
+#   Sets the ratio (percent) for 'dynamic' pages the auto scroll funtion
+#   if the page requested contains an anchor element.
+#   Example: /pages/public/about/site/#about-this-site
+#
+#   values:                           înt
+#   default:                          130
+#
 # ------------------------------------------------------------------------------
-# HTML PrettyPrint
 #
+flicker_timeout:                        150
 prettify:                               true
-
+autoScrollRatioThreshold:               130
 
 # ==============================================================================
 # PAGE global configuration settings (currently NOT used)
@@ -181,6 +191,7 @@ prettify:                               true
 #       the HTML outputs generated by J1
 #
 # ------------------------------------------------------------------------------
+#
 pages:
 
 
@@ -191,6 +202,7 @@ pages:
 #       the HTML outputs generated by J1
 #
 # ------------------------------------------------------------------------------
+#
 posts:
   # ----------------------------------------------------------------------------
   #   category_blacklist
@@ -203,6 +215,7 @@ posts:
   #   Default:                          [ posts, public, private, protected, featured, series ]
   #
   # ----------------------------------------------------------------------------
+  #
   category_blacklist:                   [ posts, public, private, protected, featured, series ]
 
 
@@ -316,6 +329,7 @@ rouge:
 #   https://developer.mozilla.org/en-US/docs/Web/HTML/Preloading_content
 #   https://github.com/GoogleChromeLabs/critters/issues/18 (crossorigin)
 # ------------------------------------------------------------------------------
+#
 preload:
 
   font:
@@ -358,6 +372,7 @@ preload:
 #   connections (HTTPS), as it may involve DNS lookups, redirects, and
 #   several round trips to the final server that handles the user's request.
 # ------------------------------------------------------------------------------
+#
 preconnect:
   enabled:                              true
   urls:                                 [ "https://bootswatch.com" ]

data/lib/starter_web/_data/modules/defaults/nbinteract.yml

@@ -74,6 +74,10 @@ defaults:
   #   values:                           URL
   #   default:                          https://mybinder.org
   #
+  # NOTE: DIRECT access to (GESIS) 'https://notebooks.gesis.org/binder/'
+  # is restricted to private access (isTrusted == true). Registration at
+  # GESIS is required.
+  #
   # ----------------------------------------------------------------------------
   #
   # provider
@@ -218,6 +222,10 @@ defaults:
                                         <br><br>
                                         Required Cookie Settings:
                                         <ul>
+                                          <li>
+                                            <code>Analysis</code> For translations, your consent on
+                                            <b>Analysis</b> with your <b>Privacy Settings</b> is required.
+                                          </li>
                                           <li>
                                           <code>Personalization</code> For processing textbooks, your consent on
                                           <b>Personalization</b> with your <b>Privacy Settings</b> (Cookie Settings) is required.

data/lib/starter_web/_data/modules/rangeSlider.yml

@@ -35,14 +35,47 @@ settings:
     # RANGE SLIDER configurations
     # --------------------------------------------------------------------------
 
+    # --------------------------------------------------------------------------
+    # example slider
+    #
+    - slider:
+        enabled:                        true
+        id:                             example_slider_asciidoc
+
+        options:
+          title:                        "Title of the Example Slider"
+          label:                        "Example Slider (Asciidoc), range: [5,50], start at: 25, step: 5"
+          start:                        25
+          step:                         5
+          range:
+            min:                        5
+            max:                        50
+
+    # --------------------------------------------------------------------------
+    # example slider (controled)
+    #
+    - slider:
+        enabled:                        true
+        id:                             example_slider_html
+
+        options:
+          title:                        "Title of the Example Slider (controlled)"
+          label:                        "Example Slider (HTML), range: [5,50], start at: 25, step: 5"
+          start:                        25
+          step:                         5
+          range:
+            min:                        5
+            max:                        50
+
     # --------------------------------------------------------------------------
     # example slider 1
     #
     - slider:
         enabled:                        true
-        id:                             example_slider
+        id:                             example_slider_1
 
         options:
+          title:                        ""
           label:                        "Slider 1, range: [0,100], start at: 20"
           start:                        20
           range:
@@ -57,6 +90,7 @@ settings:
         id:                             example_slider_2
 
         options:
+          title:                        ""
           label:                        "Slider 2, range: [0,200], start at: 80"
           start:                        80
           range:
@@ -71,6 +105,7 @@ settings:
         id:                             jgSlider_row_heigth
 
         options:
+          title:                        ""
           label:                        Image Row Height [px]
           start:                        150
           range:
@@ -85,6 +120,7 @@ settings:
         id:                             jgSlider_thumb_spacing
 
         options:
+          title:                        ""
           label:                        Thumb Image Spacing [px]
           start:                        1
           range:
@@ -99,6 +135,7 @@ settings:
         id:                             jgSlider_gallery_padding
 
         options:
+          title:                        ""
           label:                        Gallery Padding [px]
           start:                        0
           range:

data/lib/starter_web/_plugins/asciidoctor-extensions/range-slider-block.rb

@@ -0,0 +1,44 @@
+# ------------------------------------------------------------------------------
+# ~/_plugins/asciidoctor-extensions/range-slider-block.rb
+# Asciidoctor extension for J1 range-slider (Owl range-slider)
+#
+# Product/Info:
+# https://jekyll.one
+#
+# Copyright (C) 2022 Juergen Adams
+#
+# J1 Template is licensed under the MIT License.
+# See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
+#
+# ------------------------------------------------------------------------------
+require 'asciidoctor/extensions' unless RUBY_ENGINE == 'opal'
+include Asciidoctor
+
+# A block macro that embeds a range-slider block into the output document
+#
+# Usage
+#
+#   range_slider::slider-id[role="additional classes"]
+#
+# Example:
+#
+#   range_slider::example_slider[role="mb-5"]
+#
+Asciidoctor::Extensions.register do
+
+  class SliderBlockMacro < Extensions::BlockMacroProcessor
+    use_dsl
+
+    named :range_slider
+    name_positional_attributes 'role'
+    default_attrs 'role' => ''
+
+    def process parent, target, attrs
+      html = %(<div id="#{target}" class="range-slider #{attrs['role']}"></div>)
+      create_pass_block parent, html, attrs, subs: nil
+    end
+  end
+
+  block_macro SliderBlockMacro
+
+end

data/lib/starter_web/_plugins/lunr_index.rb

@@ -369,6 +369,6 @@ end
 
 module Jekyll
   module J1LunrSearch
-    VERSION = '2022.3.2'
+    VERSION = '2022.4.1'
   end
 end

data/lib/starter_web/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "j1",
-  "version": "2022.3.2",
+  "version": "2022.4.1",
   "description": "J1 Template Starter Web",
   "homepage": "https://your.site",
   "author": {

data/lib/starter_web/pages/public/jupyter/notebooks/j1/j1_odes_in_python.ipynb

@@ -104,7 +104,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "### Equation (Home Economy)"
+    "### Equation - Home Economy"
    ]
   },
   {
@@ -184,7 +184,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "### Evaluation  (Home Economy)\n",
+    "### Evaluation - Home Economy\n",
     "\n",
     "Finally, the code for the interaction, here the *interact* function from *ipywidgets* is used. A separate slider is used for each parameter with the default parameters set for a nice default visualization, with a description and the style and layout is used from the initialization cells.\n"
    ]
@@ -197,7 +197,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "3f7dc7b99bb74da48e10f83a8b66006d",
+       "model_id": "3df3e1278f904181899fd40a3c617902",
        "version_major": 2,
        "version_minor": 0
       },
@@ -268,7 +268,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "### Equation (Homes and ACs)"
+    "### Equation - Homes and ACs"
    ]
   },
   {
@@ -343,7 +343,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "### Evaluation (Homes and ACs)"
+    "### Evaluation - Homes and ACs"
    ]
   },
   {
@@ -354,7 +354,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "b102506a870b44f18d178438d5bf0288",
+       "model_id": "a5ff151fd2d94357872217ff4a2a5035",
        "version_major": 2,
        "version_minor": 0
       },
@@ -432,7 +432,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "### Equation (Stock Control)"
+    "### Equation - Stock Control"
    ]
   },
   {
@@ -502,7 +502,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "### Evaluation  (Stock Control)"
+    "### Evaluation - Stock Control"
    ]
   },
   {
@@ -513,7 +513,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "de7523f0853448639b480c9a17b5d870",
+       "model_id": "80db41f456e84921928cadfff74c6278",
        "version_major": 2,
        "version_minor": 0
       },
@@ -585,7 +585,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "### Equation (Useful life)"
+    "### Equation - Useful life"
    ]
   },
   {
@@ -686,7 +686,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "### Evaluation (Useful life)"
+    "### Evaluation - Useful life"
    ]
   },
   {
@@ -699,7 +699,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "fe6b79b4a4fc488c83080fd2f6785ad8",
+       "model_id": "dae14bb175d146d289d318a5fc773ec9",
        "version_major": 2,
        "version_minor": 0
       },
@@ -790,7 +790,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "### Equation (Foxes and Rabbits)"
+    "### Equation - Foxes and Rabbits"
    ]
   },
   {
@@ -870,20 +870,20 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "### Evaluation (Foxes and Rabbits)"
+    "### Evaluation - Foxes and Rabbits"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": 11,
    "metadata": {
-    "scrolled": true
+    "scrolled": false
    },
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "40479c2ee12141a295fe6561410b3591",
+       "model_id": "fc14607ff71c4b65be4a3f883010af2a",
        "version_major": 2,
        "version_minor": 0
       },