betterplace-content 0.7.110 → 0.7.113

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af1e4ab569a623ebc5f176034173046e62466abf446490e4eb8a89e8a129692b
-  data.tar.gz: 17cbee4e700bdfc8ef850365bca8452c04b98ad5aef702ecfd0dcc899c311b06
+  metadata.gz: ce3b385ede297a78abda000a636b83b46b76b0d325bbdbfe89def175e6b82ce0
+  data.tar.gz: 6926abc0e908ec56e63673546ed71c340fdcac65e8c831b68cc15ac4477485f4
 SHA512:
-  metadata.gz: ebcbdbd9a8564d079ef365265708fac8ce705216089f84a8f3d272068dd23f00f77e2fccf6b1acbf3e44a8a79a81014e6ca032a079108200579bd38a0daf9f1e
-  data.tar.gz: 75835f1a67dfad949cbcbc5f282648fee444e96155b0ad9aec2988b052f7b425c395596b1590028121c2673a96df7c5ccee1f97a85dd35732bec17974612a593
+  metadata.gz: 14ee258b0076621c43874dc8a141b237b4ae3c195a32e64ebf3b99a3e69a0ff2faa139355300d7ff1821016a31b2a1d6ca9fa2fbb2d3849b5ece7f9ca408eafc
+  data.tar.gz: db46b151b18598ab65eb273097866461119cf8b4ecf0817d86cc57508eb7e8f1f935c32dcb468d3bee77cf6b7a21bc139e78f716566dd79cf8a38a24eb7d9221

data/README.md

@@ -22,7 +22,7 @@ And then execute:
 
 ## Development
 
-To set up your environment to develop this theme, run the `script/bootstrap` script. Note that
+To set up your environment to develop this theme, run the [`script/bootstrap`](script/bootstrap) script. Note that
 this will check out **all** betterplace content repositories and install their bundles.
 
 The installation script will ask you for a personal github access token with repo access.

data/_layouts/default.html

@@ -56,7 +56,7 @@ Update 2019-07-19: Another problem that came us is, that URLs endet in .html whi
 <link rel="stylesheet" href="{{ style_host }}{{ site.baseurl }}{{ site._options.content.styles }}" />
 {% endif %}
 
-<link rel="stylesheet" href="{{ style_host }}/de/layouts/current_stylesheet/utils" />
+<link rel="stylesheet" href="{{ style_host }}/de/layouts/current_stylesheet/application" />
 
 <link rel="shortcut icon" href="https://betterplace-assets.betterplace.org/static-images/logos/favicon.png" />
 
@@ -110,11 +110,7 @@ Update 2019-07-19: Another problem that came us is, that URLs endet in .html whi
 
 </div>
 
-<script src="{{ style_host }}/de/layouts/current_pack/utils"></script>
-<script src="{{ style_host }}/de/layouts/current_pack/locale_{{ site.lang }}"></script>
-<script src="{{ style_host }}/de/layouts/current_pack/homepage"></script>
 <script>
-  // Make sure we can test the Rails-staging CSS on jekyll-staging.
   {% comment -%}
     //  For Staging: Simulate the environment by replacing the URLs.
     //  For Development: This does nothing, unless you force `JEKYLL_ENV=production`.
@@ -126,18 +122,40 @@ Update 2019-07-19: Another problem that came us is, that URLs endet in .html whi
     //   app.cloudcannon.com, proxy.cloudcannon.com: do nothing
     //   www.bp42.com: replace
   {% endcomment -%}
-  const prd  = window.location.hostname.indexOf('.org') !== -1
-  const dev  = window.location.hostname.indexOf('.dev') !== -1
-  const edit = window.location.hostname.indexOf('.cloud') !== -1
-  if (!prd && !dev && !edit) {
+
+  const replaceHost = () => {
+    if (!/\.(?:org|dev|cloud)/.test(window.location.hostname)) return
+
     document.querySelectorAll("[href]").forEach(element => {
       if (element.href.includes('www.betterplace.org')) {
         element.href = element.href.replace('www.betterplace.org', window.location.hostname)
         element.setAttribute('data-host-replaced', 'true')
       }
     })
+
+    {% comment -%}
+      // Some URLs in the header files are stored in data attributes for use in React.
+      // These cases can be found by searching for /data[^'"]*['"]http/ in this repo.
+      // The preceding semicolon is required in browser JS land ;)
+    {% endcomment -%}
+    ;['data-login-url', 'data-login-check-url', 'data-search-url'].forEach(dataAttr => {
+      document.querySelectorAll("[" + dataAttr + "]").forEach(element => {
+        const modifiedUrl = element.getAttribute(dataAttr).replace('www.betterplace.org', window.location.hostname)
+        element.setAttribute(dataAttr, modifiedUrl)
+        element.setAttribute('data-host-replaced', 'true')
+      })
+    })
   }
+
+  document.addEventListener('DOMContentLoaded', replaceHost)
 </script>
 
+{% comment -%}
+  // These scripts must be loaded AFTER the DOMContentLoaded listener above is defined.
+{% endcomment -%}
+<script src="https://betterplace.dev/de/layouts/current_pack/application"></script>
+<script src="https://betterplace.dev/de/layouts/current_pack/locale_{{ site.lang }}"></script>
+<script src="https://betterplace.dev/de/layouts/current_pack/homepage"></script>
+
 </body>
 </html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: betterplace-content
 version: !ruby/object:Gem::Version
-  version: 0.7.110
+  version: 0.7.113
 platform: ruby
 authors:
 - betterplace.org Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-26 00:00:00.000000000 Z
+date: 2022-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.3.15
 signing_key:
 specification_version: 4
 summary: betterplace.org's Jekyll Content Theme