j1-template 2021.3.1 → 2022.0.2

data/assets/data/banner.html

@@ -136,6 +136,7 @@ exclude_from_search:                    true
         {% when 'teaser' %}
         {% assign banner_options = banner_config_defaults.teaser | merge: banner_settings %}
         {% if debug %}<!-- banner_options:  {{banner_options}} -->{% endif %}
+
         <section id="{{banner_settings.id}}" class="container">
           <div class="row {{banner_settings.properties}}">
           {% assign card_items = cards | size %}
@@ -152,7 +153,6 @@ exclude_from_search:                    true
                 {% if key == 'icon_size' %}               {% assign icon_size         = value %}                   {% endif %}
                 {% if key == 'icon_color' %}              {% assign icon_color        = value %}                   {% endif %}
                 {% if key == 'image_path' %}              {% assign card_image_path   = value %}                   {% endif %}
-                {% if key == 'animate' %}                 {% assign card_animate      = value %}                   {% endif %}
                 {% if key == 'description_properties' %}  {% assign card_properties   = value %}                   {% endif %}
                 {% if key == 'title' %}                   {% assign card_title        = value | strip_newlines%}   {% endif %}
                 {% if key == 'description' %}             {% assign card_description  = value | strip_newlines%}   {% endif %}
@@ -181,12 +181,6 @@ exclude_from_search:                    true
               {% assign card_width_md = 12 | divided_by: card_items %}
             {% endif %}
 
-            {% if card_animate %}
-              {% assign card_animate = card_animate %}
-            {% else %}
-              {% assign card_animate = '' %}
-            {% endif %}
-
             {% comment %} TODO: Add payment_url to config
             -------------------------------------------------------------------- {% endcomment %}
             {% assign patreon_enabled     = true %}
@@ -198,10 +192,10 @@ exclude_from_search:                    true
             {% capture payment_url %}{{patreon_home}}/{{pledge_url}}/{{vanity}}{% endcapture %}
 
             {% if card_type == 'text' and card_enabled %}
-            {% if card_animate %} {% capture animate %}animated {{card_animate}}{% endcapture %} {% endif %}
+
             <!-- Heading -->
-            <div class="row">
-              <div class="{{animate}} mb-2">
+            <div class="noclass">
+              <div>
                 <h2 class="g-font-weight-500 mb-0">{{card_title}}</h2>
                 <p class="tagline mb-0">{{card_tagline}}</p>
                 <div class="d-inline-block g-width-50 g-height-2 bg-primary mb-2"></div>
@@ -210,11 +204,11 @@ exclude_from_search:                    true
             <!-- End Heading -->
 
             <!-- Body -->
-            <div class="row {{animate}}">
+            <div class="noclass">
               <div class="{{card_properties}}">{{card_description}}</div>
               {% if card_buttons %}
               <!-- Footer|Button row -->
-              <div class="mt-1 text-center">
+              <div>
                 {% for button_hash in card_buttons %}
                   {% include {{create_bs_button}} button_data=button_hash button_type="link" %}
                   {{bs_button_html}}
@@ -293,7 +287,7 @@ exclude_from_search:                    true
         {% comment %} Collect PARALLAX banner
         ------------------------------------------------------------------------ {% endcomment %}
         {% when 'parallax' %}
-        <div id="{{banner_settings.id}}">
+        <div id="{{banner_settings.id}}" class="parallax">
         {% assign banner_options = banner_config_defaults.parallax | merge: banner_settings %}
         {% if debug %}<!-- banner_options:  {{banner_options}} -->{% endif %}
 
@@ -307,10 +301,8 @@ exclude_from_search:                    true
               {% if key == 'cite_text_size' %}        {% assign card_cite_text_size        = value %}                   {% endif %}
               {% if key == 'cite_text_quotes' %}      {% assign card_cite_text_quotes      = value %}                   {% endif %}
               {% if key == 'cite_text' %}             {% assign card_text                  = value | strip_newlines %}  {% endif %}
-              {% if key == 'cite_size' %}             {% assign card_cite_size             = value %}                   {% endif %}
               {% if key == 'cite' %}                  {% assign card_cite                  = value | strip_newlines %}  {% endif %}
               {% if key == 'text_color' %}            {% assign card_text_color            = value %}                   {% endif %}
-              {% if key == 'cite_color' %}            {% assign card_cite_color            = value %}                   {% endif %}
               {% if key == 'gridify' %}               {% assign card_gridify               = value %}                   {% endif %}
               {% if key == 'gridifier' %}             {% assign card_gridifier             = value %}                   {% endif %}
               {% if key == 'darken' %}                {% assign card_darken                = value %}                   {% endif %}
