j1-template 2022.2.2 → 2022.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc402781f6f473ed4685e1eb48cc258d07d48c861856f3a1f8c0f02117308e47
-  data.tar.gz: d2ba4fe6374cca530579071f7a7320b12e3c17779f0c495fa256b6d2cd76bd99
+  metadata.gz: 7e8a8bf49396d4fe36c0390c3d0e56028fc6836f7d796a0a848d4446a4925c0a
+  data.tar.gz: ff9e9fb6c8063c8f623a72a5ca396cbd0aba4e2bc7b6de639c53e4ad224c1830
 SHA512:
-  metadata.gz: 73968677538faeb81a967b1a41928260e597977094c863b1fa82a02e0ecd2f67335f5c762f458a72c12ce48c16f1badc2a72d366d9a99c57cd5c735250c1ad67
-  data.tar.gz: cc318ccd843702b184c5bdbe4cb89950412b91315171c0080a380c83f452284f856170bf7982121e8b79152cbff38fad2e2e156f12ceb13e557a50e04d0ae5f9
+  metadata.gz: e662b6d65a3a15424e157bfb2acb767575dac5c31cb65b2ec3d4ba575ef534d40de491e981a523330765cc8f198157b03f02ce623b6fca6c47e4df12bfeb9194
+  data.tar.gz: 2872c3531e4f5adecb327af16d5cb7cac8e680b3cfb44b5f3d07121eb3d47a827e86c1ff2a8887391aaf9223744b0ea94cad5c46961a08a8747933fd5c356693

data/_includes/themes/j1/blocks/footer/boxes/contacts_box.proc

@@ -12,42 +12,70 @@
  # For details, see: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
  # -----------------------------------------------------------------------------
  # Test data:
- #  liquid_var:  {{ liquid_var | debug }}
+ #  liquid_var:  {{liquid_var | debug}}
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
 {% comment %} Liquid procedures
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 
 {% comment %} Variables
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign title               = box.title %}
+{% assign title_translation   = box.title_translation %}
+{% assign tagline             = box.tagline %}
+
+{% assign address_enabled     = box.address.enabled %}
+{% assign phone_enabled       = box.phone.enabled %}
+{% assign internet_enabled    = box.internet.enabled %}
+
+{% assign address_1           = box.address.address_1 %}
+{% assign address_2           = box.address.address_2 %}
+{% assign address_3           = box.address.address_3 %}
+
+
+{% assign office_hours        = box.phone.office_hours %}
+{% assign phone_1             = box.phone.phone_1 %}
+{% assign phone_2             = box.phone.phone_2 %}
+
+{% assign home_text           = box.internet.home_text %}
+{% assign home_link           = box.internet.home_link %}
+{% assign mail_1              = box.internet.mail_1 %}
+{% assign mail_2              = box.internet.mail_2 %}
 
 
 {% comment %} Main
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 <!-- [INFO   ] [j1.assets.data.footer              ] [Found ContactsBox. Process ContactsBox] -->
 <div class="col-md-{{footer_box_width_md}}"> <!-- ContactsBox -->
-  <div class="heading-footer"><h2 class="notoc notranslate">{{ title }}</h2></div>
-  <ul class="list-unstyled contacts">
-    {% if address %}
+
+  <h2 class="text-uppercase g-color-white-opacity-0_6 g-font-size-18 mb-0 {{title_translation}}">{{title}}</h2>
+  <p class="tagline mb-0"> <large>{{tagline}}</large> </p>
+  <div class="d-inline-block g-width-50 g-height-2 bg-primary mb-1"></div>
+
+  <ul class="list-unstyled contacts r-text-100">
+    {% if address_enabled %}
     <li>
-      <i class="radius-3x fa fa-map-marker"></i>
-      <p>{{ address_1 }}</p>
-      <p>{{ address_2 }}</p>
+      <i class="fa fa-map-marker fa-2x"></i>
+      <p>{{address_1}}</p>
+      <p>{{address_2}}</p>
+      <p>{{address_3}}</p>
     </li>
     {% endif %}
-    {% if phone %}
+    {% if phone_enabled %}
     <li>
-      <i class="radius-3x fa fa-phone"></i>
-      <p>{{ phone_1 }}</p>
-      <p>{{ phone_2 }}</p>
+      <i class="fa fa-phone fa-2x"></i>
+      <p> hours:  {{office_hours}}</p>
+      <p> office: {{phone_1}}</p>
+      <p> fax:    {{phone_2}}</p>
     </li>
     {% endif %}
-    {% if internet %}
+    {% if internet_enabled %}
     <li>
