j1-template 2021.1.4 → 2021.1.5

data/lib/starter_web/pages/public/learn/roundtrip/400_asciidoc_extensions.adoc

@@ -115,7 +115,7 @@ WARNING: Icon background-color: yellow
 .CAUTION block
 CAUTION: Icon background-color: red
 
-
+/////
 == Q&A Blocks
 
 Q&A sections are used quite often to answer popular questions. To make
@@ -163,6 +163,7 @@ find the full color scheme for Material Design.
 For J1 Template, go for the {jekyll-one-core-doc-color-scheme}[Core documentation, window="blank"] section.
 You'll find the full color scheme for Material Design.
 ====
+/////
 
 == Lightboxes
 

data/lib/starter_web/pages/public/legal/en/300_privacy.adoc

@@ -28,7 +28,7 @@ resource_options:
       padding_bottom:                   50
       opacity:                          0.5
       slides:
-        - url:                          /assets/images/modules/attics/runner-1920x1200.jpg
+        - url:                          /assets/images/modules/attics/lianhao-1920x1280.jpg
 ---
 
 // Page Initializer
@@ -44,10 +44,13 @@ resource_options:
 // Attribute settings for section control
 //
 :cookies:                               true
-:revoke-cookie-consent:                 true
-:delete-cookies:                        true
-:content-permissions:                   true
-:server-logs:                           true
+:cookie-consent:                        true
+:logs-files:                            true
+:google-analytics:                      true
+:facebook:                              false
+:twitter:                               false
+:instagram:                             false
+:youtube:                               true
 
 //  Load Liquid procedures
 // -----------------------------------------------------------------------------
@@ -73,187 +76,72 @@ The operators of this website take the protection of your personal data extremel
 seriously. We treat your personal data as confidential and comply with the
 data protection legislation and this privacy policy.
 
-It is generally *not* possible to use our website without disclosing personal
-data. Personal data (for example page visits) is collected on our website.
-This is voluntary insofar as possible. This data is never disclosed to third
-parties without your express consent.
-
 ifeval::[{cookies} == true]
 == Cookies
 
-A cookie is a commonly used automated data collection method. Cookies are
-small text files placed on your computer or device by websites that you
-visit to make websites work or work more efficiently.
-
-We, may our partners, make use of cookies, web beacons, pixel tags, scripts,
-or other similar technologies on our websites to improve the browsing
-experience of our pages:
-
-* Tailor information presented to you based on your browsing preferences,
-  such as language, user account data, selected content, and geographical
-  region
-
-* Collect statistics regarding your website usage
-
-All personal data collected is stored in Cookies. We use different kinds
-of cookies. Cookies are classified by its *lifespan* and the *domain* to
-which it belongs.
-
-Session Cookie::
-Classified by *lifespan*. Necessary to provide you with services and
-features available through our websites for the time of your visit. If you
-leave our pages, these cookies are automatically deleted by your web browser.
-Without these cookies, services you may need cannot be provided.
-
-Persistent Cookie::
-Classified by *lifespan*. Necessary to provide you with services and
-features available through our websites if you return the site. Without
-these cookies, services cannot be provided.
-
-First-party Cookie::
-Classified by the *domain*. First-party Cookies are created by *this* site.
-We are using both types: Session Cookies *and* Persistent Cookies.
-
-Second-party Cookie::
-Classified by the *domain*. Used to integrate services from *other* sites
-like Github, Disqus, and others.
-
-[NOTE]
-====
-If you do not wish to receive cookies, you may be able to refuse them by
-adjusting your browser settings to reject cookies. If you do so, we may *not*
-able to offer you *any* of our functionalities, services, or support.
-If you have previously visited our websites, you may also have to delete any
-existing cookies from your browser.
-====
+This website is using cookies and similar technologies that are required for
+operation. You are free to decide to give, refuse or withdraw your consent by
+clicking the `Settings` button in the privacy dialog. Subsequent changes are
+possible at *any* time by clicking on the `cookie icon` in the *menu bar*.
+
+*Extended* cookies are only used with your consent. Those additional cookies
+are used to analyze the usage of this website. Analysis of the use of this
+website help gives you a better user experience of the website to offer. More
+information about what data is collected and how they may be passed on
+to partners can be found in the privacy dialog by clicking on the
+`Privacy Policy` button.
+
+
+Necessary::
+data is stored to run base services of this site. This website is based on
+static content, and no database is used behind it. All information (data)
+needed to control this site is stored in so-called *session cookies*. Session
+cookies are automatically removed by your browser if you *close* all windows.
+
+Analysis::
+of the use of this website helps us to optimize your user experience of the
+website. For analysis, Google Analytics (GA) is used. This website does *not*
+transfer any *personal data* to GA. Implicit personal information, like IP
+addresses, is *anonymized* to protect your privacy.
+
+Personalization::
+is used e.g. to collect user feedback or running advertising campaigns to
+provide you a website free of charge. Partners like `Disqus` or `Google`
+provide you excellent personalized services and enables us to finance the
+costs for running this site.
 endif::[]
 
 