@@ -325,8 +317,6 @@ exclude_from_search:                    true
               {% assign background_image  = parallax_options.background %}
               {% assign gridify           = parallax_options.gridify %}
               {% assign gridifier         = parallax_options.gridifier %}
-              {% assign text_color        = parallax_options.text_color %}
-              {% assign cite_color        = parallax_options.cite_color %}
               {% assign darken            = parallax_options.darken %}
 
               {% comment %} Set banner VALUES
@@ -335,18 +325,11 @@ exclude_from_search:                    true
               {% if card_gridifier %}             {% assign gridifier         = card_gridifier %}             {% endif %}
               {% if card_darken %}                {% assign darken            = card_darken %}                {% endif %}
               {% if card_text_color %}            {% assign text_color        = card_text_color %}            {% endif %}
-              {% if card_cite_color %}            {% assign cite_color        = card_cite_color %}            {% endif %}
               {% if card_background_size %}       {% assign size_y            = card_background_size %}       {% endif %}
               {% if card_background_image %}      {% assign background_image  = card_background_image %}      {% endif %}
 
               {% capture darken %}0.{{darken}}{% endcapture %}
 
-              {% include {{select_color}} color=text_color fallback="#FAFAFA" %}
-              {% assign text_color = color %}
-
-              {% include {{select_color}} color=cite_color fallback="#FAFAFA" %}
-              {% assign cite_color = color %}
-
               {% comment %} Add individual STYLE tags
               ------------------------------------------------------------------ {% endcomment %}
               <!-- [INFO   ] [/assets/data/banner.html                   ] [ Add individual styles for the parallax banner ] -->
@@ -360,7 +343,6 @@ exclude_from_search:                    true
                   {% if card_text and card_cite_text_quotes %}
                   .{{banner_settings.id}}-parallax-quote-in p:after,.{{banner_settings.id}}-parallax-quote-in p:before{content:' " ';}
                   {% endif %}
-                  .{{banner_settings.id}}-parallax-quote-in small{color:{{cite_color}};font-size:{{card_cite_size}};font-weight:600;}
                   .{{banner_settings.id}}-parallax-quote:after{background: rgba(0,0,0,{{darken}})}
               </style>
 

data/assets/data/cookieconsent.html

@@ -79,8 +79,8 @@ exclude_from_search:                    true
           <p class="mb-4">{{consent_options.modal_settings.body_text.en}}</p>
         </div>
         <p>
-          <a href="#bccs-privacy" data-toggle="collapse" class="">Privacy Notice</a>
-          <a href="#bccs-options" data-toggle="collapse" class="float-right">My Settings</a>
+          <a href="#bccs-privacy" data-bs-toggle="collapse" class="">Privacy Notice</a>
+          <a href="#bccs-options" data-bs-toggle="collapse" class="float-right">My Settings</a>
         </p>
 
         <div id="bccs-privacy" class="collapse">
@@ -96,9 +96,9 @@ exclude_from_search:                    true
           <div class="bccs-option" data-name="necessary">
             <div class="switch">
               <label>
-                <input id="bccs-checkboxNecessary" type="checkbox" name="bccs-checkboxNecessary" checked="true" disabled>
-                <span class="bmd-switch-track"></span>
+                <input id="bccs-checkboxNecessary" type="checkbox" name="bccs-checkboxNecessary" checked disabled>
                 Necessary (Session Cookies)
+                <span class="bmd-switch-track"></span>
               </label>
               <ul>
                 <li>Required to run the website</li>
@@ -108,7 +108,7 @@ exclude_from_search:                    true
           <div class="bccs-option" data-name="analysis">
             <div class="switch">
               <label>
-                <input id="bccs-checkboxAnalysis" type="checkbox" name="bccs-checkboxAnalysis" checked="true">
+                <input id="bccs-checkboxAnalysis" type="checkbox" name="bccs-checkboxAnalysis" checked>
                 <span class="bmd-switch-track"></span>
                 Analysis (Persistent Cookies)
               </label>
@@ -122,7 +122,7 @@ exclude_from_search:                    true
           <div class="bccs-option" data-name="personalization">
             <div class="switch">
               <label>