-      <i class="radius-3x fa fa-globe"></i>
-      <p><a href="mailto:{{ mail }}">{{ mail }}</a></p>
-      <p><a href="#void">{{ www }}</a></p>
+      <i class="fa fa-globe fa-2x"></i>
+      <p><a class="link-news" href="{{home_link}}">{{home_text}}</a></p>
+      <p><a class="link-news" href="mailto:{{mail_1}}">{{mail_1}}</a></p>
+      <p><a class="link-news"href="mailto:{{mail_2}}">{{mail_2}}</a></p>
     </li>
     {% endif %}
   </ul>

data/_includes/themes/j1/blocks/footer/boxes/links_box.proc

@@ -26,6 +26,7 @@
 {% assign tagline             = box.tagline %}
 {% assign links               = box.links %}
 
+
 {% comment %} Main
 ================================================================================ {% endcomment %}
 <!-- [INFO   ] [links_box.proc                     ] [ place links box ] -->

data/assets/data/fab.html

@@ -116,14 +116,14 @@ exclude_from_search:                    true
       {% 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>
+        <i id="fab-icon" class="mdi mdi-{{menu.icon}} md-white"></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{{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">            
+          <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>

data/assets/data/footer.html

@@ -21,7 +21,7 @@ exclude_from_search:                    true
  # Test data:
  #    {{ variable | debug }}
  # -----------------------------------------------------------------------------
-{% endcomment %}
+{% endcomment %} 
 
 <!-- [INFO   ] [j1.assets.data.footer              ] [Footer generated: {{site.time}}] -->
 
@@ -162,7 +162,7 @@ exclude_from_search:                    true
                 --------------------------------------------------------------- {% endcomment %}
                 {% when 'contact' %}
                   {% if box.enabled %}
-                    {% include {{contacts_box}} %}
+                    {% include {{contacts_box}} title=box.title tagline=box.tagline %}
                   {% endif %}
 
                   {% comment %} Reset element variable

data/assets/themes/j1/adapter/js/analytics.js

@@ -85,19 +85,19 @@ j1.adapter.analytics = (function (j1, window) {
 
 {% comment %} Set global variables
 -------------------------------------------------------------------------------- {% endcomment %}
-var url             = new liteURL(window.location.href);
-var hostname        = url.hostname;
-var environment     = '{{environment}}';
-var gaScript        = document.createElement('script');
-var providerID      = '{{analytics_options.google.trackingID}}';
-var skipAllHosts    = '{{analytics_options.google.skipAllHosts}}';
-var validProviderID = (providerID.includes('your')) ? false : true;
-var optInOut        = {{analytics_options.google.optInOut}};
-var anonymizeIP     = {{analytics_options.google.anonymizeIP}};
-var cookie_names    = j1.getCookieNames();
-var date            = new Date();
-var timestamp_now   = date.toISOString();
-var skipHost        = false;
+var url               = new liteURL(window.location.href);
+var hostname          = url.hostname;
+var environment       = '{{environment}}';
+var gaScript          = document.createElement('script');
+var providerID        = '{{analytics_options.google.trackingID}}';
+var skipAllHosts      = '{{analytics_options.google.skipAllHosts}}';
+var validProviderID   = (providerID.includes('your')) ? false : true;
+var optInOut          = {{analytics_options.google.optInOut}};
+var anonymizeIP       = {{analytics_options.google.anonymizeIP}};
+var cookie_names      = j1.getCookieNames();
+var date              = new Date();
+var timestamp_now     = date.toISOString();
+var skipHost          = false;
 var skipHosts;
 var gaCookies;
 var user_consent;

data/assets/themes/j1/adapter/js/cookieConsent.js

@@ -212,7 +212,7 @@ j1.adapter.cookieConsent = (function (j1, window) {
             cookieSecure:           secure,                                     // only sent to the server with an encrypted request over HTTPS
             cookieDomain:           domainAttribute,                            // set domain (hostname|domain)
             dialogLanguage:         moduleOptions.dialogLanguage,               // language for the dialog (modal)
-            whitelisted:            moduleOptions.whitelisted,                  // pages NOt dialog is shown
+            whitelisted:            moduleOptions.whitelisted,                  // pages NO cookie dialog is shown
             reloadPageOnChange:     moduleOptions.reloadPageOnChange,           // reload if setzings has changed
             dialogContainerID:      moduleOptions.dialogContainerID,            // container, the dialog modal is (dynamically) loaded
             xhrDataElement:         moduleOptions.xhrDataElement,               // container for all language-specific dialogs (modals)