-ifeval::[{revoke-cookie-consent} == true]
-== Revoke Cookie Consent
+ifeval::[{cookie-consent} == true]
+== Cookie Consent
 
-If you do *not* wish to receive *cookies* anymore from *this site*, you can
-revoke the cookie consent you've given. Furthermore, you may be able to refuse
-them by adjusting your *browser* settings to *reject cookies*.
+If you want to configure what *cookies* are used by *this site*, you can
+adjust your consent settings on cookies you've already given. Furthermore,
+you may be able to refuse them by adjusting your *browser* settings to
+*reject cookies*. Please be carefull on changing your browser setting on
+cookies. Reject on cookies may cause severe issues visiting websites that
+depends on cookies like *this site*.
 
 CAUTION: Suppose you have previously visited our website — or any pages this
 session — and agreed on the use of cookies. In that case, you may also have
-to delete already-existing cookies by your browser to clear all cookies left.
+to delete already-existing cookies by your browser to clear all unwanted
+cookies left.
 
 ++++
-<div class="ml-0 mb-0">
-  <button type="button" name="revokeCookieConsent" class="btn btn-primary btn-raised btn-flex mb-3" style="min-width: 25rem">
-    <i class="toggle-button mdi mdi-toggle-switch-off mdi-lg mdi-md-bg-primary-50 mr-1"></i>
-    Revoke Cookie Consent
-  </button>
+<div class="mt-4 mb-3">
+  <a  href="javascript:j1.cookieConsent.showDialog()"
+      class="btn btn-primary btn-lg btn-block btn-raised btn-flex mb-3"
+      aria-label="Cookie Consent"
+      style="min-width: 25rem">
+      <i class="mdi mdi-cookie mdi-2x mr-2"></i>
+      Cookie Consent
+  </a>
 </div>
-
-<script>
-  var logger                      = log4javascript.getLogger('page.privacy');
-  var cookie_names                = j1.getCookieNames();
-  const cookie_consent_name       = cookie_names.cookie_consent;
-  const cookie_user_session_name  = cookie_names.user_session;
-  var user_state                  = j1.readCookie(cookie_user_session_name);
-  var user_state_empty            = {};
-  var pageChanged;
-
-  // ---------------------------------------------------------------------------
-  //  Initializer
-  // ---------------------------------------------------------------------------
-  $(document).ready(function() {
-    if ( user_state.cookies_accepted == 'declined' ) {
-      $('.toggle-button').toggleClass('mdi-toggle-switch-off mdi-toggle-switch');
-    }
-  });
-
-  // ---------------------------------------------------------------------------
-  //  EventHandler
-  // ---------------------------------------------------------------------------
-  $('button[name="revokeCookieConsent"]').on('click', function (e) {
-    if ( user_state.cookies_accepted === 'declined' ) {
-      logger.debug('Cookie Consent already DECLINED. Click event ignored');
-      return true;
-    } else {
-      logger.debug('Enter Cookie Consent REVOKE dialog');
-      $('#cookieRevokeCentralDanger').modal('show');
-    }
-
-    /* Manage button click events from "Cookie Consent REVOKE" dialog */
-    $('a.btn').click(function() {
-      if (this.id === 'revokeCookies') {
-        logger.debug('User clicked revokeCookiesButton');
-        user_state.cookies_accepted = 'declined';
-        j1.writeCookie({
-          name: cookie_user_session_name,
-          data: user_state
-        });
-
-        $('.toggle-button').toggleClass('mdi-toggle-switch-off mdi-toggle-switch');
-
-        // Hide cookie icon
-        $('#cookie-state').css('display', 'none');
-        return true;
-      }
-      if (this.id === 'remainCookies') {
-        logger.debug('User clicked remainCookiesButton');
-        return true;
-      }
-      return true;
-    });
-  });
-</script>
 ++++
 endif::[]
 