-                <input id="bccs-checkboxPersonalization" type="checkbox"  name="bccs-checkboxPersonalization" checked="true">
+                <input id="bccs-checkboxPersonalization" type="checkbox"  name="bccs-checkboxPersonalization" checked>
                 <span class="bmd-switch-track"></span>
                 Personalization (Persistent Cookies)
               </label>
@@ -137,16 +137,16 @@ exclude_from_search:                    true
       </div>
 
       <div class="modal-footer">
-        <button id="bccs-buttonDoNotAgree" type="button" class="btn btn-link text-decoration-none" style="">
-        I do not Agree
+        <button id="bccs-buttonDoNotAgree" type="button" class="btn btn-outline-secondary mb-1 mr-2" style="min-width: 20rem">
+        I Do not Agree
         </button>
-        <button id="bccs-buttonAgree" type="button" class="btn btn-primary btn-raised" style="">
+        <button id="bccs-buttonAgree" type="button" class="btn btn-primary mb-1 mr-2" style="min-width: 20rem">
         I Agree
         </button>
-        <button id="bccs-buttonSave" type="button" class="btn btn-primary" style="display: none;">
+        <button id="bccs-buttonSave" type="button" class="btn btn-outline-secondary mb-1 mr-2" style="display: none; min-width: 20rem">
         Save selection
         </button>
-        <button id="bccs-buttonAgreeAll" type="button" class="btn btn-primary btn-raised" style="display: none;">
+        <button id="bccs-buttonAgreeAll" type="button" class="btn btn-primary mb-1 mr-2" style="display: none; min-width: 20rem">
         Agree on all
         </button>
       </div>
@@ -173,8 +173,8 @@ exclude_from_search:                    true
           <p class="mb-4">{{consent_options.modal_settings.body_text.de}}</p>
         </div>
         <p>
-          <a href="#bccs-privacy" data-toggle="collapse" class="">Datenschutzerklärung</a>
-          <a href="#bccs-options" data-toggle="collapse" class="float-right">Meine Einstellungen</a>
+          <a href="#bccs-privacy" data-bs-toggle="collapse" class="">Datenschutzerklärung</a>
+          <a href="#bccs-options" data-bs-toggle="collapse" class="float-right">Meine Einstellungen</a>
         </p>
 
         <div id="bccs-privacy" class="collapse">
@@ -190,7 +190,7 @@ exclude_from_search:                    true
           <div class="bccs-option" data-name="necessary">
             <div class="switch">
               <label>
-                <input id="bccs-checkboxNecessary" type="checkbox" name="bccs-checkboxNecessary" checked="true" disabled>
+                <input id="bccs-checkboxNecessary" type="checkbox" name="bccs-checkboxNecessary" checked disabled>
                 <span class="bmd-switch-track"></span>
                 Notwendig (Sitzungscookies)
               </label>
@@ -202,7 +202,7 @@ exclude_from_search:                    true
           <div class="bccs-option" data-name="analysis">
             <div class="switch">
               <label>
-                <input id="bccs-checkboxAnalysis" type="checkbox" name="bccs-checkboxAnalysis" checked="true">
+                <input id="bccs-checkboxAnalysis" type="checkbox" name="bccs-checkboxAnalysis" checked>
                 <span class="bmd-switch-track"></span>
                 Analysen (dauerhafte Cookies)
               </label>
@@ -216,7 +216,7 @@ exclude_from_search:                    true
           <div class="bccs-option" data-name="personalization">
             <div class="switch">
               <label>
-                <input id="bccs-checkboxPersonalization" type="checkbox"  name="bccs-checkboxPersonalization" checked="true">
+                <input id="bccs-checkboxPersonalization" type="checkbox"  name="bccs-checkboxPersonalization" checked>
                 <span class="bmd-switch-track"></span>
                 Personalisierung (dauerhafte Cookies)
               </label>
@@ -231,16 +231,16 @@ exclude_from_search:                    true
       </div>
 
       <div class="modal-footer">
-        <button id="bccs-buttonDoNotAgree" type="button" class="btn btn-link text-decoration-none" style="">
+        <button id="bccs-buttonDoNotAgree" type="button" class="btn btn-outline-secondary mb-1 mr-2" style="min-width: 20rem">
         Ich bin nicht einverstanden
         </button>
-        <button id="bccs-buttonAgree" type="button" class="btn btn-primary btn-raised" style="">
+        <button id="bccs-buttonAgree" type="button" class="btn btn-primary mb-1 mr-2" style="min-width: 20rem">
         Ich bin Einverstanden
         </button>