-ifeval::[{delete-cookies} == true]
-== Delete cookies
-
-Suppose you have previously visited our website — or any pages this session —
-and agreed on the use of cookies. In that case, you may also have to delete
-already-existing cookies by your browser to clear all cookies left.
-
-By clicking the button below, all cookies related to *this* site will be
-deleted.
-
-++++
-<div class="ml-0 mb-0">
-  <button type="button" name="deleteCookies" class="btn btn-primary btn-raised btn-flex mb-3" style="min-width: 25rem">
-    <i class="mdi mdi-cookie mdi-lg mdi-md-bg-primary-50 mr-1"></i>
-    Delete Cookies
-  </button>
-</div>
-
-<script>
-  var logger       = log4javascript.getLogger('page.privacy');
-  var cookie_names = j1.getCookieNames();
-
-  // ---------------------------------------------------------------------------
-  //  EventHandler
-  // ---------------------------------------------------------------------------
-  $('button[name="deleteCookies"]').on('click', function (e) {
-    logger.debug('User clicked deleteCookiesButton');
-
-    j1.removeCookie({
-      name: cookie_names.user_session
-    });
-    j1.removeCookie({
-      name: cookie_names.user_state
-    });
-    j1.removeCookie({
-      name: cookie_names.app_session
-    });
-
-    logger.debug('cookies deleted: ' + cookie_names.user_session + ', ' + cookie_names.user_state);
-    logger.debug('pass to (browser) default page');
-    j1.goHome();
-
-  });
-</script>
-++++
-endif::[]
-
-ifeval::[{server-logs} == true]
-== Server log files
+ifeval::[{logs-files} == true]
+== Log files
 
 We gather certain information automatically by our webservers and store it in
 log files. This information may include Internet protocol (IP) addresses,
@@ -281,12 +169,13 @@ ifeval::[{google-analytics} == true]
 == Use of Google Analytics
 
 This website uses Google Analytics, a web analytics service provided by:
-Anbieter ist die:
 
- Google Inc.
- 1600 Amphitheatre Parkway Mountain View
- CA 94043
- USA
+----
+   Google Inc.
+   1600 Amphitheatre Parkway Mountain View
+   CA 94043
+   USA
+----
 
 Google Analytics uses so called “cookies”, which are text files placed on
 your computer to help the website analyze how users use the site. The
@@ -311,9 +200,10 @@ to use the full functionality of this website. You can also avoid the
 recording of data referring to your use of the website generated by cookies
 (including your IP address) by Google as well as the processing of your
 data by Google by downloading and installing the browser plug-in available
-from the following link: http://tools.google.com/dlpage/gaoptout?hl=de
-endif::[]
+from the following
+link:{url-google--deactivate-ga-en}[Browser-Add-on Google Analytics, {browser-window--new}]
 
+endif::[]
 
 ifeval::[{facebook} == true]
 == Use of Facebook Plug-ins
@@ -321,18 +211,16 @@ ifeval::[{facebook} == true]
 We have integrated plug-ins (Like-Button) by the social network *Facebook*,
 provided by:
 
- Facebook Inc.
- 1 Hacker Way
- Menlo Park
- California 94025
- USA
+----
+  Facebook Inc.
+  1 Hacker Way
+  Menlo Park
+  California 94025
+  USA
+----
 
 into our website.
 
-You can identify these Facebook Plug ins by the Facebook logo or the "Like"
-button on our website. You can find an overview of the Facebook plug ins
-on: http://developers.facebook.com/docs/plug-ins/.
-
 When you visit our website, the plug-in will establish a direct connection
 between your browser and the Facebook server. Thereby Facebook will be informed
 about your visit on our website with your IP address. If you click the Facebook
@@ -343,23 +231,25 @@ associate your visit to our website with your user account.
 We would like to point out that, as the website provider, we possess no
 knowledge of the contents of the transmitted data or its use by Facebook. You
 can find further information on this topic in the Facebook privacy policy at