-        <button id="bccs-buttonSave" type="button" class="btn btn-primary" style="display: none;">
+        <button id="bccs-buttonSave" type="button" class="btn btn-outline-secondary mb-1 mr-2" style="display: none; min-width: 20rem">
         Auswahl speichern
         </button>
-        <button id="bccs-buttonAgreeAll" type="button" class="btn btn-primary btn-raised" style="display: none;">
+        <button id="bccs-buttonAgreeAll" type="button" class="btn btn-primary mb-1 mr-2" style="display: none; min-width: 20rem">
         Allen zustimmen
         </button>
       </div>

data/assets/data/{fam.html → fab.html}

@@ -43,13 +43,13 @@ exclude_from_search:                    true
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign environment     = site.environment %}
 
-{% assign fam_settings    = modules.fam.settings %}
-{% assign fam_defaults    = modules.defaults.fam.defaults %}
+{% assign fab_settings    = modules.fab.settings %}
+{% assign fab_defaults    = modules.defaults.fab.defaults %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign fam_options     = fam_defaults | merge: fam_settings %}
-{% assign fam_menus       = fam_options.menus %}
+{% assign fab_options     = fab_defaults | merge: fab_settings %}
+{% assign fab_menus       = fab_options.menus %}
 
 {% comment %} Set permalink setting
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -60,31 +60,31 @@ exclude_from_search:                    true
 
 {% comment %} Set base icons and sizes
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign fam_menu_icon_family         = fam_options.icon_family %}
-{% assign fam_menu_icon_style          = fam_options.icon_style %}
-{% assign fam_menu_icon_color          = fam_options.icon_color %}
-{% assign fam_menu_icon_size           = fam_options.icon_size %}
+{% assign fab_menu_icon_family         = fab_options.icon_family %}
+{% assign fab_menu_icon_style          = fab_options.icon_style %}
+{% assign fab_menu_icon_color          = fab_options.icon_color %}
+{% assign fab_menu_icon_size           = fab_options.icon_size %}
 
-{% assign icon_family = fam_menu_icon_family | strip | downcase %}
+{% assign icon_family = fab_menu_icon_family | strip | downcase %}
 
 {% if icon_family == 'fontawesome' or icon_family == 'fontawesome5' %}
-  {% assign fam_menu_icon_family  = 'fa' %}
-  {% assign fam_menu_icon_style   = fam_menu_icon_style %}
+  {% assign fab_menu_icon_family  = 'fa' %}
+  {% assign fab_menu_icon_style   = fab_menu_icon_style %}
 {% elsif icon_family == 'mdi' %}
-  {% assign fam_menu_icon_family  = 'mdi' %}
-  {% assign fam_menu_icon_style   = fam_menu_icon_style %}
+  {% assign fab_menu_icon_family  = 'mdi' %}
+  {% assign fab_menu_icon_style   = fab_menu_icon_style %}
 {% else %}
-  {% assign fam_menu_icon_family  = 'mdi' %}
-  {% assign fam_menu_icon_style   = fam_menu_icon_style %}
+  {% assign fab_menu_icon_family  = 'mdi' %}
+  {% assign fab_menu_icon_style   = fab_menu_icon_style %}
 {% endif %}
 
 {% comment %} unused
 --------------------------------------------------------------------------------
-{% include {{select_color}} color=fam_menu_icon_color fallback="#9E9E9E" %}
-{% assign fam_menu_icon_color = color %}
+{% include {{select_color}} color=fab_menu_icon_color fallback="#9E9E9E" %}
+{% assign fab_menu_icon_color = color %}
 
-{% include {{select_icon_size}} family=fam_menu_icon_family size=fam_menu_icon_size %}
-{% assign fam_menu_icon_size = size %}
+{% include {{select_icon_size}} family=fab_menu_icon_family size=fab_menu_icon_size %}
+{% assign fab_menu_icon_size = size %}
 -------------------------------------------------------------------------------- {% endcomment %}
 
 {% assign production = false %}
@@ -100,18 +100,36 @@ exclude_from_search:                    true
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 <!-- [DEBUG  ] [j1.modules.fam.html       ] [collect all menu items] -->
-{% for menu in fam_menus %}
+{% for menu in fab_menus %}
   {% if menu.enabled %}
   <!-- [DEBUG  ] [j1.modules.fam.html       ] [collect menu {{menu.id}}] -->
   <div id="{{menu.id}}">