-http://de-de.facebook.com/policy.php. If you do not want Facebook to be able
-to associate your visit to our website with your Facebook user account,
-please log out of your Facebook account before visiting our website.
+link:{url-facebook--privacy-policy-en}[Privacy Police, {browser-window--new}].
+If you do not want Facebook to be able to associate your visit to our website
+with your Facebook user account, please log out of your Facebook account
+before visiting our website.
 endif::[]
 
-
 ifeval::[{twitter} == true]
 == Use of Twitter
 
 We have integrated functions by the service provider Twitter into our website.
 These functions are offered by:
 
- Twitter Inc.
- 1355 Market Street
- Suite 900, San Francisco
- CA 94103
- USA
+----
+  Twitter Inc.
+  1355 Market Street
+  Suite 900, San Francisco
+  CA 94103
+  USA
+----
 
 When using Twitter and the "re-tweet" function, the websites you have visited
 will be linked to your Twitter account and made available to other users.
@@ -368,22 +258,25 @@ Data will also be transmitted to Twitter.
 We would like to point out that as provider of the website we possess no
 knowledge of the contents of the data transmitted or its use by Twitter.
 You can find further information on this topic in the Twitter privacy
-policy at http://twitter.com/privacy. You can change your Twitter privacy
-settings in your account settings at http://twitter.com/account/settings.
+policy at link:{url-twitter--privacy-en}[Privacy Police, {browser-window--new}].
+You can change your Twitter privacy
+settings in your account settings at
+link:{url-twitter--login}[Login, {browser-window--new}].
 endif::[]
 
-
 ifeval::[{instagram} == true]
 == Use of Instagram
 
 Auf unseren Seiten sind Funktionen des Dienstes Instagram eingebunden. Diese
 Funktionen werden angeboten durch die
 
+----
   Instagram Inc.
   1601 Willow Road
   Menlo Park
   CA 94025
   USA
+----
 
 integriert. Wenn Sie in Ihrem Instagram Account eingeloggt sind können Sie
 durch Anklicken des *Instagram Buttons* die Inhalte unserer Seiten mit
@@ -393,28 +286,30 @@ Anbieter der Seiten keine Kenntnis vom Inhalt der übermittelten Daten sowie
 deren Nutzung durch Instagram erhalten.
 
 Weitere Informationen hierzu finden Sie in der
-http://instagram.com/about/legal/privacy/[Datenschutzerklärung von Instagram, window="_blank"].
+link:{url-instagram--privacy-policy}[Privacy Police Instagram, {browser-window--new}].
 endif::[]
 
 ifeval::[{youtube} == true]
 == Use of YouTube
 
-Unsere Webseite nutzt Plugins der von Google betriebenen Seite *YouTube*.
-Betreiber der Seiten ist die
+We have integrated functions by the service provider *YouTube* into our
+website on selected pages. These functions are offered by:
 
+----
   YouTube LLC,
   901 Cherry Ave San Bruno
   CA 94066
   USA
+----
 
-Wenn Sie eine unserer mit einem *YouTube Plugin* ausgestatteten Seiten
-besuchen, wird eine Verbindung zu den Servern von YouTube hergestellt. Dabei
-wird dem Youtube-Server mitgeteilt, welche unserer Seiten Sie besucht haben.
+If you use one of our pages equipped with a *YouTube plugin* visit, a
+connection to the YouTube servers is established. There the YouTube server
+is informed which of our pages you have visited.
 
-Wenn Sie in Ihrem YouTube-Account eingeloggt sind ermöglichen Sie YouTube,
-Ihr Surfverhalten direkt Ihrem persönlichen Profil zuzuordnen. Dies können
-Sie verhindern, indem Sie sich aus Ihrem YouTube Account ausloggen.
+If you are logged into your YouTube account, you enable YouTube to assign
+your surfing behavior directly to your personal profile. You can prevent this
+by logging out of your YouTube account.
 
-Weitere Informationen zum Umgang von Nutzerdaten finden Sie in der
-https://www.google.de/intl/de/policies/privacy[Datenschutzerklärung von YouTube, window="_blank"].
+Further information on the handling of user data can be found in the
+link:{url-google--privacy-policy-en}[Privacy Police Google/YouTube, {browser-window--new}].
 endif::[]

data/lib/starter_web/utilsrv/_defaults/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2021.1.4",
+  "version": "2021.1.5",
   "description": "J1 Template Utility Server",
   "homepage": "https://jekyll.one",
   "author": {