-    <div class="fam-btn" style="display: none">
+    <div class="fab-btn" style="display: none">
       <!-- [DEBUG  ] [j1.modules.fam.html       ] [jadams, 2020-11-15: set href|link text (Google optimisation)] -->
-      <a href="#void" id="{{menu.id}}_button" class="btn-fab-floating btn-large btn-{{menu.color}} raised-z{{fam_options.raised_level}}"><i id="fam-icon" class="mdi mdi-{{menu.icon}}"></i>FAM button</a>
-      <ul id="{{menu.id}}_items">
+
+      {% if fab_options.raised %}
+        {% capture options %}raised-z{{fab_options.raised}} {%endcapture%}
+      {% endif %}
+
+      {% if fab_options.pulsed %}
+        {% capture options %}options pulsed-z{{fab_options.pulsed}}{%endcapture%}
+      {% endif %}
+
+      <button type="button" id="{{menu.id}}_button" class="btn btn-fab btn-{{menu.color}} {{options}}" aria-label="fab-button">
+        <i id="fab-icon" class="mdi mdi-{{menu.icon}}"></i>
+      </button>
+
+      <ul id="fab_menu_items">
         {% for item in menu.items %} {% if item.enabled %}
-        <li><a href="#void" id="{{item.id}}" class="btn-fab-floating btn-{{item.color}} raised-z{{fam_options.raised_level}}" style="display: none"><i id="fam-icon" class="mdi mdi-{{item.icon}} mdi-{{item.icon_properties}}"></i>{{item.id}}</a></li>
+        <li>
+          <!-- a href="#void" id="{{item.id}}" class="btn-fab-floating btn-{{item.color}} raised-z{{fab_options.raised_level}}" style="display: none" -->
+          <a href="#" id="{{item.id}}" class="btn-fab-floating btn-{{item.color}} raised-z{{fab_options.raised_level}}" style="display: none">            
+            <i id="fab-icon" class="mdi mdi-{{item.icon}} mdi-{{item.icon_properties}}"></i>
+          </a>
+        </li>
         {% endif %} {% endfor %}
       </ul>
+
     </div>
   </div>
   <!-- [DEBUG  ] [j1.modules.fam.html       ] [end menu {{menu.id}}] -->

data/assets/data/gallery_customizer.html

@@ -74,12 +74,12 @@ exclude_from_search:                    true
 
     <header class="bmd-layout-header">
       <div class="navbar navbar-dark bg-primary raised-z2 mb-2">
-        <button class="bmd-drawer drawer-toggler animated fadeIn" type="button" data-toggle="drawer" data-target="#drw_customizer" aria-label="Menu Button">
-          <span class="mdi mdi-menu mdi-3x"></span>
+        <button class="bmd-drawer drawer-toggler animated fadeIn" type="button" data-bs-toggle="drawer" data-bs-target="#drw_customizer" aria-label="Menu Button">
+          <span class="mdi mdi-menu mdi-2x"></span>
         </button>
         <ul class="nav navbar-nav">
           <li class="nav-item">
-            <span class="navbar-text md-grey-900" style="font-size: x-large;">{{customizer_options.title}}</span>
+            <span class="navbar-text mr-3">{{customizer_options.title}}</span>
           </li>
         </ul>
       </div>
@@ -157,7 +157,7 @@ exclude_from_search:                    true
         </div>
 
         <button type="button" name="reset-defaults"
-          class="btn btn-raised btn-flex btn-primary ml-2"
+          class="btn btn-flex btn-primary ml-2"
           aria-label="Reset Button"
           style="min-width: 12rem">
           <i class="mdi mdi-close mdi-24px mdi-md_white mr-1"></i>
@@ -166,7 +166,7 @@ exclude_from_search:                    true
 
         <!-- div class="mt-1">
           <a  id="reset-defaults" href="#void"
-              class="btn btn-raised btn-flex btn-md btn-primary mr-2 mb-2" style="min-width: 10rem">
+              class="btn btn-flex btn-md btn-primary mr-2 mb-2" style="min-width: 10rem">
               <i class="mdi mdi-eye mdi-24px mdi-md_white mr-1"></i>
               Reset to defaults
           </a>
@@ -237,7 +237,7 @@ exclude_from_search:                    true
         </div>
 
         <button type="button" name="reset-defaults"
-          class="btn btn-raised btn-flex btn-primary ml-2"
+          class="btn btn-flex btn-primary ml-2"
           aria-label="Reset Button"
           style="min-width: 12rem">
           <i class="mdi mdi-close mdi-24px mdi-md_white mr-1"></i>